Merge branch 'master' into esptool_reset_method

Author: f5soh

boards.txt

@@ -74,6 +74,10 @@ generic.menu.FlashFreq.40=40MHz
 generic.menu.FlashFreq.40.build.flash_freq=40
 generic.menu.FlashFreq.80=80MHz
 generic.menu.FlashFreq.80.build.flash_freq=80
+generic.menu.FlashFreq.20=20MHz
+generic.menu.FlashFreq.20.build.flash_freq=20
+generic.menu.FlashFreq.26=26MHz
+generic.menu.FlashFreq.26.build.flash_freq=26
 generic.menu.FlashMode.dout=DOUT (compatible)
 generic.menu.FlashMode.dout.build.flash_mode=dout
 generic.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT
@@ -4754,6 +4758,10 @@ wifinfo.menu.FlashFreq.40=40MHz
 wifinfo.menu.FlashFreq.40.build.flash_freq=40
 wifinfo.menu.FlashFreq.80=80MHz
 wifinfo.menu.FlashFreq.80.build.flash_freq=80
+wifinfo.menu.FlashFreq.20=20MHz
+wifinfo.menu.FlashFreq.20.build.flash_freq=20
+wifinfo.menu.FlashFreq.26=26MHz
+wifinfo.menu.FlashFreq.26.build.flash_freq=26
 wifinfo.menu.eesz.1M64=1MB (FS:64KB OTA:~470KB)
 wifinfo.menu.eesz.1M64.build.flash_size=1M
 wifinfo.menu.eesz.1M64.build.flash_size_bytes=0x100000
@@ -5774,6 +5782,10 @@ wifi_slot.menu.FlashFreq.40=40MHz
 wifi_slot.menu.FlashFreq.40.build.flash_freq=40
 wifi_slot.menu.FlashFreq.80=80MHz
 wifi_slot.menu.FlashFreq.80.build.flash_freq=80
+wifi_slot.menu.FlashFreq.20=20MHz
+wifi_slot.menu.FlashFreq.20.build.flash_freq=20
+wifi_slot.menu.FlashFreq.26=26MHz
+wifi_slot.menu.FlashFreq.26.build.flash_freq=26
 wifi_slot.menu.FlashMode.dout=DOUT (compatible)
 wifi_slot.menu.FlashMode.dout.build.flash_mode=dout
 wifi_slot.menu.FlashMode.dout.build.flash_flags=-DFLASHMODE_DOUT

cores/esp8266/HardwareSerial.cpp

@@ -60,6 +60,15 @@ void HardwareSerial::end()
     _uart = NULL;
 }
 
+void HardwareSerial::updateBaudRate(unsigned long baud)
+{
+    if(!_uart) {
+        return;
+    }
+
+    uart_set_baudrate(_uart, baud);    
+}
+
 size_t HardwareSerial::setRxBufferSize(size_t size){
     if(_uart) {
         _rx_size = uart_resize_rx_buffer(_uart, size);
@@ -133,8 +142,8 @@ unsigned long HardwareSerial::detectBaudrate(time_t timeoutMillis)
     return detectedBaudrate;
 }
 
-size_t HardwareSerial::readBytes(char* buffer, size_t size)
-{
+size_t HardwareSerial::readBytes(char* buffer, size_t size)
+{
     size_t got = 0;
 
     while (got < size)
@@ -147,7 +156,7 @@ size_t HardwareSerial::readBytes(char* buffer, size_t size)
         got += read(buffer + got, std::min(size - got, avail));
     }
     return got;
-}
+}
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
 HardwareSerial Serial(UART0);

cores/esp8266/HardwareSerial.h

@@ -88,6 +88,8 @@ class HardwareSerial: public Stream
 
     void end();
 
