Update esptool for Big Sur

IDF release/v3.3 b4c075169 (#4604 )
esp-face: master 420fc7e esp32-camera: master 0107093
2025-06-25 09:51:33 +02:00 · 2020-12-07 10:19:55 +02:00 · 2020-12-07 10:03:16 +02:00 · 2020-12-02 11:56:45 +02:00 · 2020-12-02 11:52:04 +02:00 · 2020-12-02 11:50:12 +02:00
115 changed files with 524 additions and 304 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,10 @@
 tools/xtensa-esp32-elf
+tools/xtensa-esp32s2-elf
 tools/dist
 tools/esptool
 tools/esptool.exe
-tools/mkspiffs/mkspiffs
-tools/mkspiffs/mkspiffs.exe
+tools/mkspiffs
+tools/mklittlefs
 .DS_Store
 
 #Ignore files built by Visual Studio/Visual Micro
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -72,11 +72,11 @@ set(LIBRARY_SRCS
  libraries/WiFi/src/WiFi.cpp
  libraries/WiFi/src/WiFiGeneric.cpp
  libraries/WiFi/src/WiFiMulti.cpp
-  libraries/WiFi/src/WiFiProv.cpp
  libraries/WiFi/src/WiFiScan.cpp
  libraries/WiFi/src/WiFiServer.cpp
  libraries/WiFi/src/WiFiSTA.cpp
  libraries/WiFi/src/WiFiUdp.cpp
+  libraries/WiFiProv/src/WiFiProv.cpp
  libraries/Wire/src/Wire.cpp
  )

@ -202,6 +202,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
  libraries/WebServer/src
  libraries/WiFiClientSecure/src
  libraries/WiFi/src
+  libraries/WiFiProv/src
  libraries/Wire/src
  )

--- a/Kconfig.projbuild
+++ b/Kconfig.projbuild
@ -40,6 +40,12 @@ config ARDUINO_RUNNING_CORE
    default 1 if ARDUINO_RUN_CORE1
    default -1 if ARDUINO_RUN_NO_AFFINITY

+config ARDUINO_LOOP_STACK_SIZE
+    int "Loop thread stack size"
+    default 8192
+    help
+        Amount of stack available for the Arduino task.
+
 choice ARDUINO_EVENT_RUNNING_CORE
    bool "Core on which Arduino's event handler is running"
    default ARDUINO_EVENT_RUN_CORE1
--- a/boards.txt
+++ b/boards.txt
@ -7,6 +7,8 @@ menu.PartitionScheme=Partition Scheme
 menu.DebugLevel=Core Debug Level
 menu.PSRAM=PSRAM
 menu.Revision=Board Revision
+menu.LORAWAN_REGION=LoRaWan Region
+menu.LoRaWanDebugLevel=LoRaWan Debug Level

 ##############################################################
 ### DO NOT PUT BOARDS ABOVE THE OFFICIAL ESPRESSIF BOARDS! ###
@ -3073,74 +3075,29 @@ heltec_wifi_kit_32.serial.disableRTS=true
 heltec_wifi_kit_32.build.mcu=esp32
 heltec_wifi_kit_32.build.core=esp32
 heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32
-heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32
+heltec_wifi_kit_32.build.board=heltec_wifi_kit_32

 heltec_wifi_kit_32.build.f_cpu=240000000L
 heltec_wifi_kit_32.build.flash_size=4MB
-heltec_wifi_kit_32.build.flash_freq=40m
+heltec_wifi_kit_32.build.flash_freq=80m
 heltec_wifi_kit_32.build.flash_mode=dio
 heltec_wifi_kit_32.build.boot=dio
 heltec_wifi_kit_32.build.partitions=default
 heltec_wifi_kit_32.build.defines=
+heltec_wifi_kit_32.build.band=LoRaWAN_NONE
+heltec_wifi_kit_32.build.LoRaWanDebugLevel=0

 heltec_wifi_kit_32.menu.PSRAM.disabled=Disabled
 heltec_wifi_kit_32.menu.PSRAM.disabled.build.defines=
 heltec_wifi_kit_32.menu.PSRAM.enabled=Enabled
 heltec_wifi_kit_32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue

-heltec_wifi_kit_32.menu.PartitionScheme.default=Default
-heltec_wifi_kit_32.menu.PartitionScheme.default.build.partitions=default
-heltec_wifi_kit_32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
-heltec_wifi_kit_32.menu.PartitionScheme.minimal.build.partitions=minimal
-heltec_wifi_kit_32.menu.PartitionScheme.no_ota=No OTA (Large APP)
-heltec_wifi_kit_32.menu.PartitionScheme.no_ota.build.partitions=no_ota
-heltec_wifi_kit_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-heltec_wifi_kit_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA)
-heltec_wifi_kit_32.menu.PartitionScheme.huge_app.build.partitions=huge_app
-heltec_wifi_kit_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-heltec_wifi_kit_32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
-heltec_wifi_kit_32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-heltec_wifi_kit_32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-heltec_wifi_kit_32.menu.PartitionScheme.fatflash=16M Fat
-heltec_wifi_kit_32.menu.PartitionScheme.fatflash.build.partitions=ffat
-
 heltec_wifi_kit_32.menu.CPUFreq.240=240MHz (WiFi/BT)
 heltec_wifi_kit_32.menu.CPUFreq.240.build.f_cpu=240000000L
 heltec_wifi_kit_32.menu.CPUFreq.160=160MHz (WiFi/BT)
 heltec_wifi_kit_32.menu.CPUFreq.160.build.f_cpu=160000000L
 heltec_wifi_kit_32.menu.CPUFreq.80=80MHz (WiFi/BT)
 heltec_wifi_kit_32.menu.CPUFreq.80.build.f_cpu=80000000L
-heltec_wifi_kit_32.menu.CPUFreq.26=26MHz (26MHz XTAL)
-heltec_wifi_kit_32.menu.CPUFreq.26.build.f_cpu=26000000L
-heltec_wifi_kit_32.menu.CPUFreq.13=13MHz (26MHz XTAL)
-heltec_wifi_kit_32.menu.CPUFreq.13.build.f_cpu=13000000L
-
-heltec_wifi_kit_32.menu.FlashMode.qio=QIO
-heltec_wifi_kit_32.menu.FlashMode.qio.build.flash_mode=dio
-heltec_wifi_kit_32.menu.FlashMode.qio.build.boot=qio
-heltec_wifi_kit_32.menu.FlashMode.dio=DIO
-heltec_wifi_kit_32.menu.FlashMode.dio.build.flash_mode=dio
-heltec_wifi_kit_32.menu.FlashMode.dio.build.boot=dio
-heltec_wifi_kit_32.menu.FlashMode.qout=QOUT
-heltec_wifi_kit_32.menu.FlashMode.qout.build.flash_mode=dout
-heltec_wifi_kit_32.menu.FlashMode.qout.build.boot=qout
-heltec_wifi_kit_32.menu.FlashMode.dout=DOUT
-heltec_wifi_kit_32.menu.FlashMode.dout.build.flash_mode=dout
-heltec_wifi_kit_32.menu.FlashMode.dout.build.boot=dout
-
-heltec_wifi_kit_32.menu.FlashFreq.40=40MHz
-heltec_wifi_kit_32.menu.FlashFreq.40.build.flash_freq=40m
-heltec_wifi_kit_32.menu.FlashFreq.80=80MHz
-heltec_wifi_kit_32.menu.FlashFreq.80.build.flash_freq=80m
-
-heltec_wifi_kit_32.menu.FlashSize.4M=4MB (32Mb)
-heltec_wifi_kit_32.menu.FlashSize.4M.build.flash_size=4MB
-heltec_wifi_kit_32.menu.FlashSize.2M=2MB (16Mb)
-heltec_wifi_kit_32.menu.FlashSize.2M.build.flash_size=2MB
-heltec_wifi_kit_32.menu.FlashSize.2M.build.partitions=minimal
-heltec_wifi_kit_32.menu.FlashSize.16M=16MB (128Mb)
-heltec_wifi_kit_32.menu.FlashSize.16M.build.flash_size=16MB
-heltec_wifi_kit_32.menu.FlashSize.16M.build.partitions=ffat

 heltec_wifi_kit_32.menu.UploadSpeed.921600=921600
 heltec_wifi_kit_32.menu.UploadSpeed.921600.upload.speed=921600
@ -3185,74 +3142,27 @@ heltec_wifi_lora_32.serial.disableRTS=true
 heltec_wifi_lora_32.build.mcu=esp32
 heltec_wifi_lora_32.build.core=esp32
 heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32
-heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32
+heltec_wifi_lora_32.build.board=heltec_wifi_lora_32

 heltec_wifi_lora_32.build.f_cpu=240000000L
 heltec_wifi_lora_32.build.flash_size=4MB
-heltec_wifi_lora_32.build.flash_freq=40m
+heltec_wifi_lora_32.build.flash_freq=80m
 heltec_wifi_lora_32.build.flash_mode=dio
 heltec_wifi_lora_32.build.boot=dio
 heltec_wifi_lora_32.build.partitions=default
-heltec_wifi_lora_32.build.defines=
+heltec_wifi_lora_32.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram}

 heltec_wifi_lora_32.menu.PSRAM.disabled=Disabled
-heltec_wifi_lora_32.menu.PSRAM.disabled.build.defines=
+heltec_wifi_lora_32.menu.PSRAM.disabled.build.psram=
 heltec_wifi_lora_32.menu.PSRAM.enabled=Enabled
