From eeb138b17acaf199c3b630b1530838d620b320af Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 5 Apr 2017 21:13:06 -0700 Subject: [PATCH] Amps should be double --- src/FirmwarePlugin/FirmwarePlugin.cc | 2 +- src/FirmwarePlugin/FirmwarePlugin.h | 2 +- src/MissionManager/MissionController.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc index a573979a3..0bb2acc1d 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.cc +++ b/src/FirmwarePlugin/FirmwarePlugin.cc @@ -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; diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index 06cdc935c..034bcfedb 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -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; diff --git a/src/MissionManager/MissionController.h b/src/MissionManager/MissionController.h index f170b7a17..06751e8f6 100644 --- a/src/MissionManager/MissionController.h +++ b/src/MissionManager/MissionController.h @@ -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 -- 2.22.0