Skip to content

Commit

Permalink
rm obsolete partition schemes (arendst#19713)
Browse files Browse the repository at this point in the history
* rm obdolete partition schemes

* fix tasmota32-zbbrdgpro compile

* rm overseen partition scheme

* Special scheme needed for zbbrdgpro
  • Loading branch information
Jason2866 authored Oct 10, 2023
1 parent 663e6ab commit b5d1109
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 30 deletions.
6 changes: 0 additions & 6 deletions partitions/esp32_partition_app1572k_fs983k.csv

This file was deleted.

12 changes: 6 additions & 6 deletions partitions/esp32_partition_app1856k_fs1344k.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
safeboot, app, factory, 0x10000, 0xD0000,
app0, app, ota_0, 0xE0000, 0x1D0000,
spiffs, data, spiffs, 0x2B0000,0x150000,
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
safeboot, app, factory, 0x10000, 0xD0000,
app0, app, ota_0, 0xE0000, 0x1D0000,
spiffs, data, spiffs, 0x2B0000,0x150000,
6 changes: 0 additions & 6 deletions partitions/esp32_partition_app2944k_fs10M.csv

This file was deleted.

6 changes: 0 additions & 6 deletions partitions/esp32_partition_app2944k_fs2M.csv

This file was deleted.

9 changes: 4 additions & 5 deletions platformio_override_sample.ini
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ lib_extra_dirs = ${library.lib_extra_dirs}
[env:tasmota32_base]
; *** Uncomment next lines ";" to enable development Tasmota Arduino version ESP32
;platform = https://github.com/tasmota/platform-espressif32.git
;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1271/framework-arduinoespressif32-lwip_timeout-ed6742e7f0.zip
; framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1273/framework-arduinoespressif32-solo1-release_v4.4-804d12ce82.zip
; framework-arduino-ITEAD @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1272/framework-arduinoespressif32-ITEAD-release_v4.4-804d12ce82.zip
;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/v2.0.14/framework-arduinoespressif32-release_v4.4-9856b5e1e6.zip
; framework-arduino-solo1 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1642/framework-arduinoespressif32-solo1-release_v4.4-9856b5e1e6.zip
; framework-arduino-ITEAD @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1641/framework-arduinoespressif32-ITEAD-release_v4.4-9856b5e1e6.zip
;build_unflags = ${esp32_defaults.build_unflags}
;build_flags = ${esp32_defaults.build_flags}
;board = esp32
Expand All @@ -119,12 +119,11 @@ lib_ignore =
ESP32 Azure IoT Arduino
ESP32 Async UDP
ESP32 BLE Arduino
; SimpleBLE
SimpleBLE
NetBIOS
ESP32
Preferences
BluetoothSerial
; Disable next if you want to use ArduinoOTA in Tasmota32 (default disabled)
ArduinoOTA

lib_extra_dirs = ${library.lib_extra_dirs}
Expand Down
23 changes: 22 additions & 1 deletion platformio_tasmota_core3_env_sample.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
; tasmota32solo1-arduino30
; tasmota32-odroid30
; tasmota32s2-arduino30
; tasmota32s2cdc-arduino30
; tasmota32s3-arduino30
; tasmota32s3-qio_opi-ard30
; tasmota32s3cdc-qio_opi-ard30
Expand All @@ -29,7 +30,6 @@ build_flags = ${core32.build_flags}

[core32_30_flags]
build_unflags = ${core32_30.build_unflags}
;-DUSE_IPV6
build_flags = ${core32_30.build_flags}
lib_extra_dirs = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_audio, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl
lib_ignore =
Expand Down Expand Up @@ -103,6 +103,15 @@ build_flags = ${env:arduino30.build_flags}
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}

[env:tasmota32s2cdc-arduino30]
extends = env:arduino30
board = esp32s2cdc
build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}

[env:tasmota32s3-qio_opi-ard30]
extends = env:arduino30
board = esp32s3-qio_opi
Expand Down Expand Up @@ -150,6 +159,18 @@ build_flags = ${env:arduino30.build_flags}
-DCODE_IMAGE_STR='"webcam-v2"'
-DOTA_URL='""'

[env:tasmota32c2_2M-arduino30]
extends = env:arduino30
board = esp32c2_2M
build_unflags = ${env:arduino30.build_unflags}
-DUSE_IPV6
-mtarget-align
build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30
-DOTA_URL='""'
monitor_filters = esp32_exception_decoder
lib_ignore = ${env:arduino30.lib_ignore}

[env:tasmota32c2-arduino30]
extends = env:arduino30
board = esp32c2
Expand Down

0 comments on commit b5d1109

Please sign in to comment.