diff --git a/main/globals.cpp b/main/globals.cpp index e1d7f48..542e3da 100644 --- a/main/globals.cpp +++ b/main/globals.cpp @@ -32,8 +32,6 @@ bool simplified = ProfileSettings profileSettings; SettingsPersister settingsPersister; -std::array ledstrip_custom_colors; - Controllers controllers; #ifdef FEATURE_BLUETOOTH diff --git a/main/globals.h b/main/globals.h index ab12846..6eb72af 100644 --- a/main/globals.h +++ b/main/globals.h @@ -55,8 +55,6 @@ extern bool simplified; extern ProfileSettings profileSettings; extern SettingsPersister settingsPersister; -extern std::array ledstrip_custom_colors; - class Controllers : public std::array { public: diff --git a/main/newsettings.h b/main/newsettings.h index c2bef0e..9a17cf3 100644 --- a/main/newsettings.h +++ b/main/newsettings.h @@ -250,6 +250,16 @@ public: ConfigWrapper otaMode {OtaAnimationModes::GreenProgressBar, DoReset, {}, "ledOtaAnim" }; ConfigWrapper maxMilliamps {3000, DoReset, {}, "ledMaxMilliamps" }; ConfigWrapper enableVisualizeBlink {false, DoReset, {}, "enVisualBlink" }; + std::array, 8> custom_color { + ConfigWrapper {0, DoReset, {}, "ledCustomCol1" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol2" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol3" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol4" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol5" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol6" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol7" }, + ConfigWrapper {0, DoReset, {}, "ledCustomCol8" }, + }; } ledstrip; struct {