From fe0f016b4f6476d83e0422e2d9193e8f08f93d9d Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Tue, 19 Nov 2024 07:18:23 -0300 Subject: [PATCH] Matter example patch (#10618) * feat(matter): adjust preferences labels in matter examples * feat(matter): adjust preferences labels in matter examples * fix(matter_example): extra blank space in code added by mistake * feat(matter_example): use const char * instead of #define * feat(matter_example): use const char * instead of #define * feat(matter_example): change Preferences names * fix(matter_example): missing semicolon in code --- .../MatterDimmableLight/MatterDimmableLight.ino | 14 ++++++++------ .../examples/MatterOnOffLight/MatterOnOffLight.ino | 9 +++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino index ded0118b7d1..5fd3152dacf 100644 --- a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino +++ b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino @@ -22,7 +22,9 @@ MatterDimmableLight DimmableLight; // it will keep last OnOff & Brightness state stored, using Preferences -Preferences lastStatePref; +Preferences matterPref; +const char *onOffPrefKey = "OnOffState"; +const char *brightnessPrefKey = "BrightnessState"; // set your board RGB LED pin here #ifdef RGB_BUILTIN @@ -51,8 +53,8 @@ bool setLightState(bool state, uint8_t brightness) { digitalWrite(ledPin, LOW); } // store last Brightness and OnOff state for when the Light is restarted / power goes off - lastStatePref.putUChar("lastBrightness", brightness); - lastStatePref.putBool("lastOnOffState", state); + matterPref.putUChar(brightnessPrefKey, brightness); + matterPref.putBool(onOffPrefKey, state); // This callback must return the success state to Matter core return true; } @@ -86,11 +88,11 @@ void setup() { delay(500); // Initialize Matter EndPoint - lastStatePref.begin("matterLight", false); + matterPref.begin("MatterPrefs", false); // default OnOff state is ON if not stored before - bool lastOnOffState = lastStatePref.getBool("lastOnOffState", true); + bool lastOnOffState = matterPref.getBool(onOffPrefKey, true); // default brightness ~= 6% (15/255) - uint8_t lastBrightness = lastStatePref.getUChar("lastBrightness", 15); + uint8_t lastBrightness = matterPref.getUChar(brightnessPrefKey, 15); DimmableLight.begin(lastOnOffState, lastBrightness); // set the callback function to handle the Light state change DimmableLight.onChange(setLightState); diff --git a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino index 675e9e989f2..8f4276643e2 100644 --- a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino +++ b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino @@ -22,7 +22,8 @@ MatterOnOffLight OnOffLight; // it will keep last OnOff state stored, using Preferences -Preferences lastStatePref; +Preferences matterPref; +const char *onOffPrefKey = "OnOffState"; // set your board LED pin here #ifdef LED_BUILTIN @@ -48,7 +49,7 @@ bool setLightOnOff(bool state) { digitalWrite(ledPin, LOW); } // store last OnOff state for when the Light is restarted / power goes off - lastStatePref.putBool("lastOnOffState", state); + matterPref.putBool(onOffPrefKey, state); // This callback must return the success state to Matter core return true; } @@ -82,8 +83,8 @@ void setup() { delay(500); // Initialize Matter EndPoint - lastStatePref.begin("matterLight", false); - bool lastOnOffState = lastStatePref.getBool("lastOnOffState", true); + matterPref.begin("MatterPrefs", false); + bool lastOnOffState = matterPref.getBool(onOffPrefKey, true); OnOffLight.begin(lastOnOffState); OnOffLight.onChange(setLightOnOff);