Merge branch 'main' into New_Model_DP_666

src/comms.cpp

@@ -374,6 +374,14 @@ void XDRGTKRoutine() {
         }
         break;
 
+      case 'B':
+        byte stmo;
+        stmo = atol(buff + 1);
+        DataPrint("B" + String(stmo) + "\n");
+        if (stmo == 0) StereoToggle = false; else StereoToggle = true;
+        doStereoToggle();
+        break;
+
       case 'C':
         if (afscreen || advancedRDS) {
           BuildDisplay();
@@ -381,6 +389,12 @@ void XDRGTKRoutine() {
         }
         byte scanmethod;
         scanmethod = atol(buff + 1);
+
+        if (band < BAND_GAP) {
+          stepsize = 0;
+          ShowStepSize();
+        }
+
         if (scanmethod == 1) {
           DataPrint("C1\n");
           direction = false;
@@ -396,14 +410,6 @@ void XDRGTKRoutine() {
         DataPrint("C0\n");
         break;
 
-      case 'B':
-        byte stmo;
-        stmo = atol(buff + 1);
-        DataPrint("B" + String(stmo) + "\n");
-        if (stmo == 0) StereoToggle = false; else StereoToggle = true;
-        doStereoToggle();
-        break;
-
       case 'D':
         byte demp;
         demp = atol(buff + 1);
@@ -482,6 +488,25 @@ void XDRGTKRoutine() {
         }
         break;
 
+      case 'I':
+        byte fmscansenstemp;
+        fmscansenstemp = atol(buff + 1);
+        if (fmscansenstemp > 0 && fmscansenstemp < 31) {
+          fmscansens = fmscansenstemp;
+          EEPROM.writeByte(EE_BYTE_FMSCANSENS, fmscansens);
+          EEPROM.commit();
+        }
+        DataPrint("I" + String(fmscansens) + "\n");
+        break;
+
+      case 'J':
+        byte scandxtemp;
+        scandxtemp = atol(buff + 1);
+        if (scandxtemp == 0 && scandxmode) cancelDXScan();
+        if (scandxtemp == 1 && !scandxmode) startFMDXScan();
+        DataPrint("J" + String(scandxtemp) + "\n");
+        break;
+
       case 'M':
         byte XDRband;
         XDRband = atol(buff + 1);

src/comms.h

@@ -22,6 +22,7 @@ extern bool menu;
 extern bool RDSSPYTCP;
 extern bool RDSSPYUSB;
 extern bool RDSstatus;
+extern bool scandxmode;
 extern bool screenmute;
 extern bool seek;
 extern bool setupmode;
@@ -41,10 +42,12 @@ extern bool XDRMute;
 extern byte band;
 extern byte BWset;
 extern byte EQset;
+extern byte fmscansens;
 extern byte iMSEQ;
 extern byte iMSset;
 extern byte language;
 extern byte memorypos;
+extern byte stepsize;
 extern byte subnetclient;
 extern byte TEF;
 extern char buff[16];
@@ -135,5 +138,8 @@ extern void updateiMS();
 extern void updateEQ();
 extern void tftPrint(int8_t offset, const String & text, int16_t x, int16_t y, int color, int smoothcolor, uint8_t fontsize);
 extern void showAutoSquelch(bool mode);
+extern void ShowStepSize();
+extern void startFMDXScan();
+extern void cancelDXScan();
 
 #endif

src/gui.cpp

@@ -2022,7 +2022,7 @@ void MenuUp() {
             OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
             OneBigLineSprite.drawString(String(ContrastSet, DEC), 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
-            analogWrite(CONTRASTPIN, ContrastSet * 2 + 27);
+            analogWrite(CONTRASTPIN, map(ContrastSet, 0, 100, 15, 255));
             break;
 
           case ITEM3:
@@ -2339,7 +2339,7 @@ void MenuUp() {
 
           case ITEM10:
             fmscansens++;
-            if (fmscansens > 15) fmscansens = 1;
+            if (fmscansens > 30) fmscansens = 1;
 
             OneBigLineSprite.drawString(String(fmscansens), 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
@@ -2447,7 +2447,7 @@ void MenuUp() {
 
           case ITEM9:
             amscansens++;
-            if (amscansens > 15) amscansens = 1;
+            if (amscansens > 30) amscansens = 1;
 
             OneBigLineSprite.drawString(String(amscansens, DEC), 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
@@ -2882,7 +2882,7 @@ void MenuDown() {
             OneBigLineSprite.setTextColor(PrimaryColor, PrimaryColorSmooth, false);
             OneBigLineSprite.drawString(String(ContrastSet, DEC), 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
-            analogWrite(CONTRASTPIN, ContrastSet * 2 + 27);
+            analogWrite(CONTRASTPIN, map(ContrastSet, 0, 100, 15, 255));
             break;
 
           case ITEM3:
@@ -3201,7 +3201,7 @@ void MenuDown() {
 
           case ITEM10:
             fmscansens--;
-            if (fmscansens == 0) fmscansens = 15;
+            if (fmscansens == 0) fmscansens = 30;
 
             OneBigLineSprite.drawString(String(fmscansens), 135, 0);
             OneBigLineSprite.pushSprite(24, 118);
@@ -3310,7 +3310,7 @@ void MenuDown() {
 
           case ITEM9:
             amscansens--;
-            if (amscansens == 0) amscansens = 15;
+            if (amscansens == 0) amscansens = 30;
 
             OneBigLineSprite.drawString(String(amscansens, DEC), 135, 0);
             OneBigLineSprite.pushSprite(24, 118);

src/language.h

@@ -1,7 +1,7 @@
 #ifndef LANGUAGE_H
 #define LANGUAGE_H
 
-#define VERSION "v2.10 RC11"
+#define VERSION "v2.10 RC12"
 
 // [number of languages][number of texts]