Rename define

sparkfun · Dec 18, 2024 · efd7b2a · efd7b2a
1 parent 90c76d5
commit efd7b2a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Firmware/RTK_Everywhere/Tasks.ino b/Firmware/RTK_Everywhere/Tasks.ino
@@ -289,18 +289,18 @@ void sendGnssBuffer()
     {
         if (gnss->pushRawData(bluetoothOutgoingToGnss, bluetoothOutgoingToGnssHead))
         {
-            if ((settings.debugCorrections || PERIODIC_DISPLAY(PD_ZED_DATA_TX)) && !inMainMenu)
+            if ((settings.debugCorrections || PERIODIC_DISPLAY(PD_GNSS_DATA_TX)) && !inMainMenu)
             {
-                PERIODIC_CLEAR(PD_ZED_DATA_TX);
+                PERIODIC_CLEAR(PD_GNSS_DATA_TX);
                 systemPrintf("Sent %d BT bytes to GNSS\r\n", bluetoothOutgoingToGnssHead);
             }
         }
     }
     else
     {
-        if ((settings.debugCorrections || PERIODIC_DISPLAY(PD_ZED_DATA_TX)) && !inMainMenu)
+        if ((settings.debugCorrections || PERIODIC_DISPLAY(PD_GNSS_DATA_TX)) && !inMainMenu)
         {
-            PERIODIC_CLEAR(PD_ZED_DATA_TX);
+            PERIODIC_CLEAR(PD_GNSS_DATA_TX);
             systemPrintf("%d BT bytes NOT sent due to priority\r\n", bluetoothOutgoingToGnssHead);
         }
     }
@@ -573,9 +573,9 @@ void processUart1Message(SEMP_PARSE_STATE *parse, uint16_t type)
     int32_t use;
 
     // Display the message
-    if ((settings.enablePrintLogFileMessages || PERIODIC_DISPLAY(PD_ZED_DATA_RX)) && (!parse->crc) && (!inMainMenu))
+    if ((settings.enablePrintLogFileMessages || PERIODIC_DISPLAY(PD_GNSS_DATA_RX)) && (!parse->crc) && (!inMainMenu))
     {
-        PERIODIC_CLEAR(PD_ZED_DATA_RX);
+        PERIODIC_CLEAR(PD_GNSS_DATA_RX);
         if (settings.enablePrintLogFileMessages)
         {
             printTimeStamp();

diff --git a/Firmware/RTK_Everywhere/menuSystem.ino b/Firmware/RTK_Everywhere/menuSystem.ino
@@ -1147,10 +1147,10 @@ void menuPeriodicPrint()
         systemPrintf("%s\r\n", PERIODIC_SETTING(PD_WIFI_STATE) ? "Enabled" : "Disabled");
 
         systemPrint("8) ZED RX data: ");
-        systemPrintf("%s\r\n", PERIODIC_SETTING(PD_ZED_DATA_RX) ? "Enabled" : "Disabled");
+        systemPrintf("%s\r\n", PERIODIC_SETTING(PD_GNSS_DATA_RX) ? "Enabled" : "Disabled");
 
         systemPrint("9) ZED TX data: ");
-        systemPrintf("%s\r\n", PERIODIC_SETTING(PD_ZED_DATA_TX) ? "Enabled" : "Disabled");
+        systemPrintf("%s\r\n", PERIODIC_SETTING(PD_GNSS_DATA_TX) ? "Enabled" : "Disabled");
 
         systemPrintln("-----  Software  -----");
 
@@ -1270,9 +1270,9 @@ void menuPeriodicPrint()
         else if (incoming == 7)
             PERIODIC_TOGGLE(PD_WIFI_STATE);
         else if (incoming == 8)
-            PERIODIC_TOGGLE(PD_ZED_DATA_RX);
+            PERIODIC_TOGGLE(PD_GNSS_DATA_RX);
         else if (incoming == 9)
-            PERIODIC_TOGGLE(PD_ZED_DATA_TX);
+            PERIODIC_TOGGLE(PD_GNSS_DATA_TX);
 
         else if (incoming == 20)
         {

diff --git a/Firmware/RTK_Everywhere/settings.h b/Firmware/RTK_Everywhere/settings.h
@@ -301,8 +301,8 @@ enum PeriodDisplayValues
     PD_CELLULAR_STATE,          // 28
     PD_WIFI_STATE,              // 29
 
-    PD_ZED_DATA_RX,             // 30
-    PD_ZED_DATA_TX,             // 31
+    PD_GNSS_DATA_RX,             // 30
+    PD_GNSS_DATA_TX,             // 31
 
     PD_MQTT_CLIENT_DATA,        // 32
     PD_MQTT_CLIENT_STATE,       // 33