Remove custom defaults

betaflight · Dec 10, 2023 · 82b9fe0 · 82b9fe0
1 parent 31c5bea
commit 82b9fe0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/src/main/cli/cli.h b/src/main/cli/cli.h
@@ -25,10 +25,8 @@
 extern bool cliMode;
 
 void cliProcess(void);
-bool hasCustomDefaults(void);
 struct serialPort_s;
 void cliEnter(struct serialPort_s *serialPort);
-bool resetConfigToCustomDefaults(void);
 
 #ifdef USE_CLI_DEBUG_PRINT
 void cliPrint(const char *str);

diff --git a/src/main/config/config.c b/src/main/config/config.c
@@ -475,10 +475,7 @@ static void validateAndFixConfig(void)
     featureDisableImmediate(FEATURE_RSSI_ADC);
 #endif
 
-// Enable features in Cloud Build
-#ifdef CLOUD_BUILD
-
-if (systemConfig()->configurationState == CONFIGURATION_STATE_DEFAULTS_BARE) {
+if (systemConfig()->configurationState != CONFIGURATION_STATE_CONFIGURED) {
 
 #ifdef USE_DASHBOARD
     featureEnableImmediate(FEATURE_DASHBOARD);
@@ -511,9 +508,6 @@ if (systemConfig()->configurationState == CONFIGURATION_STATE_DEFAULTS_BARE) {
 
 }
 
-#endif // CLOUD_BUILD
-
-
 #if defined(USE_BEEPER)
 #ifdef USE_TIMER
     if (beeperDevConfig()->frequency && !timerGetConfiguredByTag(beeperDevConfig()->ioTag)) {

diff --git a/src/main/config/config.h b/src/main/config/config.h
@@ -29,7 +29,6 @@
 
 typedef enum {
     CONFIGURATION_STATE_DEFAULTS_BARE = 0,
-    CONFIGURATION_STATE_DEFAULTS_CUSTOM,
     CONFIGURATION_STATE_CONFIGURED,
 } configurationState_e;
 

diff --git a/src/main/msp/msp.c b/src/main/msp/msp.c
@@ -655,10 +655,7 @@ static bool mspCommonProcessOutCommand(int16_t cmdMSP, sbuf_t *dst, mspPostProce
         // Target capabilities (uint8)
 #define TARGET_HAS_VCP 0
 #define TARGET_HAS_SOFTSERIAL 1
-#define TARGET_IS_UNIFIED 2
 #define TARGET_HAS_FLASH_BOOTLOADER 3
-#define TARGET_SUPPORTS_CUSTOM_DEFAULTS 4
-#define TARGET_HAS_CUSTOM_DEFAULTS 5
 #define TARGET_SUPPORTS_RX_BIND 6
 
         uint8_t targetCapabilities = 0;
@@ -668,11 +665,9 @@ static bool mspCommonProcessOutCommand(int16_t cmdMSP, sbuf_t *dst, mspPostProce
 #if defined(USE_SOFTSERIAL)
         targetCapabilities |= BIT(TARGET_HAS_SOFTSERIAL);
 #endif
-        targetCapabilities |= BIT(TARGET_IS_UNIFIED);
 #if defined(USE_FLASH_BOOT_LOADER)
         targetCapabilities |= BIT(TARGET_HAS_FLASH_BOOTLOADER);
 #endif
-
 #if defined(USE_RX_BIND)
         if (getRxBindSupported()) {
             targetCapabilities |= BIT(TARGET_SUPPORTS_RX_BIND);