preparing pull request merge

Author: fesch

ISSUE_TEMPLATE.md

@@ -0,0 +1,37 @@
+Please fill the info fields, it helps to get you faster support ;)
+
+If you have a Guru Meditation Error, please decode it:
+https://github.com/me-no-dev/EspExceptionDecoder
+
+----------------------------- Remove above -----------------------------
+
+
+### Hardware:
+Board:							?ESP32 Dev Module?
+Core Installation/update date:			?11/jul/2017?
+IDE name:							?Arduino IDE? ?Platform.io? ?IDF component?
+Flash Frequency:					?40Mhz?
+Upload Speed:						?115200?
+
+
+### Description:
+Describe your problem here
+
+
+### Sketch:
+```cpp
+
+//Change the code below by your sketch
+#include <Arduino.h>
+
+void setup() {
+}
+
+void loop() {
+}
+```
+
+### Debug Messages:
+```
+Enable Core debug level: Debug on tools menu of Arduino IDE, then put the serial output here 
+```

boards.txt

@@ -1,5 +1,6 @@
 menu.UploadSpeed=Upload Speed
 menu.FlashFreq=Flash Frequency
+menu.FlashMode=Flash Mode
 menu.DebugLevel=Core Debug Level
 
 ##############################################################
@@ -20,8 +21,20 @@ esp32.build.variant=esp32
 esp32.build.board=ESP32_DEV
 
 esp32.build.f_cpu=240000000L
-esp32.build.flash_mode=dio
 esp32.build.flash_size=4MB
+esp32.build.flash_mode=dio
+esp32.build.boot=bootloader
+
+esp32.menu.FlashMode.qio=QIO
+esp32.menu.FlashMode.qio.build.flash_mode=dio
+esp32.menu.FlashMode.qio.build.boot=bootloader_qio
+esp32.menu.FlashMode.dio=DIO
+esp32.menu.FlashMode.dio.build.flash_mode=dio
+esp32.menu.FlashMode.qout=QOUT
+esp32.menu.FlashMode.qout.build.flash_mode=dout
+esp32.menu.FlashMode.qout.build.boot=bootloader_qio
+esp32.menu.FlashMode.dout=DOUT
+esp32.menu.FlashMode.dout.build.flash_mode=dout
 
 esp32.menu.FlashFreq.80=80MHz
 esp32.menu.FlashFreq.80.build.flash_freq=80m
@@ -76,6 +89,7 @@ esp32thing.build.board=ESP32_THING
 esp32thing.build.f_cpu=240000000L
 esp32thing.build.flash_mode=dio
 esp32thing.build.flash_size=4MB
+esp32thing.build.boot=bootloader
 
 esp32thing.menu.FlashFreq.80=80MHz
 esp32thing.menu.FlashFreq.80.build.flash_freq=80m
@@ -117,6 +131,7 @@ widora-air.build.board=WIDORA_AIR
 widora-air.build.f_cpu=240000000L
 widora-air.build.flash_mode=dio
 widora-air.build.flash_size=16MB
+widora-air.build.boot=bootloader
 
 widora-air.menu.FlashFreq.80=80MHz
 widora-air.menu.FlashFreq.80.build.flash_freq=80m
@@ -158,6 +173,7 @@ esp320.build.board=ESP320
 esp320.build.f_cpu=240000000L
 esp320.build.flash_mode=qio
 esp320.build.flash_size=4MB
+esp320.build.boot=bootloader
 
 esp320.menu.FlashFreq.80=80MHz
 esp320.menu.FlashFreq.80.build.flash_freq=80m
@@ -199,6 +215,7 @@ nano32.build.board=NANO32
 nano32.build.f_cpu=240000000L
 nano32.build.flash_mode=dio
 nano32.build.flash_size=4MB
+nano32.build.boot=bootloader
 
 nano32.menu.FlashFreq.80=80MHz
 nano32.menu.FlashFreq.80.build.flash_freq=80m
@@ -240,6 +257,7 @@ lolin32.build.board=LOLIN32
 lolin32.build.f_cpu=240000000L
 lolin32.build.flash_mode=dio
 lolin32.build.flash_size=4MB
