Last state SW BAND/AUTO stored in flash and made it more user friendly
This commit is contained in:
+12
-4
@@ -424,6 +424,7 @@ void setup() {
|
|||||||
fmdeemphasis = EEPROM.readByte(EE_BYTE_FM_DEEMPHASIS);
|
fmdeemphasis = EEPROM.readByte(EE_BYTE_FM_DEEMPHASIS);
|
||||||
BWsetFM = EEPROM.readByte(EE_BYTE_BWSET_FM);
|
BWsetFM = EEPROM.readByte(EE_BYTE_BWSET_FM);
|
||||||
BWsetAM = EEPROM.readByte(EE_BYTE_BWSET_AM);
|
BWsetAM = EEPROM.readByte(EE_BYTE_BWSET_AM);
|
||||||
|
nowToggleSWMIBand = EEPROM.readByte(EE_BYTE_BANDAUTOSW);
|
||||||
|
|
||||||
LWLowEdgeSet = FREQ_LW_LOW_EDGE_MIN; // later will read from flash
|
LWLowEdgeSet = FREQ_LW_LOW_EDGE_MIN; // later will read from flash
|
||||||
LWHighEdgeSet = FREQ_LW_HIGH_EDGE_MAX; // later will read from flash
|
LWHighEdgeSet = FREQ_LW_HIGH_EDGE_MAX; // later will read from flash
|
||||||
@@ -2055,17 +2056,21 @@ void ButtonPress() {
|
|||||||
EEPROM.writeByte(EE_BYTE_EQSET, EQset);
|
EEPROM.writeByte(EE_BYTE_EQSET, EQset);
|
||||||
EEPROM.commit();
|
EEPROM.commit();
|
||||||
} else {
|
} else {
|
||||||
if (band == BAND_SW) {
|
if (band == BAND_SW && tunemode != TUNE_MEM) {
|
||||||
if (tunemode != TUNE_MEM) {
|
|
||||||
nowToggleSWMIBand = !nowToggleSWMIBand;
|
nowToggleSWMIBand = !nowToggleSWMIBand;
|
||||||
tunemode = TUNE_MEM;
|
tunemode = TUNE_MAN;
|
||||||
|
EEPROM.writeByte(EE_BYTE_BANDAUTOSW, nowToggleSWMIBand);
|
||||||
|
EEPROM.commit();
|
||||||
|
if (!screenmute) {
|
||||||
|
tftPrint(0, "AUTO", 22, 60, BackgroundColor, BackgroundColor, 16);
|
||||||
|
tftPrint(0, "BAND", 22, 60, BackgroundColor, BackgroundColor, 16);
|
||||||
|
}
|
||||||
doTuneMode();
|
doTuneMode();
|
||||||
ShowTuneMode();
|
ShowTuneMode();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (screensaverset) {
|
if (screensaverset) {
|
||||||
ScreensaverTimerRestart();
|
ScreensaverTimerRestart();
|
||||||
}
|
}
|
||||||
@@ -2798,6 +2803,7 @@ void doTuneMode() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ShowTuneMode() {
|
void ShowTuneMode() {
|
||||||
|
if (!screenmute) {
|
||||||
switch (tunemode) {
|
switch (tunemode) {
|
||||||
case TUNE_MAN:
|
case TUNE_MAN:
|
||||||
if (band == BAND_SW && nowToggleSWMIBand) {
|
if (band == BAND_SW && nowToggleSWMIBand) {
|
||||||
@@ -2865,6 +2871,7 @@ void ShowTuneMode() {
|
|||||||
tftPrint(0, "MEM", 22, 82, GreyoutColor, BackgroundColor, 16);
|
tftPrint(0, "MEM", 22, 82, GreyoutColor, BackgroundColor, 16);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ShowRSSI() {
|
void ShowRSSI() {
|
||||||
@@ -3275,6 +3282,7 @@ void DefaultSettings(byte userhardwaremodel) {
|
|||||||
EEPROM.writeByte(EE_BYTE_FM_DEEMPHASIS, DEEMPHASIS_50);
|
EEPROM.writeByte(EE_BYTE_FM_DEEMPHASIS, DEEMPHASIS_50);
|
||||||
EEPROM.writeByte(EE_BYTE_BWSET_FM, 0);
|
EEPROM.writeByte(EE_BYTE_BWSET_FM, 0);
|
||||||
EEPROM.writeByte(EE_BYTE_BWSET_AM, 2);
|
EEPROM.writeByte(EE_BYTE_BWSET_AM, 2);
|
||||||
|
EEPROM.writeByte(EE_BYTE_BANDAUTOSW, 0);
|
||||||
EEPROM.commit();
|
EEPROM.commit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -144,6 +144,7 @@
|
|||||||
#define EE_BYTE_LOWLEVELSET 47
|
#define EE_BYTE_LOWLEVELSET 47
|
||||||
#define EE_BYTE_BWSET_FM 48
|
#define EE_BYTE_BWSET_FM 48
|
||||||
#define EE_BYTE_BWSET_AM 49
|
#define EE_BYTE_BWSET_AM 49
|
||||||
|
#define EE_BYTE_BANDAUTOSW 50
|
||||||
#define EE_BYTE_MEMORYPOS 51
|
#define EE_BYTE_MEMORYPOS 51
|
||||||
#define EE_BYTE_REGION 52
|
#define EE_BYTE_REGION 52
|
||||||
#define EE_BYTE_RDS_UNDERSCORE 53
|
#define EE_BYTE_RDS_UNDERSCORE 53
|
||||||
|
|||||||
Reference in New Issue
Block a user