Merge branch 'idf-update' of https://github.com/espressif/arduino-esp32 into stickbreaker-i2c

Author: me-no-dev

.gitignore

@@ -4,4 +4,4 @@ tools/esptool
 tools/esptool.exe
 tools/mkspiffs/mkspiffs
 tools/mkspiffs/mkspiffs.exe
-.DS_Store
+.DS_Store

Kconfig.projbuild

@@ -90,13 +90,16 @@ config ARDUHAL_PARTITION_SCHEME_MINIMAL
     bool "Minimal (for 2MB FLASH)"
 config ARDUHAL_PARTITION_SCHEME_NO_OTA
     bool "No OTA (for large apps)"
+config ARDUHAL_PARTITION_SCHEME_MIN_SPIFFS
+    bool "Minimal SPIFFS (for large apps with OTA)"
 endchoice
 
 config ARDUHAL_PARTITION_SCHEME
     string
     default "default" if ARDUHAL_PARTITION_SCHEME_DEFAULT
     default "minimal" if ARDUHAL_PARTITION_SCHEME_MINIMAL
     default "no_ota" if ARDUHAL_PARTITION_SCHEME_NO_OTA
+    default "min_spiffs" if ARDUHAL_PARTITION_SCHEME_MIN_SPIFFS
 
 
 config AUTOCONNECT_WIFI

boards.txt

@@ -35,6 +35,8 @@ esp32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
 esp32.menu.PartitionScheme.minimal.build.partitions=minimal
 esp32.menu.PartitionScheme.no_ota=No OTA (Large APP)
 esp32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+esp32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+esp32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
 
 esp32.menu.FlashMode.qio=QIO
 esp32.menu.FlashMode.qio.build.flash_mode=dio
@@ -108,8 +110,8 @@ pico32.build.board=ESP32_PICO
 pico32.build.f_cpu=240000000L
 pico32.build.flash_size=4MB
 pico32.build.flash_freq=80m
-pico32.build.flash_mode=qio
-pico32.build.boot=qio
+pico32.build.flash_mode=dio
+pico32.build.boot=dio
 pico32.build.partitions=default
 
 pico32.menu.UploadSpeed.921600=921600

cores/esp32/HardwareSerial.cpp

@@ -1,110 +1,110 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-
-#include "HardwareSerial.h"
-
-#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
-HardwareSerial Serial(0);
-#endif
-
-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, bool invert)
-{
-    if(0 > _uart_nr || _uart_nr > 2) {
-        log_e("Serial number is invalid, please use 0, 1 or 2");
-        return;
-    }
-    if(_uart) {
-        end();
-    }
-    if(_uart_nr == 0 && rxPin < 0 && txPin < 0) {
-        rxPin = 3;
-        txPin = 1;
-    }
-    if(_uart_nr == 1 && rxPin < 0 && txPin < 0) {
-        rxPin = 9;
-        txPin = 10;
-    }
-    if(_uart_nr == 2 && rxPin < 0 && txPin < 0) {
-        rxPin = 16;
-        txPin = 17;
-    }
-    _uart = uartBegin(_uart_nr, baud, config, rxPin, txPin, 256, invert);
-}
-
-void HardwareSerial::end()
-{
-    if(uartGetDebug() == _uart_nr) {
-        uartSetDebug(0);
-    }
-    uartEnd(_uart);
-    _uart = 0;
-}
-
-void HardwareSerial::setDebugOutput(bool en)
-{
-    if(_uart == 0) {
-        return;
-    }
-    if(en) {
-        uartSetDebug(_uart);
-    } else {
-        if(uartGetDebug() == _uart_nr) {
-            uartSetDebug(0);
-        }
-    }
-}
-
-int HardwareSerial::available(void)
-{
-    return uartAvailable(_uart);
-}
-int HardwareSerial::availableForWrite(void)
-{
-    return uartAvailableForWrite(_uart);
-}
-
-int HardwareSerial::peek(void)
-{
-    if (available()) {
-        return uartPeek(_uart);
-    }
-    return -1;
-}
-
-int HardwareSerial::read(void)
-{
-    if(available()) {
-        return uartRead(_uart);
-    }
-    return -1;
-}
-
-void HardwareSerial::flush()
-{
-    uartFlush(_uart);
-}
-
-size_t HardwareSerial::write(uint8_t c)
-{
-    uartWrite(_uart, c);
-    return 1;
-}
-
-size_t HardwareSerial::write(const uint8_t *buffer, size_t size)
-{
-    uartWriteBuf(_uart, buffer, size);
-    return size;
-}
-uint32_t  HardwareSerial::baudRate()
-
-{
-	return uartGetBaudRate(_uart);
-}
-HardwareSerial::operator bool() const
-{
-    return true;
-}
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+
+#include "HardwareSerial.h"
+
+#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SERIAL)
+HardwareSerial Serial(0);
+#endif
+
+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, bool invert)
+{
+    if(0 > _uart_nr || _uart_nr > 2) {
+        log_e("Serial number is invalid, please use 0, 1 or 2");
+        return;
+    }
+    if(_uart) {
+        end();
+    }
+    if(_uart_nr == 0 && rxPin < 0 && txPin < 0) {
+        rxPin = 3;
+        txPin = 1;
+    }
+    if(_uart_nr == 1 && rxPin < 0 && txPin < 0) {
+        rxPin = 9;
+        txPin = 10;
+    }
+    if(_uart_nr == 2 && rxPin < 0 && txPin < 0) {
+        rxPin = 16;
+        txPin = 17;
+    }
+    _uart = uartBegin(_uart_nr, baud, config, rxPin, txPin, 256, invert);
+}
+
+void HardwareSerial::end()
+{
+    if(uartGetDebug() == _uart_nr) {
+        uartSetDebug(0);
+    }
+    uartEnd(_uart);
+    _uart = 0;
+}
+
+void HardwareSerial::setDebugOutput(bool en)
+{
+    if(_uart == 0) {
+        return;
+    }
+    if(en) {
+        uartSetDebug(_uart);
+    } else {
+        if(uartGetDebug() == _uart_nr) {
+            uartSetDebug(0);
+        }
+    }
+}
+
+int HardwareSerial::available(void)
+{
+    return uartAvailable(_uart);
+}
+int HardwareSerial::availableForWrite(void)
+{
+    return uartAvailableForWrite(_uart);
+}
+
+int HardwareSerial::peek(void)
+{
+    if (available()) {
+        return uartPeek(_uart);
+    }
+    return -1;
+}
+
+int HardwareSerial::read(void)
+{
+    if(available()) {
+        return uartRead(_uart);
+    }
+    return -1;
+}
+
+void HardwareSerial::flush()
+{
+    uartFlush(_uart);
+}
+
+size_t HardwareSerial::write(uint8_t c)
+{
+    uartWrite(_uart, c);
+    return 1;
+}
+
+size_t HardwareSerial::write(const uint8_t *buffer, size_t size)
+{
+    uartWriteBuf(_uart, buffer, size);
+    return size;
+}
+uint32_t  HardwareSerial::baudRate()
+
+{
+	return uartGetBaudRate(_uart);
+}
+HardwareSerial::operator bool() const
+{
+    return true;
+}