Merge branch 'master' into patch-1

Author: me-no-dev

.github/scripts/install-platformio-esp32.sh

@@ -9,22 +9,17 @@ echo "Installing PlatformIO ..."
 pip install -U https://github.com/platformio/platformio/archive/develop.zip > /dev/null 2>&1
 
 echo "Installing Platform ESP32 ..."
-python -m platformio platform install https://github.com/platformio/platform-espressif32.git#feature/stage > /dev/null 2>&1
+python -m platformio platform install https://github.com/platformio/platform-espressif32.git > /dev/null 2>&1
 
 echo "Replacing the framework version ..."
-if [[ "$OSTYPE" == "darwin"* ]]; then
-	sed 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' "$HOME/.platformio/platforms/espressif32/platform.json" > "platform.json"
-	mv -f "platform.json" "$HOME/.platformio/platforms/espressif32/platform.json"
-else
-	sed -i 's/https:\/\/github\.com\/espressif\/arduino-esp32\.git/*/' "$HOME/.platformio/platforms/espressif32/platform.json"
-fi
+python -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/espressif32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoespressif32']['version'] = '*'; del data['packages']['framework-arduinoespressif32']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()"
 
 if [ "$GITHUB_REPOSITORY" == "espressif/arduino-esp32" ];  then
 	echo "Linking Core..."
 	ln -s $GITHUB_WORKSPACE "$PLATFORMIO_ESP32_PATH"
 else
 	echo "Cloning Core Repository ..."
-	git clone https://github.com/espressif/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
+	git clone --recursive https://github.com/espressif/arduino-esp32.git "$PLATFORMIO_ESP32_PATH" > /dev/null 2>&1
 fi
 
 echo "PlatformIO for ESP32 has been installed"

.gitignore

@@ -12,3 +12,4 @@ tools/mkspiffs/mkspiffs.exe
 .vs/
 __vm/
 *.vcxproj*
+.vscode/

CMakeLists.txt

