ENABLE_FEAT_F4HWN_CTR and ENABLE_FEAT_F4HWN_INV refactoring
This commit is contained in:
19
app/app.c
19
app/app.c
@@ -969,19 +969,10 @@ void APP_Update(void)
|
||||
//if (gKeyReading1 != KEY_INVALID)
|
||||
// gPttWasReleased = true;
|
||||
}
|
||||
#if defined(ENABLE_FEAT_F4HWN_CTR) || defined(ENABLE_FEAT_F4HWN_INV)
|
||||
ST7565_ContrastAndInv();
|
||||
#endif
|
||||
}
|
||||
/*
|
||||
if (gSetting_set_ptt_session) // Improve OnePush if TOT
|
||||
{
|
||||
ProcessKey(KEY_PTT, false, false);
|
||||
gPttIsPressed = false;
|
||||
gPttOnePushCounter = 0;
|
||||
if (gKeyReading1 != KEY_INVALID)
|
||||
gPttWasReleased = true;
|
||||
ST7565_ContrastAndInv();
|
||||
}
|
||||
*/
|
||||
#endif
|
||||
|
||||
APP_EndTransmission();
|
||||
@@ -1216,7 +1207,9 @@ static void CheckKeys(void)
|
||||
if (gKeyReading1 != KEY_INVALID)
|
||||
gPttWasReleased = true;
|
||||
gPttOnePushCounter = 0;
|
||||
ST7565_ContrastAndInv();
|
||||
#if defined(ENABLE_FEAT_F4HWN_CTR) || defined(ENABLE_FEAT_F4HWN_INV)
|
||||
ST7565_ContrastAndInv();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1236,7 +1229,9 @@ static void CheckKeys(void)
|
||||
gPttIsPressed = false;
|
||||
if (gKeyReading1 != KEY_INVALID)
|
||||
gPttWasReleased = true;
|
||||
#if defined(ENABLE_FEAT_F4HWN_CTR) || defined(ENABLE_FEAT_F4HWN_INV)
|
||||
ST7565_ContrastAndInv();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@@ -400,17 +400,19 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
|
||||
//*pMin = 0;
|
||||
*pMax = ARRAY_SIZE(gSubMenu_SET_TOT) - 1;
|
||||
break;
|
||||
#ifdef ENABLE_FEAT_F4HWN_CONTRAST
|
||||
#ifdef ENABLE_FEAT_F4HWN_CTR
|
||||
case MENU_SET_CTR:
|
||||
*pMin = 1;
|
||||
*pMax = 15;
|
||||
break;
|
||||
#endif
|
||||
case MENU_TX_LOCK:
|
||||
#ifdef ENABLE_FEAT_F4HWN_INV
|
||||
case MENU_SET_INV:
|
||||
//*pMin = 0;
|
||||
*pMax = ARRAY_SIZE(gSubMenu_OFF_ON) - 1;
|
||||
break;
|
||||
#endif
|
||||
case MENU_SET_LCK:
|
||||
//*pMin = 0;
|
||||
*pMax = ARRAY_SIZE(gSubMenu_SET_LCK) - 1;
|
||||
@@ -928,7 +930,7 @@ void MENU_AcceptSetting(void)
|
||||
case MENU_SET_EOT:
|
||||
gSetting_set_eot = gSubMenuSelection;
|
||||
break;
|
||||
#ifdef ENABLE_FEAT_F4HWN_CONTRAST
|
||||
#ifdef ENABLE_FEAT_F4HWN_CTR
|
||||
case MENU_SET_CTR:
|
||||
gSetting_set_ctr = gSubMenuSelection;
|
||||
break;
|
||||
@@ -1381,7 +1383,7 @@ void MENU_ShowCurrentSetting(void)
|
||||
case MENU_SET_EOT:
|
||||
gSubMenuSelection = gSetting_set_eot;
|
||||
break;
|
||||
#ifdef ENABLE_FEAT_F4HWN_CONTRAST
|
||||
#ifdef ENABLE_FEAT_F4HWN_CTR
|
||||
case MENU_SET_CTR:
|
||||
gSubMenuSelection = gSetting_set_ctr;
|
||||
break;
|
||||
|
Reference in New Issue
Block a user