Merge branch 'main' into New_Model_DP_666

2024-06-28 13:52:55 +08:00
parent c520ac679f 0270321b54
commit 972d77a402
11 changed files with 185 additions and 91 deletions
@@ -9,6 +9,13 @@ unsigned long rdstimer = 0;
 unsigned long bitStartTime = 0;
 bool lastBitState = false;

+uint16_t TEF6686::getBlockA(void) {
+  uint16_t blockA, dummy;
+  devTEF_Radio_Get_RDS_Status(&dummy, &blockA, &dummy, &dummy, &dummy, &dummy);
+  return blockA;
+}
+
+
 void TEF6686::TestAFEON() {
  uint16_t status;
  uint16_t dummy1;
@@ -31,7 +38,7 @@ void TEF6686::TestAFEON() {
      }
      if (afoffset > -125 || afoffset < 125) {
        devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, af[x].frequency);
-        delay(200);
+        delay(187);
        devTEF_Radio_Get_RDS_Status(&rds.rdsStat, &rds.rdsA, &rds.rdsB, &rds.rdsC, &rds.rdsD, &rds.rdsErr);

        if (rds.rdsStat & (1 << 9)) {
@@ -49,7 +56,7 @@ void TEF6686::TestAFEON() {
    }
  }
  devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, currentfreq);
