feat(matter): fixes step attibute issue from esp-matter

Author: SuGlider

docs/en/matter/ep_temperature_controlled_cabinet.rst

@@ -5,17 +5,17 @@ MatterTemperatureControlledCabinet
 About
 -----
 
-The ``MatterTemperatureControlledCabinet`` class provides a temperature controlled cabinet endpoint for Matter networks. This endpoint implements the Matter temperature control standard for managing temperature setpoints with min/max limits, optional step control, or temperature level support.
+The ``MatterTemperatureControlledCabinet`` class provides a temperature controlled cabinet endpoint for Matter networks. This endpoint implements the Matter temperature control standard for managing temperature setpoints with min/max limits, step control (always enabled), or temperature level support.
 
 **Important:** The ``temperature_number`` and ``temperature_level`` features are **mutually exclusive**. Only one can be enabled at a time. Use ``begin(tempSetpoint, minTemp, maxTemp, step)`` for temperature_number mode or ``begin(supportedLevels, levelCount, selectedLevel)`` for temperature_level mode.
 
 **Features:**
 * Two initialization modes:
-  * **Temperature Number Mode** (``begin(tempSetpoint, minTemp, maxTemp, step)``): Temperature setpoint control with min/max limits and optional step
+  * **Temperature Number Mode** (``begin(tempSetpoint, minTemp, maxTemp, step)``): Temperature setpoint control with min/max limits and step control (step value can be set in begin() or later)
   * **Temperature Level Mode** (``begin(supportedLevels, levelCount, selectedLevel)``): Temperature level control with array of supported levels
 * 1/100th degree Celsius precision (for temperature_number mode)
 * Min/max temperature limits with validation (temperature_number mode)
-* Optional temperature step control (temperature_number mode)
+* Temperature step control (temperature_number mode, always enabled)
 * Temperature level array support (temperature_level mode)
 * Automatic setpoint validation against limits
 * Feature validation - methods return errors if called with wrong feature mode
@@ -62,11 +62,11 @@ Initializes the Matter temperature controlled cabinet endpoint with **temperatur
 * ``tempSetpoint`` - Initial temperature setpoint in Celsius (default: 0.00)
 * ``minTemperature`` - Minimum allowed temperature in Celsius (default: -10.0)
 * ``maxTemperature`` - Maximum allowed temperature in Celsius (default: 32.0)
-* ``step`` - Temperature step value in Celsius for step control feature (default: 0.50, disabled if 0)
+* ``step`` - Initial temperature step value in Celsius (default: 0.50)
 
 This function will return ``true`` if successful, ``false`` otherwise.
 
-**Note:** The implementation stores temperature with 1/100th degree Celsius precision internally. If step is greater than 0, the temperature_step feature will be enabled.
+**Note:** The implementation stores temperature with 1/100th degree Celsius precision internally. The temperature_step feature is always enabled for temperature_number mode, allowing ``setStep()`` to be called later even if step is not provided in ``begin()``.
 
 begin (overloaded)
 ^^^^^^^^^^^^^^^^^^
@@ -182,13 +182,13 @@ Gets the maximum allowed temperature.
 
 This function will return the maximum temperature in Celsius with 1/100th degree precision.
 
-Temperature Step Control (Optional)
-***********************************
+Temperature Step Control
+*************************
 
 setStep
 ^^^^^^^
 
-Sets the temperature step value. This enables the temperature_step feature.
+Sets the temperature step value.
 
 **Requires:** temperature_number feature mode (use ``begin()``)
 
@@ -200,7 +200,7 @@ Sets the temperature step value. This enables the temperature_step feature.
 
 This function will return ``true`` if successful, ``false`` otherwise.
 
-**Note:** The temperature_step feature requires the temperature_number feature to be enabled. This method will return ``false`` and log an error if called when using temperature_level mode.
+**Note:** The temperature_step feature is always enabled when using temperature_number mode, so this method can be called at any time to set or change the step value, even if step was not provided in ``begin()``. This method will return ``false`` and log an error if called when using temperature_level mode.
 
 getStep
 ^^^^^^^

