diff --git a/radio/src/gui/common/stdlcd/model_module_options.cpp b/radio/src/gui/common/stdlcd/model_module_options.cpp index 05259f3e1..1a0ce1baa 100644 --- a/radio/src/gui/common/stdlcd/model_module_options.cpp +++ b/radio/src/gui/common/stdlcd/model_module_options.cpp @@ -25,10 +25,16 @@ extern uint8_t g_moduleIdx; +enum { + MODULE_SETTINGS_OK, + MODULE_SETTINGS_DIRTY, + MODULE_SETTINGS_WRITING, +}; + void onTxOptionsUpdateConfirm(const char * result) { if (result == STR_OK) { - reusableBuffer.hardwareAndSettings.moduleSettings.dirty = 2; + reusableBuffer.hardwareAndSettings.moduleSettings.dirty = MODULE_SETTINGS_WRITING; moduleState[g_moduleIdx].writeModuleSettings(&reusableBuffer.hardwareAndSettings.moduleSettings); } else { @@ -111,11 +117,11 @@ void menuModelModuleOptions(event_t event) if (event == EVT_KEY_LONG(KEY_ENTER) && reusableBuffer.hardwareAndSettings.moduleSettings.dirty) { killEvents(event); - reusableBuffer.hardwareAndSettings.moduleSettings.dirty = 0; + reusableBuffer.hardwareAndSettings.moduleSettings.dirty = MODULE_SETTINGS_OK; moduleState[g_moduleIdx].writeModuleSettings(&reusableBuffer.hardwareAndSettings.moduleSettings); } - if (reusableBuffer.hardwareAndSettings.moduleSettings.dirty == 2 && reusableBuffer.hardwareAndSettings.moduleSettings.state == PXX2_SETTINGS_OK) { + if (reusableBuffer.hardwareAndSettings.moduleSettings.dirty == MODULE_SETTINGS_WRITING && reusableBuffer.hardwareAndSettings.moduleSettings.state == PXX2_SETTINGS_OK) { popMenu(); return; } @@ -148,7 +154,7 @@ void menuModelModuleOptions(event_t event) case ITEM_MODULE_SETTINGS_EXTERNAL_ANTENNA: reusableBuffer.hardwareAndSettings.moduleSettings.externalAntenna = editCheckBox(reusableBuffer.hardwareAndSettings.moduleSettings.externalAntenna, RECEIVER_OPTIONS_2ND_COLUMN, y, "Ext. antenna", attr, event); if (attr && checkIncDec_Ret) { - reusableBuffer.hardwareAndSettings.moduleSettings.dirty = true; + reusableBuffer.hardwareAndSettings.moduleSettings.dirty = MODULE_SETTINGS_DIRTY; } break; @@ -161,7 +167,7 @@ void menuModelModuleOptions(event_t event) if (attr) { reusableBuffer.hardwareAndSettings.moduleSettings.txPower = checkIncDec(event, reusableBuffer.hardwareAndSettings.moduleSettings.txPower, 0, 30, 0, &isPowerAvailable); if (checkIncDec_Ret) { - reusableBuffer.hardwareAndSettings.moduleSettings.dirty = true; + reusableBuffer.hardwareAndSettings.moduleSettings.dirty = MODULE_SETTINGS_DIRTY; } } break;