Change L-Band menu to PointPerfect. Add AP config for PointPerfect, external triggers, NTRIP client, NTRIP Server/Client caster.

Author: nseidle

Firmware/RTK_Surveyor/AP-Config/index.html

@@ -2039,7 +2039,7 @@ void displayKeysUpdated()
 void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
 {
   //28 days
-  //until L-Band
+  //until PP
   //keys expire
 
   if (online.display == true)
@@ -2077,9 +2077,9 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
     oled.print("Until");
 
     y += fontHeight;
-    textX = x - (oled.getStringWidth("L-Band") / 2);
+    textX = x - (oled.getStringWidth("PP") / 2);
     oled.setCursor(textX, y);
-    oled.print("L-Band");
+    oled.print("PP");
 
     y += fontHeight;
     textX = x - (oled.getStringWidth("Keys") / 2);
@@ -2099,7 +2099,7 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
 
 void paintKeyWiFiFail(uint16_t displayTime)
 {
-  //L-Band
+  //PP
   //Update
   //Failed
   //No WiFi
@@ -2115,9 +2115,9 @@ void paintKeyWiFiFail(uint16_t displayTime)
     int fontHeight = 13;
     int textX;
 
-    textX = x - (oled.getStringWidth("L-Band") / 2); //Starting point of text
+    textX = x - (oled.getStringWidth("PP") / 2); //Starting point of text
     oled.setCursor(textX, y);
-    oled.print("L-Band");
+    oled.print("PP");
 
     y += fontHeight;
     textX = x - (oled.getStringWidth("Update") / 2);

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

@@ -291,7 +291,7 @@ static void handleFirmwareFileUpload(AsyncWebServerRequest *request, String file
 void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len)
 {
   if (type == WS_EVT_CONNECT) {
-    char settingsCSV[3000];
+    char settingsCSV[4000];
     memset(settingsCSV, 0, sizeof(settingsCSV));
     createSettingsString(settingsCSV);
     log_d("Sending command: %s\n\r", settingsCSV);
@@ -411,22 +411,47 @@ void createSettingsString(char* settingsCSV)
   stringRecord(settingsCSV, "radioPortBaud", settings.radioPortBaud);
   stringRecord(settingsCSV, "dataPortChannel", settings.dataPortChannel);
 
-  //New settings not yet integrated
+  //LBand
+  char hardwareID[13];
+  sprintf(hardwareID, "%02X%02X%02X%02X%02X%02X", unitMACAddress[0], unitMACAddress[1], unitMACAddress[2], unitMACAddress[3], unitMACAddress[4], unitMACAddress[5]); //Get ready for JSON
+  stringRecord(settingsCSV, "hardwareID", hardwareID);
+
+  char apDaysRemaining[50];
+  if (strlen(settings.pointPerfectCurrentKey) > 0)
+  {
+    uint8_t daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1);
+    sprintf(apDaysRemaining, "%d", daysRemaining);
+  }
+  else
+    sprintf(apDaysRemaining, "No Keys");
+
+  stringRecord(settingsCSV, "daysRemaining", apDaysRemaining);
+
+  stringRecord(settingsCSV, "pointPerfectDeviceProfileToken", settings.pointPerfectDeviceProfileToken);
+  stringRecord(settingsCSV, "enablePointPerfectCorrections", settings.enablePointPerfectCorrections);
+  stringRecord(settingsCSV, "home_wifiSSID", settings.home_wifiSSID);
+  stringRecord(settingsCSV, "home_wifiPW", settings.home_wifiPW);
+  stringRecord(settingsCSV, "autoKeyRenewal", settings.autoKeyRenewal);
+
+  //External PPS/Triggers
   stringRecord(settingsCSV, "enableExternalPulse", settings.enableExternalPulse);
   stringRecord(settingsCSV, "externalPulseTimeBetweenPulse_us", settings.externalPulseTimeBetweenPulse_us);
   stringRecord(settingsCSV, "externalPulseLength_us", settings.externalPulseLength_us);
   stringRecord(settingsCSV, "externalPulsePolarity", settings.externalPulsePolarity);
   stringRecord(settingsCSV, "enableExternalHardwareEventLogging", settings.enableExternalHardwareEventLogging);
-  stringRecord(settingsCSV, "profileName", settings.profileName);
-  stringRecord(settingsCSV, "serialTimeoutGNSS", settings.serialTimeoutGNSS);
-  stringRecord(settingsCSV, "pointPerfectDeviceProfileToken", settings.pointPerfectDeviceProfileToken);
-  stringRecord(settingsCSV, "enableLBandCorrections", settings.enableLBandCorrections);
-  stringRecord(settingsCSV, "enableIPCorrections", settings.enableIPCorrections);
-  stringRecord(settingsCSV, "home_wifiSSID", settings.home_wifiSSID);
-  stringRecord(settingsCSV, "home_wifiPW", settings.home_wifiPW);
-  stringRecord(settingsCSV, "autoKeyRenewal", settings.autoKeyRenewal);
+
+  //Profiles
+  char apProfileName[50];
+  sprintf(apProfileName, "Profile Name: %s", settings.profileName);
+  stringRecord(settingsCSV, "profileName", apProfileName);
+
+  //New settings not yet integrated
+  //...
 
   strcat(settingsCSV, "\0");
+  if(strlen(settingsCSV) > sizeof(settingsCSV))
+    Serial.println("Error: settingCSV too small");
+    
   Serial.printf("settingsCSV len: %d\n\r", strlen(settingsCSV));
   Serial.printf("settingsCSV: %s\n\r", settingsCSV);
 #endif
@@ -545,10 +570,8 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
     settings.serialTimeoutGNSS = settingValue;
   else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)
     strcpy(settings.pointPerfectDeviceProfileToken, settingValueStr);
-  else if (strcmp(settingName, "enableLBandCorrections") == 0)
-    settings.enableLBandCorrections = settingValue;
-  else if (strcmp(settingName, "enableIPCorrections") == 0)
-    settings.enableIPCorrections = settingValue;
+  else if (strcmp(settingName, "enablePointPerfectCorrections") == 0)
+    settings.enablePointPerfectCorrections = settingValue;
   else if (strcmp(settingName, "home_wifiSSID") == 0)
     strcpy(settings.home_wifiSSID, settingValueStr);
   else if (strcmp(settingName, "home_wifiPW") == 0)
@@ -680,6 +703,14 @@ void stringRecord(char* settingsCSV, const char *id, char* settingValue)
   strcat(settingsCSV, record);
 }
 
+//Add record with uint64_t
+void stringRecord(char* settingsCSV, const char *id, uint64_t settingValue)
+{
+  char record[100];
+  sprintf(record, "%s,%ld,", id, settingValue);
+  strcat(settingsCSV, record);
+}
+
 //Break CSV into setting constituents
 //Can't use strtok because we may have two commas next to each other, ie measurementRateHz,4.00,measurementRateSec,,dynamicModel,0,
 bool parseIncomingSettings()

Firmware/RTK_Surveyor/Display.ino

@@ -187,8 +187,7 @@ void recordSystemSettingsToFile(File * settingsFile)
   settingsFile->printf("%s=%d\n\r", F("ntripClient_TransmitGGA"), settings.ntripClient_TransmitGGA);
   settingsFile->printf("%s=%d\n\r", F("serialTimeoutGNSS"), settings.serialTimeoutGNSS);
   settingsFile->printf("%s=%s\n\r", F("pointPerfectDeviceProfileToken"), settings.pointPerfectDeviceProfileToken);
-  settingsFile->printf("%s=%d\n\r", F("enableLBandCorrections"), settings.enableLBandCorrections);
-  settingsFile->printf("%s=%d\n\r", F("enableIPCorrections"), settings.enableIPCorrections);
+  settingsFile->printf("%s=%d\n\r", F("enablePointPerfectCorrections"), settings.enablePointPerfectCorrections);
   settingsFile->printf("%s=%s\n\r", F("home_wifiSSID"), settings.home_wifiSSID);
   settingsFile->printf("%s=%s\n\r", F("home_wifiPW"), settings.home_wifiPW);
   settingsFile->printf("%s=%d\n\r", F("autoKeyRenewal"), settings.autoKeyRenewal);
@@ -696,10 +695,8 @@ bool parseLine(char* str, Settings *settings)
     settings->serialTimeoutGNSS = d;
   else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)
     strcpy(settings->pointPerfectDeviceProfileToken, settingValue);
