From c8494f9ce39af8b28841cb7e6a1294bf26aed234 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 14 Mar 2024 22:48:24 +0100 Subject: [PATCH 1/2] [Bugfix] Remove duplicate define in Custom-sample.h --- src/Custom-sample.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Custom-sample.h b/src/Custom-sample.h index fb806bb7d9..50a2a44b4a 100644 --- a/src/Custom-sample.h +++ b/src/Custom-sample.h @@ -272,7 +272,6 @@ -#define FEATURE_SSDP 1 /* ####################################################################################################### From 6ec42d2db0864aac1390957d9a0024268d773ab1 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Sat, 16 Mar 2024 16:42:16 +0100 Subject: [PATCH 2/2] [Build] Custom IR ESP32 configurations not using the pre_custom_esp32_IR.py Python script --- platformio_esp32_envs.ini | 6 +++--- platformio_esp32c3_envs.ini | 2 +- platformio_esp32s2_envs.ini | 2 +- platformio_esp32s3_envs.ini | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platformio_esp32_envs.ini b/platformio_esp32_envs.ini index cb558c0f08..6c24456eab 100644 --- a/platformio_esp32_envs.ini +++ b/platformio_esp32_envs.ini @@ -333,9 +333,9 @@ build_flags = ${esp32_custom_base_LittleFS.build_flags} [env:custom_IR_ESP32_4M316k_ETH] extends = env:custom_IR_ESP32_4M316k -build_flags = ${env:custom_ESP32_4M316k.build_flags} +build_flags = ${env:custom_IR_ESP32_4M316k.build_flags} -DFEATURE_ETHERNET=1 -extra_scripts = ${env:custom_ESP32_4M316k.extra_scripts} +extra_scripts = ${env:custom_IR_ESP32_4M316k.extra_scripts} [env:custom_IR_ESP32_16M8M_LittleFS_ETH] extends = esp32_common_LittleFS @@ -349,7 +349,7 @@ lib_ignore = ${esp32_always.lib_ignore} ESP32_ping ${esp32_common_LittleFS.lib_ignore} extra_scripts = ${esp32_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py + pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py [env:normal_ESP32_4M316k_ETH] diff --git a/platformio_esp32c3_envs.ini b/platformio_esp32c3_envs.ini index 36983a99c1..abffc558e6 100644 --- a/platformio_esp32c3_envs.ini +++ b/platformio_esp32c3_envs.ini @@ -44,7 +44,7 @@ build_flags = ${esp32c3_common.build_flags} lib_ignore = ${esp32_always.lib_ignore} ESP32_ping extra_scripts = ${esp32c3_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py + pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py [env:custom_ESP32c3_4M316k_LittleFS_CDC] diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 20fdaf4689..d97fd66415 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -62,7 +62,7 @@ build_flags = ${esp32s2_common.build_flags} lib_ignore = ${esp32_always.lib_ignore} ESP32_ping extra_scripts = ${esp32s2_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py + pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py diff --git a/platformio_esp32s3_envs.ini b/platformio_esp32s3_envs.ini index a771e96ce1..284b717885 100644 --- a/platformio_esp32s3_envs.ini +++ b/platformio_esp32s3_envs.ini @@ -49,7 +49,7 @@ build_flags = ${esp32s3_common.build_flags} lib_ignore = ${esp32_always.lib_ignore} ESP32_ping extra_scripts = ${esp32s3_common.extra_scripts} - pre:tools/pio/pre_custom_esp32.py + pre:tools/pio/pre_custom_esp32_IR.py pre:tools/pio/ir_build_check.py