+lolin32.build.boot=bootloader
 
 lolin32.menu.FlashFreq.80=80MHz
 lolin32.menu.FlashFreq.80.build.flash_freq=80m
@@ -281,6 +299,7 @@ espea32.build.board=ESPea32
 espea32.build.f_cpu=240000000L
 espea32.build.flash_mode=dio
 espea32.build.flash_size=4MB
+espea32.build.boot=bootloader
 
 espea32.menu.FlashFreq.80=80MHz
 espea32.menu.FlashFreq.80.build.flash_freq=80m
@@ -322,6 +341,7 @@ quantum.build.board=QUANTUM
 quantum.build.f_cpu=240000000L
 quantum.build.flash_mode=qio
 quantum.build.flash_size=16MB
+quantum.build.boot=bootloader
 
 quantum.menu.FlashFreq.80=80MHz
 quantum.menu.FlashFreq.80.build.flash_freq=80m
@@ -363,6 +383,7 @@ node32s.build.board=Node32s
 node32s.build.f_cpu=240000000L
 node32s.build.flash_mode=dio
 node32s.build.flash_size=4MB
+node32s.build.boot=bootloader
 
 node32s.menu.FlashFreq.80=80MHz
 node32s.menu.FlashFreq.80.build.flash_freq=80m
@@ -400,9 +421,11 @@ hornbill32dev.build.mcu=esp32
 hornbill32dev.build.core=esp32
 hornbill32dev.build.variant=hornbill32dev
 hornbill32dev.build.board=HORNBILL_ESP32_DEV
+
 hornbill32dev.build.f_cpu=240000000L
 hornbill32dev.build.flash_mode=dio
 hornbill32dev.build.flash_size=4MB
+hornbill32dev.build.boot=bootloader
 
 hornbill32dev.menu.FlashFreq.80=80MHz
 hornbill32dev.menu.FlashFreq.80.build.flash_freq=80m
@@ -443,6 +466,7 @@ hornbill32minima.build.board=HORNBILL_ESP32_MINIMA
 hornbill32minima.build.f_cpu=240000000L
 hornbill32minima.build.flash_mode=dio
 hornbill32minima.build.flash_size=4MB
+hornbill32minima.build.boot=bootloader
 
 hornbill32minima.menu.FlashFreq.80=80MHz
 hornbill32minima.menu.FlashFreq.80.build.flash_freq=80m
@@ -484,6 +508,7 @@ firebeetle32.build.board=ESP32_DEV
 firebeetle32.build.f_cpu=240000000L
 firebeetle32.build.flash_mode=dio
 firebeetle32.build.flash_size=4MB
+firebeetle32.build.boot=bootloader
 
 firebeetle32.menu.FlashFreq.80=80MHz
 firebeetle32.menu.FlashFreq.80.build.flash_freq=80m
@@ -525,6 +550,7 @@ intorobot-fig.build.board=INTOROBOT_ESP32_DEV
 intorobot-fig.build.f_cpu=240000000L
 intorobot-fig.build.flash_mode=dio
 intorobot-fig.build.flash_size=4MB
+intorobot-fig.build.boot=bootloader
 
 intorobot-fig.menu.FlashFreq.80=80MHz
 intorobot-fig.menu.FlashFreq.80.build.flash_freq=80m
@@ -566,6 +592,7 @@ onehorse32dev.build.board=ONEHORSE_ESP32_DEV
 onehorse32dev.build.f_cpu=240000000L
 onehorse32dev.build.flash_mode=dout
 onehorse32dev.build.flash_size=4MB
+onehorse32dev.build.boot=bootloader
 
 onehorse32dev.menu.FlashFreq.80=80MHz
 onehorse32dev.menu.FlashFreq.80.build.flash_freq=80m
@@ -607,6 +634,7 @@ featheresp32.build.board=FEATHER_ESP32
 featheresp32.build.f_cpu=240000000L
 featheresp32.build.flash_mode=dio
 featheresp32.build.flash_size=4MB