libraries/Matter/examples/MatterTemperatureControlledCabinet/README.md

@@ -27,7 +27,7 @@ This example demonstrates how to create a Matter-compatible temperature controll
 - Matter protocol implementation for a temperature controlled cabinet device
 - Support for both Wi-Fi and Thread(*) connectivity
 - Temperature setpoint control with min/max limits
-- Temperature step control (optional)
+- Temperature step control (always enabled, can be set via begin() or setStep())
 - Temperature setpoint validation against min/max limits
 - Button control for factory reset (decommission)
 - Matter commissioning via QR code or manual pairing code
@@ -79,6 +79,7 @@ Before uploading the sketch, configure the following:
    ```cpp
    TemperatureCabinet.begin(4.0, -10.0, 10.0, 0.5);
    // Parameters: setpoint, min_temp, max_temp, step (all in Celsius)
+   // Note: Step can also be set later using setStep() even if not provided here
    ```
 
 ## Building and Flashing

libraries/Matter/src/MatterEndpoints/MatterTemperatureControlledCabinet.cpp

@@ -166,6 +166,11 @@ bool MatterTemperatureControlledCabinet::begin(int16_t _rawTempSetpoint, int16_t
     return false;
   }
 
+  // Note: esp-matter automatically creates all attributes from the config struct when features are enabled
+  // - temperature_number feature creates: TemperatureSetpoint, MinTemperature, MaxTemperature
+  // - temperature_step feature creates: Step (always enabled for temperature_number mode to allow setStep() later)
+  // No need to manually set attributes here as they are already created with the config values
+
   temperature_controlled_cabinet::config_t cabinet_config;
   cabinet_config.temperature_control.temperature_number.temp_setpoint = _rawTempSetpoint;
   cabinet_config.temperature_control.temperature_number.min_temperature = _rawMinTemperature;
