diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c index 5808500fa..8cc4232b6 100644 --- a/src/main/io/beeper.c +++ b/src/main/io/beeper.c @@ -228,7 +228,7 @@ static const beeperTableEntry_t beeperTable[] = { { BEEPER_ENTRY(BEEPER_CAM_CONNECTION_OPEN, 20, beep_camOpenBeep, "CAM_CONNECTION_OPEN") }, { BEEPER_ENTRY(BEEPER_CAM_CONNECTION_CLOSE, 21, beep_camCloseBeep, "CAM_CONNECTION_CLOSED") }, { BEEPER_ENTRY(BEEPER_RC_SMOOTHING_INIT_FAIL,22, beep_rcSmoothingInitFail, "RC_SMOOTHING_INIT_FAIL") }, - { BEEPER_ENTRY(BEEPER_ALL, 22, NULL, "ALL") }, + { BEEPER_ENTRY(BEEPER_ALL, 23, NULL, "ALL") }, }; static const beeperTableEntry_t *currentBeeperEntry = NULL; diff --git a/src/main/io/beeper.h b/src/main/io/beeper.h index 82c5e027b..212e492ff 100644 --- a/src/main/io/beeper.h +++ b/src/main/io/beeper.h @@ -84,7 +84,8 @@ typedef enum { | BEEPER_GET_FLAG(BEEPER_CRASH_FLIP_MODE) \ | BEEPER_GET_FLAG(BEEPER_CAM_CONNECTION_OPEN) \ | BEEPER_GET_FLAG(BEEPER_CAM_CONNECTION_CLOSE) \ - | BEEPER_GET_FLAG(BEEPER_RC_SMOOTHING_INIT_FAIL) ) + | BEEPER_GET_FLAG(BEEPER_RC_SMOOTHING_INIT_FAIL) \ + ) #define DSHOT_BEACON_ALLOWED_MODES ( \ BEEPER_GET_FLAG(BEEPER_RX_LOST) \ diff --git a/src/main/io/osd.c b/src/main/io/osd.c index bab35dc38..17525e11c 100644 --- a/src/main/io/osd.c +++ b/src/main/io/osd.c @@ -828,7 +828,7 @@ static bool osdDrawSingleElement(uint8_t item) #ifdef USE_RC_SMOOTHING_FILTER // Show warning if rc smoothing hasn't initialized the filters - if (ARMING_FLAG(ARMED) && !rcSmoothingInitializationComplete()) { + if (osdWarnGetState(OSD_WARNING_RC_SMOOTHING) && ARMING_FLAG(ARMED) && !rcSmoothingInitializationComplete()) { osdFormatMessage(buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RCSMOOTHING"); break; } diff --git a/src/main/io/osd.h b/src/main/io/osd.h index 644ed0718..b1fcdb083 100644 --- a/src/main/io/osd.h +++ b/src/main/io/osd.h @@ -161,6 +161,7 @@ typedef enum { OSD_WARNING_CRASH_FLIP, OSD_WARNING_ESC_FAIL, OSD_WARNING_CORE_TEMPERATURE, + OSD_WARNING_RC_SMOOTHING, OSD_WARNING_COUNT // MUST BE LAST } osdWarningsFlags_e; diff --git a/src/main/target/STM32F3DISCOVERY/target.h b/src/main/target/STM32F3DISCOVERY/target.h index 1ceef1ab4..17384f75b 100644 --- a/src/main/target/STM32F3DISCOVERY/target.h +++ b/src/main/target/STM32F3DISCOVERY/target.h @@ -45,6 +45,7 @@ //#undef USE_TELEMETRY_HOTT //#undef USE_TELEMETRY_MAVLINK +#undef USE_TELEMETRY_LTM //#undef USE_SERIALRX_XBUS #undef USE_BOARD_INFO @@ -52,7 +53,6 @@ #undef USE_RTC_TIME #undef USE_EXTENDED_CMS_MENUS #undef USE_ESC_SENSOR_INFO -#undef USE_TELEMETRY_LTM #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE