Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
eeb138b1
Commit
eeb138b1
authored
Apr 05, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Amps should be double
parent
f6c802cc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
FirmwarePlugin.cc
src/FirmwarePlugin/FirmwarePlugin.cc
+1
-1
FirmwarePlugin.h
src/FirmwarePlugin/FirmwarePlugin.h
+1
-1
MissionController.h
src/MissionManager/MissionController.h
+2
-2
No files found.
src/FirmwarePlugin/FirmwarePlugin.cc
View file @
eeb138b1
...
...
@@ -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
;
...
...
src/FirmwarePlugin/FirmwarePlugin.h
View file @
eeb138b1
...
...
@@ -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
;
...
...
src/MissionManager/MissionController.h
View file @
eeb138b1
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment