Marking L-Band as deprecated. Adding back MQTT (Deprecated) to Web Config.

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/src/main.js

@@ -131,7 +131,9 @@ function parseIncoming(msg) {
                 select.add(newOption, undefined);
                 newOption = new Option('Flex NTRIP/RTCM', '1');
                 select.add(newOption, undefined);
-                newOption = new Option('Flex L-Band North America', '2');
+                newOption = new Option('Flex L-Band North America (Deprecated)', '2');
+                select.add(newOption, undefined);
+                newOption = new Option('Flex MQTT (Deprecated)', '5');
                 select.add(newOption, undefined);
             }
             else if ((platformPrefix == "Facet v2") || (platformPrefix == "Facet v2 LBand")) {
@@ -200,7 +202,9 @@ function parseIncoming(msg) {
                 select.add(newOption, undefined);
                 newOption = new Option('Flex NTRIP/RTCM', '1');
                 select.add(newOption, undefined);
-                newOption = new Option('Flex L-Band North America', '2');
+                newOption = new Option('Flex L-Band North America (Deprecated)', '2');
+                select.add(newOption, undefined);
+                newOption = new Option('Flex MQTT (Deprecated)', '5');
                 select.add(newOption, undefined);
             }
             else if (platformPrefix == "Torch") {
@@ -238,6 +242,8 @@ function parseIncoming(msg) {
                 select.add(newOption, undefined);
                 newOption = new Option('Flex NTRIP/RTCM', '1');
                 select.add(newOption, undefined);
+                newOption = new Option('Flex MQTT (Deprecated)', '5');
+                select.add(newOption, undefined);
             }
             else if (platformPrefix == "Postcard") {
                 show("baseConfig");
@@ -273,6 +279,8 @@ function parseIncoming(msg) {
                 select.add(newOption, undefined);
                 newOption = new Option('Flex NTRIP/RTCM', '1');
                 select.add(newOption, undefined);
+                newOption = new Option('Flex MQTT (Deprecated)', '5');
+                select.add(newOption, undefined);
 
                 ge("radioPortBaud").options.length = 0; //Remove all from list
                 select = ge("radioPortBaud");

Firmware/RTK_Everywhere/menuPP.ino

@@ -44,7 +44,7 @@ enum PP_DeliveryMethod
 {
     PP_DELIVERY_NTRIP = 0,    // Delivery over an internet connection (essentially TCP)
     PP_DELIVERY_MQTT,         // Delivery over an internet connection using MQTT (deprecated)
-    PP_DELIVERY_LBAND_NA,     // Delivery over L-Band signal, North America coverage
+    PP_DELIVERY_LBAND_NA,     // Delivery over L-Band signal, North America coverage (deprecated)
     PP_DELIVERY_LBAND_GLOBAL, // Delivery over L-Band signal, global coverage
     PP_DELIVERY_NONE,
 };
@@ -60,7 +60,7 @@ enum PP_Encoding
 // Each service will have a printable name, delivery method, and encoding
 typedef struct
 {
-    const char serviceName[30];
+    const char serviceName[40];
     PP_ModelType modelType;
     PP_DeliveryMethod deliveryMethod;
     PP_Encoding encoding;
@@ -70,7 +70,7 @@ typedef struct
 const PP_Service ppServices[] = {
     {"Disabled", PP_MODEL_NONE, PP_DELIVERY_NONE, PP_ENCODING_NONE},        // Do not use PointPerfect corrections
     {"Flex NTRIP/RTCM", PP_MODEL_SSR, PP_DELIVERY_NTRIP, PP_ENCODING_RTCM}, // Uses "ZTP-RTCM-100" profile
-    {"Flex L-Band North America", PP_MODEL_SSR, PP_DELIVERY_LBAND_NA, PP_ENCODING_SPARTN}, // Uses "ZTP-LBand" profile
+    {"Flex L-Band North America (Deprecated)", PP_MODEL_SSR, PP_DELIVERY_LBAND_NA, PP_ENCODING_SPARTN}, // Uses "ZTP-LBand" profile
     {"Global", PP_MODEL_SSR, PP_DELIVERY_LBAND_GLOBAL, PP_ENCODING_SPARTN},                // Uses "ZTP-Global" profile
     {"Live", PP_MODEL_OSR, PP_DELIVERY_NTRIP, PP_ENCODING_RTCM},                           // Uses "ZTP-Live" profile
     {"Flex MQTT (Deprecated)", PP_MODEL_SSR, PP_DELIVERY_MQTT,

Firmware/RTK_Everywhere/settings.h

@@ -620,12 +620,12 @@ typedef uint16_t NETCONSUMER_MASK_t;
 enum PP_NickName
 {
     PP_NICKNAME_DISABLED = 0,
-    PP_NICKNAME_FLEX_RTCM,
-    PP_NICKNAME_FLEX_LBAND_NA,
-    PP_NICKNAME_GLOBAL,
-    PP_NICKNAME_LIVE,
-    PP_NICKNAME_IP_MQTT,
-    PP_NICKNAME_MAX,
+    PP_NICKNAME_FLEX_RTCM, // 1
+    PP_NICKNAME_FLEX_LBAND_NA, // 2
+    PP_NICKNAME_GLOBAL, // 3
+    PP_NICKNAME_LIVE, // 4
+    PP_NICKNAME_IP_MQTT, // 5
+    PP_NICKNAME_MAX, // 6
 };
 
 // This is all the settings that can be set on RTK Product. It's recorded to NVM and the config file.