Skip to content

Commit ae4e5c8

Browse files
committed
WiFiC3 - macAddress() return normal bytes ordering
BSSID was not reversed so examples printed it reversed.
1 parent 9a838ba commit ae4e5c8

File tree

4 files changed

+14
-20
lines changed

4 files changed

+14
-20
lines changed

Diff for: libraries/WiFi/examples/ConnectWithWPA/ConnectWithWPA.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ void printCurrentNet() {
9797
}
9898

9999
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+
}
101104
if (mac[i] < 16) {
102105
Serial.print("0");
103106
}
104107
Serial.print(mac[i], HEX);
105-
if (i > 0) {
106-
Serial.print(":");
107-
}
108108
}
109109
Serial.println();
110110
}

Diff for: libraries/WiFi/examples/ScanNetworks/ScanNetworks.ino

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
connect to any network, so no encryption scheme is specified.
66
77
Circuit:
8-
* Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)
8+
* Portenta C33
99
1010
created 13 July 2010
1111
by dlf (Metodo2 srl)
@@ -108,14 +108,14 @@ void printEncryptionType(int thisType) {
108108
}
109109

110110
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+
}
112115
if (mac[i] < 16) {
113116
Serial.print("0");
114117
}
115118
Serial.print(mac[i], HEX);
116-
if (i > 0) {
117-
Serial.print(":");
118-
}
119119
}
120120
Serial.println();
121121
}

Diff for: libraries/WiFi/examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
BSSID and WiFi channel are printed
77
88
Circuit:
9-
* Board with NINA module (Arduino MKR WiFi 1010, MKR VIDOR 4000 and Uno WiFi Rev.2)
9+
* Portenta C33
1010
1111
This example is based on ScanNetworks
1212
@@ -130,14 +130,14 @@ void print2Digits(byte thisByte) {
130130
}
131131

132132
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+
}
134137
if (mac[i] < 16) {
135138
Serial.print("0");
136139
}
137140
Serial.print(mac[i], HEX);
138-
if (i > 0) {
139-
Serial.print(":");
140-
}
141141
}
142142
Serial.println();
143143
}

Diff for: libraries/WiFi/src/WiFi.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,6 @@ uint8_t* CWifi::macAddress(uint8_t* mac) {
172172
/* -------------------------------------------------------------------------- */
173173
if(ni != nullptr) {
174174
if(ni->getMacAddress(mac) == WL_MAC_ADDR_LENGTH) {
175-
// internal mac address representation is inverted
176-
for (int i = 0; i<3; i++) {
177-
auto tmp = mac[i];
178-
mac[i] = mac[5-i];
179-
mac[5-i] = tmp;
180-
}
181175
return mac;
182176
}
183177
}

0 commit comments

Comments
 (0)