From 99ec57a6d05093b81730267b6518d5347a9c12fc Mon Sep 17 00:00:00 2001
From: TD-er <gijs.noorlander@gmail.com>
Date: Sun, 10 May 2026 21:52:20 +0200
Subject: [PATCH] [32M flash] Fix including all 'MAX' plugins for 32M flash
 builds

---
 platformio_esp32c5_envs.ini              | 12 +++---------
 platformio_esp32p4_envs.ini              |  2 +-
 platformio_esp32p4r3_envs.ini            |  2 +-
 src/src/CustomBuild/define_plugin_sets.h |  5 +++++
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/platformio_esp32c5_envs.ini b/platformio_esp32c5_envs.ini
index 701d817ac..e3db85fd5 100644
--- a/platformio_esp32c5_envs.ini
+++ b/platformio_esp32c5_envs.ini
@@ -48,15 +48,9 @@ build_flags               = ${esp32c5_common_LittleFS.build_flags}
 extra_scripts             = ${esp32c5_common_LittleFS.extra_scripts}
 
 [env:max32_ESP32c5_32M20M]
-extends                   = esp32c5_common_LittleFS
+extends                   = env:max_ESP32c5_16M8M
 board                     = esp32c5cdc-32M
-build_flags               = ${esp32c5_common_LittleFS.build_flags}  
-                            -DFEATURE_ETHERNET=1
-                            -DFEATURE_ARDUINO_OTA=1
-                            -DPLUGIN_BUILD_MAX_ESP32
-                            -DPLUGIN_BUILD_IR_EXTENDED
-                            -D ST7789_EXTRA_INIT=1
-                            -D P116_EXTRA_ST7789=1
-extra_scripts             = ${esp32c5_common_LittleFS.extra_scripts}
+build_flags               = ${env:max_ESP32c5_16M8M.build_flags}
+                            -DPLUGIN_BUILD_MAX32_ESP32
 
 
diff --git a/platformio_esp32p4_envs.ini b/platformio_esp32p4_envs.ini
index 91b6e4379..99d6e86d6 100644
--- a/platformio_esp32p4_envs.ini
+++ b/platformio_esp32p4_envs.ini
@@ -30,7 +30,7 @@ extra_scripts             = ${esp32p4_common_LittleFS.extra_scripts}
 [env:max32_ESP32p4_32M20M]
 extends                   = env:max_ESP32p4_16M8M
 board                     = esp32p4_ev-32M
-build_flags               = ${esp32p4_common_LittleFS.build_flags}  
+build_flags               = ${env:max_ESP32p4_16M8M.build_flags}
                             -DPLUGIN_BUILD_MAX32_ESP32
 
 
diff --git a/platformio_esp32p4r3_envs.ini b/platformio_esp32p4r3_envs.ini
index 93847728d..5a8611dce 100644
--- a/platformio_esp32p4r3_envs.ini
+++ b/platformio_esp32p4r3_envs.ini
@@ -14,7 +14,7 @@ board                     = esp32p4r3
 [env:max32_ESP32p4r3_32M20M]
 extends                   = env:max_ESP32p4_16M8M
 board                     = esp32p4r3-32M
-build_flags               = ${esp32p4_common_LittleFS.build_flags}  
+build_flags               = ${env:max_ESP32p4r3_16M8M.build_flags}  
                             -DPLUGIN_BUILD_MAX32_ESP32
 
 
diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h
index 2328cd9f1..0ddd3935b 100644
--- a/src/src/CustomBuild/define_plugin_sets.h
+++ b/src/src/CustomBuild/define_plugin_sets.h
@@ -8,6 +8,11 @@
 #endif
 
 
+#if defined(PLUGIN_BUILD_MAX32_ESP32) && !defined(PLUGIN_BUILD_MAX_ESP32)
+  #define PLUGIN_BUILD_MAX_ESP32
+#endif
+
+
 /*
 #################################################
  This is the place where plugins are registered