diff --git a/src/main/config/config.c b/src/main/config/config.c index 055c27a778..53da557ec0 100755 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -564,7 +564,6 @@ static void resetConf(void) #ifdef LED_STRIP applyDefaultColors(masterConfig.colors, CONFIGURABLE_COLOR_COUNT); applyDefaultLedStripConfig(masterConfig.ledConfigs); - masterConfig.ledstrip_visual_beeper = 0; #endif #ifdef SPRACINGF3 diff --git a/src/main/config/config_master.h b/src/main/config/config_master.h index c61df40e60..25a21afba7 100644 --- a/src/main/config/config_master.h +++ b/src/main/config/config_master.h @@ -119,7 +119,6 @@ typedef struct master_t { #ifdef LED_STRIP ledConfig_t ledConfigs[MAX_LED_STRIP_LENGTH]; hsvColor_t colors[CONFIGURABLE_COLOR_COUNT]; - uint8_t ledstrip_visual_beeper; // suppress LEDLOW mode if beeper is on #endif #ifdef TRANSPONDER diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c index b4893a1f16..e7ec349649 100644 --- a/src/main/io/beeper.c +++ b/src/main/io/beeper.c @@ -386,13 +386,6 @@ int beeperTableEntryCount(void) return (int)BEEPER_TABLE_ENTRY_COUNT; } -/* - * Returns true if the beeper is on, false otherwise - */ -bool isBeeperOn(void) { - return beeperIsOn; -} - #else // Stub out beeper functions if #BEEPER not defined @@ -404,6 +397,5 @@ uint32_t getArmingBeepTimeMicros(void) {return 0;} beeperMode_e beeperModeForTableIndex(int idx) {UNUSED(idx); return BEEPER_SILENCE;} const char *beeperNameForTableIndex(int idx) {UNUSED(idx); return NULL;} int beeperTableEntryCount(void) {return 0;} -bool isBeeperOn(void) {return false;} #endif diff --git a/src/main/io/beeper.h b/src/main/io/beeper.h index 0f9f488ef6..7d3ef38ef5 100644 --- a/src/main/io/beeper.h +++ b/src/main/io/beeper.h @@ -53,4 +53,3 @@ uint32_t getArmingBeepTimeMicros(void); beeperMode_e beeperModeForTableIndex(int idx); const char *beeperNameForTableIndex(int idx); int beeperTableEntryCount(void); -bool isBeeperOn(void); diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index f0582a220d..a52ed8df09 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -34,41 +34,19 @@ #include "drivers/light_ws2811strip.h" #include "drivers/system.h" #include "drivers/serial.h" -#include "drivers/sensor.h" -#include "drivers/accgyro.h" -#include "drivers/gpio.h" -#include "drivers/timer.h" -#include "drivers/pwm_rx.h" #include -#include "common/axis.h" #include "io/rc_controls.h" #include "sensors/battery.h" -#include "sensors/sensors.h" -#include "sensors/boardalignment.h" -#include "sensors/gyro.h" -#include "sensors/acceleration.h" -#include "sensors/barometer.h" #include "io/ledstrip.h" -#include "io/beeper.h" -#include "io/escservo.h" -#include "io/gimbal.h" -#include "io/serial.h" #include "flight/failsafe.h" -#include "flight/mixer.h" -#include "flight/pid.h" -#include "flight/imu.h" - -#include "telemetry/telemetry.h" #include "config/runtime_config.h" #include "config/config.h" -#include "config/config_profile.h" -#include "config/config_master.h" static bool ledStripInitialised = false; static bool ledStripEnabled = true; @@ -938,7 +916,7 @@ void updateLedStrip(void) return; } - if (IS_RC_MODE_ACTIVE(BOXLEDLOW) && !(masterConfig.ledstrip_visual_beeper && isBeeperOn())) { + if (IS_RC_MODE_ACTIVE(BOXLEDLOW)) { if (ledStripEnabled) { ledStripDisable(); ledStripEnabled = false; diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index 7f224e16a3..6ecc665b1e 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -770,9 +770,6 @@ const clivalue_t valueTable[] = { { "magzero_x", VAR_INT16 | MASTER_VALUE, &masterConfig.magZero.raw[X], .config.minmax = { -32768, 32767 } }, { "magzero_y", VAR_INT16 | MASTER_VALUE, &masterConfig.magZero.raw[Y], .config.minmax = { -32768, 32767 } }, { "magzero_z", VAR_INT16 | MASTER_VALUE, &masterConfig.magZero.raw[Z], .config.minmax = { -32768, 32767 } }, -#ifdef LED_STRIP - { "ledstrip_visual_beeper", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.ledstrip_visual_beeper, .config.lookup = { TABLE_OFF_ON } }, -#endif }; #define VALUE_COUNT (sizeof(valueTable) / sizeof(clivalue_t))