+featheresp32.build.boot=bootloader
 
 featheresp32.menu.FlashFreq.80=80MHz
 featheresp32.menu.FlashFreq.80.build.flash_freq=80m
@@ -628,6 +656,19 @@ featheresp32.menu.UploadSpeed.460800.upload.speed=460800
 featheresp32.menu.UploadSpeed.512000.windows=512000
 featheresp32.menu.UploadSpeed.512000.upload.speed=512000
 
+featheresp32.menu.DebugLevel.none=None
+featheresp32.menu.DebugLevel.none.build.code_debug=0
+featheresp32.menu.DebugLevel.error=Error
+featheresp32.menu.DebugLevel.error.build.code_debug=1
+featheresp32.menu.DebugLevel.warn=Warn
+featheresp32.menu.DebugLevel.warn.build.code_debug=2
+featheresp32.menu.DebugLevel.info=Info
+featheresp32.menu.DebugLevel.info.build.code_debug=3
+featheresp32.menu.DebugLevel.debug=Debug
+featheresp32.menu.DebugLevel.debug.build.code_debug=4
+featheresp32.menu.DebugLevel.verbose=Verbose
+featheresp32.menu.DebugLevel.verbose.build.code_debug=5
+
 ##############################################################
 
 nodemcu-32s.name=NodeMCU-32S
@@ -648,6 +689,7 @@ nodemcu-32s.build.board=NodeMCU-32S
 nodemcu-32s.build.f_cpu=240000000L
 nodemcu-32s.build.flash_mode=dio
 nodemcu-32s.build.flash_size=4MB
+nodemcu-32s.build.boot=bootloader
 
 nodemcu-32s.menu.FlashFreq.80=80MHz
 nodemcu-32s.menu.FlashFreq.80.build.flash_freq=80m
@@ -689,6 +731,7 @@ esp32vn-iot-uno.build.board=esp32vn-iot-uno
 esp32vn-iot-uno.build.f_cpu=240000000L
 esp32vn-iot-uno.build.flash_mode=dio
 esp32vn-iot-uno.build.flash_size=4MB
+esp32vn-iot-uno.build.boot=bootloader
 
 esp32vn-iot-uno.menu.FlashFreq.80=80MHz
 esp32vn-iot-uno.menu.FlashFreq.80.build.flash_freq=80m
@@ -730,6 +773,7 @@ esp32doit-devkit-v1.build.board=ESP32_DEV
 esp32doit-devkit-v1.build.f_cpu=240000000L
 esp32doit-devkit-v1.build.flash_mode=dio
 esp32doit-devkit-v1.build.flash_size=4MB
+esp32doit-devkit-v1.build.boot=bootloader
 
 esp32doit-devkit-v1.menu.FlashFreq.80=80MHz
 esp32doit-devkit-v1.menu.FlashFreq.80.build.flash_freq=80m
@@ -782,6 +826,7 @@ esp32-evb.build.board=ESP32-EVB
 esp32-evb.build.f_cpu=240000000L
 esp32-evb.build.flash_mode=dio
 esp32-evb.build.flash_size=4MB
+esp32-evb.build.boot=bootloader
 
 esp32-evb.menu.FlashFreq.80=80MHz
 esp32-evb.menu.FlashFreq.80.build.flash_freq=80m
@@ -812,6 +857,7 @@ esp32-gateway.build.board=ESP32-GATEWAY
 esp32-gateway.build.f_cpu=240000000L
 esp32-gateway.build.flash_mode=dio
 esp32-gateway.build.flash_size=4MB
+esp32-gateway.build.boot=bootloader
 
 esp32-gateway.menu.FlashFreq.80=80MHz
 esp32-gateway.menu.FlashFreq.80.build.flash_freq=80m
@@ -821,3 +867,45 @@ esp32-gateway.menu.FlashFreq.40.build.flash_freq=40m
 
 esp32-gateway.menu.UploadSpeed.115200=115200
 esp32-gateway.menu.UploadSpeed.115200.upload.speed=115200
