Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-20 23:05:19 +03:00
Code Issues Wiki Activity

Add logging of failsafe phase (to slow frames)

Browse source
This commit is contained in:
Nicholas Sherlock 2015-05-18 11:30:46 +12:00
parent 69ea90f522
commit 0811367f24
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/blackbox/blackbox.c
View file

@ -243,7 +243,8 @@ static const blackboxSimpleFieldDefinition_t blackboxGpsHFields[] = {
// Rarely-updated fields // Rarely-updated fields
static const blackboxSimpleFieldDefinition_t blackboxSlowFields[] = { static const blackboxSimpleFieldDefinition_t blackboxSlowFields[] = {
{"flightModeFlags", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)}, {"flightModeFlags", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)},
{"stateFlags", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)} {"stateFlags", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)},
{"failsafePhase", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)}
}; };
typedef enum BlackboxState { typedef enum BlackboxState {
@ -294,6 +295,7 @@ typedef struct blackboxGpsState_t {
typedef struct blackboxSlowState_t { typedef struct blackboxSlowState_t {
uint16_t flightModeFlags; uint16_t flightModeFlags;
uint8_t stateFlags; uint8_t stateFlags;
uint8_t failsafePhase;
} __attribute__((__packed__)) blackboxSlowState_t; // We pack this struct so that padding doesn't interfere with memcmp() } __attribute__((__packed__)) blackboxSlowState_t; // We pack this struct so that padding doesn't interfere with memcmp()
//From mixer.c: //From mixer.c:
@ -686,6 +688,7 @@ static void writeSlowFrame(void)
blackboxWriteUnsignedVB(slowHistory.flightModeFlags); blackboxWriteUnsignedVB(slowHistory.flightModeFlags);
blackboxWriteUnsignedVB(slowHistory.stateFlags); blackboxWriteUnsignedVB(slowHistory.stateFlags);
blackboxWriteUnsignedVB(slowHistory.failsafePhase);
blackboxSlowFrameIterationTimer = 0; blackboxSlowFrameIterationTimer = 0;
} }
@ -697,6 +700,7 @@ static void loadSlowState(blackboxSlowState_t *slow)
{ {
slow->flightModeFlags = flightModeFlags; slow->flightModeFlags = flightModeFlags;
slow->stateFlags = stateFlags; slow->stateFlags = stateFlags;
slow->failsafePhase = failsafePhase();
} }
static void writeSlowFrameIfNeeded(void) static void writeSlowFrameIfNeeded(void)