@@ -178,11 +183,10 @@ bool MatterTemperatureControlledCabinet::begin(int16_t _rawTempSetpoint, int16_t
   // Only one of them can be enabled at a time.
   cabinet_config.temperature_control.features = temperature_control::feature::temperature_number::get_id();
 
-  // Enable temperature_step feature if step is provided
+  // Always enable temperature_step feature to allow setStep() to be called later
   // Note: temperature_step requires temperature_number feature (which is always enabled for this mode)
-  if (_rawStep > 0) {
-    cabinet_config.temperature_control.features |= temperature_control::feature::temperature_step::get_id();
-  }
+  // The step value can be set initially via begin() or later via setStep()
+  cabinet_config.temperature_control.features |= temperature_control::feature::temperature_step::get_id();
 
   // endpoint handles can be used to add/modify clusters
   endpoint_t *endpoint = temperature_controlled_cabinet::create(node::get(), &cabinet_config, ENDPOINT_FLAG_NONE, (void *)this);
@@ -201,6 +205,33 @@ bool MatterTemperatureControlledCabinet::begin(int16_t _rawTempSetpoint, int16_t
   setEndPointId(endpoint::get_id(endpoint));
   log_i("Temperature Controlled Cabinet created with temperature_number feature, endpoint_id %d", getEndPointId());
 
+  // Workaround: Manually create Step attribute if it wasn't created automatically
+  // This handles the case where temperature_step::add() fails due to feature map timing issue
+  // The feature map check in temperature_step::add() may not see the temperature_number feature
+  // immediately after it's added, causing the Step attribute to not be created
+  cluster_t *cluster = cluster::get(endpoint, TemperatureControl::Id);
+  if (cluster != nullptr) {
+    attribute_t *step_attr = attribute::get(cluster, TemperatureControl::Attributes::Step::Id);
+    if (step_attr == nullptr) {
+      // Step attribute wasn't created, manually create it
+      log_w("Step attribute not found after endpoint creation, manually creating it");
+      step_attr = temperature_control::attribute::create_step(cluster, _rawStep);
+      if (step_attr != nullptr) {
+        // Update the feature map to include temperature_step feature
+        // This ensures the feature is properly registered even though the attribute was created manually
+        esp_matter_attr_val_t feature_map_val = esp_matter_invalid(NULL);
+        attribute_t *feature_map_attr = attribute::get(cluster, Globals::Attributes::FeatureMap::Id);
+        if (feature_map_attr != nullptr && attribute::get_val(feature_map_attr, &feature_map_val) == ESP_OK) {
+          feature_map_val.val.u32 |= temperature_control::feature::temperature_step::get_id();
+          attribute::set_val(feature_map_attr, &feature_map_val);
+        }
+        log_i("Step attribute manually created with value %.02fC", (float)_rawStep / 100.0);
+      } else {
+        log_e("Failed to manually create Step attribute");
+      }
+    }
+  }
+
   started = true;
   return true;
 }
@@ -315,7 +346,6 @@ bool MatterTemperatureControlledCabinet::setRawTemperatureSetpoint(int16_t _rawT
   }
 
   esp_matter_attr_val_t tempVal = esp_matter_invalid(NULL);
-
   if (!getAttributeVal(TemperatureControl::Id, TemperatureControl::Attributes::TemperatureSetpoint::Id, &tempVal)) {
     log_e("Failed to get Temperature Controlled Cabinet Temperature Setpoint Attribute.");
     return false;
@@ -369,7 +399,6 @@ bool MatterTemperatureControlledCabinet::setRawMinTemperature(int16_t _rawTemper
   }
 
   esp_matter_attr_val_t tempVal = esp_matter_invalid(NULL);
-
   if (!getAttributeVal(TemperatureControl::Id, TemperatureControl::Attributes::MinTemperature::Id, &tempVal)) {
     log_e("Failed to get Temperature Controlled Cabinet Min Temperature Attribute.");
     return false;
@@ -423,7 +452,6 @@ bool MatterTemperatureControlledCabinet::setRawMaxTemperature(int16_t _rawTemper
   }
 
   esp_matter_attr_val_t tempVal = esp_matter_invalid(NULL);
-
   if (!getAttributeVal(TemperatureControl::Id, TemperatureControl::Attributes::MaxTemperature::Id, &tempVal)) {
     log_e("Failed to get Temperature Controlled Cabinet Max Temperature Attribute.");
     return false;
@@ -477,9 +505,8 @@ bool MatterTemperatureControlledCabinet::setRawStep(int16_t _rawStep) {
   }
 
   esp_matter_attr_val_t stepVal = esp_matter_invalid(NULL);
-
   if (!getAttributeVal(TemperatureControl::Id, TemperatureControl::Attributes::Step::Id, &stepVal)) {
-    log_e("Failed to get Temperature Controlled Cabinet Step Attribute.");
+    log_e("Failed to get Temperature Controlled Cabinet Step Attribute. Temperature_step feature may not be enabled.");
     return false;
   }
   if (stepVal.val.i16 != _rawStep) {
@@ -508,6 +535,8 @@ double MatterTemperatureControlledCabinet::getStep() {
     return 0.0;
   }
 
+  // Read from attribute (should always exist after begin() due to workaround)
+  // If read fails, use stored rawStep value from begin()
   esp_matter_attr_val_t stepVal = esp_matter_invalid(NULL);
   if (getAttributeVal(TemperatureControl::Id, TemperatureControl::Attributes::Step::Id, &stepVal)) {
     rawStep = stepVal.val.i16;
@@ -531,7 +560,6 @@ bool MatterTemperatureControlledCabinet::setSelectedTemperatureLevel(uint8_t lev
   }
 
   esp_matter_attr_val_t levelVal = esp_matter_invalid(NULL);
-
   if (!getAttributeVal(TemperatureControl::Id, TemperatureControl::Attributes::SelectedTemperatureLevel::Id, &levelVal)) {
     log_e("Failed to get Temperature Controlled Cabinet Selected Temperature Level Attribute.");
     return false;