Merge branch 'main' into main
This commit is contained in:
+7
-7
@@ -2128,7 +2128,7 @@ void KeyUp() {
|
|||||||
break;
|
break;
|
||||||
case 210:
|
case 210:
|
||||||
tft.setTextColor(TFT_BLACK);
|
tft.setTextColor(TFT_BLACK);
|
||||||
if (specialstepOIRT) tft.drawCentreString("ON", 155, 110, GFXFF); else tft.drawCentreString("OFF", 155, 110, GFXFF);
|
if (specialstepOIRT) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
if (specialstepOIRT) {
|
if (specialstepOIRT) {
|
||||||
specialstepOIRT = 0;
|
specialstepOIRT = 0;
|
||||||
} else {
|
} else {
|
||||||
@@ -2136,8 +2136,8 @@ void KeyUp() {
|
|||||||
FindlowStopOIRT();
|
FindlowStopOIRT();
|
||||||
FindhighStopOIRT();
|
FindhighStopOIRT();
|
||||||
}
|
}
|
||||||
tft.setTextColor(TFT_WHITE);
|
tft.setTextColor(TFT_YELLOW);
|
||||||
if (specialstepOIRT) tft.drawCentreString("ON", 155, 110, GFXFF); else tft.drawCentreString("OFF", 155, 110, GFXFF);
|
if (specialstepOIRT) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -2519,7 +2519,7 @@ void KeyDown() {
|
|||||||
break;
|
break;
|
||||||
case 210:
|
case 210:
|
||||||
tft.setTextColor(TFT_BLACK);
|
tft.setTextColor(TFT_BLACK);
|
||||||
if (specialstepOIRT) tft.drawCentreString("ON", 155, 110, GFXFF); else tft.drawCentreString("OFF", 155, 110, GFXFF);
|
if (specialstepOIRT) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
if (specialstepOIRT) {
|
if (specialstepOIRT) {
|
||||||
specialstepOIRT = 0;
|
specialstepOIRT = 0;
|
||||||
} else {
|
} else {
|
||||||
@@ -2527,8 +2527,8 @@ void KeyDown() {
|
|||||||
FindlowStopOIRT();
|
FindlowStopOIRT();
|
||||||
FindhighStopOIRT();
|
FindhighStopOIRT();
|
||||||
}
|
}
|
||||||
tft.setTextColor(TFT_WHITE);
|
tft.setTextColor(TFT_YELLOW);
|
||||||
if (specialstepOIRT) tft.drawCentreString("ON", 155, 110, GFXFF); else tft.drawCentreString("OFF", 155, 110, GFXFF);
|
if (specialstepOIRT) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -3047,7 +3047,7 @@ void BuildMenu() {
|
|||||||
if (amnb != 0) tft.drawRightString(String(amnb, DEC), 265, 150, GFXFF); else tft.drawRightString(myLanguage[language][30], 265, 150, GFXFF);
|
if (amnb != 0) tft.drawRightString(String(amnb, DEC), 265, 150, GFXFF); else tft.drawRightString(myLanguage[language][30], 265, 150, GFXFF);
|
||||||
if (fmnb != 0) tft.drawRightString(String(fmnb, DEC), 265, 170, GFXFF); else tft.drawRightString(myLanguage[language][30], 265, 170, GFXFF);
|
if (fmnb != 0) tft.drawRightString(String(fmnb, DEC), 265, 170, GFXFF); else tft.drawRightString(myLanguage[language][30], 265, 170, GFXFF);
|
||||||
if (audiomode) tft.drawRightString("MPX", 305, 190, GFXFF); else tft.drawRightString("Stereo", 305, 190, GFXFF);
|
if (audiomode) tft.drawRightString("MPX", 305, 190, GFXFF); else tft.drawRightString("Stereo", 305, 190, GFXFF);
|
||||||
if (specialstepOIRT) tft.drawRightString("ON", 305, 210, GFXFF); else tft.drawRightString("OFF", 305, 210, GFXFF);
|
if (specialstepOIRT) tft.drawRightString(myLanguage[language][42], 305, 210, GFXFF); else tft.drawRightString(myLanguage[language][30], 305, 210, GFXFF);
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
tft.drawString(myLanguage[language][77], 14, 30, GFXFF);
|
tft.drawString(myLanguage[language][77], 14, 30, GFXFF);
|
||||||
|
|||||||
+685
-686
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user