Merge branch 'main' into lwipclient_bool_fix

JAndrassy · web-flow · commit 209f419338a5 · 2023-12-16T07:34:30.000+01:00
diff --git a/libraries/ESPhost/examples/ESP32_TEST/ESP32_TEST.ino b/libraries/ESPhost/examples/ESP32_TEST/ESP32_TEST.ino
@@ -1,6 +1,9 @@
 #include "CEspControl.h"
 #include "CNetIf.h"
 #include <string>
+#include <vector>
+
+using namespace std;
 
 /* GPIO_LOCAL C33 
    - 0. P010 
@@ -79,7 +82,6 @@ void setup() {
   CEspControl::getInstance().listenForStationDisconnectEvent(stationDisconnectionEvent);
   CEspControl::getInstance().listenForDisconnectionFromSoftApEvent(disconnectionFromSofApEvent);
   
-  CEspControl::getInstance().begin();
 
   
 
diff --git a/libraries/WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino b/libraries/WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino
@@ -97,14 +97,14 @@ void printCurrentNet() {
 }
 
 void printMacAddress(byte mac[]) {
-  for (int i = 5; i >= 0; i--) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
     if (mac[i] < 16) {
       Serial.print("0");
     }
     Serial.print(mac[i], HEX);
-    if (i > 0) {
-      Serial.print(":");
-    }
   }
   Serial.println();
 }
diff --git a/libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino b/libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino
@@ -5,7 +5,7 @@
  connect to any network, so no encryption scheme is specified.
 
  Circuit:
- * Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)
+ * Portenta C33
 
  created 13 July 2010
  by dlf (Metodo2 srl)
@@ -108,14 +108,14 @@ void printEncryptionType(int thisType) {
 }
 
 void printMacAddress(byte mac[]) {
-  for (int i = 5; i >= 0; i--) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
     if (mac[i] < 16) {
       Serial.print("0");
     }
     Serial.print(mac[i], HEX);
-    if (i > 0) {
-      Serial.print(":");
-    }
   }
   Serial.println();
 }
diff --git a/libraries/WiFi/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino b/libraries/WiFi/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino
@@ -6,7 +6,7 @@
   BSSID and WiFi channel are printed
 
   Circuit:
-  * Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)
+  * Portenta C33
 
   This example is based on ScanNetworks
 
@@ -130,14 +130,14 @@ void print2Digits(byte thisByte) {
 }
 
 void printMacAddress(byte mac[]) {
-  for (int i = 5; i >= 0; i--) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
     if (mac[i] < 16) {
       Serial.print("0");
     }
     Serial.print(mac[i], HEX);
-    if (i > 0) {
-      Serial.print(":");
-    }
   }
   Serial.println();
 }
diff --git a/libraries/WiFi/src/WiFi.cpp b/libraries/WiFi/src/WiFi.cpp
@@ -173,12 +173,6 @@ uint8_t* CWifi::macAddress(uint8_t* mac) {
 /* -------------------------------------------------------------------------- */   
    if(ni != nullptr) {
       if(ni->getMacAddress(mac) == WL_MAC_ADDR_LENGTH) {
-         // internal mac address representation is inverted
-         for (int i = 0; i<3; i++) {
-            auto tmp = mac[i];
-            mac[i] = mac[5-i];
-            mac[5-i] = tmp;
-         }
          return mac;
       }
    }
diff --git a/libraries/WiFiS3/examples/ConnectWithWPA/ConnectWithWPA.ino b/libraries/WiFiS3/examples/ConnectWithWPA/ConnectWithWPA.ino
@@ -100,14 +100,14 @@ void printCurrentNet() {
 }
 
 void printMacAddress(byte mac[]) {
-  for (int i = 5; i >= 0; i--) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
     if (mac[i] < 16) {
       Serial.print("0");
     }
     Serial.print(mac[i], HEX);
-    if (i > 0) {
-      Serial.print(":");
-    }
   }
   Serial.println();
 }
diff --git a/libraries/WiFiS3/examples/ScanNetworks/ScanNetworks.ino b/libraries/WiFiS3/examples/ScanNetworks/ScanNetworks.ino
@@ -5,7 +5,7 @@
   connect to any network, so no encryption scheme is specified.
 
   Circuit:
-   * Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)
+   * Uno R4 WiFi
 
   created 13 July 2010
   by dlf (Metodo2 srl)
