Merge branch 'release_candidate' into pcUpdates

Author: PaulZC

Firmware/RTK_Everywhere/WiFi.ino

@@ -15,8 +15,18 @@
 #define WIFI_CONNECTION_STABLE_MSEC (15 * MILLISECONDS_IN_A_MINUTE)
 
 static const char *wifiAuthorizationName[] = {
-    "Open",     "WEP",           "WPA_PSK",  "WPA2_PSK", "WPA_WPA2_PSK", "WPA2_Enterprise",
+    "Open",     "WEP",           "WPA_PSK",  "WPA2_PSK", "WPA_WPA2_PSK", //"ENTERPRISE", 
+    "WPA2_Enterprise",
     "WPA3_PSK", "WPA2_WPA3_PSK", "WAPI_PSK", "OWE",      "WPA3_ENT_192",
+
+    //Compatible with ESP32 core v3.2.1, 16 reported, 18 listed here:
+    //https://github.com/espressif/esp-idf/blob/master/components/esp_wifi/include/esp_wifi_types_generic.h#L86
+    //"WPA3_EXT_PSK",
+    //"WPA3_EXT_PSK_MIXED_MODE",
+    //"DPP",
+    //"WPA3_ENTERPRISE",
+    //"WPA2_WPA3_ENTERPRISE",
+    //"WPA_ENTERPRISE",
 };
 static const int wifiAuthorizationNameEntries = sizeof(wifiAuthorizationName) / sizeof(wifiAuthorizationName[0]);
 
@@ -3135,7 +3145,8 @@ void RTK_WIFI::verifyTables()
     // Verify the authorization name table
     if (WIFI_AUTH_MAX != wifiAuthorizationNameEntries)
     {
-        systemPrintf("ERROR: Fix wifiAuthorizationName list to match wifi_auth_mode_t in esp_wifi_types.h!\r\n");
+        //https://github.com/espressif/esp-idf/blob/master/components/esp_wifi/include/esp_wifi_types_generic.h#L86
+        systemPrintf("ERROR: Fix wifiAuthorizationName list (%d) to match wifi_auth_mode_t (%d) in esp_wifi_types.h!\r\n", wifiAuthorizationNameEntries, WIFI_AUTH_MAX);
         reportFatalError("Fix wifiAuthorizationName list to match wifi_auth_mode_t in esp_wifi_types.h!");
     }
 

Firmware/RTK_Everywhere/form.h

@@ -26,7 +26,7 @@
 //  python main_js_zipper.py
 
 static const uint8_t main_js[] PROGMEM = {
-  0x1F, 0x8B, 0x08, 0x08, 0x95, 0x9A, 0x6D, 0x68, 0x02, 0xFF, 0x6D, 0x61, 0x69, 0x6E, 0x2E, 0x6A,
+  0x1F, 0x8B, 0x08, 0x08, 0xD2, 0x84, 0x6E, 0x68, 0x02, 0xFF, 0x6D, 0x61, 0x69, 0x6E, 0x2E, 0x6A,
   0x73, 0x2E, 0x67, 0x7A, 0x69, 0x70, 0x00, 0xED, 0x7D, 0x7B, 0x5F, 0x1B, 0x39, 0xB2, 0xE8, 0xFF,
   0xF9, 0x14, 0x5A, 0xDF, 0xBD, 0x83, 0x59, 0x8C, 0x69, 0x9B, 0x47, 0x20, 0x84, 0xEC, 0x25, 0x40,
   0x12, 0xEE, 0xF2, 0xBA, 0x98, 0xCC, 0x4C, 0x26, 0x9B, 0xC3, 0x69, 0x6C, 0x61, 0xFA, 0xC4, 0xEE,
@@ -1064,7 +1064,7 @@ static const uint8_t main_js[] PROGMEM = {
 //  python index_html_zipper.py
 
 static const uint8_t index_html[] PROGMEM = {
-  0x1F, 0x8B, 0x08, 0x08, 0x95, 0x9A, 0x6D, 0x68, 0x02, 0xFF, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E,
+  0x1F, 0x8B, 0x08, 0x08, 0xD2, 0x84, 0x6E, 0x68, 0x02, 0xFF, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E,
   0x68, 0x74, 0x6D, 0x6C, 0x2E, 0x67, 0x7A, 0x69, 0x70, 0x00, 0xED, 0x7D, 0x5B, 0x72, 0xDB, 0xCA,
   0x92, 0xE0, 0xFF, 0x59, 0x45, 0x35, 0x7B, 0xA6, 0x2D, 0xF7, 0x88, 0x14, 0x48, 0x4A, 0xB2, 0xAC,
   0x6B, 0x2B, 0x82, 0x7A, 0xD8, 0xD6, 0x5C, 0x59, 0x66, 0x8B, 0xF2, 0x3D, 0x8F, 0x89, 0x99, 0x13,

Firmware/RTK_Everywhere/menuPP.ino

@@ -23,8 +23,10 @@ static const uint8_t ppLbandToken[16] = {POINTPERFECT_LBAND_TOKEN};      // Toke
 static const uint8_t ppIpToken[16] = {POINTPERFECT_IP_TOKEN};            // Token in HEX form
 static const uint8_t ppLbandIpToken[16] = {POINTPERFECT_LBAND_IP_TOKEN}; // Token in HEX form
 static const uint8_t ppRtcmToken[16] = {POINTPERFECT_RTCM_TOKEN};        // Token in HEX form
-static const uint8_t ppGlobalToken[16] = {POINTPERFECT_GLOBAL_TOKEN};    // Token in HEX form
-static const uint8_t ppLiveToken[16] = {POINTPERFECT_LIVE_TOKEN};        // Token in HEX form
+static const uint8_t ppGlobalToken[16] = {0};
+//{POINTPERFECT_GLOBAL_TOKEN};                                             // Token in HEX form
+static const uint8_t ppLiveToken[16] = {0};
+//{POINTPERFECT_LIVE_TOKEN}; // Token in HEX form
 static unsigned long provisioningStartTime_millis;
 static bool provisioningRunning;