From abc7ba6cacb0f66a9b0c7d50c78557ef2cc9fab5 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 22:42:15 +0200 Subject: [PATCH 1/7] Remove ESP32 move to main --- platformio_override_sample.ini | 41 ---------------------------------- 1 file changed, 41 deletions(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index be5d5f24f..f8bf9ead1 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -167,44 +167,3 @@ build_type = debug build_unflags = ${esp_defaults.build_unflags} build_flags = ${esp82xx_defaults.build_flags} -Wstack-usage=300 - - -; *** Experimental ESP32 Tasmota version *** -; *** expect the unexpected. Many features not working!!! *** - -[common32] -platform = espressif32@1.12.4 -platform_packages = tool-esptoolpy@1.20800.0 -board = esp32dev -board_build.ldscript = esp32_out.ld -board_build.partitions = esp32_partition_app1984k_spiffs64k.csv -board_build.flash_mode = ${common.board_build.flash_mode} -board_build.f_flash = ${common.board_build.f_flash} -board_build.f_cpu = ${common.board_build.f_cpu} -build_unflags = ${esp_defaults.build_unflags} - -Wpointer-arith -monitor_speed = ${common.monitor_speed} -upload_port = ${common.upload_port} -upload_resetmethod = ${common.upload_resetmethod} -upload_speed = 921600 -extra_scripts = ${common.extra_scripts} - -build_flags = ${esp_defaults.build_flags} - - -D CORE_DEBUG_LEVEL=0 - -D BUFFER_LENGTH=128 - -D MQTT_MAX_PACKET_SIZE=1200 - -D uint32=uint32_t - -D uint16=uint16_t - -D uint8=uint8_t - -D sint8_t=int8_t - -D sint32_t=int32_t - -D sint16_t=int16_t - -D memcpy_P=memcpy - -D memcmp_P=memcmp - -lib_extra_dirs = - libesp32 - -lib_ignore = - cc1101 From 7b83aeb5ff773b5e5e14065979e4f7509495c0ff Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 22:50:26 +0200 Subject: [PATCH 2/7] ESP32 settings --- platformio.ini | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/platformio.ini b/platformio.ini index 86f72211a..ace3cc6db 100644 --- a/platformio.ini +++ b/platformio.ini @@ -14,6 +14,7 @@ build_dir = .pioenvs workspace_dir = .pioenvs build_cache_dir = .cache extra_configs = platformio_tasmota_env.ini + platformio_tasmota_env32.ini platformio_override.ini ; *** Build/upload environment @@ -76,6 +77,46 @@ upload_resetmethod = nodemcu upload_port = COM5 extra_scripts = ${scripts_defaults.extra_scripts} +; *** BETA ESP32 Tasmota version *** +; *** expect the unexpected. Some features not working!!! *** + +[common32] +platform = espressif32@1.12.4 +platform_packages = tool-esptoolpy@1.20800.0 +board = esp32dev +board_build.ldscript = esp32_out.ld +board_build.partitions = esp32_partition_app1984k_spiffs64k.csv +board_build.flash_mode = ${common.board_build.flash_mode} +board_build.f_flash = ${common.board_build.f_flash} +board_build.f_cpu = ${common.board_build.f_cpu} +build_unflags = ${esp_defaults.build_unflags} + -Wpointer-arith +monitor_speed = ${common.monitor_speed} +upload_port = ${common.upload_port} +upload_resetmethod = ${common.upload_resetmethod} +upload_speed = 921600 +extra_scripts = ${common.extra_scripts} + +build_flags = ${esp_defaults.build_flags} + + -D CORE_DEBUG_LEVEL=0 + -D BUFFER_LENGTH=128 + -D MQTT_MAX_PACKET_SIZE=1200 + -D uint32=uint32_t + -D uint16=uint16_t + -D uint8=uint8_t + -D sint8_t=int8_t + -D sint32_t=int32_t + -D sint16_t=int16_t + -D memcpy_P=memcpy + -D memcmp_P=memcmp + +lib_extra_dirs = + libesp32 + +lib_ignore = + cc1101 + [scripts_defaults] extra_scripts = pio/strip-floats.py pio/name-firmware.py From e966fbb2f1a51f9a3bd1d197a40b5ee526fbf303 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 22:52:11 +0200 Subject: [PATCH 3/7] Remove esp32 env --- platformio_override_sample.ini | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index f8bf9ead1..ddd74a60d 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -9,8 +9,7 @@ ; http://docs.platformio.org/en/stable/projectconf.html [platformio] -extra_configs = platformio_tasmota_env32.ini - platformio_tasmota_cenv.ini +extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment default_envs = From 640117844cb7d49e1ebd184f7214edab32637829 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 23:00:09 +0200 Subject: [PATCH 4/7] Create platformio_tasmota32.ini --- platformio_tasmota32.ini | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 platformio_tasmota32.ini diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini new file mode 100644 index 000000000..0ddf8c692 --- /dev/null +++ b/platformio_tasmota32.ini @@ -0,0 +1,33 @@ +; *** BETA ESP32 Tasmota version *** +; *** expect the unexpected. Some features not working!!! *** + +[common32] +platform = espressif32@1.12.4 +platform_packages = tool-esptoolpy@1.20800.0 +board = esp32dev +board_build.ldscript = esp32_out.ld +board_build.partitions = esp32_partition_app1984k_spiffs64k.csv +board_build.flash_mode = ${common.board_build.flash_mode} +board_build.f_flash = ${common.board_build.f_flash} +board_build.f_cpu = ${common.board_build.f_cpu} +build_unflags = ${esp_defaults.build_unflags} + -Wpointer-arith +monitor_speed = ${common.monitor_speed} +upload_port = ${common.upload_port} +upload_resetmethod = ${common.upload_resetmethod} +upload_speed = 921600 +extra_scripts = ${common.extra_scripts} + +build_flags = ${esp_defaults.build_flags} + + -D CORE_DEBUG_LEVEL=0 + -D BUFFER_LENGTH=128 + -D MQTT_MAX_PACKET_SIZE=1200 + -D uint32=uint32_t + -D uint16=uint16_t + -D uint8=uint8_t + -D sint8_t=int8_t + -D sint32_t=int32_t + -D sint16_t=int16_t + -D memcpy_P=memcpy + -D memcmp_P=memcmp From 8a5ab7febbc45af5b73336ffc52dc3efc1934b2e Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 23:03:19 +0200 Subject: [PATCH 5/7] Move ESP32 in extra platformio32 file --- platformio.ini | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/platformio.ini b/platformio.ini index ace3cc6db..161c0686f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,7 +13,8 @@ src_dir = tasmota build_dir = .pioenvs workspace_dir = .pioenvs build_cache_dir = .cache -extra_configs = platformio_tasmota_env.ini +extra_configs = platformio_tasmota32.ini + platformio_tasmota_env.ini platformio_tasmota_env32.ini platformio_override.ini @@ -76,46 +77,6 @@ upload_speed = 115200 upload_resetmethod = nodemcu upload_port = COM5 extra_scripts = ${scripts_defaults.extra_scripts} - -; *** BETA ESP32 Tasmota version *** -; *** expect the unexpected. Some features not working!!! *** - -[common32] -platform = espressif32@1.12.4 -platform_packages = tool-esptoolpy@1.20800.0 -board = esp32dev -board_build.ldscript = esp32_out.ld -board_build.partitions = esp32_partition_app1984k_spiffs64k.csv -board_build.flash_mode = ${common.board_build.flash_mode} -board_build.f_flash = ${common.board_build.f_flash} -board_build.f_cpu = ${common.board_build.f_cpu} -build_unflags = ${esp_defaults.build_unflags} - -Wpointer-arith -monitor_speed = ${common.monitor_speed} -upload_port = ${common.upload_port} -upload_resetmethod = ${common.upload_resetmethod} -upload_speed = 921600 -extra_scripts = ${common.extra_scripts} - -build_flags = ${esp_defaults.build_flags} - - -D CORE_DEBUG_LEVEL=0 - -D BUFFER_LENGTH=128 - -D MQTT_MAX_PACKET_SIZE=1200 - -D uint32=uint32_t - -D uint16=uint16_t - -D uint8=uint8_t - -D sint8_t=int8_t - -D sint32_t=int32_t - -D sint16_t=int16_t - -D memcpy_P=memcpy - -D memcmp_P=memcmp - -lib_extra_dirs = - libesp32 - -lib_ignore = - cc1101 [scripts_defaults] extra_scripts = pio/strip-floats.py From e581e59e50c0fe5d601abe1b9cc0d12b91865c57 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 23:15:17 +0200 Subject: [PATCH 6/7] Update platformio_tasmota32.ini --- platformio_tasmota32.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index 0ddf8c692..feca8c849 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -31,3 +31,9 @@ build_flags = ${esp_defaults.build_flags} -D sint16_t=int16_t -D memcpy_P=memcpy -D memcmp_P=memcmp + +lib_extra_dirs = + libesp32 + +lib_ignore = + cc1101 From e940c28be99a1d7e1b309cdacc8829e3d57c2442 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 5 Sep 2020 23:22:51 +0200 Subject: [PATCH 7/7] Remove spaces --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 161c0686f..ecf7d41ab 100644 --- a/platformio.ini +++ b/platformio.ini @@ -77,7 +77,7 @@ upload_speed = 115200 upload_resetmethod = nodemcu upload_port = COM5 extra_scripts = ${scripts_defaults.extra_scripts} - + [scripts_defaults] extra_scripts = pio/strip-floats.py pio/name-firmware.py