Fix to some #defines about the SMETER and add the Memory Scan feature

Author: stdevPavelmc

arduino-arcs.ino

@@ -59,7 +59,7 @@
 *******************************************************************************/
 
 // You like to have CAT control (PC control) of the sketch via Serial link?
-//#define CAT_CONTROL True
+#define CAT_CONTROL True
 
 // Rotary and push control?
 #define ROTARY True
@@ -69,9 +69,12 @@
 #define ABUT True
 
 // Memories?
-//#define MEMORIES True   // hard limited to 99 mems (~80 on the ATMEga168)
+#define MEMORIES True   // hard limited to 99 mems (~80 on the ATMEga168)
                           // because we have only two spaces to represent that
 
+// Also you want to scan over enabled memories?
+#define MEM_SCAN True
+
 // Smeter on the LCD?
 #define SMETER True
 
@@ -261,6 +264,14 @@ struct userData u;
         // declaring the main configuration variable for mem storage
         struct mmem memo;
 
+        // some vars for the memory scan feature if defined
+        #ifdef MEM_SCAN
+            // general memscan flag
+            bool mscan = true;
+            #define MEM_SCAN_INTERVAL  5000;    // in msecs, the time between scan jumps
+            unsigned long scanTime;             // counter against millis
+        #endif
+
     #else
         // Analog buttons with single functions
         Button bvfoab   = Button(b1, &btnVFOABClick);
@@ -297,14 +308,14 @@ struct userData u;
     LiquidCrystal lcd(LCD_RS, LCD_E, LCD_D4, LCD_D5, LCD_D6, LCD_D7);
 
     #ifdef SMETER
-        // how many samples we take in the smeter, we use a 2/3 trick to get some
-        // inertia and improve the look & feel of the bar
+        // how many samples we take in the smeter, we use a 2/3 trick
+        // to get some inertia and improve the look & feel of the bar
         #define BARGRAPH_SAMPLES    6
-        word pep[BARGRAPH_SAMPLES] = {};    // s-meter readings storage
-        boolean smeterOk = false;           // it's ok to show the bar graph
-        word sMeter = 0;                    // hold the value of the Smeter readings
-                                            // in both RX and TX modes
-        boolean barReDraw = true;           // Smeter bar needs to be redrawn
+        word pep[BARGRAPH_SAMPLES] = {};  // s-meter readings storage
+        boolean smeterOk = false;         // it's ok to show the bar graph
+        word sMeter = 0;                  // the value of the Smeter readings
+                                          // in both RX and TX modes
+        boolean barReDraw = true;         // Smeter bar needs to be redrawn
     #endif // smeter
 #endif // nolcd
 

fe-eeprom.ino

@@ -106,8 +106,28 @@ void loadEEPROMConfig() {
 
     // wipe mem, this is loaded in the init process of the eeprom.
     void wipeMEM() {
-        // run for the entire mem area writing the defaults to it, with no-go flag
+        // run for the entire mem area writing the defaults to it,
+        // with no-go flag on it
         for (word i = 0; i <= memCount; i++ ) saveMEM(i, 0);
     }
 
+
+    #ifdef MEM_SCAN
+        // check memscan
+        void checkMemScan() {
+            // check timer until the next mem jump
+            if ((mscan == true) and (scanTime < millis())) {
+                // move to the next mem
+                do {// increase the mem & check it
+                    mem += 1;
+                    if (mem >= memCount) mem = 0;
+                } while(!loadMEM(mem));
+
+                // reset timer
+                scanTime = millis() + MEM_SCAN_INTERVAL;
+            }
+        }
+
+    #endif // mem scan
+
 #endif // memories

ff-abuttons.ino

@@ -19,8 +19,13 @@
         // normal mode
         if (runMode) {
             #ifdef MEMORIES
-                // if we are in mem mode VFO A/B switch has no sense
-                if (!vfoMode) return;
+                // is the scanning feature turned on?
+                #ifdef MEM_SCAN
+                    if (!vfoMode) {
+                        mscan != mscan;
+                        return;
+                    }
+                #endif
             #endif
 
             // we force to deactivate the RIT on VFO change, as it will confuse
@@ -163,8 +168,10 @@
             // going to deactivate: reset the stored VFO
             *ptrVFO = tvfo;
             ritActive = false;
-            // flag to redraw the bar graph
-            barReDraw = true;
+            #ifdef SMETER
+                // flag to redraw the bar graph
+                barReDraw = true;
+            #endif
         }
     }
 

z-end.ino

@@ -226,6 +226,13 @@ void loop() {
             if (dbPTT.fell()) {
                 // line asserted (PTT Closed) going to TX
                 going2TX();
+
+                // clear the memory scan flag if active
+                #ifdef MEMORIES
+                    #ifdef MEM_SCAN
+                    mscan = false;
+                    #endif
+                #endif
             } else {
                 // line left open, going to RX
                 going2RX();
@@ -307,8 +314,10 @@ void loop() {
         // decrement timer
         if (showStepCounter > 0) {
             showStepCounter -= 1;
-            // flag to redraw the bar graph only if zero
-            if (showStepCounter == 0) barReDraw = true;
+            #ifdef SMETER
+                // flag to redraw the bar graph only if zero
+                if (showStepCounter == 0) barReDraw = true;
+            #endif
         }
     }
 
@@ -321,4 +330,11 @@ void loop() {
         // analog buttons check
         abm.check();
     #endif
+
+    #ifdef MEMORIES
+        #ifdef MEM_SCAN
+            // memory scan timming check
+            checkMemScan();
+        #endif
+    #endif
 }