From 7765ff43eb3cd47a3de8af28ad727ec6d00c1ca9 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 1 Jan 2022 17:34:35 +0100 Subject: [PATCH 1/2] Silence compiler warnings Discarded-qualifiers Platformio refactored to support different Platformio Scripts for esp8266 and Esp32. --- pio-tools/add_c_flags.py | 4 ++++ platformio.ini | 4 +++- platformio_override_sample.ini | 9 +++------ platformio_tasmota32.ini | 2 ++ platformio_tasmota_env32.ini | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) create mode 100644 pio-tools/add_c_flags.py diff --git a/pio-tools/add_c_flags.py b/pio-tools/add_c_flags.py new file mode 100644 index 000000000..c93059b36 --- /dev/null +++ b/pio-tools/add_c_flags.py @@ -0,0 +1,4 @@ +Import("env") + +# General options that are passed to the C compiler (C only; not C++). +env.Append(CFLAGS=["-Wno-discarded-qualifiers"]) diff --git a/platformio.ini b/platformio.ini index e16ca2778..6b77f47c1 100644 --- a/platformio.ini +++ b/platformio.ini @@ -23,6 +23,7 @@ extra_configs = platformio_tasmota32.ini platformio_tasmota_env.ini platformio_tasmota_env32.ini platformio_override.ini + platformio_tasmota_cenv.ini [common] platform = ${core.platform} @@ -38,7 +39,7 @@ monitor_port = COM5 ; *** Upload Serial reset method for Wemos and NodeMCU upload_resetmethod = nodemcu upload_port = COM5 -extra_scripts = ${scripts_defaults.extra_scripts} +extra_scripts = ${esp_defaults.extra_scripts} lib_ldf_mode = chain lib_compat_mode = strict shared_libdeps_dir = lib @@ -70,6 +71,7 @@ extra_scripts = pio-tools/strip-floats.py pio-tools/download_fs.py [esp_defaults] +extra_scripts = ${scripts_defaults.extra_scripts} ; *** remove undesired all warnings build_unflags = -Wall ; -mtarget-align diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 228d3cb75..a2c00c857 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -11,7 +11,6 @@ [platformio] ; For best Gitpod performance remove the ";" in the next line. Needed Platformio files are cached and installed at first run ;core_dir = .platformio -extra_configs = platformio_tasmota_cenv.ini ; *** Build/upload environment default_envs = @@ -65,7 +64,7 @@ board = ${common.board} ;monitor_speed = 115200 ; *** Serial port used for erasing/flashing the ESP82xx ;upload_port = COM5 -extra_scripts = ${scripts_defaults.extra_scripts} +extra_scripts = ${esp_defaults.extra_scripts} ; pio-tools/obj-dump.py lib_ldf_mode = ${common.lib_ldf_mode} lib_compat_mode = ${common.lib_compat_mode} @@ -96,7 +95,7 @@ build_unflags = ${esp32_defaults.build_unflags} build_flags = ${esp32_defaults.build_flags} ; Build variant ESP32 4M Flash, Tasmota 1856k Code/OTA, 320k LITTLEFS (default) -board = esp32_4M +;board = esp32_4M ; Build variant ESP32 8M Flash, Tasmota 2944k Code/OTA, 2112k LITTLEFS ;board = esp32_8M ; Build variant ESP32 16M Flash, Tasmota 2944k Code/OTA, 10M LITTLEFS @@ -109,9 +108,7 @@ monitor_speed = 115200 upload_port = COM4 ;upload_speed = 115200 upload_resetmethod = ${common.upload_resetmethod} -extra_scripts = ${common.extra_scripts} -lib_ldf_mode = ${common.lib_ldf_mode} -lib_compat_mode = ${common.lib_compat_mode} +;extra_scripts = ${esp32_defaults.extra_scripts} lib_ignore = ESP32 Azure IoT Arduino ESP32 Async UDP diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index 609450169..f70c70d3b 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -30,6 +30,8 @@ build_flags = ${esp_defaults.build_flags} -include "esp32x_fixes.h" ; wrappers for the crash-recorder -Wl,--wrap=panicHandler -Wl,--wrap=xt_unhandled_exception +extra_scripts = pre:pio-tools/add_c_flags.py + ${esp_defaults.extra_scripts} [core32] platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2/platform-tasmota-espressif32-2.0.2.zip diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index 24e165a64..5a5321706 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -8,7 +8,7 @@ board = esp32_4M monitor_speed = 115200 upload_port = ${common.upload_port} upload_resetmethod = ${common.upload_resetmethod} -extra_scripts = ${common.extra_scripts} +extra_scripts = ${esp32_defaults.extra_scripts} build_unflags = ${core32.build_unflags} build_flags = ${core32.build_flags} lib_ldf_mode = ${common.lib_ldf_mode} From c2b2062de62267d47a8267b93410d2535eb0127e Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 1 Jan 2022 18:08:50 +0100 Subject: [PATCH 2/2] last C3 warning --- pio-tools/add_c_flags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pio-tools/add_c_flags.py b/pio-tools/add_c_flags.py index c93059b36..0c39e777f 100644 --- a/pio-tools/add_c_flags.py +++ b/pio-tools/add_c_flags.py @@ -1,4 +1,4 @@ Import("env") # General options that are passed to the C compiler (C only; not C++). -env.Append(CFLAGS=["-Wno-discarded-qualifiers"]) +env.Append(CFLAGS=["-Wno-discarded-qualifiers", "-Wno-implicit-function-declaration"])