rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-1299 Small changes proposed in review process.

Browse Source
This commit is contained in:
Andres 2014-04-13 14:07:16 +02:00
parent 598a48a2d9
commit 944e39db07
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/modules/Battery/battery.c
View File

@ -149,7 +149,7 @@ static void onTimer(__attribute__((unused)) UAVObjEvent *ev)
GetNbCells(&batterySettings, &flightBatteryData); GetNbCells(&batterySettings, &flightBatteryData);
// ad a plausibility check: zero voltage => zero current // ad a plausibility check: zero voltage => zero current
if (currentADCPin >= 0 /*&& flightBatteryData.Voltage <= 0.f*/) { if (currentADCPin >= 0 && flightBatteryData.Voltage > 0.f) {
flightBatteryData.Current = (PIOS_ADC_PinGetVolt(currentADCPin) - batterySettings.SensorCalibrations.CurrentZero) * batterySettings.SensorCalibrations.CurrentFactor; // in Amps flightBatteryData.Current = (PIOS_ADC_PinGetVolt(currentADCPin) - batterySettings.SensorCalibrations.CurrentZero) * batterySettings.SensorCalibrations.CurrentFactor; // in Amps
if (flightBatteryData.Current > flightBatteryData.PeakCurrent) { if (flightBatteryData.Current > flightBatteryData.PeakCurrent) {
flightBatteryData.PeakCurrent = flightBatteryData.Current; // in Amps flightBatteryData.PeakCurrent = flightBatteryData.Current; // in Amps
@ -213,12 +213,12 @@ static void onTimer(__attribute__((unused)) UAVObjEvent *ev)
static int8_t GetNbCells(const FlightBatterySettingsData *batterySettings, FlightBatteryStateData *flightBatteryData) static int8_t GetNbCells(const FlightBatterySettingsData *batterySettings, FlightBatteryStateData *flightBatteryData)
{ {
// get flight status to check for armed // get flight status to check for armed
FlightStatusData flightStatus; uint8_t armed=0;
FlightStatusArmedGet(&armed);
FlightStatusGet(&flightStatus);
// check only if not armed // check only if not armed
if (flightStatus.Armed == FLIGHTSTATUS_ARMED_ARMED) { if (armed == FLIGHTSTATUS_ARMED_ARMED) {
return -2; return -2;
} }