From 195881a5e2b4ed609c754deb8fe8f55d96efe87b Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Fri, 16 Aug 2024 02:19:52 +0200 Subject: [PATCH] Move spectrum Data[4] to Data[3] --- app/spectrum.c | 8 ++++---- settings.c | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/spectrum.c b/app/spectrum.c index 64bd619..ef05597 100644 --- a/app/spectrum.c +++ b/app/spectrum.c @@ -117,21 +117,21 @@ static void LoadSettings() // 1FF0..0x1FF7 EEPROM_ReadBuffer(0x1FF0, Data, 8); - settings.scanStepIndex = ((Data[4] & 0xF0) >> 4); + settings.scanStepIndex = ((Data[3] & 0xF0) >> 4); if (settings.scanStepIndex > 14) { settings.scanStepIndex = S_STEP_25_0kHz; } - settings.stepsCount = ((Data[4] & 0x0F) & 0b1100) >> 2; + settings.stepsCount = ((Data[3] & 0x0F) & 0b1100) >> 2; if (settings.stepsCount > 3) { settings.stepsCount = STEPS_64; } - settings.listenBw = ((Data[4] & 0x0F) & 0b0011); + settings.listenBw = ((Data[3] & 0x0F) & 0b0011); if (settings.listenBw > 2) { @@ -145,7 +145,7 @@ static void SaveSettings() // 1FF0..0x1FF7 EEPROM_ReadBuffer(0x1FF0, Data, 8); - Data[4] = (settings.scanStepIndex << 4) | (settings.stepsCount << 2) | settings.listenBw; + Data[3] = (settings.scanStepIndex << 4) | (settings.stepsCount << 2) | settings.listenBw; EEPROM_WriteBuffer(0x1FF0, Data); } diff --git a/settings.c b/settings.c index 2211a77..2145b5b 100644 --- a/settings.c +++ b/settings.c @@ -348,6 +348,10 @@ void SETTINGS_InitEEPROM(void) gSetting_set_tmr = Data[4] & 1; + // Warning + // Be aware, Data[3] is use by Spectrum + // Warning + // And set special session settings for actions gSetting_set_ptt_session = gSetting_set_ptt; gEeprom.KEY_LOCK_PTT = gSetting_set_lck;