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

Corrected parameter ordering, no MSP.

Browse source
This commit is contained in:
ianrmurphy 2019-04-15 12:33:47 +01:00
parent 11dd4e7598
commit 8dc1befab1
2 changed files with 2 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/msp/msp.c
View file

@ -809,13 +809,6 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
sbufWriteU8(dst, 0); sbufWriteU8(dst, 0);
#endif // USE_OSD_STICK_OVERLAY #endif // USE_OSD_STICK_OVERLAY
// API >= 1.42
#ifdef USE_RX_LINK_QUALITY_INFO
sbufWriteU8(dst, osdConfig()->link_quality_alarm);
#else
sbufWriteU8(dst, 0);
#endif // USE_RX_LINK_QUALITY_INFO
#endif // USE_OSD #endif // USE_OSD
break; break;
} }
@ -2771,23 +2764,14 @@ static mspResult_e mspCommonProcessInCommand(uint8_t cmdMSP, sbuf_t *src, mspPos
if (sbufBytesRemaining(src) >= 1) { if (sbufBytesRemaining(src) >= 1) {
// API >= 1.41 // API >= 1.41
// OSD stick overlay mode // OSD stick overlay mode
#ifdef USE_OSD_STICK_OVERLAY #ifdef USE_OSD_STICK_OVERLAY
osdConfigMutable()->overlay_radio_mode = sbufReadU8(src); osdConfigMutable()->overlay_radio_mode = sbufReadU8(src);
#else #else
sbufReadU8(src); sbufReadU8(src);
#endif // USE_OSD_STICK_OVERLAY #endif // USE_OSD_STICK_OVERLAY
}
if (sbufBytesRemaining(src) >= 1) {
// API >= 1.42
// Link Quality alarm
#ifdef USE_RX_LINK_QUALITY_INFO
osdConfigMutable()->link_quality_alarm = sbufReadU8(src);
#else
sbufReadU8(src);
#endif // USE_RX_LINK_QUALITY_INFO
} }
#endif #endif
} else if ((int8_t)addr == -2) { } else if ((int8_t)addr == -2) {
#if defined(USE_OSD) #if defined(USE_OSD)

2
src/main/osd/osd.h
View file

@ -224,7 +224,6 @@ typedef struct osdConfig_s {
uint16_t cap_alarm; uint16_t cap_alarm;
uint16_t alt_alarm; uint16_t alt_alarm;
uint8_t rssi_alarm; uint8_t rssi_alarm;
uint8_t link_quality_alarm;
osd_unit_e units; osd_unit_e units;
@ -241,6 +240,7 @@ typedef struct osdConfig_s {
uint8_t ahInvert; // invert the artificial horizon uint8_t ahInvert; // invert the artificial horizon
uint8_t osdProfileIndex; uint8_t osdProfileIndex;
uint8_t overlay_radio_mode; uint8_t overlay_radio_mode;
uint8_t link_quality_alarm;
} osdConfig_t; } osdConfig_t;
PG_DECLARE(osdConfig_t, osdConfig); PG_DECLARE(osdConfig_t, osdConfig);