Skip to content

Commit 76c61fb

Browse files
RocketctRocketct
committed
Modified MAC address print
Modified the MAC address print in the library's examples. Porting of arduino-libraries/WiFiNINA#37
1 parent 13ea8ec commit 76c61fb

File tree

7 files changed

+102
-153
lines changed

7 files changed

+102
-153
lines changed

‎examples/AP_SimpleWebServer/AP_SimpleWebServer.ino

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,7 @@ void loop() {
8585
// a device has connected to the AP
8686
Serial.print("Device connected to AP, MAC address: ");
8787
WiFi.APClientMacAddress(remoteMac);
88-
Serial.print(remoteMac[5], HEX);
89-
Serial.print(":");
90-
Serial.print(remoteMac[4], HEX);
91-
Serial.print(":");
92-
Serial.print(remoteMac[3], HEX);
93-
Serial.print(":");
94-
Serial.print(remoteMac[2], HEX);
95-
Serial.print(":");
96-
Serial.print(remoteMac[1], HEX);
97-
Serial.print(":");
98-
Serial.println(remoteMac[0], HEX);
88+
printMacAddress(remoteMac);
9989
} else {
10090
// a device has disconnected from the AP, and we are back in listening mode
10191
Serial.println("Device disconnected from AP");
@@ -174,3 +164,16 @@ void printWiFiStatus() {
174164
Serial.println(ip);
175165

176166
}
167+
168+
void printMacAddress(byte mac[]) {
169+
for (int i = 5; i >= 0; i--) {
170+
if (mac[i] < 16) {
171+
Serial.print("0");
172+
}
173+
Serial.print(mac[i], HEX);
174+
if (i > 0) {
175+
Serial.print(":");
176+
}
177+
}
178+
Serial.println();
179+
}

‎examples/ConnectNoEncryption/ConnectNoEncryption.ino

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,7 @@ void printWiFiData() {
6666
byte mac[6];
6767
WiFi.macAddress(mac);
6868
Serial.print("MAC address: ");
69-
Serial.print(mac[5], HEX);
70-
Serial.print(":");
71-
Serial.print(mac[4], HEX);
72-
Serial.print(":");
73-
Serial.print(mac[3], HEX);
74-
Serial.print(":");
75-
Serial.print(mac[2], HEX);
76-
Serial.print(":");
77-
Serial.print(mac[1], HEX);
78-
Serial.print(":");
79-
Serial.println(mac[0], HEX);
69+
printMacAddress(mac);
8070

8171
// print your subnet mask:
8272
IPAddress subnet = WiFi.subnetMask();
@@ -98,17 +88,7 @@ void printCurrentNet() {
9888
byte bssid[6];
9989
WiFi.BSSID(bssid);
10090
Serial.print("BSSID: ");
101-
Serial.print(bssid[5], HEX);
102-
Serial.print(":");
103-
Serial.print(bssid[4], HEX);
104-
Serial.print(":");
105-
Serial.print(bssid[3], HEX);
106-
Serial.print(":");
107-
Serial.print(bssid[2], HEX);
108-
Serial.print(":");
109-
Serial.print(bssid[1], HEX);
110-
Serial.print(":");
111-
Serial.println(bssid[0], HEX);
91+
printMacAddress(bssid);
11292

11393
// print the received signal strength:
11494
long rssi = WiFi.RSSI();
@@ -121,3 +101,15 @@ void printCurrentNet() {
121101
Serial.println(encryption, HEX);
122102
}
123103

104+
void printMacAddress(byte mac[]) {
105+
for (int i = 5; i >= 0; i--) {
106+
if (mac[i] < 16) {
107+
Serial.print("0");
108+
}
109+
Serial.print(mac[i], HEX);
110+
if (i > 0) {
111+
Serial.print(":");
112+
}
113+
}
114+
Serial.println();
115+
}

‎examples/ConnectWithWEP/ConnectWithWEP.ino

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,7 @@ void printWiFiData() {
7979
byte mac[6];
8080
WiFi.macAddress(mac);
8181
Serial.print("MAC address: ");
82-
Serial.print(mac[5], HEX);
83-
Serial.print(":");
84-
Serial.print(mac[4], HEX);
85-
Serial.print(":");
86-
Serial.print(mac[3], HEX);
87-
Serial.print(":");
88-
Serial.print(mac[2], HEX);
89-
Serial.print(":");
90-
Serial.print(mac[1], HEX);
91-
Serial.print(":");
92-
Serial.println(mac[0], HEX);
82+
printMacAddress(mac);
9383
}
9484

9585
void printCurrentNet() {
@@ -101,17 +91,7 @@ void printCurrentNet() {
10191
byte bssid[6];
10292
WiFi.BSSID(bssid);
10393
Serial.print("BSSID: ");
104-
Serial.print(bssid[5], HEX);
105-
Serial.print(":");
106-
Serial.print(bssid[4], HEX);
107-
Serial.print(":");
108-
Serial.print(bssid[3], HEX);
109-
Serial.print(":");
110-
Serial.print(bssid[2], HEX);
111-
Serial.print(":");
112-
Serial.print(bssid[1], HEX);
113-
Serial.print(":");
114-
Serial.println(bssid[0], HEX);
94+
printMacAddress(bssid);
11595

11696
// print the received signal strength:
11797
long rssi = WiFi.RSSI();
@@ -125,5 +105,15 @@ void printCurrentNet() {
125105
Serial.println();
126106
}
127107

128-
129-
108+
void printMacAddress(byte mac[]) {
109+
for (int i = 5; i >= 0; i--) {
110+
if (mac[i] < 16) {
111+
Serial.print("0");
112+
}
113+
Serial.print(mac[i], HEX);
114+
if (i > 0) {
115+
Serial.print(":");
116+
}
117+
}
118+
Serial.println();
119+
}

‎examples/ConnectWithWPA/ConnectWithWPA.ino

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,7 @@ void printWiFiData() {
7070
byte mac[6];
7171
WiFi.macAddress(mac);
7272
Serial.print("MAC address: ");
73-
Serial.print(mac[5], HEX);
74-
Serial.print(":");
75-
Serial.print(mac[4], HEX);
76-
Serial.print(":");
77-
Serial.print(mac[3], HEX);
78-
Serial.print(":");
79-
Serial.print(mac[2], HEX);
80-
Serial.print(":");
81-
Serial.print(mac[1], HEX);
82-
Serial.print(":");
83-
Serial.println(mac[0], HEX);
73+
printMacAddress(mac);
8474

8575
}
8676

@@ -93,17 +83,7 @@ void printCurrentNet() {
9383
byte bssid[6];
9484
WiFi.BSSID(bssid);
9585
Serial.print("BSSID: ");
96-
Serial.print(bssid[5], HEX);
97-
Serial.print(":");
98-
Serial.print(bssid[4], HEX);
99-
Serial.print(":");
100-
Serial.print(bssid[3], HEX);
101-
Serial.print(":");
102-
Serial.print(bssid[2], HEX);
103-
Serial.print(":");
104-
Serial.print(bssid[1], HEX);
105-
Serial.print(":");
106-
Serial.println(bssid[0], HEX);
86+
printMacAddress(bssid);
10787

10888
// print the received signal strength:
10989
long rssi = WiFi.RSSI();
@@ -117,3 +97,15 @@ void printCurrentNet() {
11797
Serial.println();
11898
}
11999

100+
void printMacAddress(byte mac[]) {
101+
for (int i = 5; i >= 0; i--) {
102+
if (mac[i] < 16) {
103+
Serial.print("0");
104+
}
105+
Serial.print(mac[i], HEX);
106+
if (i > 0) {
107+
Serial.print(":");
108+
}
109+
}
110+
Serial.println();
111+
}

‎examples/ScanNetworks/ScanNetworks.ino

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,7 @@ void printMacAddress() {
5454
// print your MAC address:
5555
WiFi.macAddress(mac);
5656
Serial.print("MAC: ");
57-
Serial.print(mac[5], HEX);
58-
Serial.print(":");
59-
Serial.print(mac[4], HEX);
60-
Serial.print(":");
61-
Serial.print(mac[3], HEX);
62-
Serial.print(":");
63-
Serial.print(mac[2], HEX);
64-
Serial.print(":");
65-
Serial.print(mac[1], HEX);
66-
Serial.print(":");
67-
Serial.println(mac[0], HEX);
57+
printMacAddress(mac);
6858
}
6959

7060
void listNetworks() {
@@ -116,5 +106,15 @@ void printEncryptionType(int thisType) {
116106
}
117107
}
118108

119-
120-
109+
void printMacAddress(byte mac[]) {
110+
for (int i = 5; i >= 0; i--) {
111+
if (mac[i] < 16) {
112+
Serial.print("0");
113+
}
114+
Serial.print(mac[i], HEX);
115+
if (i > 0) {
116+
Serial.print(":");
117+
}
118+
}
119+
Serial.println();
120+
}

‎examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,11 @@ void setup() {
3333
while (true);
3434
}
3535

36-
// Print WiFi MAC address:
37-
printMacAddress();
36+
// print your MAC address:
37+
byte mac[6];
38+
WiFi.macAddress(mac);
39+
Serial.print("MAC: ");
40+
printMacAddress(mac);
3841

3942
// scan for existing networks:
4043
Serial.println();
@@ -49,26 +52,6 @@ void loop() {
4952
listNetworks();
5053
}
5154

52-
void printMacAddress() {
53-
// the MAC address of your WiFi shield
54-
byte mac[6];
55-
56-
// print your MAC address:
57-
WiFi.macAddress(mac);
58-
Serial.print("MAC: ");
59-
print2Digits(mac[5]);
60-
Serial.print(":");
61-
print2Digits(mac[4]);
62-
Serial.print(":");
63-
print2Digits(mac[3]);
64-
Serial.print(":");
65-
print2Digits(mac[2]);
66-
Serial.print(":");
67-
print2Digits(mac[1]);
68-
Serial.print(":");
69-
print2Digits(mac[0]);
70-
}
71-
7255
void listNetworks() {
7356
// scan for nearby networks:
7457
Serial.println("** Scan Networks **");
@@ -94,7 +77,7 @@ void listNetworks() {
9477
Serial.print(WiFi.channel(thisNet));
9578
byte bssid[6];
9679
Serial.print("\t\tBSSID: ");
97-
printBSSID(WiFi.BSSID(thisNet, bssid));
80+
printMacAddress(WiFi.BSSID(thisNet, bssid));
9881
Serial.print("\tEncryption: ");
9982
printEncryptionType(WiFi.encryptionType(thisNet));
10083
Serial.print("\t\tSSID: ");
@@ -104,20 +87,6 @@ void listNetworks() {
10487
Serial.println();
10588
}
10689

107-
void printBSSID(byte bssid[]) {
108-
print2Digits(bssid[5]);
109-
Serial.print(":");
110-
print2Digits(bssid[4]);
111-
Serial.print(":");
112-
print2Digits(bssid[3]);
113-
Serial.print(":");
114-
print2Digits(bssid[2]);
115-
Serial.print(":");
116-
print2Digits(bssid[1]);
117-
Serial.print(":");
118-
print2Digits(bssid[0]);
119-
}
120-
12190
void printEncryptionType(int thisType) {
12291
// read the encryption type and print out the name:
12392
switch (thisType) {
@@ -146,4 +115,15 @@ void print2Digits(byte thisByte) {
146115
Serial.print(thisByte, HEX);
147116
}
148117

149-
118+
void printMacAddress(byte mac[]) {
119+
for (int i = 5; i >= 0; i--) {
120+
if (mac[i] < 16) {
121+
Serial.print("0");
122+
}
123+
Serial.print(mac[i], HEX);
124+
if (i > 0) {
125+
Serial.print(":");
126+
}
127+
}
128+
Serial.println();
129+
}

‎examples/WiFiPing/WiFiPing.ino

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -92,18 +92,7 @@ void printWiFiData() {
9292
byte mac[6];
9393
WiFi.macAddress(mac);
9494
Serial.print("MAC address: ");
95-
Serial.print(mac[5], HEX);
96-
Serial.print(":");
97-
Serial.print(mac[4], HEX);
98-
Serial.print(":");
99-
Serial.print(mac[3], HEX);
100-
Serial.print(":");
101-
Serial.print(mac[2], HEX);
102-
Serial.print(":");
103-
Serial.print(mac[1], HEX);
104-
Serial.print(":");
105-
Serial.println(mac[0], HEX);
106-
Serial.println();
95+
printMacAddress(mac);
10796
}
10897

10998
void printCurrentNet() {
@@ -115,17 +104,7 @@ void printCurrentNet() {
115104
byte bssid[6];
116105
WiFi.BSSID(bssid);
117106
Serial.print("BSSID: ");
118-
Serial.print(bssid[5], HEX);
119-
Serial.print(":");
120-
Serial.print(bssid[4], HEX);
121-
Serial.print(":");
122-
Serial.print(bssid[3], HEX);
123-
Serial.print(":");
124-
Serial.print(bssid[2], HEX);
125-
Serial.print(":");
126-
Serial.print(bssid[1], HEX);
127-
Serial.print(":");
128-
Serial.println(bssid[0], HEX);
107+
printMacAddress(bssid);
129108

130109
// print the received signal strength:
131110
long rssi = WiFi.RSSI();
@@ -138,3 +117,16 @@ void printCurrentNet() {
138117
Serial.println(encryption, HEX);
139118
Serial.println();
140119
}
120+
121+
void printMacAddress(byte mac[]) {
122+
for (int i = 5; i >= 0; i--) {
123+
if (mac[i] < 16) {
124+
Serial.print("0");
125+
}
126+
Serial.print(mac[i], HEX);
127+
if (i > 0) {
128+
Serial.print(":");
129+
}
130+
}
131+
Serial.println();
132+
}

0 commit comments

Comments
 (0)