Moved memory channels to struct

src/comms.cpp

@@ -3,6 +3,8 @@
 #include "constants.h"
 #include <EEPROM.h>
 
+extern mem presets[];
+
 void Communication() {
   if (!menu) {
     if (wifi) {
@@ -173,12 +175,12 @@ void Communication() {
         for (byte x = 0; x < EE_PRESETS_CNT; x++) {
           Serial.print(x + 1);
           Serial.print(",");
-          Serial.print(memory[x]);
-          if (memoryband[x] == BAND_FM || memoryband[x] == BAND_OIRT) Serial.print("0");
+          Serial.print(presets[x].frequency);
+          if (presets[x].memoryband == BAND_FM || presets[x].memoryband == BAND_OIRT) Serial.print("0");
           Serial.print(",");
-          Serial.print(memorybw[x]);
+          Serial.print(presets[x].memorybw);
           Serial.print(",");
-          Serial.print(memoryms[x]);
+          Serial.print(presets[x].memoryms);
           Serial.print("\n");
         }
       } else if (data_str.startsWith("S")) {
@@ -241,10 +243,10 @@ void Communication() {
               if (error == 0) {
                 error |= (1 << 7);
                 memorypos = mempos;
-                memoryband[mempos] = memband;
-                memory[mempos] = memfreq;
-                memorybw[mempos] = membw;
-                memoryms[mempos] = memms;
+                presets[mempos].memoryband = memband;
+                presets[mempos].frequency = memfreq;
+                presets[mempos].memorybw = membw;
+                presets[mempos].memoryms = memms;
 
                 EEPROM.writeByte(mempos + EE_PRESETS_BAND_START, memband);
                 EEPROM.writeByte(mempos + EE_PRESET_BW_START, membw);

src/comms.h

@@ -17,7 +17,6 @@ extern bool BWreset;
 extern bool direction;
 extern bool externaltune;
 extern bool fullsearchrds;
-extern bool memoryms[];
 extern bool menu;
 extern bool RDSSPYTCP;
 extern bool RDSSPYUSB;
@@ -44,8 +43,6 @@ extern byte EQset;
 extern byte iMSEQ;
 extern byte iMSset;
 extern byte language;
-extern byte memoryband[];
-extern byte memorybw[];
 extern byte memorypos;
 extern byte subnetclient;
 extern char buff[16];
@@ -99,7 +96,6 @@ extern unsigned int frequency_SW;
 extern unsigned int frequencyold;
 extern unsigned int LWHighEdgeSet;
 extern unsigned int LWLowEdgeSet;
-extern unsigned int memory[];
 extern unsigned int MWHighEdgeSet;
 extern unsigned int MWLowEdgeSet;
 extern unsigned int scanner_end;

src/constants.h

@@ -295,6 +295,16 @@ static const char* const FreqFont[] = {"Classic", "Roubenstil", "Motoya", "Aura2
 static const char* const Theme[] = {"Essence", "Cyan", "Crimson", "Monochrome", "Volcano", "Dendro", "Sakura", "Whiteout", "Tangerine", "Ocean", "Indigo", "Maroon", "GoldBrite"};
 static const char* const Skin[] = {"Essential", "NightSky"};
 
+// Memory channel database
+typedef struct {
+  byte          memorybw;
+  byte          memoryband;
+  bool          memoryms;
+  unsigned int  frequency;
+  char          RDSPI[5];
+  char          RDSPS[9];
+} mem;
+
 // FM band: before BAND_GAP; AM band: after BAND_GAP
 enum RADIO_BAND {
   BAND_OIRT = 0, BAND_FM, BAND_GAP, BAND_LW, BAND_MW, BAND_SW