-  else if (strcmp(settingName, "enableLBandCorrections") == 0)
-    settings->enableLBandCorrections = d;
-  else if (strcmp(settingName, "enableIPCorrections") == 0)
-    settings->enableIPCorrections = d;
+  else if (strcmp(settingName, "enablePointPerfectCorrections") == 0)
+    settings->enablePointPerfectCorrections = d;
   else if (strcmp(settingName, "home_wifiSSID") == 0)
     strcpy(settings->home_wifiSSID, settingValue);
   else if (strcmp(settingName, "home_wifiPW") == 0)

Firmware/RTK_Surveyor/Form.ino

@@ -36,24 +36,18 @@
     (Done) Ports - Configure Radio and Data port baud rates
     (Done) Test menu
     (Done) Firmware upgrade menu
-    Enable various debug outputs sent over BT
 
   TODO:
-    Add ntripServer_MountPoint and PWDownload to AP config
-    Add ntripClient_TransmitGGA to AP config
-    Add ntripServer_CasterUser/PW to AP config
-    Add maxLogLength_minutes to AP config
-    Add L-Band to AP config
 
 */
 
 const int FIRMWARE_VERSION_MAJOR = 2;
-const int FIRMWARE_VERSION_MINOR = 0;
+const int FIRMWARE_VERSION_MINOR = 1;
 
 #define COMPILE_WIFI //Comment out to remove WiFi functionality
