Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 07:15:18 +03:00
Code Issues Wiki Activity

Merge pull request #2659 from mamaretti/master

Browse source 
Added climbrate m/s and m/3s to Hott EAM
This commit is contained in:
Michael Keller 2017-03-16 10:12:06 +13:00 • committed by GitHub
commit d857847157
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/telemetry/hott.c
View file

@ -84,6 +84,8 @@
#include "flight/navigation.h" #include "flight/navigation.h"
#include "io/gps.h" #include "io/gps.h"
#include "flight/altitudehold.h"
#include "telemetry/telemetry.h" #include "telemetry/telemetry.h"
#include "telemetry/hott.h" #include "telemetry/hott.h"
@ -275,6 +277,13 @@ static inline void hottEAMUpdateAltitude(HOTT_EAM_MSG_t *hottEAMMessage)
hottEAMMessage->altitude_H = hottEamAltitude >> 8; hottEAMMessage->altitude_H = hottEamAltitude >> 8;
} }
static inline void hottEAMUpdateClimbrate(HOTT_EAM_MSG_t *hottEAMMessage)
{
hottEAMMessage->climbrate_L = (30000 + vario) & 0x00FF;
hottEAMMessage->climbrate_H = (30000 + vario) >> 8;
hottEAMMessage->climbrate3s = 120 + (vario / 100);
}
void hottPrepareEAMResponse(HOTT_EAM_MSG_t *hottEAMMessage) void hottPrepareEAMResponse(HOTT_EAM_MSG_t *hottEAMMessage)
{ {
// Reset alarms // Reset alarms
@ -285,6 +294,7 @@ void hottPrepareEAMResponse(HOTT_EAM_MSG_t *hottEAMMessage)
hottEAMUpdateCurrentMeter(hottEAMMessage); hottEAMUpdateCurrentMeter(hottEAMMessage);
hottEAMUpdateBatteryDrawnCapacity(hottEAMMessage); hottEAMUpdateBatteryDrawnCapacity(hottEAMMessage);
hottEAMUpdateAltitude(hottEAMMessage); hottEAMUpdateAltitude(hottEAMMessage);
hottEAMUpdateClimbrate(hottEAMMessage);
} }
static void hottSerialWrite(uint8_t c) static void hottSerialWrite(uint8_t c)

3
src/test/unit/telemetry_hott_unittest.cc
View file

@ -181,6 +181,8 @@ uint32_t fixedMillis = 0;
baro_t baro; baro_t baro;
int32_t vario = 0;
uint32_t millis(void) { uint32_t millis(void) {
return fixedMillis; return fixedMillis;
} }
@ -267,4 +269,3 @@ uint16_t getVbat(void)
return vbat; return vbat;
} }
} }