-
Notifications
You must be signed in to change notification settings - Fork 7.8k
feat(matter): adds water leak detector ep #12102
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.
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
+648
−0
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6ed86b2
feat(matter): adds water leak detector matter endpoint
SuGlider f999df9
feat(matter): fix matter.h conflicts
SuGlider 90f9cb4
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] 80b5f25
Merge branch 'master' into feat/matter_water_leak_detector_ep
me-no-dev ec4a5e1
fix(matter): spelling
SuGlider 99aec0a
fix(matter): formatting
SuGlider 1272d1c
fix(matter): fix var name - spelling
SuGlider File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| ########################## | ||
| MatterWaterLeakDetector | ||
| ########################## | ||
|
|
||
| About | ||
| ----- | ||
|
|
||
| The ``MatterWaterLeakDetector`` class provides a water leak detector endpoint for Matter networks. This endpoint implements the Matter water leak detection standard for detecting water leak conditions (detected/not detected states). | ||
|
|
||
| **Features:** | ||
| * Water leak detection state reporting (detected/not detected) | ||
| * Simple boolean state | ||
| * Read-only sensor (no control functionality) | ||
| * Automatic state updates | ||
| * Integration with Apple HomeKit, Amazon Alexa, and Google Home | ||
| * Matter standard compliance | ||
|
|
||
| **Use Cases:** | ||
| * Water leak monitoring | ||
| * Basement flood detection | ||
| * Appliance leak detection | ||
| * Smart home automation triggers | ||
| * Preventative maintenance systems | ||
|
|
||
| API Reference | ||
| ------------- | ||
|
|
||
| Constructor | ||
| *********** | ||
|
|
||
| MatterWaterLeakDetector | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| Creates a new Matter water leak detector endpoint. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| MatterWaterLeakDetector(); | ||
|
|
||
| Initialization | ||
| ************** | ||
|
|
||
| begin | ||
| ^^^^^ | ||
|
|
||
| Initializes the Matter water leak detector endpoint with an initial leak detection state. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| bool begin(bool _leakState = false); | ||
|
|
||
| * ``_leakState`` - Initial water leak detection state (``true`` = detected, ``false`` = not detected, default: ``false``) | ||
|
|
||
| This function will return ``true`` if successful, ``false`` otherwise. | ||
|
|
||
| end | ||
| ^^^ | ||
|
|
||
| Stops processing Matter water leak detector events. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| void end(); | ||
|
|
||
| Water Leak Detection State Control | ||
| *********************************** | ||
|
|
||
| setLeak | ||
| ^^^^^^^^ | ||
|
|
||
| Sets the water leak detection state. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| bool setLeak(bool _leakState); | ||
|
|
||
| * ``_leakState`` - Water leak detection state (``true`` = detected, ``false`` = not detected) | ||
|
|
||
| This function will return ``true`` if successful, ``false`` otherwise. | ||
|
|
||
| getLeak | ||
| ^^^^^^^ | ||
|
|
||
| Gets the current water leak detection state. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| bool getLeak(); | ||
|
|
||
| This function will return ``true`` if water leak is detected, ``false`` if not detected. | ||
|
|
||
| Operators | ||
| ********* | ||
|
|
||
| bool operator | ||
| ^^^^^^^^^^^^^ | ||
|
|
||
| Returns the current water leak detection state. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| operator bool(); | ||
|
|
||
| Example: | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| if (myDetector) { | ||
| Serial.println("Water leak is detected"); | ||
| } else { | ||
| Serial.println("Water leak is not detected"); | ||
| } | ||
|
|
||
| Assignment operator | ||
| ^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| Sets the water leak detection state. | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| void operator=(bool _leakState); | ||
|
|
||
| Example: | ||
|
|
||
| .. code-block:: arduino | ||
|
|
||
| myDetector = true; // Set water leak detection to detected | ||
| myDetector = false; // Set water leak detection to not detected | ||
|
|
||
| Example | ||
| ------- | ||
|
|
||
| Water Leak Detector | ||
| ******************** | ||
|
|
||
| .. literalinclude:: ../../../libraries/Matter/examples/MatterWaterLeakDetector/MatterWaterLeakDetector.ino | ||
| :language: arduino |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
161 changes: 161 additions & 0 deletions
161
libraries/Matter/examples/MatterWaterLeakDetector/MatterWaterLeakDetector.ino
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| // Copyright 2025 Espressif Systems (Shanghai) PTE LTD | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
|
|
||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| /* | ||
| * This example is an example code that will create a Matter Device which can be | ||
| * commissioned and controlled from a Matter Environment APP. | ||
| * Additionally the ESP32 will send debug messages indicating the Matter activity. | ||
| * Turning DEBUG Level ON may be useful to following Matter Accessory and Controller messages. | ||
| * | ||
| * The example will create a Matter Water Leak Detector Device. | ||
| * The Water Leak Detector state can be toggled by pressing the onboard button. | ||
| * The Water Leak Detector state will be indicated by the onboard LED. | ||
| * The Water Leak Detector state will be simulated to change every 20 seconds. | ||
| * | ||
| * The onboard button can be kept pressed for 5 seconds to decommission the Matter Node. | ||
| * The example will also show the manual commissioning code and QR code to be used in the Matter environment. | ||
| * | ||
| */ | ||
|
|
||
| // Matter Manager | ||
| #include <Matter.h> | ||
| #if !CONFIG_ENABLE_CHIPOBLE | ||
| // if the device can be commissioned using BLE, WiFi is not used - save flash space | ||
| #include <WiFi.h> | ||
| #endif | ||
|
|
||
| // List of Matter Endpoints for this Node | ||
| // Matter Water Leak Detector Endpoint | ||
| MatterWaterLeakDetector WaterLeakDetector; | ||
|
|
||
| // CONFIG_ENABLE_CHIPOBLE is enabled when BLE is used to commission the Matter Network | ||
| #if !CONFIG_ENABLE_CHIPOBLE | ||
| // WiFi is manually set and started | ||
| const char *ssid = "your-ssid"; // Change this to your WiFi SSID | ||
| const char *password = "your-password"; // Change this to your WiFi password | ||
| #endif | ||
|
|
||
| // LED will be used to indicate the Water Leak Detector state | ||
| // set your board RGB LED pin here | ||
| #ifdef RGB_BUILTIN | ||
| const uint8_t ledPin = RGB_BUILTIN; | ||
| #else | ||
| const uint8_t ledPin = 2; // Set your pin here if your board has not defined LED_BUILTIN | ||
| #warning "Do not forget to set the RGB LED pin" | ||
| #endif | ||
|
|
||
| // set your board USER BUTTON pin here - decommissioning and Manual Water Leak Detector toggle button | ||
| const uint8_t buttonPin = BOOT_PIN; // Set your pin here. Using BOOT Button. | ||
|
|
||
| // Button control | ||
| uint32_t button_time_stamp = 0; // debouncing control | ||
| bool button_state = false; // false = released | true = pressed | ||
| const uint32_t debounceTime = 250; // button debouncing time (ms) | ||
| const uint32_t decommissioningTimeout = 5000; // keep the button pressed for 5s, or longer, to decommission | ||
|
|
||
| void setup() { | ||
| // Initialize the USER BUTTON (Boot button) that will be used to decommission the Matter Node | ||
| // The button will also be used to manually toggle the Water Leak Detector state | ||
| pinMode(buttonPin, INPUT_PULLUP); | ||
| // Initialize the LED (light) GPIO and Matter End Point | ||
| pinMode(ledPin, OUTPUT); | ||
|
|
||
| Serial.begin(115200); | ||
|
|
||
| // CONFIG_ENABLE_CHIPOBLE is enabled when BLE is used to commission the Matter Network | ||
| #if !CONFIG_ENABLE_CHIPOBLE | ||
| // Manually connect to WiFi | ||
| WiFi.begin(ssid, password); | ||
| // Wait for connection | ||
| while (WiFi.status() != WL_CONNECTED) { | ||
| delay(500); | ||
| Serial.print("."); | ||
| } | ||
| Serial.println(); | ||
| #endif | ||
|
|
||
| // set initial water leak detector state as false (default) | ||
| WaterLeakDetector.begin(); | ||
| digitalWrite(ledPin, LOW); // LED OFF | ||
|
|
||
| // Matter beginning - Last step, after all EndPoints are initialized | ||
| Matter.begin(); | ||
|
|
||
| // Check Matter Accessory Commissioning state, which may change during execution of loop() | ||
| if (!Matter.isDeviceCommissioned()) { | ||
| Serial.println(""); | ||
| Serial.println("Matter Node is not commissioned yet."); | ||
| Serial.println("Initiate the device discovery in your Matter environment."); | ||
| Serial.println("Commission it to your Matter hub with the manual pairing code or QR code"); | ||
| Serial.printf("Manual pairing code: %s\r\n", Matter.getManualPairingCode().c_str()); | ||
| Serial.printf("QR code URL: %s\r\n", Matter.getOnboardingQRCodeUrl().c_str()); | ||
| // waits for Matter Water Leak Detector Commissioning. | ||
| uint32_t timeCount = 0; | ||
| while (!Matter.isDeviceCommissioned()) { | ||
| delay(100); | ||
| if ((timeCount++ % 50) == 0) { // 50*100ms = 5 sec | ||
| Serial.println("Matter Node not commissioned yet. Waiting for commissioning."); | ||
| } | ||
| } | ||
| Serial.println("Matter Node is commissioned and connected to the network. Ready for use."); | ||
| } | ||
| } | ||
|
|
||
| bool simulatedHWWaterLeakDetector() { | ||
| // Simulated Water Leak Detector | ||
| static bool leakState = false; | ||
| static uint32_t lastTime = 0; | ||
|
|
||
| // Simulate a Water Leak Detector state change every 20 seconds | ||
| if (millis() - lastTime > 20000) { | ||
| leakState = !leakState; | ||
| lastTime = millis(); | ||
| } | ||
| return leakState; | ||
| } | ||
|
|
||
| void loop() { | ||
| // Check if the button has been pressed | ||
| if (digitalRead(buttonPin) == LOW && !button_state) { | ||
| // deals with button debouncing | ||
| button_time_stamp = millis(); // record the time while the button is pressed. | ||
| button_state = true; // pressed. | ||
| } | ||
|
|
||
| uint32_t time_diff = millis() - button_time_stamp; | ||
| if (button_state && time_diff > debouceTime && digitalRead(buttonPin) == HIGH) { | ||
| button_state = false; // released | ||
| // button is released - toggle Leak State (Not Detected/Detected) | ||
| WaterLeakDetector.setLeak(!WaterLeakDetector.getLeak()); // same as WaterLeakDetector = !WaterLeakDetector; | ||
| Serial.printf("User button released. Setting the Water Leak Detector to %s.\r\n", WaterLeakDetector ? "Detected" : "Not Detected"); | ||
| // LED will indicate the Water Leak Detector state | ||
| if (WaterLeakDetector) { | ||
| digitalWrite(ledPin, HIGH); // LED ON | ||
| } else { | ||
| digitalWrite(ledPin, LOW); // LED OFF | ||
| } | ||
| } | ||
|
|
||
| // Onboard User Button is kept pressed for longer than 5 seconds in order to decommission matter node | ||
| if (button_state && time_diff > decommissioningTimeout) { | ||
| Serial.println("Decommissioning Water Leak Detector Matter Accessory. It shall be commissioned again."); | ||
| Matter.decommission(); | ||
| button_time_stamp = millis(); // avoid running decommissioning again, reboot takes a second or so | ||
| } | ||
|
|
||
| // Simulated Water Leak Detector | ||
| WaterLeakDetector.setLeak(simulatedHWWaterLeakDetector()); | ||
|
|
||
| delay(50); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.