improve earlyWiFi example, slightly change AddrList interface, move W…

…iFi sketches into WiFi examples
esp8266 · earlephilhower · Dec 4, 2018 · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018
commit dbf60459d8013ea90237cb7cdd11f7f663efef18
diff --git a/cores/esp8266/AddrList.h b/cores/esp8266/AddrList.h
@@ -24,7 +24,7 @@
   for (auto a: ifList)
     out.printf("IF='%s' index=%d legacy=%d IPv4=%d local=%d hostname='%s' addr= %s\n",
                a->iface().c_str(),
-               a->number(),
+               a->ifnumber(),
                a->addr().isLegacy(),
                a->addr().isV4(),
                a->addr().isLocal(),
@@ -65,7 +65,7 @@
           for (auto iface: ifList)
               if ((configured = (   !iface->addr()->isV4()
                                  && !iface->addr().isLocal()
-                                 && iface->number() == STATION_IF)))
+                                 && iface->ifnumber() == STATION_IF)))
                   break;
           Serial.print('.');
           delay(500);
@@ -126,19 +126,23 @@ class AddrListClass {
                 }
 
                 // (*iterator) emulation:
-
                 const const_iterator& operator*  () const { return *this; }
                 const const_iterator* operator-> () const { return  this; }
 
+                // iterated address
                 bool isLegacy() const { return _num == 0; }
                 bool isLocal() const { return addr().isLocal(); }
                 IPAddress addr () const { return _ip_from_netif_num(); }
+
+                // properties of legacy/IPv4 address (one per interface)
                 IPAddress netmask () const { return _netif->netmask; }
                 IPAddress gw () const { return _netif->gw; }
-                String iface () const { return String(_netif->name[0]) + _netif->name[1]; }
-                const char* hostname () const { return _netif->hostname?: emptyString.c_str(); }
-                const char* mac () const { return (const char*)_netif->hwaddr; }
-                int number () const { return _netif->num; }
+
+                // interface properties (common to all addresses in the interface)
+                String ifname () const { return String(_netif->name[0]) + _netif->name[1]; }
+                const char* ifhostname () const { return _netif->hostname?: emptyString.c_str(); }
+                const char* ifmac () const { return (const char*)_netif->hwaddr; }
+                int ifnumber () const { return _netif->num; }
 
             protected:
 

diff --git a/libraries/ESP8266WiFi/examples/EarlyDisableWiFi/EarlyDisableWiFi.ino b/libraries/ESP8266WiFi/examples/EarlyDisableWiFi/EarlyDisableWiFi.ino
@@ -1,6 +1,11 @@
 
 #include <ESP8266WiFi.h>
 
+#ifndef STASSID
+#define STASSID "your-ssid"
+#define STAPSK  "your-password"
+#endif
+
 // early_init() is called before system startup
 // from nonos-sdk's user entry point user_init()
 
@@ -35,6 +40,38 @@ void early_init() {
 void setup () {
   Serial.begin(115200);
   Serial.setDebugOutput(true);
+  Serial.println("sleeping 5s");
+
+  // during this period, a simple amp meter shows
+  // an average of 20mA with a Wemos D1 mini
+  // a DSO is needed to check #2111
+  delay(5000);
+
+  Serial.println("waking  WiFi up, sleeping 5s");
+  WiFi.forceSleepWake();
+
+  // amp meter raises to 75mA
+  delay(5000);
+
+  Serial.println("connecting to AP " STASSID);
+  WiFi.mode(WIFI_STA);
+  WiFi.begin(STASSID, STAPSK);
+
+  for (bool configured = false; !configured;) {
+    for (auto addr : addrList)
+      if ((configured = !addr->isLocal() && addr->ifnumber() == STATION_IF)) {
+        Serial.printf("STA: IF='%s' hostname='%s' addr= %s\n",
+                      addr->ifname().c_str(),
+                      addr->ifhostname(),
+                      addr->addr().toString().c_str());
+        break;
+      }
+    Serial.print('.');
+    delay(500);
+  }
+
+  // amp meter cycles within 75-80 mA
+
 }
 
 void loop () {

diff --git a/libraries/esp8266/examples/IPv6/IPv6.ino → libraries/ESP8266WiFi/examples/IPv6/IPv6.ino b/libraries/esp8266/examples/IPv6/IPv6.ino → libraries/ESP8266WiFi/examples/IPv6/IPv6.ino
@@ -66,10 +66,10 @@ void status(Print& out) {
   out.println(F("(with 'telnet <addr> or 'nc -u <addr> 23')"));
   for (auto a : addrList) {
     out.printf("IF='%s' IPv6=%d local=%d hostname='%s' addr= %s",
-               a->iface().c_str(),
+               a->ifname().c_str(),
                !a->addr().isV4(),
                a->addr().isLocal(),
-               a->hostname(),
+               a->ifhostname(),
                a->addr().toString().c_str());
 
     if (a->isLegacy()) {
@@ -96,6 +96,8 @@ void setup() {
   Serial.println();
   Serial.println(ESP.getFullVersion());
 
+  Serial.printf("IPV6 is%s enabled\n", LWIP_IPV6? emptyString.c_str(): " NOT");
+
   WiFi.mode(WIFI_STA);
   WiFi.begin(STASSID, STAPSK);