update examples

Author: d-a-v

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

@@ -37,8 +37,13 @@
 #include <CertStoreBearSSL.h>
 #include <time.h>
 
-const char *ssid = "....";
-const char *pass = "....";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char *ssid = SSID;
+const char *pass = PSK;
 
 // A single, global CertStore which can be used by all
 // connections.  Needs to stay live the entire time any of

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

@@ -6,8 +6,13 @@
 
 #include <ESP8266WiFi.h>
 
-const char *ssid = "....";
-const char *pass = "....";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char *ssid = SSID;
+const char *pass = PSK;
 
 void fetch(BearSSL::WiFiClientSecure *client) {
   client->write("GET / HTTP/1.0\r\nHost: tls.mbed.org\r\nUser-Agent: ESP8266\r\n\r\n");

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

@@ -37,8 +37,13 @@
 #include <ESP8266WiFi.h>
 #include <time.h>
 
-const char *ssid = "....";
-const char *pass = "....";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char *ssid = SSID;
+const char *pass = PSK;
 
 // The HTTPS server
 BearSSL::WiFiServerSecure server(443);

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

@@ -65,8 +65,13 @@
 #include <ESP8266WiFi.h>
 #include <time.h>
 
-const char *ssid = "....";
-const char *pass = "....";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char *ssid = SSID;
+const char *pass = PSK;
 
 // The server which will require a client cert signed by the trusted CA
 BearSSL::WiFiServerSecure server(443);

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

@@ -6,8 +6,13 @@
 #include <ESP8266WiFi.h>
 #include <time.h>
 
-const char *ssid = "....";
-const char *pass = "....";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char *ssid = SSID;
+const char *pass = PSK;
 
 const char *   host = "api.github.com";
 const uint16_t port = 443;

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

@@ -7,8 +7,13 @@
 #include <ESP8266WiFi.h>
 #include <time.h>
 
-const char *ssid = "....";
-const char *pass = "....";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char *ssid = SSID;
+const char *pass = PSK;
 
 const char *   host = "api.github.com";
 const uint16_t port = 443;

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

@@ -19,15 +19,20 @@
 #include <ESP8266WiFi.h>
 #include <WiFiClientSecure.h>
 
-const char* ssid = "........";
-const char* password = "........";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char* ssid = SSID;
+const char* password = PSK;
 
 const char* host = "api.github.com";
 const int httpsPort = 443;
 
 // Use web browser to view and copy
 // SHA1 fingerprint of the certificate
-const char* fingerprint = "5F F1 60 31 09 04 3E F2 90 D2 B0 8A 50 38 04 E8 37 9F BC 76";
+const char fingerprint[] PROGMEM = "5F F1 60 31 09 04 3E F2 90 D2 B0 8A 50 38 04 E8 37 9F BC 76";
 
 void setup() {
   Serial.begin(115200);
@@ -54,11 +59,8 @@ void setup() {
     return;
   }
 
-  if (client.verify(fingerprint, host)) {
-    Serial.println("certificate matches");
-  } else {
-    Serial.println("certificate doesn't match");
-  }
+  Serial.printf("Using fingerprint '%s'\n", fingerprint);
+  client.setFingerprint(fingerprint);
 
   String url = "/repos/esp8266/Arduino/commits/master/status";
   Serial.print("requesting URL: ");

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

@@ -17,10 +17,21 @@
 
 #include <time.h>
 #include <ESP8266WiFi.h>
-#include <WiFiClientSecure.h>
 
-const char* ssid = "........";
-const char* password = "........";
+// force use of AxTLS (BearSSL is now default)
+#include <WiFiClientSecureAxTLS.h>
+using namespace AxTLS;
+
+// uncomment the line below to run the sketch
+#error Keeping this example for history, watch BearSSL_Validation example instead
+
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char* ssid = SSID;
+const char* password = PSK;
 
 const char* host = "api.github.com";
 const int httpsPort = 443;

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

@@ -21,8 +21,13 @@
 #include <ESP8266WiFi.h>
 #include <WiFiUdp.h>
 
-char ssid[] = "*************";  //  your network SSID (name)
-char pass[] = "********";       // your network password
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+char ssid[] = SSID;  // your network SSID (name)
+char pass[] = PSK;   // your network password
 
 
 unsigned int localPort = 2390;      // local port to listen for UDP packets

Diff for: libraries/ESP8266WiFi/examples/WiFiAccessPoint/WiFiAccessPoint.ino

@@ -34,9 +34,14 @@
 #include <WiFiClient.h>
 #include <ESP8266WebServer.h>
 
+#ifndef APSSID
+#define APSSID "ESPap"
+#define APPSK  "thereisnospoon"
+#endif
+
 /* Set these to your desired credentials. */
-const char *ssid = "ESPap";
-const char *password = "thereisnospoon";
+const char *ssid = APSSID;
+const char *password = APPSK;
 
 ESP8266WebServer server(80);
 

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

@@ -5,8 +5,13 @@
 
 #include <ESP8266WiFi.h>
 
-const char* ssid     = "your-ssid";
-const char* password = "your-password";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char* ssid     = SSID;
+const char* password = PSK;
 
 const char* host = "djxmmx.net";
 const uint16_t port = 17;
@@ -54,7 +59,10 @@ void loop() {
 
   // This will send a string to the server
   Serial.println("sending data to server");
-  client.println("hello from ESP8266");
+  if (client.connected())
+      client.println("hello from ESP8266");
+
+  // wait for data to be available
   unsigned long timeout = millis();
   while (client.available() == 0) {
     if (millis() - timeout > 5000) {
@@ -67,6 +75,7 @@ void loop() {
 
   // Read all the lines of the reply from server and print them to Serial
   Serial.println("receiving from remote server");
+  // not testing 'client.connected()' since we do not need to send data here
   while (client.available()) {
     char ch = static_cast<char>(client.read());
     Serial.print(ch);

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

@@ -7,8 +7,13 @@
 #include <ESP8266WiFi.h>
 #include <ESP8266WiFiMulti.h>
 
-const char* ssid     = "your-ssid";
-const char* password = "your-password";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char* ssid     = SSID;
+const char* password = PSK;
 
 const char* host = "192.168.1.1";
 const uint16_t port = 3000;

Diff for: libraries/ESP8266WiFi/examples/WiFiEvents/WiFiEvents.ino

@@ -16,8 +16,13 @@
 #include <ESP8266WiFi.h>
 #include <stdio.h>
 
-const char* ssid     = "ap-ssid";
-const char* password = "ap-password";
+#ifndef APSSID
+#define APSSID "esp8266"
+#define APPSK  "esp8266"
+#endif
+
+const char* ssid     = APSSID;
+const char* password = APPSK;
 
 WiFiEventHandler stationConnectedHandler;
 WiFiEventHandler stationDisconnectedHandler;

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

@@ -43,8 +43,13 @@
 
 #include <ESP8266WiFi.h>
 
-const char* ssid = "your-ssid";
-const char* password = "your-password";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char* ssid = SSID;
+const char* password = PSK;
 
 // The certificate is stored in PMEM
 static const uint8_t x509[] PROGMEM = {

Diff for: libraries/ESP8266WiFi/examples/WiFiWebServer/WiFiWebServer.ino renamed to libraries/ESP8266WiFi/examples/WiFiManualWebServer/WiFiManualWebServer.ino

@@ -9,8 +9,13 @@
 
 #include <ESP8266WiFi.h>
 
-const char* ssid = "your-ssid";
-const char* password = "your-password";
+#ifndef SSID
+#define SSID "your-ssid"
+#define PSK  "your-password"
+#endif
+
+const char* ssid = SSID;
+const char* password = PSK;
 
 // Create an instance of the server
 // specify the port to listen on as an argument
@@ -19,9 +24,9 @@ WiFiServer server(80);
 void setup() {
   Serial.begin(115200);
 
-  // prepare GPIO2
-  pinMode(2, OUTPUT);
-  digitalWrite(2, 0);
+  // prepare LED
+  pinMode(BUILTIN_LED, OUTPUT);
+  digitalWrite(BUILTIN_LED, 0);
 
   // Connect to WiFi network
   Serial.println();
@@ -53,17 +58,14 @@ void loop() {
   if (!client) {
     return;
   }
-
-  // Wait until the client sends some data
   Serial.println("new client");
-  while (!client.available()) {
-    delay(1);
-  }
+  
+  client.setTimeout(5000); // default is 1000
 
   // Read the first line of the request
   String req = client.readStringUntil('\r');
+  Serial.println("request: ");
   Serial.println(req);
-  client.flush();
 
   // Match the request
   int val;
@@ -77,22 +79,25 @@ void loop() {
     return;
   }
 
-  // Set GPIO2 according to the request
-  digitalWrite(2, val);
+  // Set LED according to the request
+  digitalWrite(BUILTIN_LED, val);
 
-  client.flush();
-
-  // Prepare the response
-  String s = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>\r\nGPIO is now ";
-  s += (val) ? "high" : "low";
-  s += "</html>\n";
+  // read/ignore the rest of the request
+  // do not client.flush(): it is for output only, see below
+  while (client.available())
+    // byte by byte is not very efficient
+    client.read();
 
   // Send the response to the client
-  client.print(s);
-  delay(1);
-  Serial.println("Client disonnected");
-
-  // The client will actually be disconnected
-  // when the function returns and 'client' object is detroyed
+  // it is OK for multiple small client.print/write,
+  // because nagle algorithm will group them into one single packet
+  // ::print*_P(F("string")) is always usable and saves RAM
+  client.print_P(F("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n<!DOCTYPE HTML>\r\n<html>\r\nGPIO is now "));
+  client.print_P((val) ? F("high" ): F("low"));
+  client.print_P(F("</html>\n"));
+
+  // The client will actually be *flushed* then disconnected
+  // when the function returns and 'client' object is destroyed (out-of-scope)
+  // flush = ensure written data are received by the other side
+  Serial.println("Disconnecting from client");
 }
-