-heltec_wifi_lora_32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
-
-heltec_wifi_lora_32.menu.PartitionScheme.default=Default
-heltec_wifi_lora_32.menu.PartitionScheme.default.build.partitions=default
-heltec_wifi_lora_32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
-heltec_wifi_lora_32.menu.PartitionScheme.minimal.build.partitions=minimal
-heltec_wifi_lora_32.menu.PartitionScheme.no_ota=No OTA (Large APP)
-heltec_wifi_lora_32.menu.PartitionScheme.no_ota.build.partitions=no_ota
-heltec_wifi_lora_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-heltec_wifi_lora_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA)
-heltec_wifi_lora_32.menu.PartitionScheme.huge_app.build.partitions=huge_app
-heltec_wifi_lora_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-heltec_wifi_lora_32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
-heltec_wifi_lora_32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-heltec_wifi_lora_32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-heltec_wifi_lora_32.menu.PartitionScheme.fatflash=16M Fat
-heltec_wifi_lora_32.menu.PartitionScheme.fatflash.build.partitions=ffat
+heltec_wifi_lora_32.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue

 heltec_wifi_lora_32.menu.CPUFreq.240=240MHz (WiFi/BT)
 heltec_wifi_lora_32.menu.CPUFreq.240.build.f_cpu=240000000L
 heltec_wifi_lora_32.menu.CPUFreq.160=160MHz (WiFi/BT)
 heltec_wifi_lora_32.menu.CPUFreq.160.build.f_cpu=160000000L
 heltec_wifi_lora_32.menu.CPUFreq.80=80MHz (WiFi/BT)
-heltec_wifi_lora_32.menu.CPUFreq.80.build.f_cpu=80000000L
-heltec_wifi_lora_32.menu.CPUFreq.26=26MHz (26MHz XTAL)
-heltec_wifi_lora_32.menu.CPUFreq.26.build.f_cpu=26000000L
-heltec_wifi_lora_32.menu.CPUFreq.13=13MHz (26MHz XTAL)
-heltec_wifi_lora_32.menu.CPUFreq.13.build.f_cpu=13000000L
-
-heltec_wifi_lora_32.menu.FlashMode.qio=QIO
-heltec_wifi_lora_32.menu.FlashMode.qio.build.flash_mode=dio
-heltec_wifi_lora_32.menu.FlashMode.qio.build.boot=qio
-heltec_wifi_lora_32.menu.FlashMode.dio=DIO
-heltec_wifi_lora_32.menu.FlashMode.dio.build.flash_mode=dio
-heltec_wifi_lora_32.menu.FlashMode.dio.build.boot=dio
-heltec_wifi_lora_32.menu.FlashMode.qout=QOUT
-heltec_wifi_lora_32.menu.FlashMode.qout.build.flash_mode=dout
-heltec_wifi_lora_32.menu.FlashMode.qout.build.boot=qout
-heltec_wifi_lora_32.menu.FlashMode.dout=DOUT
-heltec_wifi_lora_32.menu.FlashMode.dout.build.flash_mode=dout
-heltec_wifi_lora_32.menu.FlashMode.dout.build.boot=dout
-
-heltec_wifi_lora_32.menu.FlashFreq.40=40MHz
-heltec_wifi_lora_32.menu.FlashFreq.40.build.flash_freq=40m
-heltec_wifi_lora_32.menu.FlashFreq.80=80MHz
-heltec_wifi_lora_32.menu.FlashFreq.80.build.flash_freq=80m
-
-heltec_wifi_lora_32.menu.FlashSize.4M=4MB (32Mb)
-heltec_wifi_lora_32.menu.FlashSize.4M.build.flash_size=4MB
-heltec_wifi_lora_32.menu.FlashSize.2M=2MB (16Mb)
-heltec_wifi_lora_32.menu.FlashSize.2M.build.flash_size=2MB
-heltec_wifi_lora_32.menu.FlashSize.2M.build.partitions=minimal
-heltec_wifi_lora_32.menu.FlashSize.16M=16MB (128Mb)
-heltec_wifi_lora_32.menu.FlashSize.16M.build.flash_size=16MB
-heltec_wifi_lora_32.menu.FlashSize.16M.build.partitions=ffat
+heltec_wifi_lora_32.menu.CPUFreq.160.build.f_cpu=80000000L

 heltec_wifi_lora_32.menu.UploadSpeed.921600=921600
 heltec_wifi_lora_32.menu.UploadSpeed.921600.upload.speed=921600
@ -3282,12 +3192,42 @@ heltec_wifi_lora_32.menu.DebugLevel.debug.build.code_debug=4
 heltec_wifi_lora_32.menu.DebugLevel.verbose=Verbose
 heltec_wifi_lora_32.menu.DebugLevel.verbose.build.code_debug=5

+heltec_wifi_lora_32.menu.LORAWAN_REGION.0=REGION_EU868
+heltec_wifi_lora_32.menu.LORAWAN_REGION.0.build.band=REGION_EU868
+heltec_wifi_lora_32.menu.LORAWAN_REGION.1=REGION_EU433
+heltec_wifi_lora_32.menu.LORAWAN_REGION.1.build.band=REGION_EU433
+heltec_wifi_lora_32.menu.LORAWAN_REGION.2=REGION_CN470
+heltec_wifi_lora_32.menu.LORAWAN_REGION.2.build.band=REGION_CN470
+heltec_wifi_lora_32.menu.LORAWAN_REGION.3=REGION_US915
+heltec_wifi_lora_32.menu.LORAWAN_REGION.3.build.band=REGION_US915
+heltec_wifi_lora_32.menu.LORAWAN_REGION.4=REGION_AU915
+heltec_wifi_lora_32.menu.LORAWAN_REGION.4.build.band=REGION_AU915
+heltec_wifi_lora_32.menu.LORAWAN_REGION.5=REGION_CN779
+heltec_wifi_lora_32.menu.LORAWAN_REGION.5.build.band=REGION_CN779
+heltec_wifi_lora_32.menu.LORAWAN_REGION.6=REGION_AS923
+heltec_wifi_lora_32.menu.LORAWAN_REGION.6.build.band=REGION_AS923
+heltec_wifi_lora_32.menu.LORAWAN_REGION.7=REGION_KR920
+heltec_wifi_lora_32.menu.LORAWAN_REGION.7.build.band=REGION_KR920
+heltec_wifi_lora_32.menu.LORAWAN_REGION.8=REGION_IN865
+heltec_wifi_lora_32.menu.LORAWAN_REGION.8.build.band=REGION_IN865
+heltec_wifi_lora_32.menu.LORAWAN_REGION.9=REGION_US915_HYBRID
+heltec_wifi_lora_32.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID
+
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.0=None
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.1=Freq
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.2=Freq && DIO
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.3=Freq && DIO && PW
+heltec_wifi_lora_32.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3
+
 ##############################################################

 heltec_wifi_lora_32_V2.name=Heltec WiFi LoRa 32(V2)

 heltec_wifi_lora_32_V2.upload.tool=esptool_py
-heltec_wifi_lora_32_V2.upload.maximum_size=1310720
+heltec_wifi_lora_32_V2.upload.maximum_size=3342336
 heltec_wifi_lora_32_V2.upload.maximum_data_size=327680
 heltec_wifi_lora_32_V2.upload.wait_for_upload_port=true

@ -3297,37 +3237,20 @@ heltec_wifi_lora_32_V2.serial.disableRTS=true
 heltec_wifi_lora_32_V2.build.mcu=esp32
 heltec_wifi_lora_32_V2.build.core=esp32
 heltec_wifi_lora_32_V2.build.variant=heltec_wifi_lora_32_V2
-heltec_wifi_lora_32_V2.build.board=HELTEC_WIFI_LORA_32_V2
+heltec_wifi_lora_32_V2.build.board=heltec_wifi_lora_32_V2

 heltec_wifi_lora_32_V2.build.f_cpu=240000000L
 heltec_wifi_lora_32_V2.build.flash_size=8MB
-heltec_wifi_lora_32_V2.build.flash_freq=40m
+heltec_wifi_lora_32_V2.build.flash_freq=80m
 heltec_wifi_lora_32_V2.build.flash_mode=dio
-heltec_wifi_lora_32_V2.build.boot=dio
+heltec_wifi_lora_32_V2.build.boot=qio
 heltec_wifi_lora_32_V2.build.partitions=default_8MB
-heltec_wifi_lora_32_V2.build.defines=
+heltec_wifi_lora_32_V2.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram}

 heltec_wifi_lora_32_V2.menu.PSRAM.disabled=Disabled
-heltec_wifi_lora_32_V2.menu.PSRAM.disabled.build.defines=
+heltec_wifi_lora_32_V2.menu.PSRAM.disabled.build.psram=
 heltec_wifi_lora_32_V2.menu.PSRAM.enabled=Enabled
-heltec_wifi_lora_32_V2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
-
-heltec_wifi_lora_32_V2.menu.PartitionScheme.default=default_8MB
-heltec_wifi_lora_32_V2.menu.PartitionScheme.default.build.partitions=default_8MB
-heltec_wifi_lora_32_V2.menu.PartitionScheme.default.upload.maximum_size=3342336
-heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
-heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal.build.partitions=minimal
-heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota=No OTA (Large APP)
-heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota.build.partitions=no_ota
-heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-heltec_wifi_lora_32_V2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA)
-heltec_wifi_lora_32_V2.menu.PartitionScheme.huge_app.build.partitions=huge_app
-heltec_wifi_lora_32_V2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-heltec_wifi_lora_32_V2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
-heltec_wifi_lora_32_V2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-heltec_wifi_lora_32_V2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-heltec_wifi_lora_32_V2.menu.PartitionScheme.fatflash=16M Fat
-heltec_wifi_lora_32_V2.menu.PartitionScheme.fatflash.build.partitions=ffat
+heltec_wifi_lora_32_V2.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue

 heltec_wifi_lora_32_V2.menu.CPUFreq.240=240MHz (WiFi/BT)
 heltec_wifi_lora_32_V2.menu.CPUFreq.240.build.f_cpu=240000000L
@ -3335,42 +3258,6 @@ heltec_wifi_lora_32_V2.menu.CPUFreq.160=160MHz (WiFi/BT)
 heltec_wifi_lora_32_V2.menu.CPUFreq.160.build.f_cpu=160000000L
 heltec_wifi_lora_32_V2.menu.CPUFreq.80=80MHz (WiFi/BT)
 heltec_wifi_lora_32_V2.menu.CPUFreq.80.build.f_cpu=80000000L
