Merge pull request #643 from LeeLeahy2/wifi-2

Most of the changes to the common point with leeUpdates

Author: nseidle

Firmware/RTK_Everywhere/Base.ino

@@ -10,7 +10,7 @@ void processRTCM(uint8_t *rtcmData, uint16_t dataLength)
     }
 
     for (int x = 0; x < dataLength; x++)
-        espnowProcessRTCM(rtcmData[x]);
+        espNowProcessRTCM(rtcmData[x]);
 
     loraProcessRTCM(rtcmData, dataLength);
 
@@ -41,4 +41,4 @@ void baseCasterEnableOverride()
 void baseCasterDisableOverride()
 {
     settings.baseCasterOverride = false;
-}
+}

Firmware/RTK_Everywhere/Begin.ino

@@ -69,13 +69,9 @@ void identifyBoard()
     // Get unit MAC address
     // This was in beginVersion, but is needed earlier so that beginBoard
     // can print the MAC address if identifyBoard fails.
-    esp_read_mac(wifiMACAddress, ESP_MAC_WIFI_STA);
-    memcpy(btMACAddress, wifiMACAddress, sizeof(wifiMACAddress));
-    btMACAddress[5] +=
-        2; // Convert MAC address to Bluetooth MAC (add 2):
-           // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/system.html#mac-address
-    memcpy(ethernetMACAddress, wifiMACAddress, sizeof(wifiMACAddress));
-    ethernetMACAddress[5] += 3; // Convert MAC address to Ethernet MAC (add 3)
+    getMacAddresses(wifiMACAddress, "wifiMACAddress", ESP_MAC_WIFI_STA, true);
+    getMacAddresses(btMACAddress, "btMACAddress", ESP_MAC_BT, true);
+    getMacAddresses(ethernetMACAddress, "ethernetMACAddress", ESP_MAC_ETH, true);
 
     // First, test for devices that do not have ID resistors
     if (productVariant == RTK_UNKNOWN)
@@ -747,7 +743,7 @@ void beginBoard()
 void beginVersion()
 {
     char versionString[21];
-    getFirmwareVersion(versionString, sizeof(versionString), true);
+    firmwareVersionGet(versionString, sizeof(versionString), true);
 
     char title[50];
     RTKBrandAttribute *brandAttributes = getBrandAttributeFromBrand(present.brand);
@@ -926,7 +922,7 @@ void beginSD()
         }
 
         // Load firmware file from the microSD card if it is present
-        scanForFirmware();
+        microSDScanForFirmware();
 
         // Mark card not yet usable for logging
         sdCardSize = 0;
@@ -989,12 +985,7 @@ void beginGnssUart()
 
     // Never freed...
     if (rbOffsetArray == nullptr)
-    {
-        if (online.psram == true)
-            rbOffsetArray = (RING_BUFFER_OFFSET *)ps_malloc(length);
-        else
-            rbOffsetArray = (RING_BUFFER_OFFSET *)malloc(length);
-    }
+        rbOffsetArray = (RING_BUFFER_OFFSET *)rtkMalloc(length, "Ring buffer (rbOffsetArray)");
 
     if (!rbOffsetArray)
     {

Firmware/RTK_Everywhere/Buttons.ino

@@ -63,7 +63,7 @@ void powerDown(bool displayInfo)
     {
         // Platforms with power control won't get here
         // Postcard will get here if the battery is too low
-        
+
         systemPrintln("Device powered down");
         delay(5000);
 
@@ -224,4 +224,4 @@ bool buttonPressedFor(uint8_t buttonNumber, uint16_t maxTime)
 uint8_t buttonLastPressed()
 {
     return (gpioExpander_lastReleased);
-}
+}

Firmware/RTK_Everywhere/Cellular.ino

@@ -87,7 +87,7 @@ void cellularEvent(arduino_event_id_t event)
     if (networkInterfaceHasInternet(NETWORK_CELLULAR) && (event != ARDUINO_EVENT_ETH_GOT_IP) &&
         (event != ARDUINO_EVENT_ETH_GOT_IP6) && (event != ARDUINO_EVENT_PPP_CONNECTED))
     {
-        networkInterfaceEventInternetLost(NETWORK_CELLULAR);
+        networkInterfaceEventInternetLost(NETWORK_CELLULAR, __FILE__, __LINE__);
     }
 
     // Cellular State Machine
@@ -157,7 +157,7 @@ void cellularSimCheck(NetIndex_t index, uintptr_t parameter, bool debug)
     {
         systemPrintf("SIM card not present. Marking cellular offline.\r\n");
         present.cellular_lara = false;
-        networkSequenceExit(index, debug);
+        networkSequenceExit(index, debug, __FILE__, __LINE__);
     }
 }
 

