From 6074be2397148861d3a02cb055d8e6a32694aa3b Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 11 Aug 2022 19:59:16 +0200 Subject: [PATCH 1/3] [Build] Remove NeoPixel plugins from DISPLAY builds --- src/src/CustomBuild/define_plugin_sets.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index 606608ab8..e0ff7c318 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1357,21 +1357,21 @@ To create/register a plugin, you have to : #ifndef USES_P036 #define USES_P036 // FrameOLED #endif - #ifndef USES_P038 - #define USES_P038 // NeoPixel - #endif - #ifndef USES_P041 - #define USES_P041 // NeoClock - #endif - #ifndef USES_P042 - #define USES_P042 // Candle - #endif + // #ifndef USES_P038 + // #define USES_P038 // NeoPixel + // #endif + // #ifndef USES_P041 + // #define USES_P041 // NeoClock + // #endif + // #ifndef USES_P042 + // #define USES_P042 // Candle + // #endif #ifndef USES_P057 #define USES_P057 // HT16K33_LED #endif - #ifndef USES_P070 - #define USES_P070 // NeoPixel_Clock - #endif + // #ifndef USES_P070 + // #define USES_P070 // NeoPixel_Clock + // #endif #ifndef USES_P075 #define USES_P075 // Nextion #endif From 086cda08a203eaf11a9a9abcc75fd60e8024cd33 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 11 Aug 2022 22:12:29 +0200 Subject: [PATCH 2/3] [Build] Update documentation --- docs/source/Plugin/_plugin_substitutions_p03x.repl | 2 +- docs/source/Plugin/_plugin_substitutions_p04x.repl | 4 ++-- docs/source/Plugin/_plugin_substitutions_p07x.repl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/Plugin/_plugin_substitutions_p03x.repl b/docs/source/Plugin/_plugin_substitutions_p03x.repl index ad8259be2..fd4f86f70 100644 --- a/docs/source/Plugin/_plugin_substitutions_p03x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p03x.repl @@ -106,7 +106,7 @@ .. |P038_type| replace:: :cyan:`Output` .. |P038_typename| replace:: :cyan:`Output - NeoPixel (Basic)` .. |P038_porttype| replace:: `.` -.. |P038_status| replace:: :green:`NORMAL` :yellow:`DISPLAY, NEOPIXEL` +.. |P038_status| replace:: :green:`NORMAL` :yellow:`NEOPIXEL` .. |P038_github| replace:: P038_NeoPixel.ino .. _P038_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P038_NeoPixel.ino .. |P038_usedby| replace:: `NeoPixel RGB and RGBW LEDs and LED Strips` diff --git a/docs/source/Plugin/_plugin_substitutions_p04x.repl b/docs/source/Plugin/_plugin_substitutions_p04x.repl index a24b43cf1..981237601 100644 --- a/docs/source/Plugin/_plugin_substitutions_p04x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p04x.repl @@ -15,7 +15,7 @@ .. |P041_type| replace:: :cyan:`Output` .. |P041_typename| replace:: :cyan:`Output - NeoPixel (Word Clock)` .. |P041_porttype| replace:: `.` -.. |P041_status| replace:: :green:`NORMAL` :yellow:`DISPLAY, NEOPIXEL` +.. |P041_status| replace:: :green:`NORMAL` :yellow:`NEOPIXEL` .. |P041_github| replace:: P041_NeoClock.ino .. _P041_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P041_NeoClock.ino .. |P041_usedby| replace:: `.` @@ -28,7 +28,7 @@ .. |P042_type| replace:: :cyan:`Output` .. |P042_typename| replace:: :cyan:`Output - NeoPixel (Candle)` .. |P042_porttype| replace:: `.` -.. |P042_status| replace:: :green:`NORMAL` :yellow:`DISPLAY, NEOPIXEL` +.. |P042_status| replace:: :green:`NORMAL` :yellow:`NEOPIXEL` .. |P042_github| replace:: P042_Candle.ino .. _P042_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P042_Candle.ino .. |P042_usedby| replace:: `.` diff --git a/docs/source/Plugin/_plugin_substitutions_p07x.repl b/docs/source/Plugin/_plugin_substitutions_p07x.repl index 484354c30..05c92940a 100644 --- a/docs/source/Plugin/_plugin_substitutions_p07x.repl +++ b/docs/source/Plugin/_plugin_substitutions_p07x.repl @@ -3,7 +3,7 @@ .. |P070_type| replace:: :cyan:`Output` .. |P070_typename| replace:: :cyan:`Output - NeoPixel Ring Clock` .. |P070_porttype| replace:: `.` -.. |P070_status| replace:: :yellow:`DISPLAY, NEOPIXEL, COLLECTION A` +.. |P070_status| replace:: :yellow:`NEOPIXEL, COLLECTION A` .. |P070_github| replace:: P070_NeoPixel_Clock.ino .. _P070_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P070_NeoPixel_Clock.ino .. |P070_usedby| replace:: `.` From 1e985673ee5cfe5017671f02a51cff02fdf2eeb4 Mon Sep 17 00:00:00 2001 From: Ton Huisman Date: Thu, 11 Aug 2022 22:49:04 +0200 Subject: [PATCH 3/3] [Build] Explicitly remove NeoPixel plugins from DISPLAY builds (still in Normal and Collection) --- src/src/CustomBuild/define_plugin_sets.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/src/CustomBuild/define_plugin_sets.h b/src/src/CustomBuild/define_plugin_sets.h index e0ff7c318..6509b11a2 100644 --- a/src/src/CustomBuild/define_plugin_sets.h +++ b/src/src/CustomBuild/define_plugin_sets.h @@ -1357,21 +1357,21 @@ To create/register a plugin, you have to : #ifndef USES_P036 #define USES_P036 // FrameOLED #endif - // #ifndef USES_P038 - // #define USES_P038 // NeoPixel - // #endif - // #ifndef USES_P041 - // #define USES_P041 // NeoClock - // #endif - // #ifndef USES_P042 - // #define USES_P042 // Candle - // #endif + #ifdef USES_P038 + #undef USES_P038 // DISABLE NeoPixel + #endif + #ifdef USES_P041 + #undef USES_P041 // DISABLE NeoClock + #endif + #ifdef USES_P042 + #undef USES_P042 // DISABLE Candle + #endif #ifndef USES_P057 #define USES_P057 // HT16K33_LED #endif - // #ifndef USES_P070 - // #define USES_P070 // NeoPixel_Clock - // #endif + #ifdef USES_P070 + #undef USES_P070 // DISABLE NeoPixel_Clock + #endif #ifndef USES_P075 #define USES_P075 // Nextion #endif