@@ -60,6 +60,7 @@ set(LIBRARY_SRCS
   libraries/SPI/src/SPI.cpp
   libraries/Ticker/src/Ticker.cpp
   libraries/Update/src/Updater.cpp
+  libraries/Update/src/HttpsOTAUpdate.cpp
   libraries/WebServer/src/WebServer.cpp
   libraries/WebServer/src/Parsing.cpp
   libraries/WebServer/src/detail/mimetable.cpp
@@ -71,6 +72,7 @@ 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
@@ -205,7 +207,7 @@ set(COMPONENT_ADD_INCLUDEDIRS
 
 set(COMPONENT_PRIV_INCLUDEDIRS cores/esp32/libb64)
 
-set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet esp_adc_cal)
+set(COMPONENT_REQUIRES spi_flash mbedtls mdns ethernet esp_adc_cal wifi_provisioning)
 set(COMPONENT_PRIV_REQUIRES fatfs nvs_flash app_update spiffs bootloader_support openssl bt)
 
 register_component()

boards.txt

@@ -310,7 +310,6 @@ pico32.menu.DebugLevel.verbose=Verbose
 pico32.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
-
 tinypico.name=TinyPICO
 
 tinypico.upload.tool=esptool_py
@@ -2491,6 +2490,67 @@ m5stick-c.menu.DebugLevel.debug.build.code_debug=4
 m5stick-c.menu.DebugLevel.verbose=Verbose
 m5stick-c.menu.DebugLevel.verbose.build.code_debug=5
 
+##############################################################
+
+m5stack-atom.name=M5Stack-ATOM
+
+m5stack-atom.upload.tool=esptool_py
+m5stack-atom.upload.maximum_size=1310720
+m5stack-atom.upload.maximum_data_size=327680
+m5stack-atom.upload.wait_for_upload_port=true
+
+m5stack-atom.serial.disableDTR=true
+m5stack-atom.serial.disableRTS=true
+
+m5stack-atom.build.mcu=esp32
+m5stack-atom.build.core=esp32
+m5stack-atom.build.variant=m5stack_atom
+m5stack-atom.build.board=M5Stack_ATOM
+
+m5stack-atom.build.f_cpu=240000000L
+m5stack-atom.build.flash_size=4MB
+m5stack-atom.build.flash_freq=80m
+m5stack-atom.build.flash_mode=dio
+m5stack-atom.build.boot=dio
+m5stack-atom.build.partitions=default
+m5stack-atom.build.defines=
+
+m5stack-atom.menu.PartitionScheme.default=Default
+m5stack-atom.menu.PartitionScheme.default.build.partitions=default
+m5stack-atom.menu.PartitionScheme.no_ota=No OTA (Large APP)
+m5stack-atom.menu.PartitionScheme.no_ota.build.partitions=no_ota
+m5stack-atom.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+m5stack-atom.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+m5stack-atom.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+m5stack-atom.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+
+m5stack-atom.menu.UploadSpeed.1500000=1500000
+m5stack-atom.menu.UploadSpeed.1500000.upload.speed=1500000
+m5stack-atom.menu.UploadSpeed.750000=750000
+m5stack-atom.menu.UploadSpeed.750000.upload.speed=750000
+m5stack-atom.menu.UploadSpeed.500000=500000
+m5stack-atom.menu.UploadSpeed.500000.upload.speed=500000
+m5stack-atom.menu.UploadSpeed.250000=250000
+m5stack-atom.menu.UploadSpeed.250000.upload.speed=250000
+m5stack-atom.menu.UploadSpeed.115200=115200
+m5stack-atom.menu.UploadSpeed.115200.upload.speed=115200
+
+
+
+m5stack-atom.menu.DebugLevel.none=None
+m5stack-atom.menu.DebugLevel.none.build.code_debug=0
+m5stack-atom.menu.DebugLevel.error=Error
+m5stack-atom.menu.DebugLevel.error.build.code_debug=1
+m5stack-atom.menu.DebugLevel.warn=Warn
+m5stack-atom.menu.DebugLevel.warn.build.code_debug=2
+m5stack-atom.menu.DebugLevel.info=Info
+m5stack-atom.menu.DebugLevel.info.build.code_debug=3
+m5stack-atom.menu.DebugLevel.debug=Debug
+m5stack-atom.menu.DebugLevel.debug.build.code_debug=4
+m5stack-atom.menu.DebugLevel.verbose=Verbose
+m5stack-atom.menu.DebugLevel.verbose.build.code_debug=5
+
 
 ##############################################################
 
@@ -4815,9 +4875,71 @@ sensesiot_weizen.menu.UploadSpeed.460800.macosx=460800
 sensesiot_weizen.menu.UploadSpeed.460800.upload.speed=460800
 sensesiot_weizen.menu.UploadSpeed.512000.windows=512000
 sensesiot_weizen.menu.UploadSpeed.512000.upload.speed=512000
+
 ##############################################################
-mPython.name=mPython
+kits-edu.name=KITS ESP32 EDU
+
+kits-edu.upload.tool=esptool_py
+kits-edu.upload.maximum_size=1310720
+kits-edu.upload.maximum_data_size=327680
+kits-edu.upload.wait_for_upload_port=true
+
+kits-edu.serial.disableDTR=true
+kits-edu.serial.disableRTS=true
+
+kits-edu.build.mcu=esp32
+kits-edu.build.core=esp32
+kits-edu.build.variant=pico32
+kits-edu.build.board=ESP32_PICO
+
+kits-edu.build.f_cpu=240000000L
+kits-edu.build.flash_size=4MB
+kits-edu.build.flash_freq=80m
+kits-edu.build.flash_mode=dio
+kits-edu.build.boot=dio
+kits-edu.build.partitions=default
+kits-edu.build.defines=
+
+kits-edu.menu.PartitionScheme.default=Default
+kits-edu.menu.PartitionScheme.default.build.partitions=default
+kits-edu.menu.PartitionScheme.no_ota=No OTA (Large APP)
+kits-edu.menu.PartitionScheme.no_ota.build.partitions=no_ota
+kits-edu.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+kits-edu.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+kits-edu.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+kits-edu.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+kits-edu.menu.UploadSpeed.921600=921600
+kits-edu.menu.UploadSpeed.921600.upload.speed=921600
+kits-edu.menu.UploadSpeed.115200=115200
+kits-edu.menu.UploadSpeed.115200.upload.speed=115200
+kits-edu.menu.UploadSpeed.256000.windows=256000
+kits-edu.menu.UploadSpeed.256000.upload.speed=256000
+kits-edu.menu.UploadSpeed.230400.windows.upload.speed=256000
+kits-edu.menu.UploadSpeed.230400=230400
+kits-edu.menu.UploadSpeed.230400.upload.speed=230400
+kits-edu.menu.UploadSpeed.460800.linux=460800
+kits-edu.menu.UploadSpeed.460800.macosx=460800
+kits-edu.menu.UploadSpeed.460800.upload.speed=460800
+kits-edu.menu.UploadSpeed.512000.windows=512000
+kits-edu.menu.UploadSpeed.512000.upload.speed=512000
+
+kits-edu.menu.DebugLevel.none=None
+kits-edu.menu.DebugLevel.none.build.code_debug=0
+kits-edu.menu.DebugLevel.error=Error
+kits-edu.menu.DebugLevel.error.build.code_debug=1
+kits-edu.menu.DebugLevel.warn=Warn
+kits-edu.menu.DebugLevel.warn.build.code_debug=2
+kits-edu.menu.DebugLevel.info=Info
+kits-edu.menu.DebugLevel.info.build.code_debug=3
+kits-edu.menu.DebugLevel.debug=Debug
+kits-edu.menu.DebugLevel.debug.build.code_debug=4
+kits-edu.menu.DebugLevel.verbose=Verbose
+kits-edu.menu.DebugLevel.verbose.build.code_debug=5
 
+##############################################################
+
+mPython.name=Labplus mPython
 mPython.upload.tool=esptool_py
 mPython.upload.maximum_size=1310720
 mPython.upload.maximum_data_size=327680
@@ -4924,4 +5046,74 @@ mPython.menu.DebugLevel.debug=Debug
 mPython.menu.DebugLevel.debug.build.code_debug=4
 mPython.menu.DebugLevel.verbose=Verbose
 mPython.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
+imbrios-logsens-v1p1.name=IMBRIOS LOGSENS_V1P1
+
+imbrios-logsens-v1p1.upload.tool=esptool_py
+imbrios-logsens-v1p1.upload.maximum_size=1310720
+imbrios-logsens-v1p1.upload.maximum_data_size=327680
+imbrios-logsens-v1p1.upload.wait_for_upload_port=true
+
+imbrios-logsens-v1p1.serial.disableDTR=true
+imbrios-logsens-v1p1.serial.disableRTS=true
+
+imbrios-logsens-v1p1.build.mcu=esp32
+imbrios-logsens-v1p1.build.core=esp32
+imbrios-logsens-v1p1.build.variant=imbrios-logsens-v1p1
+imbrios-logsens-v1p1.build.board=IMBRIOS_LOGSENS_V1P1
+
+imbrios-logsens-v1p1.build.f_cpu=240000000L
+imbrios-logsens-v1p1.build.flash_mode=dio
+imbrios-logsens-v1p1.build.flash_size=4MB
+imbrios-logsens-v1p1.build.boot=dio
+imbrios-logsens-v1p1.build.partitions=default
+imbrios-logsens-v1p1.build.defines=
+
+imbrios-logsens-v1p1.menu.FlashFreq.80=80MHz
+imbrios-logsens-v1p1.menu.FlashFreq.80.build.flash_freq=80m
+imbrios-logsens-v1p1.menu.FlashFreq.40=40MHz
+imbrios-logsens-v1p1.menu.FlashFreq.40.build.flash_freq=40m
+
+imbrios-logsens-v1p1.menu.PartitionScheme.default=Default
+imbrios-logsens-v1p1.menu.PartitionScheme.default.build.partitions=default
+imbrios-logsens-v1p1.menu.PartitionScheme.no_ota=No OTA (Large APP)
+imbrios-logsens-v1p1.menu.PartitionScheme.no_ota.build.partitions=no_ota
+imbrios-logsens-v1p1.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+imbrios-logsens-v1p1.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+imbrios-logsens-v1p1.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+imbrios-logsens-v1p1.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+imbrios-logsens-v1p1.menu.CPUFreq.240=240MHz (WiFi/BT)
+imbrios-logsens-v1p1.menu.CPUFreq.240.build.f_cpu=240000000L
+imbrios-logsens-v1p1.menu.CPUFreq.160=160MHz (WiFi/BT)
+imbrios-logsens-v1p1.menu.CPUFreq.160.build.f_cpu=160000000L
+imbrios-logsens-v1p1.menu.CPUFreq.80=80MHz (WiFi/BT)
+imbrios-logsens-v1p1.menu.CPUFreq.80.build.f_cpu=80000000L
+imbrios-logsens-v1p1.menu.CPUFreq.40=40MHz (40MHz XTAL)
+imbrios-logsens-v1p1.menu.CPUFreq.40.build.f_cpu=40000000L
+imbrios-logsens-v1p1.menu.CPUFreq.26=26MHz (26MHz XTAL)
+imbrios-logsens-v1p1.menu.CPUFreq.26.build.f_cpu=26000000L
+imbrios-logsens-v1p1.menu.CPUFreq.20=20MHz (40MHz XTAL)
+imbrios-logsens-v1p1.menu.CPUFreq.20.build.f_cpu=20000000L
+imbrios-logsens-v1p1.menu.CPUFreq.13=13MHz (26MHz XTAL)
+imbrios-logsens-v1p1.menu.CPUFreq.13.build.f_cpu=13000000L
+imbrios-logsens-v1p1.menu.CPUFreq.10=10MHz (40MHz XTAL)
+imbrios-logsens-v1p1.menu.CPUFreq.10.build.f_cpu=10000000L
+
+imbrios-logsens-v1p1.menu.UploadSpeed.921600=921600
+imbrios-logsens-v1p1.menu.UploadSpeed.921600.upload.speed=921600
+imbrios-logsens-v1p1.menu.UploadSpeed.115200=115200
+imbrios-logsens-v1p1.menu.UploadSpeed.115200.upload.speed=115200
+imbrios-logsens-v1p1.menu.UploadSpeed.256000.windows=256000
+imbrios-logsens-v1p1.menu.UploadSpeed.256000.upload.speed=256000
+imbrios-logsens-v1p1.menu.UploadSpeed.230400.windows.upload.speed=256000
+imbrios-logsens-v1p1.menu.UploadSpeed.230400=230400
+imbrios-logsens-v1p1.menu.UploadSpeed.230400.upload.speed=230400
+imbrios-logsens-v1p1.menu.UploadSpeed.460800.linux=460800
+imbrios-logsens-v1p1.menu.UploadSpeed.460800.macosx=460800
+imbrios-logsens-v1p1.menu.UploadSpeed.460800.upload.speed=460800
+imbrios-logsens-v1p1.menu.UploadSpeed.512000.windows=512000
+imbrios-logsens-v1p1.menu.UploadSpeed.512000.upload.speed=512000
 ##############################################################

cores/esp32/Esp.cpp

@@ -218,6 +218,33 @@ uint8_t EspClass::getChipRevision(void)
     return chip_info.revision;
 }
 
+const char * EspClass::getChipModel(void)
+{
+    uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
+    uint32_t pkg_ver = chip_ver & 0x7;
+    switch (pkg_ver) {
+        case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6 :
+            return "ESP32-D0WDQ6";
+        case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ5 :
+            return "ESP32-D0WDQ5";
+        case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 :
+            return "ESP32-D2WDQ5";
+        case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 :
+            return "ESP32-PICO-D2";
+        case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 :
+            return "ESP32-PICO-D4";
+        default:
+            return "Unknown";
+    }
+}
+
+uint8_t EspClass::getChipCores(void)
+{
+    esp_chip_info_t chip_info;
+    esp_chip_info(&chip_info);
+    return chip_info.cores;
+}
+
 const char * EspClass::getSdkVersion(void)
 {
     return esp_get_idf_version();

cores/esp32/Esp.h

@@ -75,6 +75,8 @@ class EspClass
     uint32_t getMaxAllocPsram();
 
     uint8_t getChipRevision();
+    const char * getChipModel();
+    uint8_t getChipCores();
     uint32_t getCpuFreqMHz(){ return getCpuFrequencyMhz(); }
     inline uint32_t getCycleCount() __attribute__((always_inline));
     const char * getSdkVersion();