Firmware/RTK_Everywhere/Developer.ino

@@ -9,6 +9,7 @@
 // Ethernet
 //----------------------------------------
 
+bool ethernetLinkUp()   {return false;}
 void menuEthernet() {systemPrintln("**Ethernet not compiled**");}
 
 bool ntpLogIncreasing = false;
@@ -33,8 +34,9 @@ void ntpServerStop() {}
 
 void menuTcpUdp() {systemPrint("**Network not compiled**");}
 void networkBegin() {}
-uint8_t networkConsumers() {return(0);}
-uint16_t networkGetConsumerTypes() {return(0);}
+void networkConsumerAdd(NETCONSUMER_t consumer, NetIndex_t network, const char * fileName, uint32_t lineNumber) {}
+bool networkConsumerIsConnected(NETCONSUMER_t consumer) {return false;}
+void networkConsumerRemove(NETCONSUMER_t consumer, NetIndex_t network, const char * fileName, uint32_t lineNumber) {}
 IPAddress networkGetIpAddress() {return("0.0.0.0");}
 const uint8_t * networkGetMacAddress()
 {
@@ -44,7 +46,8 @@ const uint8_t * networkGetMacAddress()
         return btMACAddress;
 #endif
     return zero;
-  }
+}
+NetPriority_t networkGetPriority() {return 0;}
 bool networkHasInternet() {return false;}
 bool networkHasInternet(NetIndex_t index) {return false;}
 bool networkInterfaceHasInternet(NetIndex_t index) {return false;}
@@ -54,6 +57,8 @@ void networkMarkHasInternet(NetIndex_t index) {}
 void networkSequenceBoot(NetIndex_t index) {}
 void networkSequenceNextEntry(NetIndex_t index, bool debug) {}
 void networkUpdate() {}
+void networkUserAdd(NETCONSUMER_t consumer, const char * fileName, uint32_t lineNumber) {}
+void networkUserRemove(NETCONSUMER_t consumer, const char * fileName, uint32_t lineNumber) {}
 void networkValidateIndex(NetIndex_t index) {}
 void networkVerifyTables() {}
 
@@ -83,30 +88,30 @@ bool ntripServerIsCasting(int serverIndex) {
 // TCP client
 //----------------------------------------
 
+void tcpClientDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 int32_t tcpClientSendData(uint16_t dataHead) {return 0;}
 void tcpClientUpdate() {}
 void tcpClientValidateTables() {}
 void tcpClientZeroTail() {}
-void discardTcpClientBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 
 //----------------------------------------
 // TCP server
 //----------------------------------------
 
+void tcpServerDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 int32_t tcpServerSendData(uint16_t dataHead) {return 0;}
 void tcpServerZeroTail() {}
 void tcpServerValidateTables() {}
-void discardTcpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 
 //----------------------------------------
 // UDP server
 //----------------------------------------
 
+void udpServerDiscardBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 int32_t udpServerSendData(uint16_t dataHead) {return 0;}
 void udpServerStop() {}
 void udpServerUpdate() {}
 void udpServerZeroTail() {}
-void discardUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 
 #endif // COMPILE_NETWORK
 
@@ -117,7 +122,9 @@ void discardUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET n
 #ifndef COMPILE_OTA_AUTO
 
 void otaAutoUpdate() {}
-bool otaNeedsNetwork() {return false;}
+bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength)    {return false;}
+void otaMenuDisplay(char * currentVersion) {}
+bool otaMenuProcessInput(byte incoming) {return false;}
 void otaUpdate() {}
 void otaUpdateStop() {}
 void otaVerifyTables() {}
@@ -131,9 +138,9 @@ void otaVerifyTables() {}
 #ifndef COMPILE_MQTT_CLIENT
 
 bool mqttClientIsConnected() {return false;}
