Update list of contributors and added softwareversion to menu

2023-11-23 12:51:24 +01:00
parent 3221337404
commit e4e4a6c3ef
3 changed files with 66 additions and 39 deletions
--- a/TEF6686_ESP32.ino
+++ b/TEF6686_ESP32.ino
@@ -33,7 +33,6 @@
 #define CONTRASTPIN     2
 #define STANDBYLED      19
 #define SMETERPIN       27
-#define VERSION         "v2.00 RC2"

 // #define CHINA_PORTABLE      // uncomment for China Portable build (Simplified Chinese)
 #define DYNAMIC_SPI_SPEED   // uncomment to enable dynamic SPI Speed https://github.com/ohmytime/TFT_eSPI_DynamicSpeed
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -379,6 +379,7 @@ void BuildMenu() {
      tftPrint(0, myLanguage[language][182], 160, ITEM6 + 6, ActiveColor, ActiveColorSmooth, 16);
      tftPrint(0, myLanguage[language][183], 160, ITEM7 + 6, ActiveColor, ActiveColorSmooth, 16);
      tftPrint(0, myLanguage[language][70], 160, ITEM8 + 6, ActiveColor, ActiveColorSmooth, 16);
+      tftPrint(0, String(myLanguage[language][209]) + " " + String(VERSION), 160, ITEM10 + 6, SecondaryColor, SecondaryColorSmooth, 16);
      break;

    case MAINSETTINGS:
@@ -2078,25 +2079,28 @@ void DoMenu() {

          case ITEM8:
            menuopen = true;
-            tft.drawRoundRect(10, 10, 300, 220, 5, ActiveColor);
-            tft.fillRoundRect(12, 12, 296, 216, 5, BackgroundColor);
-            tftPrint(0, myLanguage[language][71], 155, 18, ActiveColor, ActiveColorSmooth, 28);
-            tftPrint(0, myLanguage[language][72], 155, 68, ActiveColor, ActiveColorSmooth, 28);
-            tftPrint(0, "PE5PVB", 155, 48, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "ohmytime", 145, 98, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "HyperDX", 145, 113, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(-1, "MCelliotG", 155, 98, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(-1, "andimik", 155, 113, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "DXHR05", 145, 128, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "NoobishSVK", 145, 143, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(-1, "yo2ldk", 155, 128, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(-1, "Justin_Peng(Portable)", 155, 143, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "Overland DX", 145, 158, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(-1, "elektronik232", 155, 158, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "KOTYA8", 145, 173, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(-1, "mrwish7", 155, 173, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(1, "lxsxl", 145, 188, PrimaryColor, PrimaryColorSmooth, 16);
-            tftPrint(0, "github.com/PE5PVB/TEF6686_ESP32", 155, 208, ActiveColor, ActiveColorSmooth, 16);
+            tft.drawRoundRect(10, 6, 300, 230, 5, ActiveColor);
+            tft.fillRoundRect(12, 8, 296, 226, 5, BackgroundColor);
+            tftPrint(0, myLanguage[language][71], 155, 13, ActiveColor, ActiveColorSmooth, 28);
+            tftPrint(0, myLanguage[language][72], 155, 63, ActiveColor, ActiveColorSmooth, 28);
+            tftPrint(0, "PE5PVB", 155, 43, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "ohmytime", 145, 93, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "HyperDX", 145, 108, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "MCelliotG", 155, 93, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "andimik", 155, 108, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "DXHR05", 145, 123, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "NoobishSVK", 145, 138, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "yo2ldk", 155, 123, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "Justin_Peng(Portable)", 155, 138, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "Overland DX", 145, 153, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "elektronik232", 155, 153, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "KOTYA8", 145, 168, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "mrwish7", 155, 168, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "lxsxl", 145, 183, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "leryfm", 155, 183, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(1, "marsel90-1", 145, 198, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(-1, "lawendel", 155, 198, PrimaryColor, PrimaryColorSmooth, 16);
+            tftPrint(0, "github.com/PE5PVB/TEF6686_ESP32", 155, 215, ActiveColor, ActiveColorSmooth, 16);
            break;
        }
        break;
--- a/src/language.h
+++ b/src/language.h
@@ -1,6 +1,11 @@
+#ifndef LANGUAGE_H
+#define LANGUAGE_H
+
+#define VERSION "v2.00 RC2"
+
 // [number of languages][number of texts]
 // *** means the text is the same as in English
-static const char* const myLanguage[18][209] = {
+static const char* const myLanguage[18][210] = {
  { "English", // English
    "Rotary direction changed", // 1
    "Please release button", // 2
@@ -209,7 +214,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205
    "Dynamic SPI speed", // 206
    "Scan sensitivity", // 207
-    "NONE"
+    "NONE", // 208
+    "Software version" // 209
  },

  { "Nederlands", // Dutch
@@ -420,7 +426,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynamische\nSPI snelheid", // 206
    "Zoek gevoeligheid", // 207
-    "Geen"
+    "Geen", // 208
+    "Software versie" // 209
  },

  { "Polski", // Polish
@@ -631,7 +638,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynam. predkosc SPI", // 206 ***
    "Czulosc skanowania", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Hrvatski", // Croatian
@@ -842,7 +850,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynamic SPI speed", // 206 ***
    "Scan sensitivity", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Ελληνικά", // Greek
@@ -1053,7 +1062,8 @@ static const char* const myLanguage[18][209] = {
    "Λεπτά", // 205
    "Δυναμική ταχύτητα\nSPI", // 206
    "Ευαισθησία\nανίχνευσης", // 207
-    "KAMIA" // 208
+    "KAMIA", // 208
+    "Software version" // 209
  },

  { "Română", // Romanian
@@ -1264,7 +1274,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynamic SPI speed", // 206 ***
    "Scan sensitivity", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Deutsch", // German
@@ -1475,7 +1486,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205
    "Dynamische \nSPI-Geschwindigkeit", // 206
    "Scanempfindlichkeit", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Český", // Czech
@@ -1686,7 +1698,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynamic SPI speed", // 206 ***
    "Scan sensitivity", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Slovenský", // Slovak
@@ -1897,7 +1910,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynamic SPI speed", // 206 ***
    "Scan sensitivity", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Français", // French
@@ -2108,7 +2122,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205
    "Vitesse SPI\ndynamique", // 206
    "Sensibilité\ndu scanne ", // 207
-    "AUC." // 208
+    "AUC.", // 208
+    "Software version" // 209
  },

  { "Български", // Bulgarian
@@ -2319,7 +2334,8 @@ static const char* const myLanguage[18][209] = {
    "Мин.", // 205
    "Dynamic SPI speed", // 206 ***
    "Scan sensitivity", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Русский", // Russian
@@ -2530,7 +2546,8 @@ static const char* const myLanguage[18][209] = {
    "мин.", // 205
    "Скорость шины дисплея (SPI)", // 206 ***
    "Чувствительность сканирования", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Українська", // Ukranian
@@ -2741,7 +2758,8 @@ static const char* const myLanguage[18][209] = {
    "мін.", // 205
    "Dynamic SPI speed", // 206 ***
    "Scan sensitivity", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Italiano", // Italian
@@ -2952,7 +2970,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Velocità SPI Dinamico", // 206 ***
    "Sensibilità scansione", // 207
-    "NONE" // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "NONE", // 208 represents: AM/FM bands unavailable(please delete this note after translation）
+    "Software version" // 209
  },

  { "Simplified Chinese", // Simplified Chinese
@@ -3163,7 +3182,8 @@ static const char* const myLanguage[18][209] = {
    "分钟", // 205
    "调整SPI通讯速率", // 206
    "搜索灵敏度", // 207
-    "不可用" // 208
+    "不可用", // 208
+    "Software version" // 209
  },

  { "Norsk", // Norwegian
@@ -3374,7 +3394,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205 ***
    "Dynamisk SPI hastighet", // 206
    "Skannefølsomhet", // 207
-    "INGEN" // 208
+    "INGEN", // 208
+    "Software version" // 209
  },

  { "Español", // Spanish
@@ -3585,7 +3606,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205
    "Velocidad de SPI", // 206
    "Sensibilidad\ndel escaneo", // 207
-    "NING." // 208
+    "NING.", // 208
+    "Software version" // 209
  },

  { "Português", // Portuguese
@@ -3796,6 +3818,8 @@ static const char* const myLanguage[18][209] = {
    "Min.", // 205
    "Velocidade dinâmica\nde SPI", // 206
    "Sensibilidade\nda varredura", // 207
-    "NEN." // 208
+    "NEN.", // 208
+    "Software version" // 209
  }
 };
+#endif