Fixed language selector
added SW wavelength indicator selector.
This commit is contained in:
+38
-2
@@ -222,8 +222,8 @@ WiFiUDP Udp;
|
|||||||
void setup() {
|
void setup() {
|
||||||
setupmode = true;
|
setupmode = true;
|
||||||
EEPROM.begin(244);
|
EEPROM.begin(244);
|
||||||
if (EEPROM.readByte(43) != 24) {
|
if (EEPROM.readByte(43) != 25) {
|
||||||
EEPROM.writeByte(43, 24);
|
EEPROM.writeByte(43, 25);
|
||||||
EEPROM.writeUInt(0, 10000);
|
EEPROM.writeUInt(0, 10000);
|
||||||
EEPROM.writeInt(4, 0);
|
EEPROM.writeInt(4, 0);
|
||||||
EEPROM.writeUInt(8, 0);
|
EEPROM.writeUInt(8, 0);
|
||||||
@@ -256,6 +256,7 @@ void setup() {
|
|||||||
EEPROM.writeByte(54, 0);
|
EEPROM.writeByte(54, 0);
|
||||||
EEPROM.writeByte(55, 0);
|
EEPROM.writeByte(55, 0);
|
||||||
EEPROM.writeByte(56, 1);
|
EEPROM.writeByte(56, 1);
|
||||||
|
EEPROM.writeByte(57, 1);
|
||||||
for (int i = 0; i < 30; i++) EEPROM.writeByte(i + 60, 0);
|
for (int i = 0; i < 30; i++) EEPROM.writeByte(i + 60, 0);
|
||||||
for (int i = 0; i < 30; i++) EEPROM.writeUInt((i * 4) + 100, 8750);
|
for (int i = 0; i < 30; i++) EEPROM.writeUInt((i * 4) + 100, 8750);
|
||||||
EEPROM.writeUInt(221, 180);
|
EEPROM.writeUInt(221, 180);
|
||||||
@@ -298,6 +299,7 @@ void setup() {
|
|||||||
USBmode = EEPROM.readByte(54);
|
USBmode = EEPROM.readByte(54);
|
||||||
wifi = EEPROM.readByte(55);
|
wifi = EEPROM.readByte(55);
|
||||||
subnetclient = EEPROM.readByte(56);
|
subnetclient = EEPROM.readByte(56);
|
||||||
|
showSWMIBand = EEPROM.readByte(57);
|
||||||
frequency_LW = EEPROM.readUInt(221);
|
frequency_LW = EEPROM.readUInt(221);
|
||||||
frequency_MW = EEPROM.readUInt(225);
|
frequency_MW = EEPROM.readUInt(225);
|
||||||
frequency_SW = EEPROM.readUInt(229);
|
frequency_SW = EEPROM.readUInt(229);
|
||||||
@@ -1216,6 +1218,7 @@ void ModeButtonPress() {
|
|||||||
EEPROM.writeByte(54, USBmode);
|
EEPROM.writeByte(54, USBmode);
|
||||||
EEPROM.writeByte(55, wifi);
|
EEPROM.writeByte(55, wifi);
|
||||||
EEPROM.writeByte(56, subnetclient);
|
EEPROM.writeByte(56, subnetclient);
|
||||||
|
EEPROM.writeByte(57, showSWMIBand);
|
||||||
EEPROM.commit();
|
EEPROM.commit();
|
||||||
Serial.end();
|
Serial.end();
|
||||||
if (wifi) remoteip = IPAddress (WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], subnetclient);
|
if (wifi) remoteip = IPAddress (WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], subnetclient);
|
||||||
@@ -1436,6 +1439,7 @@ void ButtonPress() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
switch (menuoption) {
|
switch (menuoption) {
|
||||||
case 30:
|
case 30:
|
||||||
@@ -1524,6 +1528,8 @@ void ButtonPress() {
|
|||||||
BuildMenu();
|
BuildMenu();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
switch (menuoption) {
|
switch (menuoption) {
|
||||||
case 30:
|
case 30:
|
||||||
@@ -1532,6 +1538,13 @@ void ButtonPress() {
|
|||||||
tft.setTextColor(TFT_YELLOW);
|
tft.setTextColor(TFT_YELLOW);
|
||||||
tft.drawCentreString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 155, 110, GFXFF);
|
tft.drawCentreString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 50:
|
||||||
|
tft.setTextColor(TFT_WHITE);
|
||||||
|
tft.drawCentreString(myLanguage[language][59], 155, 70, GFXFF);
|
||||||
|
tft.setTextColor(TFT_YELLOW);
|
||||||
|
if (showSWMIBand) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -1712,6 +1725,7 @@ void KeyUp() {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 2:
|
case 2:
|
||||||
switch (menuoption) {
|
switch (menuoption) {
|
||||||
case 30:
|
case 30:
|
||||||
@@ -1795,6 +1809,8 @@ void KeyUp() {
|
|||||||
if (wifi) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
if (wifi) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
switch (menuoption) {
|
switch (menuoption) {
|
||||||
case 30:
|
case 30:
|
||||||
@@ -1805,6 +1821,14 @@ void KeyUp() {
|
|||||||
tft.setTextColor(TFT_YELLOW);
|
tft.setTextColor(TFT_YELLOW);
|
||||||
tft.drawCentreString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 155, 110, GFXFF);
|
tft.drawCentreString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 50:
|
||||||
|
tft.setTextColor(TFT_BLACK);
|
||||||
|
if (showSWMIBand) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
|
if (showSWMIBand) showSWMIBand = false; else showSWMIBand = true;
|
||||||
|
tft.setTextColor(TFT_YELLOW);
|
||||||
|
if (showSWMIBand) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2062,6 +2086,8 @@ void KeyDown() {
|
|||||||
if (wifi) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
if (wifi) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
switch (menuoption) {
|
switch (menuoption) {
|
||||||
case 30:
|
case 30:
|
||||||
@@ -2072,6 +2098,14 @@ void KeyDown() {
|
|||||||
tft.setTextColor(TFT_YELLOW);
|
tft.setTextColor(TFT_YELLOW);
|
||||||
tft.drawCentreString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 155, 110, GFXFF);
|
tft.drawCentreString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 155, 110, GFXFF);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case 50:
|
||||||
|
tft.setTextColor(TFT_BLACK);
|
||||||
|
if (showSWMIBand) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
|
if (showSWMIBand) showSWMIBand = false; else showSWMIBand = true;
|
||||||
|
tft.setTextColor(TFT_YELLOW);
|
||||||
|
if (showSWMIBand) tft.drawCentreString(myLanguage[language][42], 155, 110, GFXFF); else tft.drawCentreString(myLanguage[language][30], 155, 110, GFXFF);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2454,7 +2488,9 @@ void BuildMenu() {
|
|||||||
|
|
||||||
case 3:
|
case 3:
|
||||||
tft.drawString(myLanguage[language][58], 14, 30, GFXFF);
|
tft.drawString(myLanguage[language][58], 14, 30, GFXFF);
|
||||||
|
tft.drawString(myLanguage[language][59], 14, 50, GFXFF);
|
||||||
tft.drawRightString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 305, 30, GFXFF);
|
tft.drawRightString(String(WiFi.localIP()[0]) + "." + String(WiFi.localIP()[1]) + "." + String(WiFi.localIP()[2]) + "." + String(subnetclient, DEC), 305, 30, GFXFF);
|
||||||
|
if (showSWMIBand) tft.drawRightString(myLanguage[language][42], 305, 50, GFXFF); else tft.drawRightString(myLanguage[language][30], 305, 50, GFXFF);
|
||||||
}
|
}
|
||||||
analogWrite(SMETERPIN, 0);
|
analogWrite(SMETERPIN, 0);
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-10
@@ -1,6 +1,6 @@
|
|||||||
// [number of languages][number of texts][max. length of text]
|
// [number of languages][number of texts][max. length of text]
|
||||||
|
|
||||||
static const char myLanguage[9][59][78] = {
|
static const char myLanguage[9][60][78] = {
|
||||||
{ "English", // English
|
{ "English", // English
|
||||||
"Rotary direction changed",
|
"Rotary direction changed",
|
||||||
"Please release button",
|
"Please release button",
|
||||||
@@ -59,7 +59,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Trying to connect with Wi-Fi",
|
"Trying to connect with Wi-Fi",
|
||||||
"FAILED.. WiFi disabled",
|
"FAILED.. WiFi disabled",
|
||||||
"CONNECTED!",
|
"CONNECTED!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "Nederlands", // Dutch
|
{ "Nederlands", // Dutch
|
||||||
@@ -120,7 +121,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Verbinden met Wi-Fi...",
|
"Verbinden met Wi-Fi...",
|
||||||
"MISLUKT.. WiFi uitgeschakeld",
|
"MISLUKT.. WiFi uitgeschakeld",
|
||||||
"VERBONDEN!",
|
"VERBONDEN!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Toon SW golflengte"
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "Polski", // Polish
|
{ "Polski", // Polish
|
||||||
@@ -181,7 +183,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Proba polaczenia z Wi-Fi",
|
"Proba polaczenia z Wi-Fi",
|
||||||
"BLAD.. WiFi wylaczone",
|
"BLAD.. WiFi wylaczone",
|
||||||
"POLACZONO!",
|
"POLACZONO!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "Hrvatski", // Croatian
|
{ "Hrvatski", // Croatian
|
||||||
@@ -242,7 +245,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Spajanje s Wi-Fi mrežom..",
|
"Spajanje s Wi-Fi mrežom..",
|
||||||
"NEUSPJEŠNO.. Wi-Fi onemogućen",
|
"NEUSPJEŠNO.. Wi-Fi onemogućen",
|
||||||
"SPOJENO!",
|
"SPOJENO!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "Ελληνικά", // Greek
|
{ "Ελληνικά", // Greek
|
||||||
@@ -303,7 +307,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Προσπάθεια σύνδεσης με το Wi-Fi",
|
"Προσπάθεια σύνδεσης με το Wi-Fi",
|
||||||
"ΑΠΟΤΥΧΙΑ.. WiFi ανενεργό",
|
"ΑΠΟΤΥΧΙΑ.. WiFi ανενεργό",
|
||||||
"ΣΕ ΣΥΝΔΕΣΗ!",
|
"ΣΕ ΣΥΝΔΕΣΗ!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "Romana", // Romanian
|
{ "Romana", // Romanian
|
||||||
@@ -364,7 +369,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Trying to connect with Wi-Fi",
|
"Trying to connect with Wi-Fi",
|
||||||
"FAILED.. WiFi disabled",
|
"FAILED.. WiFi disabled",
|
||||||
"CONNECTED!",
|
"CONNECTED!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
|
|
||||||
{ "Deutsch", // German
|
{ "Deutsch", // German
|
||||||
@@ -425,7 +431,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Versuche WLAN zu verbinden",
|
"Versuche WLAN zu verbinden",
|
||||||
"FEHLER.. WLAN deaktiviert",
|
"FEHLER.. WLAN deaktiviert",
|
||||||
"VERBUNDEN!",
|
"VERBUNDEN!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
{ "Czech", // Czech
|
{ "Czech", // Czech
|
||||||
"Směr enkóderu byl změněn",
|
"Směr enkóderu byl změněn",
|
||||||
@@ -485,7 +492,8 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Trying to connect with Wi-Fi",
|
"Trying to connect with Wi-Fi",
|
||||||
"FAILED.. WiFi disabled",
|
"FAILED.. WiFi disabled",
|
||||||
"CONNECTED!",
|
"CONNECTED!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
{ "Slovak", // Slovak
|
{ "Slovak", // Slovak
|
||||||
"Smer enkóderu bol zmenený",
|
"Smer enkóderu bol zmenený",
|
||||||
@@ -545,6 +553,7 @@ static const char myLanguage[9][59][78] = {
|
|||||||
"Trying to connect with Wi-Fi",
|
"Trying to connect with Wi-Fi",
|
||||||
"FAILED.. WiFi disabled",
|
"FAILED.. WiFi disabled",
|
||||||
"CONNECTED!",
|
"CONNECTED!",
|
||||||
"Stationlist client IP"
|
"Stationlist client IP",
|
||||||
|
"Show SW wavelength"
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user