From ed296b781bacf2e6c1238bfb1f479db7d08e105f Mon Sep 17 00:00:00 2001 From: SuGlider Date: Wed, 3 Dec 2025 14:33:42 -0300 Subject: [PATCH 1/3] feat(matter): adds rain sensor matter endpoint --- docs/en/matter/ep_rain_sensor.rst | 138 +++++++++++++ docs/en/matter/matter.rst | 1 + .../MatterRainSensor/MatterRainSensor.ino | 162 ++++++++++++++++ .../examples/MatterRainSensor/README.md | 182 ++++++++++++++++++ .../Matter/examples/MatterRainSensor/ci.yml | 5 + libraries/Matter/keywords.txt | 3 + libraries/Matter/src/Matter.h | 2 + .../src/MatterEndpoints/MatterRainSensor.cpp | 105 ++++++++++ .../src/MatterEndpoints/MatterRainSensor.h | 55 ++++++ 9 files changed, 653 insertions(+) create mode 100644 docs/en/matter/ep_rain_sensor.rst create mode 100644 libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino create mode 100644 libraries/Matter/examples/MatterRainSensor/README.md create mode 100644 libraries/Matter/examples/MatterRainSensor/ci.yml create mode 100644 libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp create mode 100644 libraries/Matter/src/MatterEndpoints/MatterRainSensor.h diff --git a/docs/en/matter/ep_rain_sensor.rst b/docs/en/matter/ep_rain_sensor.rst new file mode 100644 index 00000000000..372ba3b8f92 --- /dev/null +++ b/docs/en/matter/ep_rain_sensor.rst @@ -0,0 +1,138 @@ +################### +MatterRainSensor +################### + +About +----- + +The ``MatterRainSensor`` class provides a rain sensor endpoint for Matter networks. This endpoint implements the Matter rain sensing standard for detecting rain presence (detected/not detected states). + +**Features:** +* Rain 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:** +* Weather monitoring systems +* Irrigation control systems +* Outdoor sensor networks +* Smart home automation triggers +* Rain detection for automated systems + +API Reference +------------- + +Constructor +*********** + +MatterRainSensor +^^^^^^^^^^^^^^^^ + +Creates a new Matter rain sensor endpoint. + +.. code-block:: arduino + + MatterRainSensor(); + +Initialization +************** + +begin +^^^^^ + +Initializes the Matter rain sensor endpoint with an initial rain detection state. + +.. code-block:: arduino + + bool begin(bool _rainState = false); + +* ``_rainState`` - Initial rain detection state (``true`` = detected, ``false`` = not detected, default: ``false``) + +This function will return ``true`` if successful, ``false`` otherwise. + +end +^^^ + +Stops processing Matter rain sensor events. + +.. code-block:: arduino + + void end(); + +Rain Detection State Control +**************************** + +setRain +^^^^^^^ + +Sets the rain detection state. + +.. code-block:: arduino + + bool setRain(bool _rainState); + +* ``_rainState`` - Rain detection state (``true`` = detected, ``false`` = not detected) + +This function will return ``true`` if successful, ``false`` otherwise. + +getRain +^^^^^^^ + +Gets the current rain detection state. + +.. code-block:: arduino + + bool getRain(); + +This function will return ``true`` if rain is detected, ``false`` if not detected. + +Operators +********* + +bool operator +^^^^^^^^^^^^^ + +Returns the current rain detection state. + +.. code-block:: arduino + + operator bool(); + +Example: + +.. code-block:: arduino + + if (mySensor) { + Serial.println("Rain is detected"); + } else { + Serial.println("Rain is not detected"); + } + +Assignment operator +^^^^^^^^^^^^^^^^^^^ + +Sets the rain detection state. + +.. code-block:: arduino + + void operator=(bool _rainState); + +Example: + +.. code-block:: arduino + + mySensor = true; // Set rain detection to detected + mySensor = false; // Set rain detection to not detected + +Example +------- + +Rain Sensor +*********** + +.. literalinclude:: ../../../libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino + :language: arduino + diff --git a/docs/en/matter/matter.rst b/docs/en/matter/matter.rst index 7fd3cc9ee2e..38dbe4f983d 100644 --- a/docs/en/matter/matter.rst +++ b/docs/en/matter/matter.rst @@ -126,6 +126,7 @@ The library provides specialized endpoint classes for different device types. Ea * ``MatterHumiditySensor``: Humidity sensor (read-only) * ``MatterPressureSensor``: Pressure sensor (read-only) * ``MatterContactSensor``: Contact sensor (open/closed state) +* ``MatterRainSensor``: Rain sensor (detected/not detected state) * ``MatterOccupancySensor``: Occupancy sensor (occupied/unoccupied state) **Control Endpoints:** diff --git a/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino b/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino new file mode 100644 index 00000000000..42b61116903 --- /dev/null +++ b/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino @@ -0,0 +1,162 @@ +// 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 Rain Sensor Device. + * The Rain Sensor state can be toggled by pressing the onboard button. + * The Rain Sensor state will be indicated by the onboard LED. + * The Rain Sensor 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 +#if !CONFIG_ENABLE_CHIPOBLE +// if the device can be commissioned using BLE, WiFi is not used - save flash space +#include +#endif + +// List of Matter Endpoints for this Node +// Matter Rain Sensor Endpoint +MatterRainSensor RainSensor; + +// 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 Rain Sensor 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 Rain Sensor 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 debouceTime = 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 Rain Sensor 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 rain sensor state as false (default) + RainSensor.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 Rain Sensor 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 simulatedHWRainSensor() { + // Simulated Rain Sensor + static bool rainState = false; + static uint32_t lastTime = 0; + + // Simulate a Rain Sensor state change every 20 seconds + if (millis() - lastTime > 20000) { + rainState = !rainState; + lastTime = millis(); + } + return rainState; +} + +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 Rain State (Not Detected/Detected) + RainSensor.setRain(!RainSensor.getRain()); // same as RainSensor = !RainSensor; + Serial.printf("User button released. Setting the Rain Sensor to %s.\r\n", RainSensor ? "Detected" : "Not Detected"); + // LED will indicate the Rain Sensor state + if (RainSensor) { + 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 Rain Sensor Matter Accessory. It shall be commissioned again."); + Matter.decommission(); + button_time_stamp = millis(); // avoid running decommissining again, reboot takes a second or so + } + + // Simulated Rain Sensor + RainSensor.setRain(simulatedHWRainSensor()); + + delay(50); +} + diff --git a/libraries/Matter/examples/MatterRainSensor/README.md b/libraries/Matter/examples/MatterRainSensor/README.md new file mode 100644 index 00000000000..122f6ced1ae --- /dev/null +++ b/libraries/Matter/examples/MatterRainSensor/README.md @@ -0,0 +1,182 @@ +# Matter Rain Sensor Example + +This example demonstrates how to create a Matter-compatible rain sensor device using an ESP32 SoC microcontroller.\ +The application showcases Matter commissioning, device control via smart home ecosystems, manual control using a physical button, and automatic simulation of rain detection state changes. + +## Supported Targets + +| SoC | Wi-Fi | Thread | BLE Commissioning | LED | Status | +| --- | ---- | ------ | ----------------- | --- | ------ | +| ESP32 | ✅ | ❌ | ❌ | Required | Fully supported | +| ESP32-S2 | ✅ | ❌ | ❌ | Required | Fully supported | +| ESP32-S3 | ✅ | ❌ | ✅ | Required | Fully supported | +| ESP32-C3 | ✅ | ❌ | ✅ | Required | Fully supported | +| ESP32-C5 | ✅ | ❌ | ✅ | Required | Fully supported | +| ESP32-C6 | ✅ | ❌ | ✅ | Required | Fully supported | +| ESP32-H2 | ❌ | ✅ | ✅ | Required | Supported (Thread only) | + +### Note on Commissioning: + +- **ESP32 & ESP32-S2** do not support commissioning over Bluetooth LE. For these chips, you must provide Wi-Fi credentials directly in the sketch code so they can connect to your network manually. +- **ESP32-C6** Although it has Thread support, the ESP32 Arduino Matter Library has been pre compiled using Wi-Fi only. In order to configure it for Thread-only operation it is necessary to build the project as an ESP-IDF component and to disable the Matter Wi-Fi station feature. +- **ESP32-C5** Although it has Thread support, the ESP32 Arduino Matter Library has been pre compiled using Wi-Fi only. In order to configure it for Thread-only operation it is necessary to build the project as an ESP-IDF component and to disable the Matter Wi-Fi station feature. + +## Features + +- Matter protocol implementation for a rain sensor device +- Support for both Wi-Fi and Thread(*) connectivity +- Rain detection state indication using LED (ON = Detected, OFF = Not Detected) +- Automatic simulation of rain detection state changes every 20 seconds +- Button control for toggling rain detection state and factory reset +- Matter commissioning via QR code or manual pairing code +- Integration with Apple HomeKit, Amazon Alexa, and Google Home +(*) It is necessary to compile the project using Arduino as IDF Component. + +## Hardware Requirements + +- ESP32 compatible development board (see supported targets table) +- LED connected to GPIO pins (or using built-in LED) to indicate rain detection state +- User button for manual control (uses BOOT button by default) + +## Pin Configuration + +- **LED**: Uses `RGB_BUILTIN` if defined, otherwise pin 2 +- **Button**: Uses `BOOT_PIN` by default + +## Software Setup + +### Prerequisites + +1. Install the Arduino IDE (2.0 or newer recommended) +2. Install ESP32 Arduino Core with Matter support +3. ESP32 Arduino libraries: + - `Matter` + - `Wi-Fi` (only for ESP32 and ESP32-S2) + +### Configuration + +Before uploading the sketch, configure the following: + +1. **Wi-Fi credentials** (if not using BLE commissioning - mandatory for ESP32 | ESP32-S2): + ```cpp + const char *ssid = "your-ssid"; // Change to your Wi-Fi SSID + const char *password = "your-password"; // Change to your Wi-Fi password + ``` + +2. **LED pin configuration** (if not using built-in LED): + ```cpp + const uint8_t ledPin = 2; // Set your LED pin here + ``` + +3. **Button pin configuration** (optional): + By default, the `BOOT` button (GPIO 0) is used for the Rain Sensor state toggle and factory reset. You can change this to a different pin if needed. + ```cpp + const uint8_t buttonPin = BOOT_PIN; // Set your button pin here + ``` + +## Building and Flashing + +1. Open the `MatterRainSensor.ino` sketch in the Arduino IDE. +2. Select your ESP32 board from the **Tools > Board** menu. +3. Connect your ESP32 board to your computer via USB. +4. Click the **Upload** button to compile and flash the sketch. + +## Expected Output + +Once the sketch is running, open the Serial Monitor at a baud rate of **115200**. The Wi-Fi connection messages will be displayed only for ESP32 and ESP32-S2. Other targets will use Matter CHIPoBLE to automatically setup the IP Network. You should see output similar to the following, which provides the necessary information for commissioning: + +``` +Connecting to your-wifi-ssid +....... +Wi-Fi connected +IP address: 192.168.1.100 + +Matter Node is not commissioned yet. +Initiate the device discovery in your Matter environment. +Commission it to your Matter hub with the manual pairing code or QR code +Manual pairing code: 34970112332 +QR code URL: https://project-chip.github.io/connectedhomeip/qrcode.html?data=MT%3A6FCJ142C00KA0648G00 +Matter Node not commissioned yet. Waiting for commissioning. +Matter Node not commissioned yet. Waiting for commissioning. +... +Matter Node is commissioned and connected to the network. Ready for use. +User button released. Setting the Rain Sensor to Detected. +User button released. Setting the Rain Sensor to Not Detected. +``` + +## Using the Device + +### Manual Control + +The user button (BOOT button by default) provides manual control: + +- **Short press of the button**: Toggle rain sensor state (Not Detected/Detected) +- **Long press (>5 seconds)**: Factory reset the device (decommission) + +### Automatic Simulation + +The rain sensor state automatically toggles every 20 seconds to simulate a real rain sensor. The LED will reflect the current state: +- **LED ON**: Rain is Detected +- **LED OFF**: Rain is Not Detected + +### Smart Home Integration + +Use a Matter-compatible hub (like an Apple HomePod, Google Nest Hub, or Amazon Echo) to commission the device. +Check for Matter Rain Sensor endpoint support within the Matter Controller developer webpage. +This endpoint is part of the latest Matter supported device list and it may not be fully supported by your Matter environment. +You can also try the Home Assistant Matter feature in order to test it. + +#### Apple Home + +1. Open the Home app on your iOS device +2. Tap the "+" button > Add Accessory +3. Scan the QR code displayed in the Serial Monitor, or +4. Tap "I Don't Have a Code or Cannot Scan" and enter the manual pairing code +5. Follow the prompts to complete setup +6. The device will appear as a rain sensor in your Home app +7. You can monitor the rain detection state (Detected/Not Detected) and receive notifications when the state changes + +#### Amazon Alexa + +1. Open the Alexa app +2. Tap More > Add Device > Matter +3. Select "Scan QR code" or "Enter code manually" +4. Complete the setup process +5. The rain sensor will appear in your Alexa app +6. You can monitor the rain detection state and set up routines based on state changes + +#### Google Home + +1. Open the Google Home app +2. Tap "+" > Set up device > New device +3. Choose "Matter device" +4. Scan the QR code or enter the manual pairing code +5. Follow the prompts to complete setup +6. The rain sensor will appear in your Google Home app + +## Code Structure + +The MatterRainSensor example consists of the following main components: + +1. **`setup()`**: Initializes hardware (button, LED), configures Wi-Fi (if needed), sets up the Matter Rain Sensor endpoint with initial state (Not Detected), and waits for Matter commissioning. +2. **`loop()`**: Handles button input for toggling rain detection state and factory reset, and automatically simulates rain detection state changes every 20 seconds. +3. **`simulatedHWRainSensor()`**: Simulates a hardware rain sensor by toggling the rain detection state every 20 seconds. + +## Troubleshooting + +- **Device not visible during commissioning**: Ensure Wi-Fi or Thread connectivity is properly configured +- **LED not responding**: Verify pin configurations and connections +- **Rain sensor state not updating**: Check Serial Monitor output to verify state changes are being processed +- **Failed to commission**: Try factory resetting the device by long-pressing the button. Other option would be to erase the SoC Flash Memory by using `Arduino IDE Menu` -> `Tools` -> `Erase All Flash Before Sketch Upload: "Enabled"` or directly with `esptool.py --port erase_flash` +- **No serial output**: Check baudrate (115200) and USB connection + +## Related Documentation + +- [Matter Overview](https://docs.espressif.com/projects/arduino-esp32/en/latest/matter/matter.html) +- [Matter Endpoint Base Class](https://docs.espressif.com/projects/arduino-esp32/en/latest/matter/matter_ep.html) +- [Matter Rain Sensor Endpoint](https://docs.espressif.com/projects/arduino-esp32/en/latest/matter/ep_rain_sensor.html) + +## License + +This example is licensed under the Apache License, Version 2.0. + diff --git a/libraries/Matter/examples/MatterRainSensor/ci.yml b/libraries/Matter/examples/MatterRainSensor/ci.yml new file mode 100644 index 00000000000..1cbd404d6ed --- /dev/null +++ b/libraries/Matter/examples/MatterRainSensor/ci.yml @@ -0,0 +1,5 @@ +fqbn_append: PartitionScheme=huge_app + +requires: + - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y + diff --git a/libraries/Matter/keywords.txt b/libraries/Matter/keywords.txt index 6c2e092e417..7c026d056b3 100644 --- a/libraries/Matter/keywords.txt +++ b/libraries/Matter/keywords.txt @@ -21,6 +21,7 @@ FanModeSequence_t KEYWORD1 MatterTemperatureSensor KEYWORD1 MatterHumiditySensor KEYWORD1 MatterContactSensor KEYWORD1 +MatterRainSensor KEYWORD1 MatterPressureSensor KEYWORD1 MatterOccupancySensor KEYWORD1 MatterOnOffPlugin KEYWORD1 @@ -90,6 +91,8 @@ setHumidity KEYWORD2 getHumidity KEYWORD2 setContact KEYWORD2 getContact KEYWORD2 +setRain KEYWORD2 +getRain KEYWORD2 setPressure KEYWORD2 getPressure KEYWORD2 setOccupancy KEYWORD2 diff --git a/libraries/Matter/src/Matter.h b/libraries/Matter/src/Matter.h index 89360e81d4b..f1dcca4d047 100644 --- a/libraries/Matter/src/Matter.h +++ b/libraries/Matter/src/Matter.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -194,6 +195,7 @@ class ArduinoMatter { friend class MatterTemperatureSensor; friend class MatterHumiditySensor; friend class MatterContactSensor; + friend class MatterRainSensor; friend class MatterPressureSensor; friend class MatterOccupancySensor; friend class MatterOnOffPlugin; diff --git a/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp new file mode 100644 index 00000000000..9195d89d4d8 --- /dev/null +++ b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp @@ -0,0 +1,105 @@ +// 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. + +#include +#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL + +#include +#include +#include + +using namespace esp_matter; +using namespace esp_matter::endpoint; +using namespace chip::app::Clusters; + +bool MatterRainSensor::attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val) { + bool ret = true; + if (!started) { + log_e("Matter Rain Sensor device has not begun."); + return false; + } + + log_d("Rain Sensor Attr update callback: endpoint: %u, cluster: %u, attribute: %u, val: %u", endpoint_id, cluster_id, attribute_id, val->val.u32); + return ret; +} + +MatterRainSensor::MatterRainSensor() {} + +MatterRainSensor::~MatterRainSensor() { + end(); +} + +bool MatterRainSensor::begin(bool _rainState) { + ArduinoMatter::_init(); + + if (getEndPointId() != 0) { + log_e("Matter Rain Sensor with Endpoint Id %d device has already been created.", getEndPointId()); + return false; + } + + rain_sensor::config_t rain_sensor_config; + rain_sensor_config.boolean_state.state_value = _rainState; + + // endpoint handles can be used to add/modify clusters. + endpoint_t *endpoint = rain_sensor::create(node::get(), &rain_sensor_config, ENDPOINT_FLAG_NONE, (void *)this); + if (endpoint == nullptr) { + log_e("Failed to create Rain Sensor endpoint"); + return false; + } + rainState = _rainState; + setEndPointId(endpoint::get_id(endpoint)); + log_i("Rain Sensor created with endpoint_id %d", getEndPointId()); + + started = true; + return true; +} + +void MatterRainSensor::end() { + started = false; +} + +bool MatterRainSensor::setRain(bool _rainState) { + if (!started) { + log_e("Matter Rain Sensor device has not begun."); + return false; + } + + // avoid processing if there was no change + if (rainState == _rainState) { + return true; + } + + esp_matter_attr_val_t rainVal = esp_matter_invalid(NULL); + + if (!getAttributeVal(BooleanState::Id, BooleanState::Attributes::StateValue::Id, &rainVal)) { + log_e("Failed to get Rain Sensor Attribute."); + return false; + } + if (rainVal.val.u8 != _rainState) { + rainVal.val.u8 = _rainState; + bool ret; + ret = updateAttributeVal(BooleanState::Id, BooleanState::Attributes::StateValue::Id, &rainVal); + if (!ret) { + log_e("Failed to update Rain Sensor Attribute."); + return false; + } + rainState = _rainState; + } + log_v("Rain Sensor set to %s", _rainState ? "Detected" : "Not Detected"); + + return true; +} + +#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */ + diff --git a/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h new file mode 100644 index 00000000000..7f08d76dd06 --- /dev/null +++ b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h @@ -0,0 +1,55 @@ +// 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. + +#pragma once +#include +#ifdef CONFIG_ESP_MATTER_ENABLE_DATA_MODEL + +#include +#include + +class MatterRainSensor : public MatterEndPoint { +public: + MatterRainSensor(); + ~MatterRainSensor(); + // begin Matter Rain Sensor endpoint with initial rain state + bool begin(bool _rainState = false); + // this will just stop processing Rain Sensor Matter events + void end(); + + // set the rain state + bool setRain(bool _rainState); + // returns the rain state + bool getRain() { + return rainState; + } + + // bool conversion operator + void operator=(bool _rainState) { + setRain(_rainState); + } + // bool conversion operator + operator bool() { + return getRain(); + } + + // this function is called by Matter internal event processor. It could be overwritten by the application, if necessary. + bool attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val); + +protected: + bool started = false; + bool rainState = false; +}; +#endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */ + From 51080dd583fdfd2db92a14d772fea93dd2bd9a97 Mon Sep 17 00:00:00 2001 From: SuGlider Date: Wed, 3 Dec 2025 14:46:55 -0300 Subject: [PATCH 2/3] feat(matter): adds source code to CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4732354aa73..47a866645c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -193,6 +193,7 @@ set(ARDUINO_LIBRARY_Matter_SRCS libraries/Matter/src/MatterEndpoints/MatterTemperatureSensor.cpp libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp + libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp From f113707f9fe1d1ade2d3b4c83a0535d3000b848a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Thu, 4 Dec 2025 12:32:59 +0000 Subject: [PATCH 3/3] ci(pre-commit): Apply automatic fixes --- docs/en/matter/ep_rain_sensor.rst | 1 - libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino | 1 - libraries/Matter/examples/MatterRainSensor/README.md | 1 - libraries/Matter/examples/MatterRainSensor/ci.yml | 1 - libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp | 1 - libraries/Matter/src/MatterEndpoints/MatterRainSensor.h | 1 - 6 files changed, 6 deletions(-) diff --git a/docs/en/matter/ep_rain_sensor.rst b/docs/en/matter/ep_rain_sensor.rst index 372ba3b8f92..53f150996cb 100644 --- a/docs/en/matter/ep_rain_sensor.rst +++ b/docs/en/matter/ep_rain_sensor.rst @@ -135,4 +135,3 @@ Rain Sensor .. literalinclude:: ../../../libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino :language: arduino - diff --git a/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino b/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino index 42b61116903..93242fbf4f5 100644 --- a/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino +++ b/libraries/Matter/examples/MatterRainSensor/MatterRainSensor.ino @@ -159,4 +159,3 @@ void loop() { delay(50); } - diff --git a/libraries/Matter/examples/MatterRainSensor/README.md b/libraries/Matter/examples/MatterRainSensor/README.md index 122f6ced1ae..1e81b3ea3c9 100644 --- a/libraries/Matter/examples/MatterRainSensor/README.md +++ b/libraries/Matter/examples/MatterRainSensor/README.md @@ -179,4 +179,3 @@ The MatterRainSensor example consists of the following main components: ## License This example is licensed under the Apache License, Version 2.0. - diff --git a/libraries/Matter/examples/MatterRainSensor/ci.yml b/libraries/Matter/examples/MatterRainSensor/ci.yml index 1cbd404d6ed..050a80ff543 100644 --- a/libraries/Matter/examples/MatterRainSensor/ci.yml +++ b/libraries/Matter/examples/MatterRainSensor/ci.yml @@ -2,4 +2,3 @@ fqbn_append: PartitionScheme=huge_app requires: - CONFIG_ESP_MATTER_ENABLE_DATA_MODEL=y - diff --git a/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp index 9195d89d4d8..76fb4929ade 100644 --- a/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp +++ b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp @@ -102,4 +102,3 @@ bool MatterRainSensor::setRain(bool _rainState) { } #endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */ - diff --git a/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h index 7f08d76dd06..d19d7feda34 100644 --- a/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h +++ b/libraries/Matter/src/MatterEndpoints/MatterRainSensor.h @@ -52,4 +52,3 @@ class MatterRainSensor : public MatterEndPoint { bool rainState = false; }; #endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */ -