From c7293392dd250029f91496978d32dc4525ab852a Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 09:06:28 -0300 Subject: [PATCH 1/7] feat(matter): adjust preferences labels in matter examples --- .../MatterDimmableLight/MatterDimmableLight.ino | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino index ded0118b7d1..ca2217e0e7c 100644 --- a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino +++ b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino @@ -23,6 +23,8 @@ MatterDimmableLight DimmableLight; // it will keep last OnOff & Brightness state stored, using Preferences Preferences lastStatePref; +#define ON_OFF_PREF_KEY "lastOnOffState" +#define BRIGHTNESS_PREF_KEY "lastBrightness" // 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); + lastStatePref.putUChar(BRIGHTNESS_PREF_KEY, brightness); + lastStatePref.putBool(ON_OFF_PREF_KEY, state); // This callback must return the success state to Matter core return true; } @@ -88,9 +90,9 @@ void setup() { // Initialize Matter EndPoint lastStatePref.begin("matterLight", false); // default OnOff state is ON if not stored before - bool lastOnOffState = lastStatePref.getBool("lastOnOffState", true); + bool lastOnOffState = lastStatePref.getBool(ON_OFF_PREF_KEY, true); // default brightness ~= 6% (15/255) - uint8_t lastBrightness = lastStatePref.getUChar("lastBrightness", 15); + uint8_t lastBrightness = lastStatePref.getUChar(BRIGHTNESS_PREF_KEY, 15); DimmableLight.begin(lastOnOffState, lastBrightness); // set the callback function to handle the Light state change DimmableLight.onChange(setLightState); From 692e09b923b0c80770de9524908a1b25d07ccb41 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 09:09:36 -0300 Subject: [PATCH 2/7] feat(matter): adjust preferences labels in matter examples --- .../Matter/examples/MatterOnOffLight/MatterOnOffLight.ino | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino index 675e9e989f2..f3cdf7303cc 100644 --- a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino +++ b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino @@ -23,6 +23,7 @@ MatterOnOffLight OnOffLight; // it will keep last OnOff state stored, using Preferences Preferences lastStatePref; +#define ON_OFF_PREF_KEY "lastOnOffState" // 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); + lastStatePref.putBool(ON_OFF_PREF_KEY, state); // This callback must return the success state to Matter core return true; } @@ -83,8 +84,8 @@ void setup() { // Initialize Matter EndPoint lastStatePref.begin("matterLight", false); - bool lastOnOffState = lastStatePref.getBool("lastOnOffState", true); - OnOffLight.begin(lastOnOffState); + bool lastOnOffState = lastStatePref.getBool(ON_OFF_PREF_KEY, true); + OnOffLight.begin(lastOnOffState); OnOffLight.onChange(setLightOnOff); // Matter beginning - Last step, after all EndPoints are initialized From ea2d6bd798e4bade487cdf87aabc608b5dc32050 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 09:14:54 -0300 Subject: [PATCH 3/7] fix(matter_example): extra blank space in code added by mistake --- libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino index f3cdf7303cc..5701c3dac48 100644 --- a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino +++ b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino @@ -85,7 +85,7 @@ void setup() { // Initialize Matter EndPoint lastStatePref.begin("matterLight", false); bool lastOnOffState = lastStatePref.getBool(ON_OFF_PREF_KEY, true); - OnOffLight.begin(lastOnOffState); + OnOffLight.begin(lastOnOffState); OnOffLight.onChange(setLightOnOff); // Matter beginning - Last step, after all EndPoints are initialized From 393001720c5ead62c9dedf270f06e2e5c340fd49 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 10:15:49 -0300 Subject: [PATCH 4/7] feat(matter_example): use const char * instead of #define --- .../examples/MatterOnOffLight/MatterOnOffLight.ino | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino index 5701c3dac48..27be54a9753 100644 --- a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino +++ b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino @@ -22,8 +22,8 @@ MatterOnOffLight OnOffLight; // it will keep last OnOff state stored, using Preferences -Preferences lastStatePref; -#define ON_OFF_PREF_KEY "lastOnOffState" +Preferences statePref; +const char *OnOffPrefKey = "OnOffState"; // set your board LED pin here #ifdef LED_BUILTIN @@ -49,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(ON_OFF_PREF_KEY, state); + statePref.putBool(OnOffPrefKey, state); // This callback must return the success state to Matter core return true; } @@ -83,8 +83,8 @@ void setup() { delay(500); // Initialize Matter EndPoint - lastStatePref.begin("matterLight", false); - bool lastOnOffState = lastStatePref.getBool(ON_OFF_PREF_KEY, true); + statePref.begin("matterLight", false); + bool lastOnOffState = statePref.getBool(OnOffPrefKey, true); OnOffLight.begin(lastOnOffState); OnOffLight.onChange(setLightOnOff); From ab2f01c50af43182c80fee9845c9049b24097d44 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 10:21:56 -0300 Subject: [PATCH 5/7] feat(matter_example): use const char * instead of #define --- .../MatterDimmableLight/MatterDimmableLight.ino | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino index ca2217e0e7c..26ea93f84e4 100644 --- a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino +++ b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino @@ -22,9 +22,9 @@ MatterDimmableLight DimmableLight; // it will keep last OnOff & Brightness state stored, using Preferences -Preferences lastStatePref; -#define ON_OFF_PREF_KEY "lastOnOffState" -#define BRIGHTNESS_PREF_KEY "lastBrightness" +Preferences matterPref; +const char *onOffPrefKey = "OnOffState" +const char *brightnessPrefKey = "BrightnessState" // set your board RGB LED pin here #ifdef RGB_BUILTIN @@ -53,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(BRIGHTNESS_PREF_KEY, brightness); - lastStatePref.putBool(ON_OFF_PREF_KEY, state); + matterPref.putUChar(brightnessPrefKey, brightness); + matterPref.putBool(onOffPrefKey, state); // This callback must return the success state to Matter core return true; } @@ -88,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(ON_OFF_PREF_KEY, true); + bool lastOnOffState = matterPref.getBool(onOffPrefKey, true); // default brightness ~= 6% (15/255) - uint8_t lastBrightness = lastStatePref.getUChar(BRIGHTNESS_PREF_KEY, 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); From 79ba93c67134cfc66720a6946855e31455c5aeaa Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 10:25:32 -0300 Subject: [PATCH 6/7] feat(matter_example): change Preferences names --- .../examples/MatterOnOffLight/MatterOnOffLight.ino | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino index 27be54a9753..8f4276643e2 100644 --- a/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino +++ b/libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino @@ -22,8 +22,8 @@ MatterOnOffLight OnOffLight; // it will keep last OnOff state stored, using Preferences -Preferences statePref; -const char *OnOffPrefKey = "OnOffState"; +Preferences matterPref; +const char *onOffPrefKey = "OnOffState"; // set your board LED pin here #ifdef LED_BUILTIN @@ -49,7 +49,7 @@ bool setLightOnOff(bool state) { digitalWrite(ledPin, LOW); } // store last OnOff state for when the Light is restarted / power goes off - statePref.putBool(OnOffPrefKey, state); + matterPref.putBool(onOffPrefKey, state); // This callback must return the success state to Matter core return true; } @@ -83,8 +83,8 @@ void setup() { delay(500); // Initialize Matter EndPoint - statePref.begin("matterLight", false); - bool lastOnOffState = statePref.getBool(OnOffPrefKey, true); + matterPref.begin("MatterPrefs", false); + bool lastOnOffState = matterPref.getBool(onOffPrefKey, true); OnOffLight.begin(lastOnOffState); OnOffLight.onChange(setLightOnOff); From 45375d1c4f2709c93e19dddf3f59fa95451afd62 Mon Sep 17 00:00:00 2001 From: Rodrigo Garcia Date: Mon, 18 Nov 2024 10:39:10 -0300 Subject: [PATCH 7/7] fix(matter_example): missing semicolon in code --- .../examples/MatterDimmableLight/MatterDimmableLight.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino index 26ea93f84e4..5fd3152dacf 100644 --- a/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino +++ b/libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino @@ -23,8 +23,8 @@ MatterDimmableLight DimmableLight; // it will keep last OnOff & Brightness state stored, using Preferences Preferences matterPref; -const char *onOffPrefKey = "OnOffState" -const char *brightnessPrefKey = "BrightnessState" +const char *onOffPrefKey = "OnOffState"; +const char *brightnessPrefKey = "BrightnessState"; // set your board RGB LED pin here #ifdef RGB_BUILTIN