-heltec_wifi_lora_32_V2.menu.CPUFreq.40=40MHz (40MHz XTAL)
-heltec_wifi_lora_32_V2.menu.CPUFreq.40.build.f_cpu=40000000L
-heltec_wifi_lora_32_V2.menu.CPUFreq.20=20MHz (40MHz XTAL)
-heltec_wifi_lora_32_V2.menu.CPUFreq.20.build.f_cpu=20000000L
-heltec_wifi_lora_32_V2.menu.CPUFreq.10=10MHz (40MHz XTAL)
-heltec_wifi_lora_32_V2.menu.CPUFreq.10.build.f_cpu=10000000L
-
-heltec_wifi_lora_32_V2.menu.FlashMode.qio=QIO
-heltec_wifi_lora_32_V2.menu.FlashMode.qio.build.flash_mode=dio
-heltec_wifi_lora_32_V2.menu.FlashMode.qio.build.boot=qio
-heltec_wifi_lora_32_V2.menu.FlashMode.dio=DIO
-heltec_wifi_lora_32_V2.menu.FlashMode.dio.build.flash_mode=dio
-heltec_wifi_lora_32_V2.menu.FlashMode.dio.build.boot=dio
-heltec_wifi_lora_32_V2.menu.FlashMode.qout=QOUT
-heltec_wifi_lora_32_V2.menu.FlashMode.qout.build.flash_mode=dout
-heltec_wifi_lora_32_V2.menu.FlashMode.qout.build.boot=qout
-heltec_wifi_lora_32_V2.menu.FlashMode.dout=DOUT
-heltec_wifi_lora_32_V2.menu.FlashMode.dout.build.flash_mode=dout
-heltec_wifi_lora_32_V2.menu.FlashMode.dout.build.boot=dout
-
-heltec_wifi_lora_32_V2.menu.FlashFreq.80=80MHz
-heltec_wifi_lora_32_V2.menu.FlashFreq.80.build.flash_freq=80m
-heltec_wifi_lora_32_V2.menu.FlashFreq.40=40MHz
-heltec_wifi_lora_32_V2.menu.FlashFreq.40.build.flash_freq=40m
-
-heltec_wifi_lora_32_V2.menu.FlashSize.8M=8MB (64Mb)
-heltec_wifi_lora_32_V2.menu.FlashSize.8M.build.flash_size=8MB
-heltec_wifi_lora_32_V2.menu.FlashSize.8M.build.partitions=default_8MB
-heltec_wifi_lora_32_V2.menu.FlashSize.4M=4MB (32Mb)
-heltec_wifi_lora_32_V2.menu.FlashSize.4M.build.flash_size=4MB
-heltec_wifi_lora_32_V2.menu.FlashSize.2M=2MB (16Mb)
-heltec_wifi_lora_32_V2.menu.FlashSize.2M.build.flash_size=2MB
-heltec_wifi_lora_32_V2.menu.FlashSize.2M.build.partitions=minimal
-heltec_wifi_lora_32_V2.menu.FlashSize.16M=16MB (128Mb)
-heltec_wifi_lora_32_V2.menu.FlashSize.16M.build.flash_size=16MB
-heltec_wifi_lora_32_V2.menu.FlashSize.16M.build.partitions=ffat

 heltec_wifi_lora_32_V2.menu.UploadSpeed.921600=921600
 heltec_wifi_lora_32_V2.menu.UploadSpeed.921600.upload.speed=921600
@ -3400,12 +3287,42 @@ heltec_wifi_lora_32_V2.menu.DebugLevel.debug.build.code_debug=4
 heltec_wifi_lora_32_V2.menu.DebugLevel.verbose=Verbose
 heltec_wifi_lora_32_V2.menu.DebugLevel.verbose.build.code_debug=5

+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.0=REGION_EU868
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.0.build.band=REGION_EU868
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.1=REGION_EU433
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.1.build.band=REGION_EU433
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.2=REGION_CN470
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.2.build.band=REGION_CN470
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.3=REGION_US915
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.3.build.band=REGION_US915
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.4=REGION_AU915
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.4.build.band=REGION_AU915
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.5=REGION_CN779
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.5.build.band=REGION_CN779
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.6=REGION_AS923
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.6.build.band=REGION_AS923
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.7=REGION_KR920
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.7.build.band=REGION_KR920
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.8=REGION_IN865
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.8.build.band=REGION_IN865
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.9=REGION_US915_HYBRID
+heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID
+
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.0=None
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.1=Freq
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.2=Freq && DIO
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.3=Freq && DIO && PW
+heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3
+
 ##############################################################

 heltec_wireless_stick.name=Heltec Wireless Stick

 heltec_wireless_stick.upload.tool=esptool_py
-heltec_wireless_stick.upload.maximum_size=1310720
+heltec_wireless_stick.upload.maximum_size=3342336
 heltec_wireless_stick.upload.maximum_data_size=327680
 heltec_wireless_stick.upload.wait_for_upload_port=true

@ -3415,37 +3332,20 @@ heltec_wireless_stick.serial.disableRTS=true
 heltec_wireless_stick.build.mcu=esp32
 heltec_wireless_stick.build.core=esp32
 heltec_wireless_stick.build.variant=heltec_wireless_stick
-heltec_wireless_stick.build.board=HELTEC_WIRELESS_STICK
+heltec_wireless_stick.build.board=heltec_wireless_stick

 heltec_wireless_stick.build.f_cpu=240000000L
 heltec_wireless_stick.build.flash_size=8MB
-heltec_wireless_stick.build.flash_freq=40m
+heltec_wireless_stick.build.flash_freq=80m
 heltec_wireless_stick.build.flash_mode=dio
 heltec_wireless_stick.build.boot=dio
 heltec_wireless_stick.build.partitions=default_8MB
-heltec_wireless_stick.build.defines=
+heltec_wireless_stick.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram}

 heltec_wireless_stick.menu.PSRAM.disabled=Disabled
-heltec_wireless_stick.menu.PSRAM.disabled.build.defines=
+heltec_wireless_stick.menu.PSRAM.disabled.build.psram=
 heltec_wireless_stick.menu.PSRAM.enabled=Enabled
-heltec_wireless_stick.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
-
-heltec_wireless_stick.menu.PartitionScheme.default=default_8MB
-heltec_wireless_stick.menu.PartitionScheme.default.build.partitions=default_8MB
-heltec_wireless_stick.menu.PartitionScheme.default.upload.maximum_size=3342336
-heltec_wireless_stick.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
-heltec_wireless_stick.menu.PartitionScheme.minimal.build.partitions=minimal
-heltec_wireless_stick.menu.PartitionScheme.no_ota=No OTA (Large APP)
-heltec_wireless_stick.menu.PartitionScheme.no_ota.build.partitions=no_ota
-heltec_wireless_stick.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
-heltec_wireless_stick.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA)
-heltec_wireless_stick.menu.PartitionScheme.huge_app.build.partitions=huge_app
-heltec_wireless_stick.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
-heltec_wireless_stick.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
-heltec_wireless_stick.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
-heltec_wireless_stick.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
-heltec_wireless_stick.menu.PartitionScheme.fatflash=16M Fat
-heltec_wireless_stick.menu.PartitionScheme.fatflash.build.partitions=ffat
+heltec_wireless_stick.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue

 heltec_wireless_stick.menu.CPUFreq.240=240MHz (WiFi/BT)
 heltec_wireless_stick.menu.CPUFreq.240.build.f_cpu=240000000L
@ -3453,42 +3353,6 @@ heltec_wireless_stick.menu.CPUFreq.160=160MHz (WiFi/BT)
 heltec_wireless_stick.menu.CPUFreq.160.build.f_cpu=160000000L
 heltec_wireless_stick.menu.CPUFreq.80=80MHz (WiFi/BT)
 heltec_wireless_stick.menu.CPUFreq.80.build.f_cpu=80000000L
-heltec_wireless_stick.menu.CPUFreq.40=40MHz (40MHz XTAL)
-heltec_wireless_stick.menu.CPUFreq.40.build.f_cpu=40000000L
-heltec_wireless_stick.menu.CPUFreq.20=20MHz (40MHz XTAL)
-heltec_wireless_stick.menu.CPUFreq.20.build.f_cpu=20000000L
-heltec_wireless_stick.menu.CPUFreq.10=10MHz (40MHz XTAL)
-heltec_wireless_stick.menu.CPUFreq.10.build.f_cpu=10000000L
-
-heltec_wireless_stick.menu.FlashMode.qio=QIO
-heltec_wireless_stick.menu.FlashMode.qio.build.flash_mode=dio
-heltec_wireless_stick.menu.FlashMode.qio.build.boot=qio
-heltec_wireless_stick.menu.FlashMode.dio=DIO
-heltec_wireless_stick.menu.FlashMode.dio.build.flash_mode=dio
-heltec_wireless_stick.menu.FlashMode.dio.build.boot=dio
-heltec_wireless_stick.menu.FlashMode.qout=QOUT
-heltec_wireless_stick.menu.FlashMode.qout.build.flash_mode=dout
-heltec_wireless_stick.menu.FlashMode.qout.build.boot=qout
-heltec_wireless_stick.menu.FlashMode.dout=DOUT
-heltec_wireless_stick.menu.FlashMode.dout.build.flash_mode=dout
-heltec_wireless_stick.menu.FlashMode.dout.build.boot=dout
-
-heltec_wireless_stick.menu.FlashFreq.80=80MHz
-heltec_wireless_stick.menu.FlashFreq.80.build.flash_freq=80m
-heltec_wireless_stick.menu.FlashFreq.40=40MHz
-heltec_wireless_stick.menu.FlashFreq.40.build.flash_freq=40m
-
-heltec_wireless_stick.menu.FlashSize.8M=8MB (64Mb)
-heltec_wireless_stick.menu.FlashSize.8M.build.flash_size=8MB
-heltec_wireless_stick.menu.FlashSize.2M.build.partitions=default_8MB
-heltec_wireless_stick.menu.FlashSize.4M=4MB (32Mb)
-heltec_wireless_stick.menu.FlashSize.4M.build.flash_size=4MB
-heltec_wireless_stick.menu.FlashSize.2M=2MB (16Mb)
-heltec_wireless_stick.menu.FlashSize.2M.build.flash_size=2MB
-heltec_wireless_stick.menu.FlashSize.2M.build.partitions=minimal
-heltec_wireless_stick.menu.FlashSize.16M=16MB (128Mb)
-heltec_wireless_stick.menu.FlashSize.16M.build.flash_size=16MB
-heltec_wireless_stick.menu.FlashSize.16M.build.partitions=ffat

 heltec_wireless_stick.menu.UploadSpeed.921600=921600
 heltec_wireless_stick.menu.UploadSpeed.921600.upload.speed=921600