-#define COMPILE_BT //Comment out to remove Bluetooth functionality
+//#define COMPILE_BT //Comment out to remove Bluetooth functionality
 #define COMPILE_AP //Comment out to remove Access Point functionality
-//#define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
+#define ENABLE_DEVELOPER //Uncomment this line to enable special developer modes (don't check power button at startup)
 
 //Define the RTK board identifier:
 //  This is an int which is unique to this variant of the RTK Surveyor hardware which allows us
@@ -356,7 +350,7 @@ int incomingSettingsSpot = 0;
 unsigned long timeSinceLastIncomingSetting = 0;
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-//L-Band Corrections
+//PointPerfect Corrections
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 SFE_UBLOX_GNSS i2cLBand; // NEO-D9S
 
@@ -471,7 +465,7 @@ bool mqttMessageReceived = false; //Goes true when the subscribed MQTT channel r
 uint8_t leapSeconds = 0; //Gets set if GNSS is online
 unsigned long systemTestDisplayTime = 0; //Timestamp for swapping the graphic during testing
 uint8_t systemTestDisplayNumber = 0; //Tracks which test screen we're looking at
-unsigned long rtcWaitTime = 0; //At poweron, we give the RTC a few seconds to update during L-Band Key checking
+unsigned long rtcWaitTime = 0; //At poweron, we give the RTC a few seconds to update during PointPerfect Key checking
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
@@ -510,7 +504,7 @@ void setup()
 
   beginSystemState(); //Determine initial system state. Start task for button monitoring.
 
-  updateRTC(); //The GNSS likely has time/date. Update ESP32 RTC to match. Needed for L-Band key expiration.
+  updateRTC(); //The GNSS likely has time/date. Update ESP32 RTC to match. Needed for PointPerfect key expiration.
 
   Serial.flush(); //Complete any previous prints
 
@@ -543,7 +537,7 @@ void loop()
 
   updateNTRIPClient(); //Move any available incoming NTRIP to ZED
 
-  updateLBand(); //Check if we've recently received L-Band corrections or not
+  updateLBand(); //Check if we've recently received PointPerfect corrections or not
 
   //Convert current system time to minutes. This is used in F9PSerialReadTask()/updateLogs() to see if we are within max log window.
   systemTime_minutes = millis() / 1000L / 60;

Firmware/RTK_Surveyor/NVM.ino

@@ -1116,8 +1116,8 @@ void updateSystemState()
           //We want an immediate change from this state
           forceSystemStateUpdate = true; //Imediately go to this new state
 
-          //If user has turned off L-Band, skip everything
-          if (settings.enableLBandCorrections == false)
+          //If user has turned off PointPerfect, skip everything
+          if (settings.enablePointPerfectCorrections == false)
           {
             changeState(settings.lastState); //Go to either rover or base
           }
@@ -1220,7 +1220,7 @@ void updateSystemState()
 
       case (STATE_KEYS_WIFI_CONNECTED):
         {
-          if (updatePointPerfectKeys() == true) //Connect to ThingStream MQTT and get L-Band key UBX packet
+          if (updatePointPerfectKeys() == true) //Connect to ThingStream MQTT and get PointPerfect key UBX packet
           {
             displayKeysUpdated();
           }
@@ -1239,7 +1239,7 @@ void updateSystemState()
             if (settings.pointPerfectNextKeyStart > 0)
             {
               uint8_t daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1);
-              Serial.printf("Days until L-Band keys expire: %d\n\r", daysRemaining);
+              Serial.printf("Days until PointPerfect keys expire: %d\n\r", daysRemaining);
               paintKeyDaysRemaining(daysRemaining, 2000);
             }
           }