@@ -108,14 +108,14 @@ void printEncryptionType(int thisType) {
 
 
 void printMacAddress(byte mac[]) {
-  for (int i = 5; i >= 0; i--) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
     if (mac[i] < 16) {
       Serial.print("0");
     }
     Serial.print(mac[i], HEX);
-    if (i > 0) {
-      Serial.print(":");
-    }
   }
   Serial.println();
 }
diff --git a/libraries/WiFiS3/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino b/libraries/WiFiS3/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino
@@ -6,7 +6,7 @@
   BSSID and WiFi channel are printed
 
   Circuit:
-  * Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)
+  * Uno R4 WiFi
 
   This example is based on ScanNetworks
 
@@ -130,14 +130,14 @@ void print2Digits(byte thisByte) {
 }
 
 void printMacAddress(byte mac[]) {
-  for (int i = 5; i >= 0; i--) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
     if (mac[i] < 16) {
       Serial.print("0");
     }
     Serial.print(mac[i], HEX);
-    if (i > 0) {
-      Serial.print(":");
-    }
   }
   Serial.println();
 }
diff --git a/libraries/WiFiS3/src/WiFi.cpp b/libraries/WiFiS3/src/WiFi.cpp
@@ -4,12 +4,6 @@ using namespace std;
 
 /* -------------------------------------------------------------------------- */
 CWifi::CWifi() : _timeout(50000){
-   mac[0] = 0;
-   mac[1] = 0;
-   mac[2] = 0;
-   mac[3] = 0;
-   mac[4] = 0;
-   mac[5] = 0;
 }
 /* -------------------------------------------------------------------------- */
 
@@ -242,21 +236,16 @@ uint8_t* CWifi::macAddress(uint8_t* _mac) {
   if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE)))  {
       if(atoi(res.c_str()) == 1) {
          if(modem.write(string(PROMPT(_MACSTA)),res, "%s" , CMD_READ(_MACSTA)))  {
-            macStr2macArray(mac, res.c_str());
+            macStr2macArray(_mac, res.c_str());
          }
       }
       else if(atoi(res.c_str()) == 2) {
          if(modem.write(string(PROMPT(_MACSOFTAP)),res, "%s" , CMD_READ(_MACSOFTAP)))  {
-            macStr2macArray(mac, res.c_str());
+            macStr2macArray(_mac, res.c_str());
          }
       }
    }
 
-   for(int i = 0; i < 6; i++) 
-   {
-      _mac[i] = mac[5 - i];
-   }
-
    return _mac;
 }
 