-bool mqttClientNeedsNetwork() {return false;}
 void mqttClientPrintStatus() {}
 void mqttClientRestart() {}
+void mqttClientStartEnabled() {}
 void mqttClientUpdate() {}
 void mqttClientValidateTables() {}
 
@@ -165,7 +172,6 @@ bool webServerStart(int httpPort = 80)
 bool parseIncomingSettings() {return false;}
 void sendStringToWebsocket(const char* stringToSend) {}
 void stopWebServer() {}
-bool webServerNeedsNetwork() {return false;}
 void webServerStop() {}
 void webServerUpdate()  {}
 void webServerVerifyTables() {}
@@ -178,18 +184,17 @@ void webServerVerifyTables() {}
 
 #ifndef COMPILE_ESPNOW
 
-bool espnowGetState()                   {return ESPNOW_OFF;}
-bool espnowIsPaired()                   {return false;}
-void espnowProcessRTCM(byte incoming)   {}
-esp_err_t espnowRemovePeer(uint8_t *peerMac)        {return ESP_OK;}
-esp_err_t espnowSendPairMessage(uint8_t *sendToMac) {return ESP_OK;}
-bool espnowSetChannel(uint8_t channelNumber)        {return false;}
-bool espNowStart()                      {return false;}
-#define ESPNOW_START()                  false
-void espnowStaticPairing()              {}
+bool espNowGetState()                   {return ESPNOW_OFF;}
+bool espNowIsPaired()                   {return false;}
+void espNowProcessRTCM(byte incoming)   {}
+bool espNowProcessRxPairedMessage()     {return true;}
+esp_err_t espNowRemovePeer(const uint8_t *peerMac)        {return ESP_OK;}
+esp_err_t espNowSendPairMessage(const uint8_t *sendToMac) {return ESP_OK;}
+bool espNowSetChannel(uint8_t channelNumber)        {return false;}
+bool espNowStart()                      {return true;}
+void espNowStaticPairing()              {}
 bool espNowStop()                       {return true;}
-#define ESPNOW_STOP()                   true
-void updateEspnow()                     {}
+void espNowUpdate()                     {}
 
 #endif   // COMPILE_ESPNOW
 
@@ -199,19 +204,22 @@ void updateEspnow()                     {}
 
 #ifndef COMPILE_WIFI
 
-void menuWiFi() {systemPrintln("**WiFi not compiled**");}
-bool wifiApIsRunning() {return false;}
-bool wifiConnect(bool startWiFiStation, bool startWiFiAP, unsigned long timeout) {return false;}
-uint32_t wifiGetStartTimeout() {return 0;}
-#define WIFI_IS_RUNNING() 0
-int wifiNetworkCount() {return 0;}
-void wifiResetThrottleTimeout() {}
-void wifiResetTimeout() {}
-#define WIFI_SOFT_AP_RUNNING() false
-bool wifiStart() {return false;}
-bool wifiStationIsRunning() {return false;}
-#define WIFI_STOP() {}
-bool wifiUnavailable()  {return true;}
+void menuWiFi()                 {systemPrintln("**WiFi not compiled**");}
+void wifiDisplayNetworkData()                   {}
+void wifiDisplaySoftApStatus()                  {}
+bool wifiEspNowOff(const char * fileName, uint32_t lineNumber) {return true;}
+bool wifiEspNowOn(const char * fileName, uint32_t lineNumber) {return false;}
+void wifiEspNowSetChannel(WIFI_CHANNEL_t channel) {}
+uint32_t wifiGetStartTimeout()                  {return 0;}
+int wifiNetworkCount()                          {return 0;}
+void wifiResetThrottleTimeout()                 {}
+void wifiResetTimeout()                         {}
+const char * wifiSoftApGetSsid()                {return "";}
+bool wifiSoftApOff(const char * fileName, uint32_t lineNumber) {return true;}
+bool wifiSoftApOn(const char * fileName, uint32_t lineNumber) {return false;}
+bool wifiStationOff(const char * fileName, uint32_t lineNumber) {return true;}
+bool wifiStationOn(const char * fileName, uint32_t lineNumber) {return false;}
+void wifiStopAll()                              {}
 
 #endif // COMPILE_WIFI