-  if (!mute) setUnMute();
+  setUnMute();
 }

 uint16_t TEF6686::TestAF() {
@@ -97,7 +104,7 @@ uint16_t TEF6686::TestAF() {

    if (af_counter != 0 && af[highestIndex].afvalid && af[highestIndex].score > (currentlevel - currentusn - currentwam) && (af[highestIndex].score - (currentlevel - currentusn - currentwam)) >= 70) {
      devTEF_Set_Cmd(TEF_FM, Cmd_Tune_To, 7, 4, af[highestIndex].frequency);
-      delay(200);
+      delay(187);
      devTEF_Radio_Get_RDS_Status(&rds.rdsStat, &rds.rdsA, &rds.rdsB, &rds.rdsC, &rds.rdsD, &rds.rdsErr);
      if (rds.rdsStat & (1 << 9)) {
        if ((afmethodB && rds.afreg ? (((rds.rdsA >> 8) & 0xF) > 2 && ((rds.correctPI >> 8) & 0xF) > 2 && ((rds.rdsA >> 12) & 0xF) == ((rds.correctPI >> 12) & 0xF) && (rds.rdsA & 0xFF) == (rds.correctPI & 0xFF)) || rds.rdsA == rds.correctPI : rds.rdsA == rds.correctPI)) {
@@ -708,6 +708,7 @@ class TEF6686 {
    void setUnMute();
    void setVolume(int8_t volume);
    void tone(uint16_t time, int16_t amplitude, uint16_t frequency);
+    uint16_t getBlockA(void);
    String trimTrailingSpaces(String str);
    uint8_t af_counter;
    uint8_t eon_counter;
@@ -515,6 +515,17 @@ void XDRGTKRoutine() {
        DataPrint("J" + String(scandxtemp) + "\n");
        break;

+      case 'K':
+        byte scanholdtemp;
+        scanholdtemp = atol(buff + 1);
+        if (scanholdtemp < 31) {
+          scanhold = scanholdtemp;
+          EEPROM.writeByte(EE_BYTE_SCANHOLD, scanhold);
+          EEPROM.commit();
+        }
+        DataPrint("K" + String(scanhold) + "\n");
+        break;
+
      case 'M':
        byte XDRband;
        XDRband = atol(buff + 1);
@@ -47,6 +47,7 @@ extern byte iMSEQ;
 extern byte iMSset;
 extern byte language;
 extern byte memorypos;
+extern byte scanhold;
 extern byte stepsize;
 extern byte subnetclient;
 extern byte TEF;
@@ -312,7 +312,7 @@
 #define EE_BYTE_SCANMUTE            2213
 #define EE_BYTE_AUTOSQUELCH         2214
 #define EE_BYTE_LONGBANDPRESS       2215
-#define EE_BYTE_SHOWCLOCK			2216
+#define EE_BYTE_SHOWCLOCK      2216
 #ifdef HAS_AIR_BAND
 #define EE_BYTE_AIRSTEPSIZE         2117
 #define EE_UINT16_FREQUENCY_AIR     2218
@@ -422,7 +422,7 @@ static const uint8_t TEFLogo[] PROGMEM = {

 static const uint8_t RDSLogo[] PROGMEM = {
  0x01, 0xf8, 0x0f, 0xe0, 0x00,
-  0x02, 0x00, 0x30, 0x18, 0x00,
+  0x07, 0x80, 0x30, 0x18, 0x00,
  0x0c, 0x30, 0x43, 0xc6, 0x00,
  0x11, 0xc0, 0x8c, 0x31, 0x00,
  0x26, 0x01, 0x31, 0x8c, 0x80,
@@ -491,11 +491,11 @@ static const uint8_t WiFi1[] PROGMEM = {
  0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
-  0x00, 0x08, 0x00, 0x00
+  0x00, 0x08, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
 };

 static const uint8_t WiFi2[] PROGMEM = {
@@ -513,7 +513,6 @@ static const uint8_t WiFi2[] PROGMEM = {
  0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x7f, 0x00, 0x00,
  0x00, 0xff, 0x80, 0x00,
@@ -523,7 +522,8 @@ static const uint8_t WiFi2[] PROGMEM = {
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
-  0x00, 0x08, 0x00, 0x00
+  0x00, 0x08, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
 };

 static const uint8_t WiFi3[] PROGMEM = {
@@ -534,7 +534,6 @@ static const uint8_t WiFi3[] PROGMEM = {
  0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00,
  0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00,
  0x00, 0x7f, 0x00, 0x00,
  0x01, 0xff, 0xc0, 0x00,
  0x03, 0xff, 0xe0, 0x00,
@@ -551,7 +550,8 @@ static const uint8_t WiFi3[] PROGMEM = {
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
-  0x00, 0x08, 0x00, 0x00
+  0x00, 0x08, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
 };

 static const uint8_t WiFi4[] PROGMEM = {
@@ -578,7 +578,8 @@ static const uint8_t WiFi4[] PROGMEM = {
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
  0x00, 0x1c, 0x00, 0x00,
-  0x00, 0x08, 0x00, 0x00
+  0x00, 0x08, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00
 };

 static const uint16_t openradiologo[] PROGMEM  = {
@@ -1,7 +1,7 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H

-#define VERSION "v2.10 RC14"
+#define VERSION "v2.11"

 // [number of languages][number of texts]

@@ -1374,8 +1374,8 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Alegeți Limba", // 40
    "Apasați MODE ptr MEMORARE și ieșire", // 41
    "Pornit", // 42
-    "lipsă zgomot FM", // 43
-    "lipsă zgomot AM", // 44
+    "Lipsă zgomot FM", // 43
+    "Lipsă zgomot AM", // 44
    "Beep la capătul benzii", // 45
    "Regiune", // 46
    "Europa", // 47
@@ -1385,7 +1385,7 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Wi-Fi activ", // 51
    "Configurare Wi-Fi", // 52
    "Conectare la: ", // 53
-    "ptr configurare Wi-Fi", // 54
+    "Ptr configurare Wi-Fi", // 54
    "Incerc conectarea la Wi-Fi", // 55
    "Fară succes!", // 56
    "Conectat!", // 57
@@ -1393,16 +1393,16 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Arată lungimea de undă SW", // 59
    "Filtru RDS", // 60
    "Arată erorile PI", // 61
-    "folosește squelch", // 62
+    "Folosește squelch", // 62
    "Contor modulație", // 63
    "Eliminator de zgomot AM", // 64
    "Eliminator de zgomot FM", // 65
    "Revenire la setările de fabrică", // 66
-    "ieșire Audio", // 67
+    "Ieșire Audio", // 67
    "Permite reglarea in timp ce ecranul este oprit", // 68
    "Ecran inversat", // 69
    "Despre software", // 70
-    "cod principal:", // 71
+    "Cod principal:", // 71
    "Contribuitori:", // 72
    "Necunoscut", // 73
    "Opțiuni economizor ecran", // 74
@@ -1415,7 +1415,7 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Viteză SPI dinamică", // 81
    "Sensibilitatea scanării", // 82
    "NICI UNUL", // 83
-    " versiune Software", // 84
+    "Versiune Software", // 84
    "Font Frecvență", // 85
    "Auto", // 86
    "AF nu este disponibil", // 87
@@ -1425,12 +1425,12 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Screensaver", // 91
    "Sec", // 92
    "Apăsați BAND pentru inchidere", // 93
-    "luminozitate 1%", // 94
-    "luminozitate 25%", // 95
-    "luminozitate 50%", // 96
+    "Luminozitate 1%", // 94
+    "Luminozitate 25%", // 95
+    "Luminozitate 50%", // 96
    "Decalaj de nivel AM RF", // 97
-    "unitați S-metru", // 98
-    "folosești AF", // 99
+    "Unitați S-metru", // 98
+    "Folosești AF", // 99
    "Selectare banda FM", // 100
    "Selectare banda AM", // 101
    "LW", // 102
@@ -1439,7 +1439,7 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "FM", // 105
    "OIRT", // 106
    "Rotire când ecranul este oprit", // 107
-    "selectare Model", // 108
+    "Selectare Model", // 108
    "Bază (ILI9341)", // 109
    "Portabil (ILI9341)", // 110
    "Portabil touch (ILI9341)", // 111
@@ -1500,14 +1500,14 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Identificare", // 166
    "Cumpără", // 167
    "Preiau date", // 168
-    "pași MW impliciți", // 169
+    "Pași MW impliciți", // 169
    "Tangerine", // 170
    "Ocean", // 171
    "Indigo", // 172
    "Opțiuni Baterie", // 173
    "Arată tensiunea", // 174
    "Arată procente", // 175
-    "porțiune RT", // 176
+    "Porțiune RT", // 176
    "Setări de bază", // 177
    "Setări Audio", // 178
    "Setări ecran", // 179
@@ -2090,34 +2090,34 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Vypnout displej", // 226
    "Zakázáno", // 227
    "Nedefinovaný pr.", // 228
-    "Zpravy", // 229
+    "Zprávy", // 229
    "Publicistika", // 230
    "Informace", // 231
    "Sport", // 232
-    "Vzdelani", // 233
+    "Vzdělání", // 233
    "Drama", // 234
    "Kultura", // 235
-    "Veda", // 236
-    "Ruzne Zanry", // 237
-    "Popova Hudba", // 238
-    "Rockova Hudba", // 239
-    "Oddychova Hudba", // 240
-    "Klasicka Hudba", // 241
-    "Vazna Hudba", // 242
-    "Jina Hudba", // 243
-    "Pocasi", // 244
+    "Věda", // 236
+    "Různé žánry", // 237
+    "Popová hudba", // 238
+    "Rocková hudba", // 239
+    "Oddychová hudba", // 240
+    "Klasická hudba", // 241
+    "Vážná hudba", // 242
+    "Jiná hudba", // 243
+    "Počasí", // 244
    "Finance", // 245
-    "Detsky Program", // 246
-    "Spolecenska Tem.", // 247
-    "Nabozens. Temata", // 248
-    "Telefonaty", // 249
-    "Cestovani", // 250
-    "Zabava", // 251
-    "Jazzova Hudba", // 252
-    "Country Hudba", // 253
-    "Narodni Hudba", // 254
-    "Oldies Hudba", // 255
-    "Folkova Hudba", // 256
+    "Dětský program", // 246
+    "Společenská tém.", // 247
+    "Naboženství", // 248
+    "Telefonáty", // 249
+    "Cestování", // 250
+    "Zábava", // 251
+    "Jazzová hudba", // 252
+    "Country hudba", // 253
+    "Národní hudba", // 254
+    "Oldies hudba", // 255
+    "Folková hudba", // 256
    "Dokumenty", // 257
    "Alarm Test", // 258
    "Alarm – Alarm !", // 259
@@ -4776,4 +4776,4 @@ static const char* const myLanguage[18][263] PROGMEM = {
    "Mostrar relógio" // 262
  }
 };
-#endif
+#endif
@@ -269,7 +269,7 @@ void doAF() {
  if (radio.af_counter != af_counterold && radio.rds.hasAF) {
    if (wifi) {
      Udp.beginPacket(remoteip, 9030);
-      Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";AF=");
+      Udp.print("from=TEF_tuner_" + String(stationlistid, DEC) + ";AF=");

      for (byte af_scan = 0; af_scan < radio.af_counter; af_scan++) {
        if (wifi) {
@@ -303,7 +303,7 @@ void showECC() {

    if (wifi) {
      Udp.beginPacket(remoteip, 9030);
-      Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";ECC=");
+      Udp.print("from=TEF_tuner_" + String(stationlistid, DEC) + ";ECC=");
      if (radio.rds.ECC < 0x10) Udp.print("0");
      Udp.print(String(radio.rds.ECC, HEX));
      Udp.endPacket();
@@ -629,7 +629,7 @@ void showPI() {

    if (wifi) {
      Udp.beginPacket(remoteip, 9030);
-      Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";PI=" + String(radio.rds.picode, 4));
+      Udp.print("from=TEF_tuner_" + String(stationlistid, DEC) + ";PI=" + String(radio.rds.picode, 4));
      Udp.endPacket();
    }
  }
@@ -659,7 +659,7 @@ void showPTY() {

    if (wifi) {
      Udp.beginPacket(remoteip, 9030);
-      Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";PTY=");
+      Udp.print("from=TEF_tuner_" + String(stationlistid, DEC) + ";PTY=");
      Udp.print(String(radio.rds.stationTypeCode, HEX));
      Udp.endPacket();
    }
@@ -719,7 +719,7 @@ void showPS() {

      if (wifi && radio.rds.stationName.length() > 0 && PSold != radio.rds.stationName) {
        Udp.beginPacket(remoteip, 9030);
-        Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";PS=");
+        Udp.print("from=TEF_tuner_" + String(stationlistid, DEC) + ";PS=");
        char PShex[9];
        radio.rds.stationName.toCharArray(PShex, 9);
        for (int i = 0; i < 8; i++)
@@ -730,8 +730,8 @@ void showPS() {
        }
        Udp.endPacket();
      }
-      PSold = radio.rds.stationName;
    }
+    PSold = radio.rds.stationName;
  }
 }

@@ -857,7 +857,7 @@ void showRadioText() {

    if (wifi) {
      Udp.beginPacket(remoteip, 9030);
-      Udp.print("from=TEF_tuner " + String(stationlistid, DEC) + ";RT1=");
+      Udp.print("from=TEF_tuner_" + String(stationlistid, DEC) + ";RT1=");
      char RThex[65];
      radio.rds.stationText.toCharArray(RThex, 65);
      for (int i = 0; i < 64; i++) {