From bf12719158704ba09b961be724ea0d1d7ba887e2 Mon Sep 17 00:00:00 2001 From: OneOfEleven Date: Thu, 28 Sep 2023 22:34:43 +0100 Subject: [PATCH] Rename to help me better remember/understand --- app/app.c | 8 ++++---- app/main.c | 2 +- app/menu.c | 6 +++--- misc.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/app.c b/app/app.c index 1a29898..9659bd3 100644 --- a/app/app.c +++ b/app/app.c @@ -2305,8 +2305,8 @@ Skip: { SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxVfo, gRequestSaveChannel); if (gScreenToDisplay != DISPLAY_SCANNER) - if (gVfoConfigureMode == VFO_CONFIGURE_0) - gVfoConfigureMode = VFO_CONFIGURE_1; + if (gVfoConfigureMode == VFO_CONFIGURE_NONE) + gVfoConfigureMode = VFO_CONFIGURE; } else { @@ -2318,7 +2318,7 @@ Skip: gRequestSaveChannel = 0; } - if (gVfoConfigureMode != VFO_CONFIGURE_0) + if (gVfoConfigureMode != VFO_CONFIGURE_NONE) { if (gFlagResetVfos) { @@ -2332,7 +2332,7 @@ Skip: gRequestDisplayScreen = DISPLAY_MAIN; gFlagReconfigureVfos = true; - gVfoConfigureMode = VFO_CONFIGURE_0; + gVfoConfigureMode = VFO_CONFIGURE_NONE; gFlagResetVfos = false; } diff --git a/app/main.c b/app/main.c index 6151060..ae182c7 100644 --- a/app/main.c +++ b/app/main.c @@ -182,7 +182,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep) { gTxVfo->SCANLIST1_PARTICIPATION = gTxVfo->SCANLIST1_PARTICIPATION ? 0 : 1; SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true); - gVfoConfigureMode = VFO_CONFIGURE_1; + gVfoConfigureMode = VFO_CONFIGURE; gFlagResetVfos = true; } #endif diff --git a/app/menu.c b/app/menu.c index f8e9dee..3e10e41 100644 --- a/app/menu.c +++ b/app/menu.c @@ -317,7 +317,7 @@ void MENU_AcceptSetting(void) case MENU_SQL: gEeprom.SQUELCH_LEVEL = gSubMenuSelection; - gVfoConfigureMode = VFO_CONFIGURE_1; + gVfoConfigureMode = VFO_CONFIGURE; break; case MENU_STEP: @@ -512,14 +512,14 @@ void MENU_AcceptSetting(void) case MENU_S_ADD1: gTxVfo->SCANLIST1_PARTICIPATION = gSubMenuSelection; SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true); - gVfoConfigureMode = VFO_CONFIGURE_1; + gVfoConfigureMode = VFO_CONFIGURE; gFlagResetVfos = true; return; case MENU_S_ADD2: gTxVfo->SCANLIST2_PARTICIPATION = gSubMenuSelection; SETTINGS_UpdateChannel(gTxVfo->CHANNEL_SAVE, gTxVfo, true); - gVfoConfigureMode = VFO_CONFIGURE_1; + gVfoConfigureMode = VFO_CONFIGURE; gFlagResetVfos = true; return; diff --git a/misc.h b/misc.h index a4e653a..dd7708a 100644 --- a/misc.h +++ b/misc.h @@ -52,8 +52,8 @@ enum { }; enum { - VFO_CONFIGURE_0 = 0, - VFO_CONFIGURE_1, + VFO_CONFIGURE_NONE = 0, + VFO_CONFIGURE, VFO_CONFIGURE_RELOAD };