Browse Source

Amps should be double

QGC4.4
Don Gagne 8 years ago
parent
commit
eeb138b17a
  1. 2
      src/FirmwarePlugin/FirmwarePlugin.cc
  2. 2
      src/FirmwarePlugin/FirmwarePlugin.h
  3. 4
      src/MissionManager/MissionController.h

2
src/FirmwarePlugin/FirmwarePlugin.cc

@ -438,7 +438,7 @@ bool FirmwarePlugin::_armVehicle(Vehicle* vehicle) @@ -438,7 +438,7 @@ bool FirmwarePlugin::_armVehicle(Vehicle* vehicle)
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);
mAhBattery = 0;

2
src/FirmwarePlugin/FirmwarePlugin.h

@ -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] hoverAmps Current draw in amps during hover
/// @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
static const char* px4FollowMeFlightMode;

4
src/MissionManager/MissionController.h

@ -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 gimbalYaw; ///< NaN signals yaw was never changed
int mAhBattery; ///< 0 for not available
int hoverAmps; ///< Amp consumption during hover
int cruiseAmps; ///< Amp consumption during cruise
double hoverAmps; ///< Amp consumption during hover
double cruiseAmps; ///< Amp consumption during cruise
double ampMinutesAvailable; ///< Amp minutes available from single battery
double hoverAmpsTotal; ///< Total hover amps used
double cruiseAmpsTotal; ///< Total cruise amps used

Loading…
Cancel
Save