+    void updateBaudRate(unsigned long baud);
+
     size_t setRxBufferSize(size_t size);
     size_t getRxBufferSize()
     {

cores/esp8266/WString.cpp

@@ -185,7 +185,7 @@ unsigned char String::changeBuffer(unsigned int maxStrLen) {
         size_t oldSize = capacity() + 1; // include NULL.
         if (isSSO()) {
             // Copy the SSO buffer into allocated space
-            memmove(newbuffer, sso.buff, sizeof(sso.buff));
+            memmove_P(newbuffer, sso.buff, sizeof(sso.buff));
         }
         if (newSize > oldSize)
         {
@@ -210,7 +210,7 @@ String & String::copy(const char *cstr, unsigned int length) {
         return *this;
     }
     setLen(length);
-    memmove(wbuffer(), cstr, length + 1);
+    memmove_P(wbuffer(), cstr, length + 1);
     return *this;
 }
 
@@ -228,7 +228,7 @@ String & String::copy(const __FlashStringHelper *pstr, unsigned int length) {
 void String::move(String &rhs) {
     if(buffer()) {
         if(capacity() >= rhs.len()) {
-            memmove(wbuffer(), rhs.buffer(), rhs.length() + 1);
+            memmove_P(wbuffer(), rhs.buffer(), rhs.length() + 1);
             setLen(rhs.len());
 	    rhs.invalidate();
             return;
@@ -241,7 +241,7 @@ void String::move(String &rhs) {
     }
     if (rhs.isSSO()) {
         setSSO(true);
-        memmove(sso.buff, rhs.sso.buff, sizeof(sso.buff));
+        memmove_P(sso.buff, rhs.sso.buff, sizeof(sso.buff));
     } else {
         setSSO(false);
         setBuffer(rhs.wbuffer());
@@ -313,7 +313,7 @@ unsigned char String::concat(const String &s) {
             return 1;
         if (!reserve(newlen))
             return 0;
-        memmove(wbuffer() + len(), buffer(), len());
+        memmove_P(wbuffer() + len(), buffer(), len());
         setLen(newlen);
         wbuffer()[len()] = 0;
         return 1;
@@ -330,12 +330,7 @@ unsigned char String::concat(const char *cstr, unsigned int length) {
         return 1;
     if(!reserve(newlen))
         return 0;
-    if (cstr >= wbuffer() && cstr < wbuffer() + len())
-        // compatible with SSO in ram #6155 (case "x += x.c_str()")
-        memmove(wbuffer() + len(), cstr, length + 1);
-    else
-        // compatible with source in flash #6367
-        memcpy_P(wbuffer() + len(), cstr, length + 1);
+    memmove_P(wbuffer() + len(), cstr, length + 1);
     setLen(newlen);
     return 1;
 }
@@ -739,21 +734,21 @@ void String::replace(const String& find, const String& replace) {
     char *foundAt;
     if(diff == 0) {
         while((foundAt = strstr(readFrom, find.buffer())) != NULL) {
-            memmove(foundAt, replace.buffer(), replace.len());
+            memmove_P(foundAt, replace.buffer(), replace.len());
             readFrom = foundAt + replace.len();
         }
     } else if(diff < 0) {
         char *writeTo = wbuffer();
         while((foundAt = strstr(readFrom, find.buffer())) != NULL) {
             unsigned int n = foundAt - readFrom;
-            memmove(writeTo, readFrom, n);
+            memmove_P(writeTo, readFrom, n);
             writeTo += n;
-            memmove(writeTo, replace.buffer(), replace.len());
+            memmove_P(writeTo, replace.buffer(), replace.len());
             writeTo += replace.len();
             readFrom = foundAt + find.len();
             setLen(len() + diff);
         }
-        memmove(writeTo, readFrom, strlen(readFrom)+1);
+        memmove_P(writeTo, readFrom, strlen(readFrom)+1);
     } else {
         unsigned int size = len(); // compute size needed for result
         while((foundAt = strstr(readFrom, find.buffer())) != NULL) {
@@ -767,9 +762,9 @@ void String::replace(const String& find, const String& replace) {
         int index = len() - 1;
         while(index >= 0 && (index = lastIndexOf(find, index)) >= 0) {
             readFrom = wbuffer() + index + find.len();
-            memmove(readFrom + diff, readFrom, len() - (readFrom - buffer()));
+            memmove_P(readFrom + diff, readFrom, len() - (readFrom - buffer()));
 	    int newLen = len() + diff;
-            memmove(wbuffer() + index, replace.buffer(), replace.len());
+            memmove_P(wbuffer() + index, replace.buffer(), replace.len());
             setLen(newLen);
             wbuffer()[newLen] = 0;
             index--;
@@ -797,7 +792,7 @@ void String::remove(unsigned int index, unsigned int count) {
     char *writeTo = wbuffer() + index;
     unsigned int newlen = len() - count;
     setLen(newlen);
-    memmove(writeTo, wbuffer() + index + count, newlen - index);
+    memmove_P(writeTo, wbuffer() + index + count, newlen - index);
     wbuffer()[newlen] = 0;
 }
 
@@ -829,7 +824,7 @@ void String::trim(void) {
     unsigned int newlen = end + 1 - begin;
     setLen(newlen);
     if(begin > buffer())
-        memmove(wbuffer(), begin, newlen);
+        memmove_P(wbuffer(), begin, newlen);
     wbuffer()[newlen] = 0;
 }
 

cores/esp8266/esp8266_undocumented.h

@@ -11,6 +11,27 @@ extern int rom_i2c_readReg_Mask(int, int, int, int, int);
 
 extern int uart_baudrate_detect(int, int);
 
+/*
+ROM function, uart_buff_switch(), is used to switch printing between UART0 and
+UART1. It updates a structure that only controls a select group of print
+functions. ets_putc() and ets_uart_printf() are examples and are not affected by
+calls to ets_install_putc1().
+
+ Use:
+   0 for UART0, also clears RX FIFO
+   1 for UART1
+ */
+extern void uart_buff_switch(uint8_t);
+
+/*
+ ROM function, ets_uart_printf(), prints on the UART selected by
+ uart_buff_switch(). Supported format options are the same as vprintf(). Also
+ has cooked newline behavior. No flash format/string support; however, ISR safe.
+ Also, uses a static function in ROM to print characters which is only
+ controlled by uart_buff_switch().
+ */
+extern int ets_uart_printf(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
+
 extern void ets_delay_us(uint32_t us);
 
 #ifdef __cplusplus

cores/esp8266/spiffs_api.cpp

@@ -25,6 +25,21 @@
 
 using namespace fs;
 
+
+// Deprecated functions, to be deleted in next release
+int32_t spiffs_hal_write(uint32_t addr, uint32_t size, uint8_t *src) {
+    return flash_hal_write(addr, size, src);
+}
+int32_t spiffs_hal_erase(uint32_t addr, uint32_t size) {
+    return flash_hal_erase(addr, size);
+}
+int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) {
+    return flash_hal_read(addr, size, dst);
+}
+
+
+
+
 namespace spiffs_impl {
 
 FileImplPtr SPIFFSImpl::open(const char* path, OpenMode openMode, AccessMode accessMode)

cores/esp8266/spiffs_api.h

@@ -39,6 +39,26 @@ extern "C" {
 
 using namespace fs;
 
+// The following are deprecated symbols and functions, to be removed at the next major release.
+// They are provided only for backwards compatibility and to give libs a chance to update.
+
+extern "C" uint32_t _SPIFFS_start __attribute__((deprecated));
+extern "C" uint32_t _SPIFFS_end __attribute__((deprecated));
+extern "C" uint32_t _SPIFFS_page __attribute__((deprecated));
+extern "C" uint32_t _SPIFFS_block __attribute__((deprecated));
+
+#define SPIFFS_PHYS_ADDR ((uint32_t) (&_SPIFFS_start) - 0x40200000)
+#define SPIFFS_PHYS_SIZE ((uint32_t) (&_SPIFFS_end) - (uint32_t) (&_SPIFFS_start))
+#define SPIFFS_PHYS_PAGE ((uint32_t) &_SPIFFS_page)
+#define SPIFFS_PHYS_BLOCK ((uint32_t) &_SPIFFS_block)
+
+extern int32_t spiffs_hal_write(uint32_t addr, uint32_t size, uint8_t *src) __attribute__((deprecated));
+extern int32_t spiffs_hal_erase(uint32_t addr, uint32_t size) __attribute__((deprecated));
+extern int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst) __attribute__((deprecated));
+
+
+
+
 namespace spiffs_impl {
 
 int getSpiffsMode(OpenMode openMode, AccessMode accessMode);