Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove custom defaults and enable features on boot #13216

Merged
merged 4 commits into from
Dec 17, 2023
Merged

Remove custom defaults and enable features on boot #13216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82b9fe0
Remove custom defaults
haslinghuis Dec 10, 2023
34f537a
Fixes per review
haslinghuis Dec 13, 2023
1bfc0f6
Fixes per review (thanks ledvinap)
haslinghuis Dec 13, 2023
c6a7ac9
Fix copy pasta
haslinghuis Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/cli/cli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,10 @@ static const char *mcuTypeNames[] = {
"AT32F435"
};

static const char *configurationStates[] = { "UNCONFIGURED", "CUSTOM DEFAULTS", "CONFIGURED" };
static const char *configurationStates[] = {
[CONFIGURATION_STATE_UNCONFIGURED] = "UNCONFIGURED",
[CONFIGURATION_STATE_CONFIGURED] = "CONFIGURED"
};

typedef enum dumpFlags_e {
DUMP_MASTER = (1 << 0),
Expand Down
2 changes: 0 additions & 2 deletions src/main/cli/cli.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 2 additions & 8 deletions src/main/config/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ PG_RESET_TEMPLATE(systemConfig_t, systemConfig,
.powerOnArmingGraceTime = 5,
.boardIdentifier = TARGET_BOARD_IDENTIFIER,
.hseMhz = SYSTEM_HSE_MHZ, // Only used for F4 and G4 targets
.configurationState = CONFIGURATION_STATE_DEFAULTS_BARE,
.configurationState = CONFIGURATION_STATE_UNCONFIGURED,
.enableStickArming = false,
);

Expand Down Expand Up @@ -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_UNCONFIGURED) {

#ifdef USE_DASHBOARD
featureEnableImmediate(FEATURE_DASHBOARD);
Expand Down Expand Up @@ -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)) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/config/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
#define MAX_NAME_LENGTH 16u

typedef enum {
CONFIGURATION_STATE_DEFAULTS_BARE = 0,
CONFIGURATION_STATE_DEFAULTS_CUSTOM,
KarateBrot marked this conversation as resolved.
Show resolved Hide resolved
CONFIGURATION_STATE_UNCONFIGURED = 0,
CONFIGURATION_STATE_CONFIGURED,
} configurationState_e;

Expand Down
5 changes: 0 additions & 5 deletions src/main/msp/msp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down