Merge pull request #705 from LeeLeahy2/ap-name

WiFi: Set the soft AP name

Author: nseidle

Firmware/RTK_Everywhere/States.ino

@@ -208,7 +208,6 @@ void stateUpdate()
         case (STATE_BASE_CASTER_NOT_STARTED): {
             baseCasterEnableOverride();
 
-            wifiSoftApSsid = "RTK Caster";
             changeState(STATE_BASE_NOT_STARTED);
         }
         break;
@@ -431,7 +430,6 @@ void stateUpdate()
             for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
                 ntripServerStop(serverIndex, true); // Do not allocate new wifiClient
 
-            wifiSoftApSsid = "RTK Config";
             webServerStart(); // Start the webserver state machine for web config
 
             RTK_MODE(RTK_MODE_WEB_CONFIG);
@@ -458,9 +456,9 @@ void stateUpdate()
                     //Create temporary copy of Settings, so that we can check if they change while parsing
                     //Useful for detecting when we need to change WiFi station settings
                     wifiSettingsClone();
-                    
+
                     parseIncomingSettings();
-                    
+
                     settings.gnssConfiguredOnce = false; // On the next boot, reapply all settings
                     settings.gnssConfiguredBase = false;
                     settings.gnssConfiguredRover = false;

Firmware/RTK_Everywhere/WiFi.ino

@@ -773,6 +773,12 @@ bool wifiSoftApOn(const char *fileName, uint32_t lineNumber)
     if (settings.debugWifiState)
         systemPrintf("wifiSoftApOn called in %s at line %d\r\n", fileName, lineNumber);
 
+    // Select the AP name
+    if (inWebConfigMode())
+        wifiSoftApSsid = "RTK Config";
+    else
+        wifiSoftApSsid = "RTK";
+
     return wifi.enable(wifiEspNowRunning, true, wifiStationRunning, __FILE__, __LINE__);
 }
 
@@ -1418,7 +1424,7 @@ bool RTK_WIFI::enable(bool enableESPNow, bool enableSoftAP, bool enableStation,
             // Allocate the soft AP SSID
             if (!_apSsid)
             {
-                _apSsid = (char *)rtkMalloc(strlen(wifiSoftApSsid) + 1, "SSID string (_apSsid)");
+                _apSsid = (char *)rtkMalloc(SSID_LENGTH + 1 + 4 + 1, "SSID string (_apSsid)");
                 if (_apSsid)
                     _apSsid[0] = 0;
                 else