Skip to content

Matter example patch #10618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 19, 2024
Merged

Matter example patch #10618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c729339
feat(matter): adjust preferences labels in matter examples
SuGlider Nov 18, 2024
692e09b
feat(matter): adjust preferences labels in matter examples
SuGlider Nov 18, 2024
ea2d6bd
fix(matter_example): extra blank space in code added by mistake
SuGlider Nov 18, 2024
3930017
feat(matter_example): use const char * instead of #define
SuGlider Nov 18, 2024
ab2f01c
feat(matter_example): use const char * instead of #define
SuGlider Nov 18, 2024
79ba93c
feat(matter_example): change Preferences names
SuGlider Nov 18, 2024
45375d1
fix(matter_example): missing semicolon in code
SuGlider Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);

Expand Down