This commit is contained in:
19
settings.c
19
settings.c
@@ -338,8 +338,6 @@ void SETTINGS_InitEEPROM(void) {
|
||||
int tmp = ((Data[5] & 0xF0) >> 4);
|
||||
|
||||
gSetting_set_inv = (((tmp >> 0) & 0x01) < 2) ? ((tmp >> 0) & 0x01): 0;
|
||||
gSetting_set_lck = (((tmp >> 1) & 0x01) < 2) ? ((tmp >> 1) & 0x01): 0;
|
||||
gSetting_set_ctr = (((Data[5] & 0x0F)) > 00 && ((Data[5] & 0x0F)) < 16) ? ((Data[5] & 0x0F)) : 10;
|
||||
|
||||
gSetting_set_tmr = ((Data[4] & 1) < 2) ? (Data[4] & 1): 0;
|
||||
*/
|
||||
@@ -351,14 +349,6 @@ void SETTINGS_InitEEPROM(void) {
|
||||
#else
|
||||
gSetting_set_inv = 0;
|
||||
#endif
|
||||
gSetting_set_lck = (tmp >> 1) & 0x01;
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN_CTR
|
||||
int ctr_value = Data[5] & 0x0F;
|
||||
gSetting_set_ctr = (ctr_value > 0 && ctr_value < 16) ? ctr_value : 10;
|
||||
#else
|
||||
gSetting_set_ctr = 10;
|
||||
#endif
|
||||
|
||||
gSetting_set_tmr = Data[4] & 0x01;
|
||||
#ifdef ENABLE_FEAT_F4HWN_SLEEP
|
||||
@@ -371,7 +361,6 @@ void SETTINGS_InitEEPROM(void) {
|
||||
|
||||
// And set special session settings for actions
|
||||
gSetting_set_ptt_session = gSetting_set_ptt;
|
||||
gEeprom.KEY_LOCK_PTT = gSetting_set_lck;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -763,8 +752,6 @@ void SETTINGS_SaveSettings(void) {
|
||||
|
||||
if(gSetting_set_inv == 1)
|
||||
tmp = tmp | (1 << 0);
|
||||
if (gSetting_set_lck == 1)
|
||||
tmp = tmp | (1 << 1);
|
||||
*/
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN_SLEEP
|
||||
@@ -773,13 +760,11 @@ void SETTINGS_SaveSettings(void) {
|
||||
State[4] = gSetting_set_tmr ? (1 << 0) : 0;
|
||||
#endif
|
||||
|
||||
tmp = (gSetting_set_inv << 0) |
|
||||
(gSetting_set_lck << 1);
|
||||
tmp = (gSetting_set_inv << 0);
|
||||
|
||||
State[5] = ((tmp << 4) | (gSetting_set_ctr & 0x0F));
|
||||
State[5] = (tmp << 4);
|
||||
State[6] = ((gSetting_set_tot << 4) | (gSetting_set_eot & 0x0F));
|
||||
State[7] = gSetting_set_ptt & 0x0F;
|
||||
gEeprom.KEY_LOCK_PTT = gSetting_set_lck;
|
||||
|
||||
EEPROM_WriteBuffer(0x1FF0, State);
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user