Skip to content

Q
qgroundcontrol
Commit eeb138b1 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Amps should be double

parent f6c802cc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/FirmwarePlugin/FirmwarePlugin.cc
View file @ eeb138b1
...@@ -438,7 +438,7 @@ bool FirmwarePlugin::_armVehicle(Vehicle* vehicle) ...@@ -438,7 +438,7 @@ bool FirmwarePlugin::_armVehicle(Vehicle* vehicle)
return vehicle->armed(); return vehicle->armed();
} }
void FirmwarePlugin::batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, int& hoverAmps, int& cruiseAmps) const void FirmwarePlugin::batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, double& hoverAmps, double& cruiseAmps) const
{ {
Q_UNUSED(vehicle); Q_UNUSED(vehicle);
mAhBattery = 0; mAhBattery = 0;
......
src/FirmwarePlugin/FirmwarePlugin.h
View file @ eeb138b1
...@@ -280,7 +280,7 @@ public: ...@@ -280,7 +280,7 @@ public:
/// @param[out] mAhBattery Battery milliamp-hours rating (0 for no battery data available) /// @param[out] mAhBattery Battery milliamp-hours rating (0 for no battery data available)
/// @param[out] hoverAmps Current draw in amps during hover /// @param[out] hoverAmps Current draw in amps during hover
/// @param[out] cruiseAmps Current draw in amps during cruise /// @param[out] cruiseAmps Current draw in amps during cruise
virtual void batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, int& hoverAmps, int& cruiseAmps) const; virtual void batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, double& hoverAmps, double& cruiseAmps) const;
// FIXME: Hack workaround for non pluginize FollowMe support // FIXME: Hack workaround for non pluginize FollowMe support
static const char* px4FollowMeFlightMode; static const char* px4FollowMeFlightMode;
......
src/MissionManager/MissionController.h
View file @ eeb138b1
...@@ -50,8 +50,8 @@ public: ...@@ -50,8 +50,8 @@ public:
double vehicleSpeed; ///< Either cruise or hover speed based on vehicle type and vtol state double vehicleSpeed; ///< Either cruise or hover speed based on vehicle type and vtol state
double gimbalYaw; ///< NaN signals yaw was never changed double gimbalYaw; ///< NaN signals yaw was never changed
int mAhBattery; ///< 0 for not available int mAhBattery; ///< 0 for not available
int hoverAmps; ///< Amp consumption during hover double hoverAmps; ///< Amp consumption during hover
int cruiseAmps; ///< Amp consumption during cruise double cruiseAmps; ///< Amp consumption during cruise
double ampMinutesAvailable; ///< Amp minutes available from single battery double ampMinutesAvailable; ///< Amp minutes available from single battery
double hoverAmpsTotal; ///< Total hover amps used double hoverAmpsTotal; ///< Total hover amps used
double cruiseAmpsTotal; ///< Total cruise amps used double cruiseAmpsTotal; ///< Total cruise amps used
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment