weak hook preinit() #2111 #2133 #2136

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:
 

cores/esp8266/Arduino.h

@@ -219,6 +219,7 @@ uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 void attachInterrupt(uint8_t pin, void (*)(void), int mode);
 void detachInterrupt(uint8_t pin);
 
+void early_init(void);
 void setup(void);
 void loop(void);
 

cores/esp8266/core_esp8266_main.cpp

@@ -63,7 +63,7 @@ static uint32_t s_micros_at_task_start;
 
 extern "C" {
 extern const uint32_t __attribute__((section(".ver_number"))) core_version = ARDUINO_ESP8266_GIT_VER;
-const char* core_release = 
+const char* core_release =
 #ifdef ARDUINO_ESP8266_RELEASE
     ARDUINO_ESP8266_RELEASE;
 #else
@@ -212,18 +212,26 @@ extern "C" void ICACHE_RAM_ATTR app_entry (void)
     return app_entry_custom();
 }
 
+extern "C" void early_init (void) __attribute__((weak));
+extern "C" void early_init (void)
+{
+    /* do nothing by default */
+}
+
 extern "C" void user_init(void) {
     struct rst_info *rtc_info_ptr = system_get_rst_info();
     memcpy((void *) &resetInfo, (void *) rtc_info_ptr, sizeof(resetInfo));
 
     uart_div_modify(0, UART_CLK_FREQ / (115200));
 
-    init();
+    init(); // in core_esp8266_wiring.c
 
     initVariant();
 
     cont_init(g_pcont);
 
+    early_init(); // user redefinable
+
     ets_task(loop_task,
         LOOP_TASK_PRIORITY, s_loop_queue,
         LOOP_QUEUE_SIZE);

libraries/ESP8266WiFi/examples/EarlyDisableWiFi/EarlyDisableWiFi.ino

@@ -0,0 +1,78 @@
+
+#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()
+
+void early_init() {
+  // Global constructors are not called yet
+  // (global class instances like WiFi, Serial... are not yet initialized).
+  // In this function, we must only use nonos-sdk API.
+
+  // example
+
+  // https://github.com/esp8266/Arduino/issues/2111#issuecomment-224251391
+  // WiFi.persistent(false);
+  // WiFi.mode(WIFI_OFF);
+  // WiFi.forceSleepBegin();
+
+  //WiFi.mode(WIFI_OFF) equivalent:
+  // datasheet:
+  // Set Wi-Fi working mode to Station mode, SoftAP
+  // or Station + SoftAP, and do not update flash
+  // (not persistent)
+  wifi_set_opmode_current(WIFI_OFF);
+
+  //WiFi.forceSleepBegin(/*default*/0) equivalent:
+  // sleep forever until wifi_fpm_do_wakeup() is called
+  wifi_fpm_set_sleep_type(MODEM_SLEEP_T);
+  wifi_fpm_open();
+  wifi_fpm_do_sleep(0xFFFFFFF);
+
+  // use WiFi.forceSleepWake() to wake WiFi up
+}
+
+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() {
+}

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);
 

tests/common.sh

@@ -116,8 +116,8 @@ function install_ide()
         debug_flags="-DDEBUG_ESP_PORT=Serial -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM"
     fi
     # Set custom warnings for all builds (i.e. could add -Wextra at some point)
-    echo "compiler.c.extra_flags=-Wall -Wextra -Werror $debug_flags" > esp8266/platform.local.txt
-    echo "compiler.cpp.extra_flags=-Wall -Wextra -Werror $debug_flags" >> esp8266/platform.local.txt
+    echo "compiler.c.extra_flags=-Wall -Wextra -Werror -DLWIP_IPV6=0 $debug_flags" > esp8266/platform.local.txt
+    echo "compiler.cpp.extra_flags=-Wall -Wextra -Werror -DLWIP_IPV6=0 $debug_flags" >> esp8266/platform.local.txt
     echo -e "\n----platform.local.txt----"
     cat esp8266/platform.local.txt
     echo -e "\n----\n"

tests/run_CI_locally.sh

@@ -33,7 +33,7 @@ if [ -d ${TMPCI} ]; then
 	echo ""
 	echo " -- updating CI directory in ${TMPCI} --"
 	echo ""
-	(cd ${TMPCI}; git checkout ${branch}; git pull)
+	(cd ${TMPCI}; git checkout master; git branch -D ${branch}; git checkout -b ${branch}; git pull origin ${branch})
 else
 	echo ""
 	echo " -- installing CI directory in ${TMPCI} --"