kuba/TEF6686_ESP32
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix bug where some pixels in MHz were missing.

Browse Source
This commit is contained in:
Sjef Verhoeven PE5PVB
2023-07-27 15:16:41 +02:00
parent 9c91872f9a
commit d5dc878313
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TEF6686_ESP32.ino
+7 -8
View File
@@ -112,7 +112,7 @@ byte batteryold;
byte BWset; byte BWset;
#ifdef CHINA_PORTABLE #ifdef CHINA_PORTABLE
byte hardwaremodel = PORTABLE_ILI9341; byte hardwaremodel = PORTABLE_ILI9341;
#else #else
byte hardwaremodel = BASE_ILI9341; byte hardwaremodel = BASE_ILI9341;
#endif #endif
byte hardwaremodelold; byte hardwaremodelold;
@@ -2255,7 +2255,7 @@ void ButtonPress() {
break; break;
} }
break; break;
case 5: case 5:
switch (menuoption) { switch (menuoption) {
case 30: case 30:
@@ -2673,7 +2673,7 @@ void KeyUp() {
} }
break; break;
case 5: case 5:
switch (menuoption) { switch (menuoption) {
case 30: case 30:
@@ -3870,10 +3870,10 @@ void BuildMenu() {
ShowBandSelectionFM(false, true); ShowBandSelectionFM(false, true);
ShowBandSelectionAM(false, true); ShowBandSelectionAM(false, true);
break; break;
case 5: case 5:
tftPrint(-1, myLanguage[language][108], 14, 36, ActiveColor, ActiveColorSmooth, FONT16); tftPrint(-1, myLanguage[language][108], 14, 36, ActiveColor, ActiveColorSmooth, FONT16);
switch (hardwaremodel) { switch (hardwaremodel) {
case BASE_ILI9341: tftPrint(1, myLanguage[language][109], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; case BASE_ILI9341: tftPrint(1, myLanguage[language][109], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break;
case PORTABLE_ILI9341: tftPrint(1, myLanguage[language][110 ], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break; case PORTABLE_ILI9341: tftPrint(1, myLanguage[language][110 ], 305, 36, PrimaryColor, PrimaryColorSmooth, FONT16); break;
@@ -4202,8 +4202,6 @@ void BuildDisplay() {
tftPrint(-1, "kHz", 222, 4, ActiveColor, ActiveColorSmooth, FONT28); tftPrint(-1, "kHz", 222, 4, ActiveColor, ActiveColorSmooth, FONT28);
tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, FONT16); tftPrint(-1, unitString[unit], 282, 145, ActiveColor, ActiveColorSmooth, FONT16);
if (band < BAND_GAP) tftPrint(-1, "MHz", 258, 76, ActiveColor, ActiveColorSmooth, FONT28); else tftPrint(-1, "kHz", 258, 76, ActiveColor, ActiveColorSmooth, FONT28);
tft.drawRoundRect(249, 56, 30, 20, 5, GreyoutColor); tft.drawRoundRect(249, 56, 30, 20, 5, GreyoutColor);
tft.drawRoundRect(287, 56, 30, 20, 5, GreyoutColor); tft.drawRoundRect(287, 56, 30, 20, 5, GreyoutColor);
tft.drawCircle(81, 15, 10, GreyoutColor); tft.drawCircle(81, 15, 10, GreyoutColor);
@@ -4246,6 +4244,7 @@ void BuildDisplay() {
strcpy(radioIdPrevious, "0"); strcpy(radioIdPrevious, "0");
programServicePrevious = "0"; programServicePrevious = "0";
BWreset = true; BWreset = true;
if (band < BAND_GAP) tftPrint(-1, "MHz", 258, 76, ActiveColor, ActiveColorSmooth, FONT28); else tftPrint(-1, "kHz", 258, 76, ActiveColor, ActiveColorSmooth, FONT28);
} }
void ShowFreq(int mode) { void ShowFreq(int mode) {
@@ -6010,7 +6009,7 @@ void DefaultSettings(byte userhardwaremodel) {
EEPROM.writeByte(EE_BYTE_AM_NB, 0); EEPROM.writeByte(EE_BYTE_AM_NB, 0);
EEPROM.writeByte(EE_BYTE_FM_NB, 0); EEPROM.writeByte(EE_BYTE_FM_NB, 0);
EEPROM.writeByte(EE_BYTE_AUDIOMODE, 0); EEPROM.writeByte(EE_BYTE_AUDIOMODE, 0);
if (userhardwaremodel == BASE_ILI9341) EEPROM.writeByte(EE_BYTE_TOUCH_ROTATING, 0); else EEPROM.writeByte(EE_BYTE_TOUCH_ROTATING, 1); if (userhardwaremodel == BASE_ILI9341) EEPROM.writeByte(EE_BYTE_TOUCH_ROTATING, 0); else EEPROM.writeByte(EE_BYTE_TOUCH_ROTATING, 1);
EEPROM.writeUInt(EE_UINT16_LOWEDGEOIRTSET, 0); EEPROM.writeUInt(EE_UINT16_LOWEDGEOIRTSET, 0);
EEPROM.writeUInt(EE_UINT16_HIGHEDGEOIRTSET, 0); EEPROM.writeUInt(EE_UINT16_HIGHEDGEOIRTSET, 0);
EEPROM.writeByte(EE_BYTE_HARDWARE_MODEL, userhardwaremodel); EEPROM.writeByte(EE_BYTE_HARDWARE_MODEL, userhardwaremodel);