Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 09:45:37 +03:00
Code Issues Wiki Activity

Fixes from review

Browse source
This commit is contained in:
Bruce Luckcuck 2018-07-07 20:22:37 -04:00
parent ae2abc5d50
commit 899942621c
5 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/io/beeper.c
View file

@ -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_OPEN, 20, beep_camOpenBeep, "CAM_CONNECTION_OPEN") },
{ BEEPER_ENTRY(BEEPER_CAM_CONNECTION_CLOSE, 21, beep_camCloseBeep, "CAM_CONNECTION_CLOSED") }, { 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_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; static const beeperTableEntry_t *currentBeeperEntry = NULL;

3
src/main/io/beeper.h
View file

@ -84,7 +84,8 @@ typedef enum {
| BEEPER_GET_FLAG(BEEPER_CRASH_FLIP_MODE) \ | BEEPER_GET_FLAG(BEEPER_CRASH_FLIP_MODE) \
| BEEPER_GET_FLAG(BEEPER_CAM_CONNECTION_OPEN) \ | BEEPER_GET_FLAG(BEEPER_CAM_CONNECTION_OPEN) \
| BEEPER_GET_FLAG(BEEPER_CAM_CONNECTION_CLOSE) \ | 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 ( \ #define DSHOT_BEACON_ALLOWED_MODES ( \
BEEPER_GET_FLAG(BEEPER_RX_LOST) \ BEEPER_GET_FLAG(BEEPER_RX_LOST) \

2
src/main/io/osd.c
View file

@ -828,7 +828,7 @@ static bool osdDrawSingleElement(uint8_t item)
#ifdef USE_RC_SMOOTHING_FILTER #ifdef USE_RC_SMOOTHING_FILTER
// Show warning if rc smoothing hasn't initialized the filters // 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"); osdFormatMessage(buff, OSD_FORMAT_MESSAGE_BUFFER_SIZE, "RCSMOOTHING");
break; break;
} }

1
src/main/io/osd.h
View file

@ -161,6 +161,7 @@ typedef enum {
OSD_WARNING_CRASH_FLIP, OSD_WARNING_CRASH_FLIP,
OSD_WARNING_ESC_FAIL, OSD_WARNING_ESC_FAIL,
OSD_WARNING_CORE_TEMPERATURE, OSD_WARNING_CORE_TEMPERATURE,
OSD_WARNING_RC_SMOOTHING,
OSD_WARNING_COUNT // MUST BE LAST OSD_WARNING_COUNT // MUST BE LAST
} osdWarningsFlags_e; } osdWarningsFlags_e;

2
src/main/target/STM32F3DISCOVERY/target.h
View file

@ -45,6 +45,7 @@
//#undef USE_TELEMETRY_HOTT //#undef USE_TELEMETRY_HOTT
//#undef USE_TELEMETRY_MAVLINK //#undef USE_TELEMETRY_MAVLINK
#undef USE_TELEMETRY_LTM
//#undef USE_SERIALRX_XBUS //#undef USE_SERIALRX_XBUS
#undef USE_BOARD_INFO #undef USE_BOARD_INFO
@ -52,7 +53,6 @@
#undef USE_RTC_TIME #undef USE_RTC_TIME
#undef USE_EXTENDED_CMS_MENUS #undef USE_EXTENDED_CMS_MENUS
#undef USE_ESC_SENSOR_INFO #undef USE_ESC_SENSOR_INFO
#undef USE_TELEMETRY_LTM
#define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_NONE