+
+##############################################################
+
+espino32.name=ThaiEasyElec's ESPino32
+
+espino32.upload.tool=esptool
+espino32.upload.maximum_size=1310720
+espino32.upload.maximum_data_size=294912
+espino32.upload.wait_for_upload_port=true
+
+espino32.serial.disableDTR=true
+espino32.serial.disableRTS=true
+
+espino32.build.mcu=esp32
+espino32.build.core=esp32
+espino32.build.variant=espino32
+espino32.build.board=ESPino32
+
+espino32.build.f_cpu=240000000L
+espino32.build.flash_mode=dio
+espino32.build.flash_size=4MB
+espino32.build.boot=bootloader
+
+espino32.menu.FlashFreq.80=80MHz
+espino32.menu.FlashFreq.80.build.flash_freq=80m
+espino32.menu.FlashFreq.40=40MHz
+espino32.menu.FlashFreq.40.build.flash_freq=40m
+
+espino32.menu.UploadSpeed.921600=921600
+espino32.menu.UploadSpeed.921600.upload.speed=921600
+espino32.menu.UploadSpeed.115200=115200
+espino32.menu.UploadSpeed.115200.upload.speed=115200
+espino32.menu.UploadSpeed.256000.windows=256000
+espino32.menu.UploadSpeed.256000.upload.speed=256000
+espino32.menu.UploadSpeed.230400.windows.upload.speed=256000
+espino32.menu.UploadSpeed.230400=230400
+espino32.menu.UploadSpeed.230400.upload.speed=230400
+espino32.menu.UploadSpeed.460800.linux=460800
+espino32.menu.UploadSpeed.460800.macosx=460800
+espino32.menu.UploadSpeed.460800.upload.speed=460800
+espino32.menu.UploadSpeed.512000.windows=512000
+espino32.menu.UploadSpeed.512000.upload.speed=512000

cores/esp32/HardwareSerial.cpp

@@ -11,6 +11,9 @@ HardwareSerial::HardwareSerial(int uart_nr) : _uart_nr(uart_nr), _uart(NULL) {}
 
 void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, int8_t txPin)
 {
+    if(_uart) {
+        end();
+    }
     if(_uart_nr == 0 && rxPin < 0 && txPin < 0) {
         rxPin = 3;
         txPin = 1;

cores/esp32/esp32-hal-uart.c

@@ -197,7 +197,7 @@ uart_t* uartBegin(uint8_t uart_nr, uint32_t baudrate, uint32_t config, int8_t rx
     uart->dev->conf0.val = config;
     #define TWO_STOP_BITS_CONF 0x3
     #define ONE_STOP_BITS_CONF 0x1
-	
+
     if ( uart->dev->conf0.stop_bit_num == TWO_STOP_BITS_CONF) {
         uart->dev->conf0.stop_bit_num = ONE_STOP_BITS_CONF;
         uart->dev->rs485_conf.dl1_en = 1;
@@ -223,14 +223,17 @@ void uartEnd(uart_t* uart)
 
     UART_MUTEX_LOCK();
     if(uart->queue != NULL) {
+        uint8_t c;
+        while(xQueueReceive(uart->queue, &c, 0));
         vQueueDelete(uart->queue);
     }
 
-    uartDetachRx(uart);
-    uartDetachTx(uart);
-
     uart->dev->conf0.val = 0;
+
     UART_MUTEX_UNLOCK();
+
+    uartDetachRx(uart);
+    uartDetachTx(uart);
 }
 
 uint32_t uartAvailable(uart_t* uart)
@@ -417,4 +420,3 @@ int log_printf(const char *format, ...)
     }
     return len;
 }
-

cores/esp32/main.cpp

@@ -22,7 +22,7 @@ void loopTask(void *pvParameters)
 extern "C" void app_main()
 {
     initArduino();
-    xTaskCreatePinnedToCore(loopTask, "loopTask", 4096, NULL, 1, NULL, ARDUINO_RUNNING_CORE);
+    xTaskCreatePinnedToCore(loopTask, "loopTask", 8192, NULL, 1, NULL, ARDUINO_RUNNING_CORE);
 }
 
 #endif