Merge pull request esp8266#3 from earlephilhower/reducei2ciram

Reducei2ciram

Author: Jason2866

README.md

@@ -9,9 +9,9 @@ Arduino core for ESP8266 WiFi chip
 
 # Arduino on ESP8266
 
-This project brings support for ESP8266 chip to the Arduino environment. It lets you write sketches using familiar Arduino functions and libraries, and run them directly on ESP8266, no external microcontroller required.
+This project brings support for the ESP8266 chip to the Arduino environment. It lets you write sketches, using familiar Arduino functions and libraries, and run them directly on ESP8266, with no external microcontroller required.
 
-ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and UDP, set up HTTP, mDNS, SSDP, and DNS servers, do OTA updates, use a file system in flash memory, work with SD cards, servos, SPI and I2C peripherals.
+ESP8266 Arduino core comes with libraries to communicate over WiFi using TCP and UDP, set up HTTP, mDNS, SSDP, and DNS servers, do OTA updates, use a file system in flash memory, and work with SD cards, servos, SPI and I2C peripherals.
 
 # Contents
 - Installing options:
@@ -71,9 +71,9 @@ python get.py
 ### Using PlatformIO
 
 [PlatformIO](https://platformio.org?utm_source=github&utm_medium=arduino-esp8266) is an open source ecosystem for IoT
-development with a cross-platform build system, library manager and full support
-for Espressif (ESP8266) development. It works on the popular host OS: macOS, Windows,
-Linux 32/64, Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard).
+development with a cross-platform build system, a library manager, and full support
+for Espressif (ESP8266) development. It works on the following popular host operating systems: macOS, Windows,
+Linux 32/64, and Linux ARM (like Raspberry Pi, BeagleBone, CubieBoard).
 
 - [What is PlatformIO?](https://docs.platformio.org/en/latest/what-is-platformio.html?utm_source=github&utm_medium=arduino-esp8266)
 - [PlatformIO IDE](https://platformio.org/platformio-ide?utm_source=github&utm_medium=arduino-esp8266)
@@ -95,7 +95,7 @@ Documentation for latest development version: https://arduino-esp8266.readthedoc
 
 ### Issues and support ###
 
-[ESP8266 Community Forum](https://www.esp8266.com/u/arduinoanswers) is a well-established community for questions and answers about Arduino for ESP8266. If you need help, have a "How do I..." type question, have a problem with a 3rd party lib not hosted in this repo, or just want to discuss how to approach a problem, please ask there.
+[ESP8266 Community Forum](https://www.esp8266.com/u/arduinoanswers) is a well-established community for questions and answers about Arduino for ESP8266. If you need help, have a "How do I..." type question, have a problem with a 3rd party library not hosted in this repo, or just want to discuss how to approach a problem, please ask there.
 
 If you find the forum useful, please consider supporting it with a donation. <br />
 [![Donate](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/webscr?cmd=_s-xclick&hosted_button_id=4M56YCWV6PX66)
@@ -107,7 +107,7 @@ Please provide as much context as possible, as well as the information requested
 - ESP8266 Arduino core version which you are using (you can check it in Boards Manager)
 - your sketch code; please wrap it into a code block, see [Github markdown manual](https://help.github.com/articles/basic-writing-and-formatting-syntax/#quoting-code)
 - when encountering an issue that happens at run time, attach the serial output. Wrap it into a code block, just like the code.
-- for issues which happen at compile time, enable verbose compiler output in the IDE preferences, and attach that output (also inside a code block)
+- for issues that happen at compile time, enable verbose compiler output in the IDE preferences, and attach that output (also inside a code block)
 - ESP8266 development board model
 - IDE settings (board choice, flash size)
 - etc

boards.txt

@@ -482,6 +482,8 @@ generic.menu.baud.512000.windows=512000
 generic.menu.baud.512000.upload.speed=512000
 generic.menu.baud.921600=921600
 generic.menu.baud.921600.upload.speed=921600
+generic.menu.baud.3000000=3000000
+generic.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 esp8285.name=Generic ESP8285 Module
@@ -752,6 +754,8 @@ esp8285.menu.baud.512000.windows=512000
 esp8285.menu.baud.512000.upload.speed=512000
 esp8285.menu.baud.921600=921600
 esp8285.menu.baud.921600.upload.speed=921600
+esp8285.menu.baud.3000000=3000000
+esp8285.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espduino.name=ESPDuino (ESP-13 Module)
@@ -763,7 +767,7 @@ espduino.menu.ResetMethod.v1=ESPduino-V1
 espduino.menu.ResetMethod.v1.upload.resetmethod=ck
 espduino.menu.UploadTool.esptool=Serial
 espduino.menu.UploadTool.esptool.upload.tool=esptool
-espduino.menu.UploadTool.esptool.upload.verbose=-vv
+espduino.menu.UploadTool.esptool.upload.verbose=--trace
 espduino.menu.UploadTool.espota=OTA
 espduino.menu.UploadTool.espota.upload.tool=espota
 espduino.upload.tool=esptool
@@ -946,6 +950,8 @@ espduino.menu.baud.512000.windows=512000
 espduino.menu.baud.512000.upload.speed=512000
 espduino.menu.baud.921600=921600
 espduino.menu.baud.921600.upload.speed=921600
+espduino.menu.baud.3000000=3000000
+espduino.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 huzzah.name=Adafruit Feather HUZZAH ESP8266
@@ -1132,6 +1138,8 @@ huzzah.menu.baud.512000.windows=512000
 huzzah.menu.baud.512000.upload.speed=512000
 huzzah.menu.baud.921600=921600
 huzzah.menu.baud.921600.upload.speed=921600
+huzzah.menu.baud.3000000=3000000
+huzzah.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 inventone.name=Invent One
@@ -1318,6 +1326,8 @@ inventone.menu.baud.512000.windows=512000
 inventone.menu.baud.512000.upload.speed=512000
 inventone.menu.baud.921600=921600
 inventone.menu.baud.921600.upload.speed=921600
+inventone.menu.baud.3000000=3000000
+inventone.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 cw01.name=XinaBox CW01
@@ -1507,6 +1517,8 @@ cw01.menu.baud.512000.windows=512000
 cw01.menu.baud.512000.upload.speed=512000
 cw01.menu.baud.921600=921600
 cw01.menu.baud.921600.upload.speed=921600
+cw01.menu.baud.3000000=3000000
+cw01.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espresso_lite_v1.name=ESPresso Lite 1.0
@@ -1696,6 +1708,8 @@ espresso_lite_v1.menu.baud.512000.windows=512000
 espresso_lite_v1.menu.baud.512000.upload.speed=512000
 espresso_lite_v1.menu.baud.921600=921600
 espresso_lite_v1.menu.baud.921600.upload.speed=921600
+espresso_lite_v1.menu.baud.3000000=3000000
+espresso_lite_v1.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espresso_lite_v2.name=ESPresso Lite 2.0
@@ -1885,6 +1899,8 @@ espresso_lite_v2.menu.baud.512000.windows=512000
 espresso_lite_v2.menu.baud.512000.upload.speed=512000
 espresso_lite_v2.menu.baud.921600=921600
 espresso_lite_v2.menu.baud.921600.upload.speed=921600
+espresso_lite_v2.menu.baud.3000000=3000000
+espresso_lite_v2.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 phoenix_v1.name=Phoenix 1.0
@@ -2074,6 +2090,8 @@ phoenix_v1.menu.baud.512000.windows=512000
 phoenix_v1.menu.baud.512000.upload.speed=512000
 phoenix_v1.menu.baud.921600=921600
 phoenix_v1.menu.baud.921600.upload.speed=921600
+phoenix_v1.menu.baud.3000000=3000000
+phoenix_v1.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 phoenix_v2.name=Phoenix 2.0
@@ -2263,6 +2281,8 @@ phoenix_v2.menu.baud.512000.windows=512000
 phoenix_v2.menu.baud.512000.upload.speed=512000
 phoenix_v2.menu.baud.921600=921600
 phoenix_v2.menu.baud.921600.upload.speed=921600
+phoenix_v2.menu.baud.3000000=3000000
+phoenix_v2.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
@@ -2449,6 +2469,8 @@ nodemcu.menu.baud.512000.windows=512000
 nodemcu.menu.baud.512000.upload.speed=512000
 nodemcu.menu.baud.921600=921600
 nodemcu.menu.baud.921600.upload.speed=921600
+nodemcu.menu.baud.3000000=3000000
+nodemcu.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
@@ -2635,6 +2657,8 @@ nodemcuv2.menu.baud.512000.windows=512000
 nodemcuv2.menu.baud.512000.upload.speed=512000
 nodemcuv2.menu.baud.921600=921600
 nodemcuv2.menu.baud.921600.upload.speed=921600
+nodemcuv2.menu.baud.3000000=3000000
+nodemcuv2.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
@@ -2841,6 +2865,8 @@ modwifi.menu.baud.512000.windows=512000
 modwifi.menu.baud.512000.upload.speed=512000
 modwifi.menu.baud.921600=921600
 modwifi.menu.baud.921600.upload.speed=921600
+modwifi.menu.baud.3000000=3000000
+modwifi.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 thing.name=SparkFun ESP8266 Thing
@@ -3027,6 +3053,8 @@ thing.menu.baud.512000.windows=512000
 thing.menu.baud.512000.upload.speed=512000
 thing.menu.baud.921600=921600
 thing.menu.baud.921600.upload.speed=921600
+thing.menu.baud.3000000=3000000
+thing.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 thingdev.name=SparkFun ESP8266 Thing Dev
@@ -3213,6 +3241,8 @@ thingdev.menu.baud.512000.windows=512000
 thingdev.menu.baud.512000.upload.speed=512000
 thingdev.menu.baud.921600=921600
 thingdev.menu.baud.921600.upload.speed=921600
+thingdev.menu.baud.3000000=3000000
+thingdev.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 esp210.name=SweetPea ESP-210
@@ -3399,6 +3429,8 @@ esp210.menu.baud.512000.windows=512000
 esp210.menu.baud.512000.upload.speed=512000
 esp210.menu.baud.921600=921600
 esp210.menu.baud.921600.upload.speed=921600
+esp210.menu.baud.3000000=3000000
+esp210.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 d1_mini.name=LOLIN(WEMOS) D1 R2 & mini
@@ -3585,6 +3617,8 @@ d1_mini.menu.baud.460800.macosx=460800
 d1_mini.menu.baud.460800.upload.speed=460800
 d1_mini.menu.baud.512000.windows=512000
 d1_mini.menu.baud.512000.upload.speed=512000
+d1_mini.menu.baud.3000000=3000000
+d1_mini.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 d1_mini_pro.name=LOLIN(WEMOS) D1 mini Pro
@@ -3754,6 +3788,8 @@ d1_mini_pro.menu.baud.460800.macosx=460800
 d1_mini_pro.menu.baud.460800.upload.speed=460800
 d1_mini_pro.menu.baud.512000.windows=512000
 d1_mini_pro.menu.baud.512000.upload.speed=512000
+d1_mini_pro.menu.baud.3000000=3000000
+d1_mini_pro.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 d1_mini_lite.name=LOLIN(WEMOS) D1 mini Lite
@@ -3980,6 +4016,8 @@ d1_mini_lite.menu.baud.460800.macosx=460800
 d1_mini_lite.menu.baud.460800.upload.speed=460800
 d1_mini_lite.menu.baud.512000.windows=512000
 d1_mini_lite.menu.baud.512000.upload.speed=512000
+d1_mini_lite.menu.baud.3000000=3000000
+d1_mini_lite.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 d1.name=WeMos D1 R1
@@ -4166,6 +4204,8 @@ d1.menu.baud.460800.macosx=460800
 d1.menu.baud.460800.upload.speed=460800
 d1.menu.baud.512000.windows=512000
 d1.menu.baud.512000.upload.speed=512000
+d1.menu.baud.3000000=3000000
+d1.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espino.name=ESPino (ESP-12 Module)
@@ -4355,6 +4395,8 @@ espino.menu.baud.512000.windows=512000
 espino.menu.baud.512000.upload.speed=512000
 espino.menu.baud.921600=921600
 espino.menu.baud.921600.upload.speed=921600
+espino.menu.baud.3000000=3000000
+espino.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espinotee.name=ThaiEasyElec's ESPino
@@ -4541,6 +4583,8 @@ espinotee.menu.baud.512000.windows=512000
 espinotee.menu.baud.512000.upload.speed=512000
 espinotee.menu.baud.921600=921600
 espinotee.menu.baud.921600.upload.speed=921600
+espinotee.menu.baud.3000000=3000000
+espinotee.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 wifinfo.name=WifInfo
@@ -4787,6 +4831,8 @@ wifinfo.menu.baud.512000.windows=512000
 wifinfo.menu.baud.512000.upload.speed=512000
 wifinfo.menu.baud.921600=921600
 wifinfo.menu.baud.921600.upload.speed=921600
+wifinfo.menu.baud.3000000=3000000
+wifinfo.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 arduino-esp8266.name=Arduino
@@ -4985,6 +5031,8 @@ arduino-esp8266.menu.baud.512000.windows=512000
 arduino-esp8266.menu.baud.512000.upload.speed=512000
 arduino-esp8266.menu.baud.921600=921600
 arduino-esp8266.menu.baud.921600.upload.speed=921600
+arduino-esp8266.menu.baud.3000000=3000000
+arduino-esp8266.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 gen4iod.name=4D Systems gen4 IoD Range
@@ -5172,6 +5220,8 @@ gen4iod.menu.baud.512000.windows=512000
 gen4iod.menu.baud.512000.upload.speed=512000
 gen4iod.menu.baud.921600=921600
 gen4iod.menu.baud.921600.upload.speed=921600
+gen4iod.menu.baud.3000000=3000000
+gen4iod.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 oak.name=Digistump Oak
@@ -5359,6 +5409,8 @@ oak.menu.baud.460800.macosx=460800
 oak.menu.baud.460800.upload.speed=460800
 oak.menu.baud.512000.windows=512000
 oak.menu.baud.512000.upload.speed=512000
+oak.menu.baud.3000000=3000000
+oak.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 wifiduino.name=WiFiduino
@@ -5545,6 +5597,8 @@ wifiduino.menu.baud.460800.macosx=460800
 wifiduino.menu.baud.460800.upload.speed=460800
 wifiduino.menu.baud.512000.windows=512000
 wifiduino.menu.baud.512000.upload.speed=512000
+wifiduino.menu.baud.3000000=3000000
+wifiduino.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 wifi_slot.name=Amperka WiFi Slot
@@ -5841,6 +5895,8 @@ wifi_slot.menu.baud.512000.windows=512000
 wifi_slot.menu.baud.512000.upload.speed=512000
 wifi_slot.menu.baud.921600=921600
 wifi_slot.menu.baud.921600.upload.speed=921600
+wifi_slot.menu.baud.3000000=3000000
+wifi_slot.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 wiolink.name=Seeed Wio Link
@@ -6027,6 +6083,8 @@ wiolink.menu.baud.512000.windows=512000
 wiolink.menu.baud.512000.upload.speed=512000
 wiolink.menu.baud.921600=921600
 wiolink.menu.baud.921600.upload.speed=921600
+wiolink.menu.baud.3000000=3000000
+wiolink.menu.baud.3000000.upload.speed=3000000
 
 ##############################################################
 espectro.name=ESPectro Core
@@ -6213,4 +6271,6 @@ espectro.menu.baud.512000.windows=512000
 espectro.menu.baud.512000.upload.speed=512000
 espectro.menu.baud.921600=921600
 espectro.menu.baud.921600.upload.speed=921600
+espectro.menu.baud.3000000=3000000
+espectro.menu.baud.3000000.upload.speed=3000000
 

cores/esp8266/Arduino.h

@@ -142,30 +142,9 @@ void timer0_detachInterrupt(void);
 void ets_intr_lock();
 void ets_intr_unlock();
 
-#ifndef __STRINGIFY
-#define __STRINGIFY(a) #a
-#endif
-
-// these low level routines provide a replacement for SREG interrupt save that AVR uses
-// but are esp8266 specific. A normal use pattern is like
-//
-//{
-//    uint32_t savedPS = xt_rsil(1); // this routine will allow level 2 and above
-//    // do work here
-//    xt_wsr_ps(savedPS); // restore the state
-//}
-//
-// level (0-15), interrupts of the given level and above will be active
-// level 15 will disable ALL interrupts,
-// level 0 will enable ALL interrupts,
-//
-#define xt_rsil(level) (__extension__({uint32_t state; __asm__ __volatile__("rsil %0," __STRINGIFY(level) : "=a" (state) :: "memory"); state;}))
-#define xt_wsr_ps(state)  __asm__ __volatile__("wsr %0,ps; isync" :: "a" (state) : "memory")
-
 #define interrupts() xt_rsil(0)
 #define noInterrupts() xt_rsil(15)
 
-
 #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
 #define clockCyclesToMicroseconds(a) ( (a) / clockCyclesPerMicrosecond() )
 #define microsecondsToClockCycles(a) ( (a) * clockCyclesPerMicrosecond() )
@@ -303,6 +282,10 @@ extern "C" void configTime(long timezone, int daylightOffset_sec,
 
 #include "pins_arduino.h"
 
+#ifndef PUYA_SUPPORT
+#define PUYA_SUPPORT 1
+#endif
+
 #endif
 
 #ifdef DEBUG_ESP_OOM

cores/esp8266/Esp.h

@@ -209,9 +209,7 @@ class EspClass {
 #ifndef CORE_MOCK
 uint32_t EspClass::getCycleCount()
 {
-    uint32_t ccount;
-    __asm__ __volatile__("esync; rsr %0,ccount":"=a" (ccount));
-    return ccount;
+    return esp_get_cycle_count();
 }
 
 #endif // !defined(CORE_MOCK)

cores/esp8266/WString.cpp

@@ -330,7 +330,12 @@ unsigned char String::concat(const char *cstr, unsigned int length) {
         return 1;
     if(!reserve(newlen))
         return 0;
-    memmove(wbuffer() + len(), cstr, length + 1);
+    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);
     setLen(newlen);
     return 1;
 }