Skip to content

Commit a28b183

Browse files
d-a-vd-a-v
committed
fix serial<->tcp example, use STASSID instead of SSID (name collision)
1 parent 9dfdfd5 commit a28b183

File tree

15 files changed

+130
-72
lines changed

15 files changed

+130
-72
lines changed

Diff for: ‎libraries/ESP8266WiFi/examples/BearSSL_CertStore/BearSSL_CertStore.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
#include <CertStoreBearSSL.h>
3838
#include <time.h>
3939

40-
#ifndef SSID
41-
#define SSID "your-ssid"
40+
#ifndef STASSID
41+
#define STASSID "your-ssid"
4242
#define PSK "your-password"
4343
#endif
4444

45-
const char *ssid = SSID;
45+
const char *ssid = STASSID;
4646
const char *pass = PSK;
4747

4848
// A single, global CertStore which can be used by all

Diff for: ‎libraries/ESP8266WiFi/examples/BearSSL_MaxFragmentLength/BearSSL_MaxFragmentLength.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
#include <ESP8266WiFi.h>
88

9-
#ifndef SSID
10-
#define SSID "your-ssid"
9+
#ifndef STASSID
10+
#define STASSID "your-ssid"
1111
#define PSK "your-password"
1212
#endif
1313

14-
const char *ssid = SSID;
14+
const char *ssid = STASSID;
1515
const char *pass = PSK;
1616

1717
void fetch(BearSSL::WiFiClientSecure *client) {

Diff for: ‎libraries/ESP8266WiFi/examples/BearSSL_Server/BearSSL_Server.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
#include <ESP8266WiFi.h>
3838
#include <time.h>
3939

40-
#ifndef SSID
41-
#define SSID "your-ssid"
40+
#ifndef STASSID
41+
#define STASSID "your-ssid"
4242
#define PSK "your-password"
4343
#endif
4444

45-
const char *ssid = SSID;
45+
const char *ssid = STASSID;
4646
const char *pass = PSK;
4747

4848
// The HTTPS server

Diff for: ‎libraries/ESP8266WiFi/examples/BearSSL_ServerClientCert/BearSSL_ServerClientCert.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@
6565
#include <ESP8266WiFi.h>
6666
#include <time.h>
6767

68-
#ifndef SSID
69-
#define SSID "your-ssid"
68+
#ifndef STASSID
69+
#define STASSID "your-ssid"
7070
#define PSK "your-password"
7171
#endif
7272

73-
const char *ssid = SSID;
73+
const char *ssid = STASSID;
7474
const char *pass = PSK;
7575

7676
// The server which will require a client cert signed by the trusted CA

Diff for: ‎libraries/ESP8266WiFi/examples/BearSSL_Sessions/BearSSL_Sessions.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#include <ESP8266WiFi.h>
77
#include <time.h>
88

9-
#ifndef SSID
10-
#define SSID "your-ssid"
9+
#ifndef STASSID
10+
#define STASSID "your-ssid"
1111
#define PSK "your-password"
1212
#endif
1313

14-
const char *ssid = SSID;
14+
const char *ssid = STASSID;
1515
const char *pass = PSK;
1616

1717
const char * host = "api.github.com";

Diff for: ‎libraries/ESP8266WiFi/examples/BearSSL_Validation/BearSSL_Validation.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#include <ESP8266WiFi.h>
88
#include <time.h>
99

10-
#ifndef SSID
11-
#define SSID "your-ssid"
10+
#ifndef STASSID
11+
#define STASSID "your-ssid"
1212
#define PSK "your-password"
1313
#endif
1414

15-
const char *ssid = SSID;
15+
const char *ssid = STASSID;
1616
const char *pass = PSK;
1717

1818
const char * host = "api.github.com";

Diff for: ‎libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include <ESP8266WiFi.h>
2020
#include <WiFiClientSecure.h>
2121

22-
#ifndef SSID
23-
#define SSID "your-ssid"
22+
#ifndef STASSID
23+
#define STASSID "your-ssid"
2424
#define PSK "your-password"
2525
#endif
2626

27-
const char* ssid = SSID;
27+
const char* ssid = STASSID;
2828
const char* password = PSK;
2929

3030
const char* host = "api.github.com";

Diff for: ‎libraries/ESP8266WiFi/examples/HTTPSRequestCACert/HTTPSRequestCACert.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ using namespace AxTLS;
2525
// uncomment the line below to run the sketch
2626
#error Keeping this example for history, watch BearSSL_Validation example instead
2727

28-
#ifndef SSID
29-
#define SSID "your-ssid"
28+
#ifndef STASSID
29+
#define STASSID "your-ssid"
3030
#define PSK "your-password"
3131
#endif
3232

33-
const char* ssid = SSID;
33+
const char* ssid = STASSID;
3434
const char* password = PSK;
3535

3636
const char* host = "api.github.com";

Diff for: ‎libraries/ESP8266WiFi/examples/NTPClient/NTPClient.ino

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
#include <ESP8266WiFi.h>
2222
#include <WiFiUdp.h>
2323

24-
#ifndef SSID
25-
#define SSID "your-ssid"
24+
#ifndef STASSID
25+
#define STASSID "your-ssid"
2626
#define PSK "your-password"
2727
#endif
2828

29-
char ssid[] = SSID; // your network SSID (name)
30-
char pass[] = PSK; // your network password
29+
char ssid[] = STASSID; // your network SSID (name)
30+
char pass[] = PSK; // your network password
3131

3232

3333
unsigned int localPort = 2390; // local port to listen for UDP packets

Diff for: ‎libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
#include <ESP8266WiFi.h>
77

8-
#ifndef SSID
9-
#define SSID "your-ssid"
8+
#ifndef STASSID
9+
#define STASSID "your-ssid"
1010
#define PSK "your-password"
1111
#endif
1212

13-
const char* ssid = SSID;
13+
const char* ssid = STASSID;
1414
const char* password = PSK;
1515

1616
const char* host = "djxmmx.net";

Diff for: ‎libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
#include <ESP8266WiFi.h>
88
#include <ESP8266WiFiMulti.h>
99

10-
#ifndef SSID
11-
#define SSID "your-ssid"
10+
#ifndef STASSID
11+
#define STASSID "your-ssid"
1212
#define PSK "your-password"
1313
#endif
1414

15-
const char* ssid = SSID;
15+
const char* ssid = STASSID;
1616
const char* password = PSK;
1717

1818
const char* host = "192.168.1.1";

Diff for: ‎libraries/ESP8266WiFi/examples/WiFiHTTPSServer/WiFiHTTPSServer.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343

4444
#include <ESP8266WiFi.h>
4545

46-
#ifndef SSID
47-
#define SSID "your-ssid"
46+
#ifndef STASSID
47+
#define STASSID "your-ssid"
4848
#define PSK "your-password"
4949
#endif
5050

51-
const char* ssid = SSID;
51+
const char* ssid = STASSID;
5252
const char* password = PSK;
5353

5454
// The certificate is stored in PMEM

Diff for: ‎libraries/ESP8266WiFi/examples/WiFiManualWebServer/WiFiManualWebServer.ino

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
#include <ESP8266WiFi.h>
1111

12-
#ifndef SSID
13-
#define SSID "your-ssid"
12+
#ifndef STASSID
13+
#define STASSID "your-ssid"
1414
#define PSK "your-password"
1515
#endif
1616

17-
const char* ssid = SSID;
17+
const char* ssid = STASSID;
1818
const char* password = PSK;
1919

2020
// Create an instance of the server

0 commit comments

Comments
 (0)