Skip to content

Commit 195698b

Browse files
RocketctRocketct
committed
Modified MAC address print
- Modified the MAC address print in the library's examples. - Modified Examples documentations Resolve #32.
1 parent 202eb92 commit 195698b

File tree

14 files changed

+105
-167
lines changed

14 files changed

+105
-167
lines changed

‎examples/AP_SimpleWebServer/AP_SimpleWebServer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
to the Serial monitor. From there, you can open that address in a web browser
88
to turn on and off the LED on pin 13.
99
10-
If the IP address of your shield is yourAddress:
10+
If the IP address of your board is yourAddress:
1111
http://yourAddress/H turns the LED on
1212
http://yourAddress/L turns it off
1313

‎examples/ConnectNoEncryption/ConnectNoEncryption.ino

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
33
This example connects to an unencrypted Wifi network.
4-
Then it prints the MAC address of the Wifi shield,
4+
Then it prints the MAC address of the board,
55
the IP address obtained, and other network details.
66
77
created 13 July 2010
@@ -58,7 +58,7 @@ void loop() {
5858
}
5959

6060
void printWifiData() {
61-
// print your WiFi shield's IP address:
61+
// print your board's IP address:
6262
IPAddress ip = WiFi.localIP();
6363
Serial.print("IP Address: ");
6464
Serial.println(ip);
@@ -68,17 +68,7 @@ void printWifiData() {
6868
byte mac[6];
6969
WiFi.macAddress(mac);
7070
Serial.print("MAC address: ");
71-
Serial.print(mac[5], HEX);
72-
Serial.print(":");
73-
Serial.print(mac[4], HEX);
74-
Serial.print(":");
75-
Serial.print(mac[3], HEX);
76-
Serial.print(":");
77-
Serial.print(mac[2], HEX);
78-
Serial.print(":");
79-
Serial.print(mac[1], HEX);
80-
Serial.print(":");
81-
Serial.println(mac[0], HEX);
71+
printMacAddress(mac);
8272

8373
// print your subnet mask:
8474
IPAddress subnet = WiFi.subnetMask();
@@ -100,17 +90,7 @@ void printCurrentNet() {
10090
byte bssid[6];
10191
WiFi.BSSID(bssid);
10292
Serial.print("BSSID: ");
103-
Serial.print(bssid[5], HEX);
104-
Serial.print(":");
105-
Serial.print(bssid[4], HEX);
106-
Serial.print(":");
107-
Serial.print(bssid[3], HEX);
108-
Serial.print(":");
109-
Serial.print(bssid[2], HEX);
110-
Serial.print(":");
111-
Serial.print(bssid[1], HEX);
112-
Serial.print(":");
113-
Serial.println(bssid[0], HEX);
93+
printMacAddress(bssid);
11494

11595
// print the received signal strength:
11696
long rssi = WiFi.RSSI();
@@ -123,3 +103,15 @@ void printCurrentNet() {
123103
Serial.println(encryption, HEX);
124104
}
125105

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

‎examples/ConnectWithWEP/ConnectWithWEP.ino

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void loop() {
7171
}
7272

7373
void printWifiData() {
74-
// print your WiFi shield's IP address:
74+
// print your board's IP address:
7575
IPAddress ip = WiFi.localIP();
7676
Serial.print("IP Address: ");
7777
Serial.println(ip);
@@ -81,17 +81,7 @@ void printWifiData() {
8181
byte mac[6];
8282
WiFi.macAddress(mac);
8383
Serial.print("MAC address: ");
84-
Serial.print(mac[5], HEX);
85-
Serial.print(":");
86-
Serial.print(mac[4], HEX);
87-
Serial.print(":");
88-
Serial.print(mac[3], HEX);
89-
Serial.print(":");
90-
Serial.print(mac[2], HEX);
91-
Serial.print(":");
92-
Serial.print(mac[1], HEX);
93-
Serial.print(":");
94-
Serial.println(mac[0], HEX);
84+
printMacAddress(mac);
9585
}
9686

9787
void printCurrentNet() {
@@ -103,17 +93,7 @@ void printCurrentNet() {
10393
byte bssid[6];
10494
WiFi.BSSID(bssid);
10595
Serial.print("BSSID: ");
106-
Serial.print(bssid[5], HEX);
107-
Serial.print(":");
108-
Serial.print(bssid[4], HEX);
109-
Serial.print(":");
110-
Serial.print(bssid[3], HEX);
111-
Serial.print(":");
112-
Serial.print(bssid[2], HEX);
113-
Serial.print(":");
114-
Serial.print(bssid[1], HEX);
115-
Serial.print(":");
116-
Serial.println(bssid[0], HEX);
96+
printMacAddress(bssid);
11797

11898
// print the received signal strength:
11999
long rssi = WiFi.RSSI();
@@ -127,5 +107,15 @@ void printCurrentNet() {
127107
Serial.println();
128108
}
129109

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

‎examples/ConnectWithWPA/ConnectWithWPA.ino

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void loop() {
6262
}
6363

6464
void printWifiData() {
65-
// print your WiFi shield's IP address:
65+
// print your board's IP address:
6666
IPAddress ip = WiFi.localIP();
6767
Serial.print("IP Address: ");
6868
Serial.println(ip);
@@ -72,18 +72,7 @@ void printWifiData() {
7272
byte mac[6];
7373
WiFi.macAddress(mac);
7474
Serial.print("MAC address: ");
75-
Serial.print(mac[5], HEX);
76-
Serial.print(":");
77-
Serial.print(mac[4], HEX);
78-
Serial.print(":");
79-
Serial.print(mac[3], HEX);
80-
Serial.print(":");
81-
Serial.print(mac[2], HEX);
82-
Serial.print(":");
83-
Serial.print(mac[1], HEX);
84-
Serial.print(":");
85-
Serial.println(mac[0], HEX);
86-
75+
printMacAddress(mac);
8776
}
8877

8978
void printCurrentNet() {
@@ -95,17 +84,7 @@ void printCurrentNet() {
9584
byte bssid[6];
9685
WiFi.BSSID(bssid);
9786
Serial.print("BSSID: ");
98-
Serial.print(bssid[5], HEX);
99-
Serial.print(":");
100-
Serial.print(bssid[4], HEX);
101-
Serial.print(":");
102-
Serial.print(bssid[3], HEX);
103-
Serial.print(":");
104-
Serial.print(bssid[2], HEX);
105-
Serial.print(":");
106-
Serial.print(bssid[1], HEX);
107-
Serial.print(":");
108-
Serial.println(bssid[0], HEX);
87+
printMacAddress(bssid);
10988

11089
// print the received signal strength:
11190
long rssi = WiFi.RSSI();
@@ -119,3 +98,15 @@ void printCurrentNet() {
11998
Serial.println();
12099
}
121100

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

‎examples/ScanNetworks/ScanNetworks.ino

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,11 @@ void setup() {
3737
Serial.println("Please upgrade the firmware");
3838
}
3939

40-
// Print WiFi MAC address:
41-
printMacAddress();
40+
// print your MAC address:
41+
byte mac[6];
42+
WiFi.macAddress(mac);
43+
Serial.print("MAC: ");
44+
printMacAddress(mac);
4245
}
4346

4447
void loop() {
@@ -48,26 +51,6 @@ void loop() {
4851
delay(10000);
4952
}
5053

51-
void printMacAddress() {
52-
// the MAC address of your Wifi shield
53-
byte mac[6];
54-
55-
// print your MAC address:
56-
WiFi.macAddress(mac);
57-
Serial.print("MAC: ");
58-
Serial.print(mac[5], HEX);
59-
Serial.print(":");
60-
Serial.print(mac[4], HEX);
61-
Serial.print(":");
62-
Serial.print(mac[3], HEX);
63-
Serial.print(":");
64-
Serial.print(mac[2], HEX);
65-
Serial.print(":");
66-
Serial.print(mac[1], HEX);
67-
Serial.print(":");
68-
Serial.println(mac[0], HEX);
69-
}
70-
7154
void listNetworks() {
7255
// scan for nearby networks:
7356
Serial.println("** Scan Networks **");
@@ -120,4 +103,15 @@ void printEncryptionType(int thisType) {
120103
}
121104

122105

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

‎examples/ScanNetworksAdvanced/ScanNetworksAdvanced.ino

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,11 @@ void setup() {
3838
Serial.println("Please upgrade the firmware");
3939
}
4040

41-
// Print WiFi MAC address:
42-
printMacAddress();
41+
// print your MAC address:
42+
byte mac[6];
43+
WiFi.macAddress(mac);
44+
Serial.print("MAC: ");
45+
printMacAddress(mac);
4346

4447
// scan for existing networks:
4548
Serial.println();
@@ -54,26 +57,6 @@ void loop() {
5457
listNetworks();
5558
}
5659

57-
void printMacAddress() {
58-
// the MAC address of your WiFi shield
59-
byte mac[6];
60-
61-
// print your MAC address:
62-
WiFi.macAddress(mac);
63-
Serial.print("MAC: ");
64-
print2Digits(mac[5]);
65-
Serial.print(":");
66-
print2Digits(mac[4]);
67-
Serial.print(":");
68-
print2Digits(mac[3]);
69-
Serial.print(":");
70-
print2Digits(mac[2]);
71-
Serial.print(":");
72-
print2Digits(mac[1]);
73-
Serial.print(":");
74-
print2Digits(mac[0]);
75-
}
76-
7760
void listNetworks() {
7861
// scan for nearby networks:
7962
Serial.println("** Scan Networks **");
@@ -99,7 +82,7 @@ void listNetworks() {
9982
Serial.print(WiFi.channel(thisNet));
10083
byte bssid[6];
10184
Serial.print("\t\tBSSID: ");
102-
printBSSID(WiFi.BSSID(thisNet, bssid));
85+
printMacAddress(WiFi.BSSID(thisNet, bssid));
10386
Serial.print("\tEncryption: ");
10487
printEncryptionType(WiFi.encryptionType(thisNet));
10588
Serial.print("\t\tSSID: ");
@@ -109,20 +92,6 @@ void listNetworks() {
10992
Serial.println();
11093
}
11194

112-
void printBSSID(byte bssid[]) {
113-
print2Digits(bssid[5]);
114-
Serial.print(":");
115-
print2Digits(bssid[4]);
116-
Serial.print(":");
117-
print2Digits(bssid[3]);
118-
Serial.print(":");
119-
print2Digits(bssid[2]);
120-
Serial.print(":");
121-
print2Digits(bssid[1]);
122-
Serial.print(":");
123-
print2Digits(bssid[0]);
124-
}
125-
12695
void printEncryptionType(int thisType) {
12796
// read the encryption type and print out the name:
12897
switch (thisType) {
@@ -155,4 +124,15 @@ void print2Digits(byte thisByte) {
155124
Serial.print(thisByte, HEX);
156125
}
157126

158-
127+
void printMacAddress(byte mac[]) {
128+
for (int i = 5; i >= 0; i--) {
129+
if (mac[i] < 16) {
130+
Serial.print("0");
131+
}
132+
Serial.print(mac[i], HEX);
133+
if (i > 0) {
134+
Serial.print(":");
135+
}
136+
}
137+
Serial.println();
138+
}

‎examples/WiFiChatServer/WiFiChatServer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ void printWifiStatus() {
104104
Serial.print("SSID: ");
105105
Serial.println(WiFi.SSID());
106106

107-
// print your WiFi shield's IP address:
107+
// print your board's IP address:
108108
IPAddress ip = WiFi.localIP();
109109
Serial.print("IP Address: ");
110110
Serial.println(ip);

0 commit comments

Comments
 (0)