From 7e0f69e9359365ae77b3ef83d28383813dba4698 Mon Sep 17 00:00:00 2001
From: Stephan Hadinger <stephan.hadinger@gmail.com>
Date: Sat, 2 Jul 2022 00:13:27 +0200
Subject: [PATCH] Partition Wizard use ota.tasmota.com

---
 boards/esp32_4M_Legacy.json                   |  38 ++++++++++++++++++
 lib/libesp32/berry/Makefile                   |   2 +-
 tasmota/berry/modules/Partition_Wizard.tapp   | Bin 16295 -> 16253 bytes
 .../Partition_Wizard/partition_wizard.bec     | Bin 15852 -> 15810 bytes
 tasmota/berry/modules/partition_wizard.be     |   2 +-
 tasmota/tasmota_support/support_esp.ino       |   6 ++-
 6 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 boards/esp32_4M_Legacy.json

diff --git a/boards/esp32_4M_Legacy.json b/boards/esp32_4M_Legacy.json
new file mode 100644
index 000000000..2af2b4add
--- /dev/null
+++ b/boards/esp32_4M_Legacy.json
@@ -0,0 +1,38 @@
+{
+    "build": {
+      "arduino":{
+        "ldscript": "esp32_out.ld"
+      },
+      "core": "esp32",
+      "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M",
+      "f_cpu": "80000000L",
+      "f_flash": "40000000L",
+      "flash_mode": "dout",
+      "mcu": "esp32",
+      "variant": "esp32",
+      "partitions": "partitions/esp32_partition_app1856k_fs320k.csv"
+    },
+    "connectivity": [
+      "wifi",
+      "bluetooth",
+      "ethernet",
+      "can"
+    ],
+    "debug": {
+      "openocd_target": "esp32.cfg"
+    },
+    "frameworks": [
+      "arduino",
+      "espidf"
+    ],
+    "name": "Espressif Generic ESP32 4M Flash, Tasmota 2880k Code/OTA, 320k FS",
+    "upload": {
+      "flash_size": "4MB",
+      "maximum_ram_size": 327680,
+      "maximum_size": 4194304,
+      "require_upload_port": true,
+      "speed": 460800
+    },
+    "url": "https://en.wikipedia.org/wiki/ESP32",
+    "vendor": "Espressif"
+  }
diff --git a/lib/libesp32/berry/Makefile b/lib/libesp32/berry/Makefile
index f9d61125d..6241afbdd 100644
--- a/lib/libesp32/berry/Makefile
+++ b/lib/libesp32/berry/Makefile
@@ -11,7 +11,7 @@ GENERATE  = generate
 CONFIG    = default/berry_conf.h
 COC		  = tools/coc/coc
 PY        = python3
-PYCOC     = tools/pycoc/main.py
+PYCOC     = tools/coc/coc
 CONST_TAB = $(GENERATE)/be_const_strtab.h
 MAKE_COC  = $(MAKE) -C tools/coc
 
diff --git a/tasmota/berry/modules/Partition_Wizard.tapp b/tasmota/berry/modules/Partition_Wizard.tapp
index 0b78e8f9da7abbbc16e3517044c923e4f6ac050a..24e28deaeacdc1b1cb201471be7e704426dc5390 100644
GIT binary patch
delta 194
zcmZ2p|F@1ez?+$civa{Ir{9{$tH{nbVMh`WPc&^55#RSPBunC`(ji+01`rlukYSj-
zP)L|JIW&Zmfq7r{{v;sY_$t6w%aI|Yq@=(~Uq8PjQLiMiI2S}G=jZA}*~UitMX5Qd
ziN&dt`|MJffp$&)YNxLQvaGa%n}Lz#2O|RmiwMve0p5&Ea?B7Xp*Uc2fW02b&dH7T
L3T%7qKu!h#1<X9>

delta 213
zcmexcx4fP=z?+$civa{uHeH;^tH{3R;hLnq57$gIZ4^1Q@nXpKNvCSw*fKDHun2<;
z!{miR!o10$A)E}%-4E6z0rAFH0k$F83>hUQ1;tkS`bCN5dg+-Z8Kp_3#i>Qf`FSO&
zc_n(u`MLUuMX7ly#U=V7iN(43C5gIenMJwfKtcW7#LPT>IIjdEZEQ3-#V&;z=&H%5
h?ev*}&YJw!PKFo7O_SB^^+3*;9B!|`_RJ3C3jnGAR0041

diff --git a/tasmota/berry/modules/Partition_Wizard/partition_wizard.bec b/tasmota/berry/modules/Partition_Wizard/partition_wizard.bec
index 33aa383a1714e022f64fa3e8fe6baeb9eeb00cfb..9c9f4dd370c9c60f8fac7c64026fd8f45c834234 100644
GIT binary patch
delta 54
zcmaD;eW-eagRPb$Lq<tSft9{~eo3NUNn&v>h)&MW)rYc;jr5CBb5awFQzuWcjQ{{g
CBNWB}

delta 96
zcmX?9{ib?@gKbDQLq<tSL9vy-eo<n%UV3IpMrl%MacWU=eqKpxUWs0Eey)CEQEFaF
nafyCNVsUPMNuq9AW>IcAP*6WNF*8pe&MSdP8yii|vW)-$Pn{*N

diff --git a/tasmota/berry/modules/partition_wizard.be b/tasmota/berry/modules/partition_wizard.be
index e5845fc32..314067831 100644
--- a/tasmota/berry/modules/partition_wizard.be
+++ b/tasmota/berry/modules/partition_wizard.be
@@ -17,7 +17,7 @@ var partition_wizard = module('partition_wizard')
 class Partition_wizard_UI
   static app_size_min = 832    # Min OTA size - let's set it at a safe 896KB for minimal Tasmota32 with TLS
   static app_size_max = 3072   # Max OTA size - (4096 - 896 - 128)
-  static _default_safeboot_URL = "https://raw.githubusercontent.com/arendst/Tasmota-firmware/main/firmware/tasmota32/tasmota32%s-safeboot.bin"
+  static _default_safeboot_URL = "http://ota.tasmota.com/tasmota32/release/tasmota32%s-safeboot.bin"
 
   def init()
     import persist
diff --git a/tasmota/tasmota_support/support_esp.ino b/tasmota/tasmota_support/support_esp.ino
index 902b6a17d..7d451d612 100644
--- a/tasmota/tasmota_support/support_esp.ino
+++ b/tasmota/tasmota_support/support_esp.ino
@@ -123,7 +123,11 @@ String GetDeviceHardwareRevision(void) {
 #include "bootloader_flash.h"
 // ESP32_ARCH contains the name of the architecture (used by autoconf)
 #if CONFIG_IDF_TARGET_ESP32
-  #define ESP32_ARCH              "esp32"
+  #ifdef CORE32SOLO1
+    #define ESP32_ARCH            "esp32solo1"
+  #else
+    #define ESP32_ARCH            "esp32"
+  #endif
 #elif CONFIG_IDF_TARGET_ESP32S2
   #define ESP32_ARCH              "esp32s2"
 #elif CONFIG_IDF_TARGET_ESP32S3