@ -3518,6 +3382,131 @@ heltec_wireless_stick.menu.DebugLevel.debug.build.code_debug=4
 heltec_wireless_stick.menu.DebugLevel.verbose=Verbose
 heltec_wireless_stick.menu.DebugLevel.verbose.build.code_debug=5

+heltec_wireless_stick.menu.LORAWAN_REGION.0=REGION_EU868
+heltec_wireless_stick.menu.LORAWAN_REGION.0.build.band=REGION_EU868
+heltec_wireless_stick.menu.LORAWAN_REGION.1=REGION_EU433
+heltec_wireless_stick.menu.LORAWAN_REGION.1.build.band=REGION_EU433
+heltec_wireless_stick.menu.LORAWAN_REGION.2=REGION_CN470
+heltec_wireless_stick.menu.LORAWAN_REGION.2.build.band=REGION_CN470
+heltec_wireless_stick.menu.LORAWAN_REGION.3=REGION_US915
+heltec_wireless_stick.menu.LORAWAN_REGION.3.build.band=REGION_US915
+heltec_wireless_stick.menu.LORAWAN_REGION.4=REGION_AU915
+heltec_wireless_stick.menu.LORAWAN_REGION.4.build.band=REGION_AU915
+heltec_wireless_stick.menu.LORAWAN_REGION.5=REGION_CN779
+heltec_wireless_stick.menu.LORAWAN_REGION.5.build.band=REGION_CN779
+heltec_wireless_stick.menu.LORAWAN_REGION.6=REGION_AS923
+heltec_wireless_stick.menu.LORAWAN_REGION.6.build.band=REGION_AS923
+heltec_wireless_stick.menu.LORAWAN_REGION.7=REGION_KR920
+heltec_wireless_stick.menu.LORAWAN_REGION.7.build.band=REGION_KR920
+heltec_wireless_stick.menu.LORAWAN_REGION.8=REGION_IN865
+heltec_wireless_stick.menu.LORAWAN_REGION.8.build.band=REGION_IN865
+heltec_wireless_stick.menu.LORAWAN_REGION.9=REGION_US915_HYBRID
+heltec_wireless_stick.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID
+
+heltec_wireless_stick.menu.LoRaWanDebugLevel.0=None
+heltec_wireless_stick.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0
+heltec_wireless_stick.menu.LoRaWanDebugLevel.1=Freq
+heltec_wireless_stick.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1
+heltec_wireless_stick.menu.LoRaWanDebugLevel.2=Freq && DIO
+heltec_wireless_stick.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2
+heltec_wireless_stick.menu.LoRaWanDebugLevel.3=Freq && DIO && PW
+heltec_wireless_stick.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3
+
+##############################################################
+
+heltec_wireless_stick_lite.name=Heltec Wireless Stick Lite
+
+heltec_wireless_stick_lite.upload.tool=esptool_py
+heltec_wireless_stick_lite.upload.maximum_size=1310720
+heltec_wireless_stick_lite.upload.maximum_data_size=327680
+heltec_wireless_stick_lite.upload.wait_for_upload_port=true
+
+heltec_wireless_stick_lite.serial.disableDTR=true
+heltec_wireless_stick_lite.serial.disableRTS=true
+
+heltec_wireless_stick_lite.build.mcu=esp32
+heltec_wireless_stick_lite.build.core=esp32
+heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite
+heltec_wireless_stick_lite.build.board=heltec_wireless_stick_LITE
+
+heltec_wireless_stick_lite.build.f_cpu=240000000L
+heltec_wireless_stick_lite.build.flash_size=4MB
+heltec_wireless_stick_lite.build.flash_freq=80m
+heltec_wireless_stick_lite.build.flash_mode=dio
+heltec_wireless_stick_lite.build.boot=dio
+heltec_wireless_stick_lite.build.partitions=default
+heltec_wireless_stick_lite.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram}
+
+heltec_wireless_stick_lite.menu.PSRAM.disabled=Disabled
+heltec_wireless_stick_lite.menu.PSRAM.disabled.build.psram=
+heltec_wireless_stick_lite.menu.PSRAM.enabled=Enabled
+heltec_wireless_stick_lite.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
+
+heltec_wireless_stick_lite.menu.CPUFreq.240=240MHz (WiFi/BT)
+heltec_wireless_stick_lite.menu.CPUFreq.240.build.f_cpu=240000000L
+heltec_wireless_stick_lite.menu.CPUFreq.160=160MHz (WiFi/BT)
+heltec_wireless_stick_lite.menu.CPUFreq.160.build.f_cpu=160000000L
+heltec_wireless_stick_lite.menu.CPUFreq.80=80MHz (WiFi/BT)
+heltec_wireless_stick_lite.menu.CPUFreq.80.build.f_cpu=80000000L
+
+heltec_wireless_stick_lite.menu.UploadSpeed.921600=921600
+heltec_wireless_stick_lite.menu.UploadSpeed.921600.upload.speed=921600
+heltec_wireless_stick_lite.menu.UploadSpeed.115200=115200
+heltec_wireless_stick_lite.menu.UploadSpeed.115200.upload.speed=115200
+heltec_wireless_stick_lite.menu.UploadSpeed.256000.windows=256000
+heltec_wireless_stick_lite.menu.UploadSpeed.256000.upload.speed=256000
+heltec_wireless_stick_lite.menu.UploadSpeed.230400.windows.upload.speed=256000
+heltec_wireless_stick_lite.menu.UploadSpeed.230400=230400
+heltec_wireless_stick_lite.menu.UploadSpeed.230400.upload.speed=230400
+heltec_wireless_stick_lite.menu.UploadSpeed.460800.linux=460800
+heltec_wireless_stick_lite.menu.UploadSpeed.460800.macosx=460800
+heltec_wireless_stick_lite.menu.UploadSpeed.460800.upload.speed=460800
+heltec_wireless_stick_lite.menu.UploadSpeed.512000.windows=512000
+heltec_wireless_stick_lite.menu.UploadSpeed.512000.upload.speed=512000
+
+heltec_wireless_stick_lite.menu.DebugLevel.none=None
+heltec_wireless_stick_lite.menu.DebugLevel.none.build.code_debug=0
+heltec_wireless_stick_lite.menu.DebugLevel.error=Error
+heltec_wireless_stick_lite.menu.DebugLevel.error.build.code_debug=1
+heltec_wireless_stick_lite.menu.DebugLevel.warn=Warn
+heltec_wireless_stick_lite.menu.DebugLevel.warn.build.code_debug=2
+heltec_wireless_stick_lite.menu.DebugLevel.info=Info
+heltec_wireless_stick_lite.menu.DebugLevel.info.build.code_debug=3
+heltec_wireless_stick_lite.menu.DebugLevel.debug=Debug
+heltec_wireless_stick_lite.menu.DebugLevel.debug.build.code_debug=4
+heltec_wireless_stick_lite.menu.DebugLevel.verbose=Verbose
+heltec_wireless_stick_lite.menu.DebugLevel.verbose.build.code_debug=5
+
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.0=REGION_EU868
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.0.build.band=REGION_EU868
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.1=REGION_EU433
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.1.build.band=REGION_EU433
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.2=REGION_CN470
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.2.build.band=REGION_CN470
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.3=REGION_US915
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.3.build.band=REGION_US915
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.4=REGION_AU915
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.4.build.band=REGION_AU915
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.5=REGION_CN779
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.5.build.band=REGION_CN779
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.6=REGION_AS923
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.6.build.band=REGION_AS923
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.7=REGION_KR920
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.7.build.band=REGION_KR920
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.8=REGION_IN865
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.8.build.band=REGION_IN865
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.9=REGION_US915_HYBRID
+heltec_wireless_stick_lite.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID
+
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.0=None
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.1=Freq
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.2=Freq && DIO
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.3=Freq && DIO && PW
+heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3
+
 ##############################################################

 espectro32.name=ESPectro32
--- a/cores/esp32/main.cpp
+++ b/cores/esp32/main.cpp
@ -3,6 +3,10 @@
 #include "esp_task_wdt.h"
 #include "Arduino.h"

+#ifndef CONFIG_ARDUINO_LOOP_STACK_SIZE
+#define CONFIG_ARDUINO_LOOP_STACK_SIZE 8192
+#endif
+
 TaskHandle_t loopTaskHandle = NULL;

 #if CONFIG_AUTOSTART_ARDUINO
@ -25,7 +29,7 @@ extern "C" void app_main()
 {
    loopTaskWDTEnabled = false;
    initArduino();
-    xTaskCreateUniversal(loopTask, "loopTask", 8192, NULL, 1, &loopTaskHandle, CONFIG_ARDUINO_RUNNING_CORE);
+    xTaskCreateUniversal(loopTask, "loopTask", CONFIG_ARDUINO_LOOP_STACK_SIZE, NULL, 1, &loopTaskHandle, CONFIG_ARDUINO_RUNNING_CORE);
 }

 #endif
--- a/libraries/SPI/src/SPI.cpp
+++ b/libraries/SPI/src/SPI.cpp
@ -85,7 +85,7 @@ void SPIClass::setHwCs(bool use)
    if(use && !_use_hw_ss) {
        spiAttachSS(_spi, 0, _ss);
        spiSSEnable(_spi);
-    } else if(_use_hw_ss) {
+    } else if(!use && _use_hw_ss) {
        spiSSDisable(_spi);
        spiDetachSS(_spi, _ss);
    }
--- a/libraries/WiFi/src/WiFi.cpp
+++ b/libraries/WiFi/src/WiFi.cpp
@ -88,4 +88,14 @@ void WiFiClass::printDiag(Print& p)
    p.println(conf.sta.bssid_set);
 }

+void WiFiClass::enableProv(bool status)
+{
+    prov_enable = status;
+}
+
+bool WiFiClass::isProvEnabled()
+{
+    return prov_enable;
+}
+
 WiFiClass WiFi;
