Merge pull request #438 from Links2004/esp8266

update SDK to esp_iot_sdk_v1.1.2_15_06_16_p1

cores/esp8266/Arduino.h

@@ -195,6 +195,7 @@ unsigned long micros(void);
 void delay(unsigned long);
 void delayMicroseconds(unsigned int us);
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
 
 void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
@@ -236,6 +237,8 @@ void loop(void);
 
 #define min(a,b) ((a)<(b)?(a):(b))
 #define max(a,b) ((a)>(b)?(a):(b))
+#define _min(a,b) ((a)<(b)?(a):(b))
+#define _max(a,b) ((a)>(b)?(a):(b))
 
 uint16_t makeWord(uint16_t w);
 uint16_t makeWord(byte h, byte l);
@@ -243,6 +246,7 @@ uint16_t makeWord(byte h, byte l);
 #define word(...) makeWord(__VA_ARGS__)
 
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
 
 void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);
 void noTone(uint8_t _pin);
@@ -250,7 +254,7 @@ void noTone(uint8_t _pin);
 // WMath prototypes
 long random(long);
 long random(long, long);
-void randomSeed(unsigned int);
+void randomSeed(unsigned long);
 long map(long, long, long, long, long);
 
 

cores/esp8266/Esp.cpp

@@ -32,7 +32,7 @@ extern struct rst_info resetInfo;
 
 // #define DEBUG_SERIAL Serial
 
-
+    
 /**
  * User-defined Literals
  *  usage:
@@ -97,8 +97,8 @@ void EspClass::wdtFeed(void)
 
 void EspClass::deepSleep(uint32_t time_us, WakeMode mode)
 {
-    system_deep_sleep_set_option(static_cast<int>(mode));
-    system_deep_sleep(time_us);
+	system_deep_sleep_set_option(static_cast<int>(mode));
+ 	system_deep_sleep(time_us);
 }
 
 extern "C" void esp_yield();
@@ -280,8 +280,8 @@ uint32_t EspClass::getFlashChipSizeByChipId(void) {
 
 String EspClass::getResetInfo(void) {
     if(resetInfo.reason != 0) {
-        char buff[150];
-        sprintf(&buff[0], "Fatal exception:%d flag:%d epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
+        char buff[200];
+        sprintf(&buff[0], "Fatal exception:%d flag:%d (%s) epc1:0x%08x epc2:0x%08x epc3:0x%08x excvaddr:0x%08x depc:0x%08x", resetInfo.exccause, resetInfo.reason, (resetInfo.reason == 0 ? "DEFAULT" : resetInfo.reason == 1 ? "WDT" : resetInfo.reason == 2 ? "EXCEPTION" : resetInfo.reason == 3 ? "SOFT_WDT" : resetInfo.reason == 4 ? "SOFT_RESTART" : resetInfo.reason == 5 ? "DEEP_SLEEP_AWAKE" : "???"), resetInfo.epc1, resetInfo.epc2, resetInfo.epc3, resetInfo.excvaddr, resetInfo.depc);
         return String(buff);
     }
     return String("flag: 0");
@@ -400,6 +400,13 @@ bool EspClass::updateSketch(Stream& in, uint32_t size) {
             return false;
         }
 
+        if(addr == freeSpaceStart) {
+            // check for valid first magic byte
+            if(*((uint8 *) buffer.get()) != 0xE9) {
+                return false;
+            }
+        }
+
         noInterrupts();
         rc = SPIWrite(addr, buffer.get(), willRead);
         interrupts();
@@ -426,7 +433,7 @@ bool EspClass::updateSketch(Stream& in, uint32_t size) {
     ebcmd.args[1] = 0x00000;
     ebcmd.args[2] = size;
     eboot_command_write(&ebcmd);
-    
+
     ESP.restart();
     return true; // never happens
 }

cores/esp8266/HardwareSerial.cpp

@@ -620,6 +620,7 @@ size_t HardwareSerial::write(uint8_t c) {
 
     while(_tx_buffer->room() == 0) {
         yield();
+        uart_arm_tx_interrupt(_uart);
     }
 
     _tx_buffer->write(c);

cores/esp8266/Print.cpp

@@ -127,8 +127,7 @@ size_t ICACHE_FLASH_ATTR Print::print(const Printable& x) {
 }
 
 size_t ICACHE_FLASH_ATTR Print::println(void) {
-    size_t n = print("\r\n");
-    return n;
+    return print("\r\n");
 }
 
 size_t ICACHE_FLASH_ATTR Print::println(const String &s) {

cores/esp8266/Stream.h

@@ -69,6 +69,8 @@ class Stream: public Print {
         }
         // returns true if target string is found, false if timed out
 
+        bool find(char target) { return find (&target, 1); }
+
         bool findUntil(const char *target, const char *terminator);   // as find but search ends if the terminator string is found
         bool findUntil(const uint8_t *target, const char *terminator) {
             return findUntil((char *) target, terminator);

cores/esp8266/WMath.cpp

@@ -27,7 +27,7 @@ extern "C" {
 #include <stdlib.h>
 }
 
-void randomSeed(unsigned int seed) {
+void randomSeed(unsigned long seed) {
     if(seed != 0) {
         srand(seed);
     }

cores/esp8266/cbuf.h

@@ -39,8 +39,12 @@ class cbuf {
         }
 
         size_t room() const {
-            if(_end >= _begin) return _size - (_end - _begin) - 1;
-
+            if(_end >= _begin) {
+                return _size - (_end - _begin) - 1;
+            }
+            if(_begin == _end) {
+                return _size;
+            }
             return _begin - _end - 1;
         }
 

cores/esp8266/core_esp8266_main.cpp

@@ -121,9 +121,10 @@ void init_done() {
 
 extern "C" {
 void user_init(void) {
-    system_rtc_mem_read(0, &resetInfo, sizeof(struct rst_info));
-    struct rst_info info = { 0 };
-    system_rtc_mem_write(0, &info, sizeof(struct rst_info));
+    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));
 

cores/esp8266/core_esp8266_wiring_pulse.c

@@ -30,3 +30,7 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout) {
   while(digitalRead(pin) == state && (micros() - start) < timeout);
   return micros() - start;
 }
+
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout) {
+    return pulseIn(pin, state, timeout);
+}