diff --git a/libraries/WiFiS3/src/WiFi.h b/libraries/WiFiS3/src/WiFi.h
@@ -33,7 +33,6 @@ class CWifi {
 private: 
    void _config(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dns1, IPAddress dns2);
    unsigned long _timeout;
-   uint8_t mac[6];
    std::vector<CAccessPoint> access_points;
    std::string ssid;
    std::string apssid;

Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,14 @@ void printCurrentNet() {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`void printMacAddress(byte mac[]) {`
`100`		`- for (int i = 5; i >= 0; i--) {`
	`100`	`+ for (int i = 0; i < 6; i++) {`
	`101`	`+ if (i > 0) {`
	`102`	`+ Serial.print(":");`
	`103`	`+ }`
`101`	`104`	`if (mac[i] < 16) {`
`102`	`105`	`Serial.print("0");`
`103`	`106`	`}`
`104`	`107`	`Serial.print(mac[i], HEX);`
`105`		`- if (i > 0) {`
`106`		`- Serial.print(":");`
`107`		`- }`
`108`	`108`	`}`
`109`	`109`	`Serial.println();`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`connect to any network, so no encryption scheme is specified.`
`6`	`6`
`7`	`7`	`Circuit:`
`8`		`- * Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)`
	`8`	`+ * Portenta C33`
`9`	`9`
`10`	`10`	`created 13 July 2010`
`11`	`11`	`by dlf (Metodo2 srl)`
`@@ -108,14 +108,14 @@ void printEncryptionType(int thisType) {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`void printMacAddress(byte mac[]) {`
`111`		`- for (int i = 5; i >= 0; i--) {`
	`111`	`+ for (int i = 0; i < 6; i++) {`
	`112`	`+ if (i > 0) {`
	`113`	`+ Serial.print(":");`
	`114`	`+ }`
`112`	`115`	`if (mac[i] < 16) {`
`113`	`116`	`Serial.print("0");`
`114`	`117`	`}`
`115`	`118`	`Serial.print(mac[i], HEX);`
`116`		`- if (i > 0) {`
`117`		`- Serial.print(":");`
`118`		`- }`
`119`	`119`	`}`
`120`	`120`	`Serial.println();`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`BSSID and WiFi channel are printed`
`7`	`7`
`8`	`8`	`Circuit:`
`9`		`- * Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)`
	`9`	`+ * Portenta C33`
`10`	`10`
`11`	`11`	`This example is based on ScanNetworks`
`12`	`12`
`@@ -130,14 +130,14 @@ void print2Digits(byte thisByte) {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`void printMacAddress(byte mac[]) {`
`133`		`- for (int i = 5; i >= 0; i--) {`
	`133`	`+ for (int i = 0; i < 6; i++) {`
	`134`	`+ if (i > 0) {`
	`135`	`+ Serial.print(":");`
	`136`	`+ }`
`134`	`137`	`if (mac[i] < 16) {`
`135`	`138`	`Serial.print("0");`
`136`	`139`	`}`
`137`	`140`	`Serial.print(mac[i], HEX);`
`138`		`- if (i > 0) {`
`139`		`- Serial.print(":");`
`140`		`- }`
`141`	`141`	`}`
`142`	`142`	`Serial.println();`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,12 +173,6 @@ uint8_t* CWifi::macAddress(uint8_t* mac) {`
`173`	`173`	`/* -------------------------------------------------------------------------- */`
`174`	`174`	`if(ni != nullptr) {`
`175`	`175`	`if(ni->getMacAddress(mac) == WL_MAC_ADDR_LENGTH) {`
`176`		`- // internal mac address representation is inverted`
`177`		`- for (int i = 0; i<3; i++) {`
`178`		`- auto tmp = mac[i];`
`179`		`- mac[i] = mac[5-i];`
`180`		`- mac[5-i] = tmp;`
`181`		`- }`
`182`	`176`	`return mac;`
`183`	`177`	`}`
`184`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,14 @@ void printCurrentNet() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`void printMacAddress(byte mac[]) {`
`103`		`- for (int i = 5; i >= 0; i--) {`
	`103`	`+ for (int i = 0; i < 6; i++) {`
	`104`	`+ if (i > 0) {`
	`105`	`+ Serial.print(":");`
	`106`	`+ }`
`104`	`107`	`if (mac[i] < 16) {`
`105`	`108`	`Serial.print("0");`
`106`	`109`	`}`
`107`	`110`	`Serial.print(mac[i], HEX);`
`108`		`- if (i > 0) {`
`109`		`- Serial.print(":");`
`110`		`- }`
`111`	`111`	`}`
`112`	`112`	`Serial.println();`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,6 @@ using namespace std;`
`4`	`4`
`5`	`5`	`/* -------------------------------------------------------------------------- */`
`6`	`6`	`CWifi::CWifi() : _timeout(50000){`
`7`		`- mac[0] = 0;`
`8`		`- mac[1] = 0;`
`9`		`- mac[2] = 0;`
`10`		`- mac[3] = 0;`
`11`		`- mac[4] = 0;`
`12`		`- mac[5] = 0;`
`13`	`7`	`}`
`14`	`8`	`/* -------------------------------------------------------------------------- */`
`15`	`9`
`@@ -242,21 +236,16 @@ uint8_t* CWifi::macAddress(uint8_t* _mac) {`
`242`	`236`	`if(modem.write(string(PROMPT(_MODE)),res, "%s" , CMD_READ(_MODE))) {`
`243`	`237`	`if(atoi(res.c_str()) == 1) {`
`244`	`238`	`if(modem.write(string(PROMPT(_MACSTA)),res, "%s" , CMD_READ(_MACSTA))) {`
`245`		`- macStr2macArray(mac, res.c_str());`
	`239`	`+ macStr2macArray(_mac, res.c_str());`
`246`	`240`	`}`
`247`	`241`	`}`
`248`	`242`	`else if(atoi(res.c_str()) == 2) {`
`249`	`243`	`if(modem.write(string(PROMPT(_MACSOFTAP)),res, "%s" , CMD_READ(_MACSOFTAP))) {`
`250`		`- macStr2macArray(mac, res.c_str());`
	`244`	`+ macStr2macArray(_mac, res.c_str());`
`251`	`245`	`}`
`252`	`246`	`}`
`253`	`247`	`}`
`254`	`248`
`255`		`- for(int i = 0; i < 6; i++)`
`256`		`- {`
`257`		`- _mac[i] = mac[5 - i];`
`258`		`- }`
`259`		`-`
`260`	`249`	`return _mac;`
`261`	`250`	`}`
`262`	`251`