--- a/libraries/WiFi/src/WiFi.h
+++ b/libraries/WiFi/src/WiFi.h
@ -37,11 +37,17 @@
 #include "WiFiClient.h"
 #include "WiFiServer.h"
 #include "WiFiUdp.h"
-#include "WiFiProv.h"

-class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanClass, public WiFiAPClass, public WiFiProvClass
+class WiFiClass : public WiFiGenericClass, public WiFiSTAClass, public WiFiScanClass, public WiFiAPClass
 {
+private:
+    bool prov_enable;
 public:
+    WiFiClass()
+    {
+        prov_enable = false;
+    }
+
    using WiFiGenericClass::channel;

    using WiFiSTAClass::SSID;
@ -60,6 +66,8 @@ public:
    friend class WiFiClient;
    friend class WiFiServer;
    friend class WiFiUDP;
+    void enableProv(bool status);
+    bool isProvEnabled();
 };

 extern WiFiClass WiFi;
--- a/libraries/WiFi/src/WiFiClient.cpp
+++ b/libraries/WiFi/src/WiFiClient.cpp
@ -216,9 +216,9 @@ int WiFiClient::connect(IPAddress ip, uint16_t port, int32_t timeout)

    uint32_t ip_addr = ip;
    struct sockaddr_in serveraddr;
-    bzero((char *) &serveraddr, sizeof(serveraddr));
+    memset((char *) &serveraddr, 0, sizeof(serveraddr));
    serveraddr.sin_family = AF_INET;
-    bcopy((const void *)(&ip_addr), (void *)&serveraddr.sin_addr.s_addr, 4);
+    memcpy((void *)&serveraddr.sin_addr.s_addr, (const void *)(&ip_addr), 4);
    serveraddr.sin_port = htons(port);
    fd_set fdset;
    struct timeval tv;
