Merge branch 'master' into thunks

Author: earlephilhower

boards.txt

@@ -183,6 +183,11 @@ uint32_t EspClass::getFreeContStack()
     return cont_get_free_stack(g_pcont);
 }
 
+void EspClass::resetFreeContStack()
+{
+    cont_repaint_stack(g_pcont);
+}
+
 uint32_t EspClass::getChipId(void)
 {
     return system_get_chip_id();

cores/esp8266/Esp.cpp

@@ -111,6 +111,7 @@ class EspClass {
         void getHeapStats(uint32_t* free = nullptr, uint16_t* max = nullptr, uint8_t* frag = nullptr);
 
         uint32_t getFreeContStack();
+        void resetFreeContStack();
 
         const char * getSdkVersion();
         String getCoreVersion();

cores/esp8266/Esp.h

@@ -37,7 +37,7 @@ void UpdaterClass::_reset() {
   _command = U_FLASH;
 
   if(_ledPin != -1) {
-    digitalWrite(_ledPin, _ledStateRestore);
+    digitalWrite(_ledPin, !_ledOn); // off
   }
 }
 
@@ -50,10 +50,7 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
   }
 
   _ledPin = ledPin;
-  _ledOn = ledOn;
-  if(_ledPin != -1) {
-    _ledStateRestore = digitalRead(_ledPin);
-  }
+  _ledOn = !!ledOn; // 0(LOW) or 1(HIGH)
 
   /* Check boot mode; if boot mode is 1 (UART download mode),
     we will not be able to reset into normal mode once update is done.
@@ -178,7 +175,7 @@ bool UpdaterClass::end(bool evenIfRemaining){
 
   _md5.calculate();
   if(_target_md5.length()) {
-    if(_target_md5 != _md5.toString()){
+    if(strcasecmp(_target_md5.c_str(), _md5.toString().c_str()) != 0){
       _setError(UPDATE_ERROR_MD5);
       _reset();
       return false;
@@ -376,7 +373,7 @@ size_t UpdaterClass::writeStream(Stream &data) {
 
     while(remaining()) {
         if(_ledPin != -1) {
-            digitalWrite(LED_BUILTIN, _ledOn); // Switch LED on
+            digitalWrite(_ledPin, _ledOn); // Switch LED on
         }
         size_t bytesToRead = _bufferSize - _bufferLen;
         if(bytesToRead > remaining()) {
@@ -394,7 +391,7 @@ size_t UpdaterClass::writeStream(Stream &data) {
             }
         }
         if(_ledPin != -1) {
-            digitalWrite(LED_BUILTIN, _ledOn == HIGH ? LOW : HIGH); // Switch LED off
+            digitalWrite(_ledPin, !_ledOn); // Switch LED off
         }
         _bufferLen += toRead;
         if((_bufferLen == remaining() || _bufferLen == _bufferSize) && !_writeBuffer())

cores/esp8266/Updater.cpp

@@ -165,7 +165,6 @@ class UpdaterClass {
 
     int _ledPin;
     uint8_t _ledOn;
-    int _ledStateRestore;
 };
 
 extern UpdaterClass Update;

cores/esp8266/Updater.h

@@ -796,3 +796,7 @@ float String::toFloat(void) const {
         return atof(buffer);
     return 0;
 }
+
+// global empty string to allow returning const String& with nothing
+
+const String emptyString;

cores/esp8266/WString.cpp

@@ -294,5 +294,7 @@ class StringSumHelper: public String {
         }
 };
 
+extern const String emptyString;
+
 #endif  // __cplusplus
 #endif  // String_class_h

cores/esp8266/WString.h

@@ -74,6 +74,12 @@ int cont_get_free_stack(cont_t* cont);
 // continuation stack
 bool cont_can_yield(cont_t* cont);
 
+// Repaint the stack from the current SP to the end, to allow individual
+// routines' stack usages to be calculated by re-painting, checking current
+// free, running the routine, then checking the max free
+void cont_repaint_stack(cont_t *cont);
+
+
 #ifdef __cplusplus
 }
 #endif

cores/esp8266/cont.h

@@ -64,3 +64,18 @@ bool ICACHE_RAM_ATTR cont_can_yield(cont_t* cont) {
     return !ETS_INTR_WITHINISR() &&
            cont->pc_ret != 0 && cont->pc_yield == 0;
 }
+
+// No need for this to be in IRAM, not expected to be IRQ called
+void cont_repaint_stack(cont_t *cont)
+{
+    register uint32_t *sp asm("a1");
+    // Ensure 64 bytes adjacent to the current SP don't get touched to endure
+    // we don't accidentally trounce over locals or IRQ temps.
+    uint32_t sp_safe = CONT_STACKSIZE/4 - ((sp - &cont->stack[0] - 64)/4);
+
+    // Fill stack with magic values
+    for(uint32_t pos = 0; pos < sp_safe; pos++)
+    {
+        cont->stack[pos] = CONT_STACKGUARD;
+    }
+}