--- a/libraries/WiFiClientSecure/src/ssl_client.cpp
+++ b/libraries/WiFiClientSecure/src/ssl_client.cpp
@ -227,7 +227,7 @@ int start_ssl_client(sslclient_context *ssl_client, const char *host, uint32_t p
    log_v("Verifying peer X.509 certificate...");

    if ((flags = mbedtls_ssl_get_verify_result(&ssl_client->ssl_ctx)) != 0) {
-        bzero(buf, sizeof(buf));
+        memset(buf, 0, sizeof(buf));
        mbedtls_x509_crt_verify_info(buf, sizeof(buf), "  ! ", flags);
        log_e("Failed to verify peer certificate! verification info: %s", buf);
        stop_ssl_socket(ssl_client, rootCABuff, cli_cert, cli_key);  //It's not safe continue.
--- a/libraries/WiFiProv/examples/WiFiProv/README.md
+++ b/libraries/WiFiProv/examples/WiFiProv/README.md
--- a/libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino
+++ b/libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino
@ -1,4 +1,4 @@
-#include "WiFi.h"
+#include "WiFiProv.h"
 void SysProvEvent(system_event_t *sys_event,wifi_prov_event_t *prov_event)
 {
    if(sys_event) {
@ -56,8 +56,8 @@ void setup() {
  /* uint8_t uuid[16] = {0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf,
                   0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02 };*/
  WiFi.onEvent(SysProvEvent);
-  //WiFi.beginProvision(provSchemeBLE, WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, "abcd1234", "PROV_XXX", NULL, NULL);
-  WiFi.beginProvision(provSchemeSoftAP, WIFI_PROV_EVENT_HANDLER_NONE, WIFI_PROV_SECURITY_1, "abcd1234", NULL, NULL, NULL);
+  //WiFiProv.beginProvision(provSchemeBLE, WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, "abcd1234", "PROV_XXX", NULL, NULL);
+  WiFiProv.beginProvision(provSchemeSoftAP, WIFI_PROV_EVENT_HANDLER_NONE, WIFI_PROV_SECURITY_1, "abcd1234", NULL, NULL, NULL);
 }

 void loop() {
--- a/libraries/WiFiProv/library.properties
+++ b/libraries/WiFiProv/library.properties
@ -0,0 +1,9 @@
+name=WiFiProv
+version=1.0
+author=Switi Mhaiske <sweetymhaiske@gmail.com>
+maintainer=Hristo Gochkov <hristo@espressif.com>
+sentence=Enables provisioning.
+paragraph=With this library you can perform provisioning on esp32 via SoftAP or BLE.
+category=Communication
+url=
+architectures=esp32
--- a/libraries/WiFiProv/src/WiFiProv.cpp
+++ b/libraries/WiFiProv/src/WiFiProv.cpp
@ -31,7 +31,8 @@
 #include <wifi_provisioning/scheme_softap.h>
 #include <wifi_provisioning/manager.h>
 #undef IPADDR_NONE
-#include "WiFi.h"
+#include "WiFiProv.h"
+#include "SimpleBLE.h"

 extern esp_err_t postToSysQueue(system_prov_event_t *);

@ -42,13 +43,6 @@ static const uint8_t custom_service_uuid[16] = {  0xb4, 0xdf, 0x5a, 0x1c, 0x3f,

 #define SERV_NAME_PREFIX_PROV "PROV_"

-bool WiFiProvClass::prov_enable = true;
-
-bool WiFiProvClass::isProvEnabled()
-{
-    return prov_enable;
-}
-
 void provSchemeBLE()
 {
    prov_scheme = WIFI_PROV_SCHEME_BLE;
@ -109,7 +103,7 @@ static void get_device_service_name(char *service_name, size_t max)

 void WiFiProvClass :: beginProvision(void (*scheme_cb)(), wifi_prov_event_handler_t scheme_event_handler, wifi_prov_security_t security, const char * pop, const char *service_name, const char *service_key, uint8_t * uuid)
 {
-    prov_enable = true;
+    WiFi.enableProv(true);
    bool provisioned = false;
    scheme_cb();
    config.scheme_event_handler = scheme_event_handler;
@ -152,7 +146,7 @@ void WiFiProvClass :: beginProvision(void (*scheme_cb)(), wifi_prov_event_handle
    } else {
        wifi_prov_mgr_deinit();
        WiFi.mode(WIFI_MODE_STA);
-        log_i("Aleardy Provisioned, starting Wi-Fi STA");
+        log_i("Already Provisioned, starting Wi-Fi STA");
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
        wifi_config_t conf;
        esp_wifi_get_config(WIFI_IF_STA,&conf);
@ -162,4 +156,4 @@ void WiFiProvClass :: beginProvision(void (*scheme_cb)(), wifi_prov_event_handle
        WiFi.begin(); 
    }
 }
-
+WiFiProvClass WiFiProv;
--- a/libraries/WiFiProv/src/WiFiProv.h
+++ b/libraries/WiFiProv/src/WiFiProv.h
@ -17,10 +17,9 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */

+#include "WiFi.h"
 #include "wifi_provisioning/manager.h"
 #include "wifi_provisioning/scheme_ble.h"
-#include "nvs_flash.h"
-#include "SimpleBLE.h"
 //Select the scheme using which you want to provision
 typedef enum 
 {
@ -34,19 +33,11 @@ extern void provSchemeBLE();
 //Provisioning class 
 class WiFiProvClass
 {
-    protected:
-        static bool prov_enable;
-  
    public:
-        WiFiProvClass() {
-            prov_enable = false;
-        }

-        bool isProvEnabled();
-    
-        void beginProvision(void (*scheme_cb)() = provSchemeSoftAP, wifi_prov_event_handler_t scheme_event_handler = WIFI_PROV_EVENT_HANDLER_NONE, wifi_prov_security_t security = WIFI_PROV_SECURITY_1, const char * pop = "abcd1234", const char * service_name = NULL, const char * service_key = NULL, uint8_t *uuid = NULL);
+    void beginProvision(void (*scheme_cb)() = provSchemeSoftAP, wifi_prov_event_handler_t scheme_event_handler = WIFI_PROV_EVENT_HANDLER_NONE, wifi_prov_security_t security = WIFI_PROV_SECURITY_1, const char * pop = "abcd1234", const char * service_name = NULL, const char * service_key = NULL, uint8_t *uuid = NULL);
 };
-
+extern WiFiProvClass WiFiProv;
 /*
 Event Handler for BLE
      - WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM
--- a/package/package_esp32_index.template.json
+++ b/package/package_esp32_index.template.json
@ -115,8 +115,8 @@
              "host": "x86_64-apple-darwin",
              "url": "https://dl.espressif.com/dl/esptool-3.0.0.2-macos.tar.gz",
              "archiveFileName": "esptool-3.0.0.2-macos.tar.gz",
-              "checksum": "SHA-256:9213f46d5aa865558da4a2ef4218e87eef4782779128083c15ce2b3e4d07a1ea",
-              "size": "3849615"
+              "checksum": "SHA-256:2cafab7f1ebce89475b84c115548eaace40b6366d7b3f9862cdb2fc64f806643",
+              "size": "3859642"
            },
            {
              "host": "x86_64-pc-linux-gnu",
--- a/platform.txt
+++ b/platform.txt
@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls

 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
 compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.project.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority  -u __cxa_guard_dummy -u __cxx_fatal_exception
-compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lod -lmdns -ldetection -lvfs -lpe -lesp_websocket_client -lespcoredump -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -ldl -lspiffs -lface_detection -lefuse -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -ldetection_cat_face -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd  -lstdc++
+compiler.c.elf.libs=-lgcc -lespcoredump -lesp_event -lheap -lpe -lmesh -lm -lesp_http_client -lfb_gfx -lface_detection -lesp_adc_cal -ldetection_cat_face -lmbedtls -lunity -lspiffs -lod -lapp_trace -llog -lesp_websocket_client -lexpat -lwpa2 -lxtensa-debug-module -lnet80211 -lhal -lvfs -lwps -lmqtt -lasio -lbt -lwpa_supplicant -lpp -lmdns -llwip -lnvs_flash -lc -lbootloader_support -lnewlib -lsdmmc -lapp_update -lethernet -lefuse -lprotobuf-c -ldetection -lfreemodbus -lcore -lface_recognition -lfd -lcoap -ljsmn -lesp_https_ota -ltcp_transport -lbtdm_app -lesp_ringbuf -ldriver -lwifi_provisioning -llibsodium -lopenssl -lfatfs -lnghttp -lespnow -lprotocomm -lspi_flash -lc_nano -lulp -lesp_http_server -lesp32-camera -lsmartconfig -lsmartconfig_ack -lesp-tls -lcoexist -lmicro-ecc -lesp_https_server -lwpa -ltcpip_adapter -lwear_levelling -lfreertos -lsoc -ljson -lesp32 -lpthread -lcxx -lfr -ldl -lphy -limage_util -lrtc -lconsole  -lstdc++

 compiler.as.cmd=xtensa-esp32-elf-as

--- a/tools/platformio-build.py
+++ b/tools/platformio-build.py
@ -171,7 +171,7 @@ env.Append(
    ],

    LIBS=[
-        "-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lod", "-lmdns", "-ldetection", "-lvfs", "-lpe", "-lesp_websocket_client", "-lespcoredump", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-ldl", "-lspiffs", "-lface_detection", "-lefuse", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldetection_cat_face", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
+        "-lgcc", "-lespcoredump", "-lesp_event", "-lheap", "-lpe", "-lmesh", "-lm", "-lesp_http_client", "-lfb_gfx", "-lface_detection", "-lesp_adc_cal", "-ldetection_cat_face", "-lmbedtls", "-lunity", "-lspiffs", "-lod", "-lapp_trace", "-llog", "-lesp_websocket_client", "-lexpat", "-lwpa2", "-lxtensa-debug-module", "-lnet80211", "-lhal", "-lvfs", "-lwps", "-lmqtt", "-lasio", "-lbt", "-lwpa_supplicant", "-lpp", "-lmdns", "-llwip", "-lnvs_flash", "-lc", "-lbootloader_support", "-lnewlib", "-lsdmmc", "-lapp_update", "-lethernet", "-lefuse", "-lprotobuf-c", "-ldetection", "-lfreemodbus", "-lcore", "-lface_recognition", "-lfd", "-lcoap", "-ljsmn", "-lesp_https_ota", "-ltcp_transport", "-lbtdm_app", "-lesp_ringbuf", "-ldriver", "-lwifi_provisioning", "-llibsodium", "-lopenssl", "-lfatfs", "-lnghttp", "-lespnow", "-lprotocomm", "-lspi_flash", "-lc_nano", "-lulp", "-lesp_http_server", "-lesp32-camera", "-lsmartconfig", "-lsmartconfig_ack", "-lesp-tls", "-lcoexist", "-lmicro-ecc", "-lesp_https_server", "-lwpa", "-ltcpip_adapter", "-lwear_levelling", "-lfreertos", "-lsoc", "-ljson", "-lesp32", "-lpthread", "-lcxx", "-lfr", "-ldl", "-lphy", "-limage_util", "-lrtc", "-lconsole", "-lstdc++"
    ],

    LIBSOURCE_DIRS=[
--- a/tools/sdk/bin/bootloader_dio_40m.bin
+++ b/tools/sdk/bin/bootloader_dio_40m.bin
--- a/tools/sdk/bin/bootloader_dio_80m.bin
+++ b/tools/sdk/bin/bootloader_dio_80m.bin
--- a/tools/sdk/bin/bootloader_dout_40m.bin
+++ b/tools/sdk/bin/bootloader_dout_40m.bin
--- a/tools/sdk/bin/bootloader_dout_80m.bin
+++ b/tools/sdk/bin/bootloader_dout_80m.bin
--- a/tools/sdk/bin/bootloader_qio_40m.bin
+++ b/tools/sdk/bin/bootloader_qio_40m.bin
--- a/tools/sdk/bin/bootloader_qio_80m.bin
+++ b/tools/sdk/bin/bootloader_qio_80m.bin
--- a/tools/sdk/bin/bootloader_qout_40m.bin
+++ b/tools/sdk/bin/bootloader_qout_40m.bin
--- a/tools/sdk/bin/bootloader_qout_80m.bin
+++ b/tools/sdk/bin/bootloader_qout_80m.bin
--- a/tools/sdk/include/config/sdkconfig.h
+++ b/tools/sdk/include/config/sdkconfig.h
@ -87,6 +87,7 @@
 #define CONFIG_MFN56_1X 1
 #define CONFIG_LWIP_MAX_SOCKETS 10
 #define CONFIG_LWIP_NETIF_LOOPBACK 1
+#define CONFIG_LWIP_TCP_ISN_HOOK 1
 #define CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT "pthread"
 #define CONFIG_EMAC_TASK_PRIORITY 20
 #define CONFIG_TIMER_TASK_STACK_DEPTH 2048
@ -143,6 +144,7 @@
 #define CONFIG_MBEDTLS_PSK_MODES 1
 #define CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO 1
 #define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
+#define CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION 1
 #define CONFIG_EFUSE_MAX_BLK_LEN 192
 #define CONFIG_SPIFFS_USE_MAGIC 1
 #define CONFIG_OV7725_SUPPORT 1
@ -170,6 +172,7 @@
 #define CONFIG_ESP32_REV_MIN_0 1
 #define CONFIG_LOG_DEFAULT_LEVEL 1
 #define CONFIG_TIMER_QUEUE_LENGTH 10
+#define CONFIG_ARDUINO_LOOP_STACK_SIZE 8192
 #define CONFIG_ESP32_REV_MIN 0
 #define CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT 1
 #define CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE 0
@ -244,7 +247,6 @@
 #define CONFIG_SPIFFS_GC_MAX_RUNS 10
 #define CONFIG_ARDUINO_RUN_CORE1 1
 #define CONFIG_ESP32_APPTRACE_DEST_NONE 1
-#define CONFIG_ESP32_WIFI_RX_IRAM_OPT 1
 #define CONFIG_HP_NANO1 1
 #define CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC 1
 #define CONFIG_MBEDTLS_SSL_PROTO_TLS1_2 1
@ -392,7 +394,6 @@
 #define CONFIG_HD_NANO1 1
 #define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
-#define CONFIG_ESP32_WIFI_IRAM_OPT 1
 #define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
-#define CONFIG_ARDUINO_IDF_COMMIT "66d3783c8"
+#define CONFIG_ARDUINO_IDF_COMMIT "b4c075169"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
--- a/tools/sdk/include/esp32/esp_mesh_internal.h
+++ b/tools/sdk/include/esp32/esp_mesh_internal.h
@ -263,6 +263,16 @@ esp_err_t esp_mesh_set_announce_interval(int short_ms, int long_ms);
 */
 esp_err_t esp_mesh_get_announce_interval(int *short_ms, int *long_ms);

+/**
+ * @brief      Enable mesh print scan result
+ *
+ * @param[in]  enable  enable or not
+ *
+ * @return
+ *    - ESP_OK
+ */
+esp_err_t esp_mesh_print_scan_result(bool enable);
+
 #ifdef __cplusplus
 }
 #endif
--- a/tools/sdk/include/esp32/esp_panic.h
+++ b/tools/sdk/include/esp32/esp_panic.h
@ -20,6 +20,7 @@ extern "C"
 #ifndef __ASSEMBLER__

 #include "esp_err.h"
+#include "soc/soc.h"


 /**
@ -61,12 +62,36 @@ esp_err_t esp_set_watchpoint(int no, void *adr, int size, int flags);
 */
 void esp_clear_watchpoint(int no);

+/**
+ * @brief Checks stack pointer in dram
+ */
+inline static bool esp_stack_ptr_in_dram(uint32_t sp)
+{
+    //Check if stack ptr is in between SOC_DRAM_LOW and SOC_DRAM_HIGH, and 16 byte aligned.
+    return !(sp < SOC_DRAM_LOW + 0x10 || sp > SOC_DRAM_HIGH - 0x10 || ((sp & 0xF) != 0));
+}
+
+#if CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY
+/**
+ * @brief Checks stack pointer in external ram
+ */
+inline static bool esp_stack_ptr_in_extram(uint32_t sp)
+{
+    //Check if stack ptr is in between SOC_EXTRAM_DATA_LOW and SOC_EXTRAM_DATA_HIGH, and 16 byte aligned.
+    return !(sp < SOC_EXTRAM_DATA_LOW + 0x10 || sp > SOC_EXTRAM_DATA_HIGH - 0x10 || ((sp & 0xF) != 0));
+}
+#endif
+
 /**
 * @brief Checks stack pointer
 */
 static inline bool esp_stack_ptr_is_sane(uint32_t sp)
 {
-	return !(sp < 0x3ffae010UL || sp > 0x3ffffff0UL || ((sp & 0xf) != 0));
+#if CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY
+    return (esp_stack_ptr_in_dram(sp) || esp_stack_ptr_in_extram(sp));
+#else
+    return esp_stack_ptr_in_dram(sp);
+#endif
 }
 #endif

--- a/tools/sdk/include/lwip/lwipopts.h
+++ b/tools/sdk/include/lwip/lwipopts.h
@ -396,6 +396,17 @@
 */
 #define LWIP_TCP_RTO_TIME             CONFIG_LWIP_TCP_RTO_TIME

+/**
+ * Set TCP hook for Initial Sequence Number (ISN)
+ */
+#ifdef CONFIG_LWIP_TCP_ISN_HOOK
+#include <lwip/arch.h>
+struct ip_addr;
+u32_t lwip_hook_tcp_isn(const struct ip_addr *local_ip, u16_t local_port,
+                        const struct ip_addr *remote_ip, u16_t remote_port);
+#define LWIP_HOOK_TCP_ISN               lwip_hook_tcp_isn
+#endif
+
 /*
   ----------------------------------
   ---------- Pbuf options ----------
--- a/tools/sdk/include/lwip/netdb.h
+++ b/tools/sdk/include/lwip/netdb.h
@ -32,9 +32,17 @@

 #include "lwip/netdb.h"

+#ifdef __cplusplus
+extern "C" {
+#endif
+  
 #ifdef ESP_PLATFORM
 int getnameinfo(const struct sockaddr *addr, socklen_t addrlen,
                char *host, socklen_t hostlen,
                char *serv, socklen_t servlen, int flags);

 #endif
+
+#ifdef __cplusplus
+}
+#endif
--- a/tools/sdk/include/lwip/tcp_isn.h
+++ b/tools/sdk/include/lwip/tcp_isn.h
@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016 The MINIX 3 Project.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ *
+ * Author: David van Moolenbroek <david@minix3.org>
+ */
+
+#ifndef LWIP_TCP_ISN_H
+#define LWIP_TCP_ISN_H
+
+#include "lwip/opt.h"
+#include "lwip/ip_addr.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void lwip_init_tcp_isn(u32_t boot_time, const u8_t *secret_16_bytes);
+u32_t lwip_hook_tcp_isn(const ip_addr_t *local_ip, u16_t local_port,
+                        const ip_addr_t *remote_ip, u16_t remote_port);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LWIP_TCP_ISN_H */
--- a/tools/sdk/include/mqtt/mqtt_client.h
+++ b/tools/sdk/include/mqtt/mqtt_client.h
@ -80,10 +80,17 @@ typedef enum {
 */
 typedef enum {
    MQTT_ERROR_TYPE_NONE = 0,
-    MQTT_ERROR_TYPE_ESP_TLS,
+    MQTT_ERROR_TYPE_TCP_TRANSPORT,
    MQTT_ERROR_TYPE_CONNECTION_REFUSED,
 } esp_mqtt_error_type_t;

+/**
+ * MQTT_ERROR_TYPE_TCP_TRANSPORT error type hold all sorts of transport layer errors,
+ * including ESP-TLS error, but in the past only the errors from MQTT_ERROR_TYPE_ESP_TLS layer
+ * were reported, so the ESP-TLS error type is re-defined here for backward compatibility
+ */
+#define MQTT_ERROR_TYPE_ESP_TLS MQTT_ERROR_TYPE_TCP_TRANSPORT
+
 typedef enum {
    MQTT_TRANSPORT_UNKNOWN = 0x0,
    MQTT_TRANSPORT_OVER_TCP,      /*!< MQTT over TCP, using scheme: ``mqtt`` */
@ -110,7 +117,7 @@ typedef enum {
 * Use this structure directly checking error_type first and then appropriate error code depending on the source of the error:
 *
 * | error_type | related member variables | note |
- * | MQTT_ERROR_TYPE_ESP_TLS | esp_tls_last_esp_err, esp_tls_stack_err, esp_tls_cert_verify_flags | Error reported from esp-tls |
+ * | MQTT_ERROR_TYPE_TCP_TRANSPORT | esp_tls_last_esp_err, esp_tls_stack_err, esp_tls_cert_verify_flags, sock_errno | Error reported from tcp_transport/esp-tls |
 * | MQTT_ERROR_TYPE_CONNECTION_REFUSED | connect_return_code | Internal error reported from MQTT broker on connection |
 */
 typedef struct esp_mqtt_error_codes {
@ -121,6 +128,9 @@ typedef struct esp_mqtt_error_codes {
    /* esp-mqtt specific structure extension */
    esp_mqtt_error_type_t error_type;            /*!< error type referring to the source of the error */
    esp_mqtt_connect_return_code_t connect_return_code; /*!< connection refused error code reported from MQTT broker on connection */
+    /* tcp_transport extension */
+    int       esp_transport_sock_errno;         /*!< errno from the underlying socket */
+
 } esp_mqtt_error_codes_t;

 /**
@ -179,7 +189,7 @@ typedef struct {
    int refresh_connection_after_ms;        /*!< Refresh connection after this value (in milliseconds) */
    const struct psk_key_hint* psk_hint_key;     /*!< Pointer to PSK struct defined in esp_tls.h to enable PSK authentication (as alternative to certificate verification). If not NULL and server/client certificates are NULL, PSK is enabled */
    bool          use_global_ca_store;      /*!< Use a global ca_store for all the connections in which this bool is set. */
-    int reconnect_timeout_ms;               /*!< Reconnect to the broker after this value in miliseconds if auto reconnect is not disabled */
+    int reconnect_timeout_ms;               /*!< Reconnect to the broker after this value in miliseconds if auto reconnect is not disabled (defaults to 10s) */
    const char **alpn_protos;               /*!< NULL-terminated list of supported application protocols to be used for ALPN */
    const char *clientkey_password;         /*!< Client key decryption password string */
    int clientkey_password_len;             /*!< String length of the password pointed to by clientkey_password */
@ -188,6 +198,8 @@ typedef struct {
    bool skip_cert_common_name_check;       /*!< Skip any validation of server certificate CN field, this reduces the security of TLS and makes the mqtt client susceptible to MITM attacks  */
    bool use_secure_element;                /*!< enable secure element for enabling SSL connection */
    void *ds_data;                          /*!< carrier of handle for digital signature parameters */
+    int network_timeout_ms;                 /*!< Abort network operation if it is not completed after this value, in milliseconds (defaults to 10s) */
+    bool disable_keepalive;                 /*!< Set disable_keepalive=true to turn off keep-alive mechanism, false by default (keepalive is active by default). Note: setting the config value `keepalive` to `0` doesn't disable keepalive feature, but uses a default keepalive period */
 } esp_mqtt_client_config_t;

 /**
@ -347,6 +359,14 @@ esp_err_t esp_mqtt_set_config(esp_mqtt_client_handle_t client, const esp_mqtt_cl
 */
 esp_err_t esp_mqtt_client_register_event(esp_mqtt_client_handle_t client, esp_mqtt_event_id_t event, esp_event_handler_t event_handler, void* event_handler_arg);

+/**
+ * @brief Get outbox size
+ *
+ * @param client            mqtt client handle
+ * @return outbox size
+ */
+int esp_mqtt_client_get_outbox_size(esp_mqtt_client_handle_t client);
+
 #ifdef __cplusplus
 }
 #endif //__cplusplus
--- a/tools/sdk/include/mqtt/mqtt_config.h
+++ b/tools/sdk/include/mqtt/mqtt_config.h
@ -84,8 +84,8 @@
 #endif
 #endif

-#ifdef  CONFIG_OUTBOX_EXPIRED_TIMEOUT_MS
-#define OUTBOX_EXPIRED_TIMEOUT_MS   CONFIG_OUTBOX_EXPIRED_TIMEOUT_MS
+#ifdef  CONFIG_MQTT_OUTBOX_EXPIRED_TIMEOUT_MS
+#define OUTBOX_EXPIRED_TIMEOUT_MS   CONFIG_MQTT_OUTBOX_EXPIRED_TIMEOUT_MS
 #else
 #define OUTBOX_EXPIRED_TIMEOUT_MS   (30*1000)
 #endif
--- a/tools/sdk/include/mqtt/mqtt_supported_features.h
+++ b/tools/sdk/include/mqtt/mqtt_supported_features.h
@ -56,6 +56,7 @@
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
 // Features supported in 4.3
 #define MQTT_SUPPORTED_FEATURE_DIGITAL_SIGNATURE
+#define MQTT_SUPPORTED_FEATURE_TRANSPORT_SOCK_ERRNO_REPORTING
 #endif

 #endif /* ESP_IDF_VERSION */
--- a/tools/sdk/include/wpa_supplicant/wpa/wpa_debug.h
+++ b/tools/sdk/include/wpa_supplicant/wpa/wpa_debug.h
@ -47,6 +47,11 @@ void wpa_debug_close_file(void);
 */
 void wpa_debug_print_timestamp(void);

+#if CONFIG_WPA_DEBUG_PRINT
+#define DEBUG_PRINT
+#endif
+
+#ifdef DEBUG_PRINT
 /**
 * wpa_printf - conditional printf
 * @level: priority level (MSG_*) of the message
@ -58,8 +63,17 @@ void wpa_debug_print_timestamp(void);
 *
 * Note: New line '\n' is added to the end of the text when printing to stdout.
 */
-#define  DEBUG_PRINT
-#define   MSG_PRINT
+
+#define wpa_printf(level,fmt, args...) ESP_LOG_LEVEL_LOCAL(level, TAG, fmt, ##args)
+
+static inline void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, size_t len)
+{
+
+}
+
+static inline void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf, size_t len)
+{
+}

 /**
 * wpa_hexdump - conditional hex dump
@ -72,19 +86,6 @@ void wpa_debug_print_timestamp(void);
 * output may be directed to stdout, stderr, and/or syslog based on
 * configuration. The contents of buf is printed out has hex dump.
 */
-#ifdef DEBUG_PRINT
-#define wpa_printf(level,fmt, args...) ESP_LOG_LEVEL_LOCAL(level, TAG, fmt, ##args)
-
-static inline void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, size_t len)
-{
-
-}
-
-static inline void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf, size_t len)
-{
-}
-
-
 void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len);

 static inline void wpa_hexdump_buf(int level, const char *title,
@ -148,13 +149,14 @@ void wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
 void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
 			   size_t len);
 #else
-#define wpa_printf(level,fmt, args...)
-#define wpa_hexdump(...)
-#define wpa_hexdump_buf(...)
-#define wpa_hexdump_key(...)
-#define wpa_hexdump_buf_key(...)
-#define wpa_hexdump_ascii(...)
-#define wpa_hexdump_ascii_key(...)
+#define wpa_printf(level,fmt, args...) do {} while(0)
+#define wpa_hexdump(...) do {} while(0)
+#define wpa_dump_mem(...) do {} while(0)
+#define wpa_hexdump_buf(...) do {} while(0)
+#define wpa_hexdump_key(...) do {} while(0)
+#define wpa_hexdump_buf_key(...) do {} while(0)
+#define wpa_hexdump_ascii(...) do {} while(0)
+#define wpa_hexdump_ascii_key(...) do {} while(0)
 #endif

 #define wpa_auth_logger
--- a/tools/sdk/ld/esp32.project.ld
+++ b/tools/sdk/ld/esp32.project.ld
--- a/tools/sdk/lib/libapp_trace.a
+++ b/tools/sdk/lib/libapp_trace.a
--- a/tools/sdk/lib/libapp_update.a
+++ b/tools/sdk/lib/libapp_update.a
--- a/tools/sdk/lib/libasio.a
+++ b/tools/sdk/lib/libasio.a
--- a/tools/sdk/lib/libbootloader_support.a
+++ b/tools/sdk/lib/libbootloader_support.a
--- a/tools/sdk/lib/libbt.a
+++ b/tools/sdk/lib/libbt.a
--- a/tools/sdk/lib/libcoap.a
+++ b/tools/sdk/lib/libcoap.a
--- a/tools/sdk/lib/libcoexist.a
+++ b/tools/sdk/lib/libcoexist.a
--- a/tools/sdk/lib/libconsole.a
+++ b/tools/sdk/lib/libconsole.a
--- a/tools/sdk/lib/libcore.a
+++ b/tools/sdk/lib/libcore.a
--- a/tools/sdk/lib/libcxx.a
+++ b/tools/sdk/lib/libcxx.a
--- a/tools/sdk/lib/libdriver.a
+++ b/tools/sdk/lib/libdriver.a
--- a/tools/sdk/lib/libefuse.a
+++ b/tools/sdk/lib/libefuse.a
--- a/tools/sdk/lib/libesp-tls.a
+++ b/tools/sdk/lib/libesp-tls.a
--- a/tools/sdk/lib/libesp32-camera.a
+++ b/tools/sdk/lib/libesp32-camera.a
--- a/tools/sdk/lib/libesp32.a
+++ b/tools/sdk/lib/libesp32.a
--- a/tools/sdk/lib/libesp_adc_cal.a
+++ b/tools/sdk/lib/libesp_adc_cal.a
--- a/tools/sdk/lib/libesp_event.a
+++ b/tools/sdk/lib/libesp_event.a
--- a/tools/sdk/lib/libesp_http_client.a
+++ b/tools/sdk/lib/libesp_http_client.a
--- a/tools/sdk/lib/libesp_http_server.a
+++ b/tools/sdk/lib/libesp_http_server.a
--- a/tools/sdk/lib/libesp_https_ota.a
+++ b/tools/sdk/lib/libesp_https_ota.a
--- a/tools/sdk/lib/libesp_https_server.a
+++ b/tools/sdk/lib/libesp_https_server.a
--- a/tools/sdk/lib/libesp_ringbuf.a
+++ b/tools/sdk/lib/libesp_ringbuf.a
--- a/tools/sdk/lib/libesp_websocket_client.a
+++ b/tools/sdk/lib/libesp_websocket_client.a
--- a/tools/sdk/lib/libespcoredump.a
+++ b/tools/sdk/lib/libespcoredump.a
--- a/tools/sdk/lib/libespnow.a
+++ b/tools/sdk/lib/libespnow.a
--- a/tools/sdk/lib/libethernet.a
+++ b/tools/sdk/lib/libethernet.a
--- a/tools/sdk/lib/libexpat.a
+++ b/tools/sdk/lib/libexpat.a
--- a/tools/sdk/lib/libface_detection.a
+++ b/tools/sdk/lib/libface_detection.a
--- a/tools/sdk/lib/libface_recognition.a
+++ b/tools/sdk/lib/libface_recognition.a
--- a/tools/sdk/lib/libfatfs.a
+++ b/tools/sdk/lib/libfatfs.a
--- a/tools/sdk/lib/libfb_gfx.a
+++ b/tools/sdk/lib/libfb_gfx.a
--- a/tools/sdk/lib/libfreemodbus.a
+++ b/tools/sdk/lib/libfreemodbus.a
--- a/tools/sdk/lib/libfreertos.a
+++ b/tools/sdk/lib/libfreertos.a
--- a/tools/sdk/lib/libheap.a
+++ b/tools/sdk/lib/libheap.a
--- a/tools/sdk/lib/libimage_util.a
+++ b/tools/sdk/lib/libimage_util.a
--- a/tools/sdk/lib/libjsmn.a
+++ b/tools/sdk/lib/libjsmn.a
--- a/tools/sdk/lib/libjson.a
+++ b/tools/sdk/lib/libjson.a
--- a/tools/sdk/lib/liblibsodium.a
+++ b/tools/sdk/lib/liblibsodium.a
--- a/tools/sdk/lib/liblog.a
+++ b/tools/sdk/lib/liblog.a
--- a/tools/sdk/lib/liblwip.a
+++ b/tools/sdk/lib/liblwip.a
--- a/tools/sdk/lib/libmbedtls.a
+++ b/tools/sdk/lib/libmbedtls.a
--- a/tools/sdk/lib/libmdns.a
+++ b/tools/sdk/lib/libmdns.a
--- a/tools/sdk/lib/libmesh.a
+++ b/tools/sdk/lib/libmesh.a
--- a/tools/sdk/lib/libmicro-ecc.a
+++ b/tools/sdk/lib/libmicro-ecc.a
--- a/tools/sdk/lib/libmqtt.a
+++ b/tools/sdk/lib/libmqtt.a
--- a/tools/sdk/lib/libnet80211.a
+++ b/tools/sdk/lib/libnet80211.a
--- a/tools/sdk/lib/libnewlib.a
+++ b/tools/sdk/lib/libnewlib.a
--- a/tools/sdk/lib/libnghttp.a
+++ b/tools/sdk/lib/libnghttp.a
--- a/tools/sdk/lib/libnvs_flash.a
+++ b/tools/sdk/lib/libnvs_flash.a
--- a/tools/sdk/lib/libopenssl.a
+++ b/tools/sdk/lib/libopenssl.a
--- a/tools/sdk/lib/libpp.a
+++ b/tools/sdk/lib/libpp.a
--- a/tools/sdk/lib/libprotobuf-c.a
+++ b/tools/sdk/lib/libprotobuf-c.a
--- a/tools/sdk/lib/libprotocomm.a
+++ b/tools/sdk/lib/libprotocomm.a
--- a/tools/sdk/lib/libpthread.a
+++ b/tools/sdk/lib/libpthread.a
--- a/tools/sdk/lib/libsdmmc.a
+++ b/tools/sdk/lib/libsdmmc.a
--- a/tools/sdk/lib/libsmartconfig.a
+++ b/tools/sdk/lib/libsmartconfig.a
--- a/tools/sdk/lib/libsmartconfig_ack.a
+++ b/tools/sdk/lib/libsmartconfig_ack.a
--- a/tools/sdk/lib/libsoc.a
+++ b/tools/sdk/lib/libsoc.a
--- a/tools/sdk/lib/libspi_flash.a
+++ b/tools/sdk/lib/libspi_flash.a
--- a/tools/sdk/lib/libspiffs.a
+++ b/tools/sdk/lib/libspiffs.a
--- a/tools/sdk/lib/libtcp_transport.a
+++ b/tools/sdk/lib/libtcp_transport.a
--- a/tools/sdk/lib/libtcpip_adapter.a
+++ b/tools/sdk/lib/libtcpip_adapter.a
--- a/tools/sdk/lib/libulp.a
+++ b/tools/sdk/lib/libulp.a
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
me-no-dev	b05bdf6904	Update esptool for Big Sur	2020-12-07 10:19:55 +02:00
Me No Dev	442c63a4c6	IDF release/v3.3 b4c075169 (#4604 ) esp-face: master 420fc7e esp32-camera: master 0107093	2020-12-07 10:03:16 +02:00
Me No Dev	d1a4b3b822	Add loop task stack size config to Kconfig Follow up for https://github.com/espressif/arduino-esp32/pull/4564	2020-12-02 11:56:45 +02:00
coylen	7d5bf9e385	[1.0.5] Make looptask stack size configurable (#4564 ) Added guarded define to set the stacksize on the main looptask. Advantage of this is that build_flags can be used to provide a different value for the stack size should it be neccessary default behaviour is unaffected	2020-12-02 11:52:04 +02:00
Aaron.Lee	aac26a4d1e	[1.0.5] Update Heltec ESP32 series boards definition (#4577 )	2020-12-02 11:50:12 +02:00
me-no-dev	804c221499	Update .gitignore	2020-12-01 22:20:06 +02:00
Clemens Kirchgatterer	3236358ded	Update WiFiClient.cpp (#4573 ) Replace (depricated) bzero, bcopy with memset and memcpy.	2020-12-01 16:35:12 +02:00
Clemens Kirchgatterer	82e71f9b50	Update ssl_client.cpp (#4574 ) Replace (depricated) bzero with memset.	2020-12-01 16:34:36 +02:00
Me No Dev	2e12392721	IDF release/v3.3 c33fc7821 esp-face: master 420fc7e esp32-camera: master 0107093	2020-12-01 16:22:18 +02:00
Marc J	6b0114366b	Fix logic in SPIClass::setHwCs. (#4559 ) Fixes #4558	2020-11-23 14:22:43 +02:00
FedericoBusero	18832bb418	M5TimerCam: add LED_BUILTIN & SS/MOSI/MISO/SCK (#4560 )	2020-11-23 14:21:58 +02:00
Mike Dunston	97dcea2b99	Update library.properties (#4563 ) Set the category to silence this warning in the Arduino IDE: ``` WARNING: Category '' in library WiFiProv is not valid. Setting to 'Uncategorized' ```	2020-11-23 14:21:34 +02:00
Sweety	dcff2e9774	Separate Provisioning library from WiFi library (#4547 )	2020-11-19 00:12:16 +02:00
Me No Dev	6d256b6454	IDF release/v3.3 68b237fe5 with Disable IRAM optimisation for WiFi	2020-11-16 13:06:50 +02:00
me-no-dev	f6bf0f7aa2	IDF release/v3.3 68b237fe5	2020-11-16 12:44:07 +02:00
Me No Dev	a59eb5d51e	Merge branch 'master' into idf-release/v3.3	2020-11-16 12:09:23 +02:00
Me No Dev	cee7b4237c	Merge branch 'master' into idf-release/v3.3	2020-11-15 12:02:51 +02:00
me-no-dev	954df2fc3e	Disable IRAM optimization for WiFi	2020-11-15 11:56:01 +02:00
me-no-dev	cecef8e930	IDF release/v3.3 68b237fe5	2020-11-14 00:33:27 +00:00
Me No Dev	a8e99baeab	Merge branch 'master' into idf-release/v3.3	2020-11-12 21:29:57 +02:00
me-no-dev	7494c4e76d	IDF release/v3.3 44ec7972b	2020-11-08 00:36:32 +00:00
me-no-dev	c1951670d1	IDF release/v3.3 66d3783c8	2020-11-06 18:15:23 +00:00