feat(matter): adds specifc type name for thermostat auto mode enabled

Author: SuGlider

libraries/Matter/examples/MatterThermostat/MatterThermostat.ino

@@ -73,7 +73,7 @@ void setup() {
 
   // Simulated Thermostat in COOLING and HEATING mode with Auto Mode to keep the temperature between setpoints
   // Auto Mode can only be used when the control sequence of operation is Cooling & Heating
-  SimulatedThermostat.begin(MatterThermostat::THERMOSTAT_SEQ_OP_COOLING_HEATING, true);
+  SimulatedThermostat.begin(MatterThermostat::THERMOSTAT_SEQ_OP_COOLING_HEATING, MatterThermostat::THERMOSTAT_AUTO_MODE_ENABLED);
 
   // Matter beginning - Last step, after all EndPoints are initialized
   Matter.begin();

libraries/Matter/keywords.txt

@@ -145,3 +145,5 @@ THERMOSTAT_MODE_OFF	LITERAL1
 THERMOSTAT_MODE_AUTO	LITERAL1
 THERMOSTAT_MODE_COOL	LITERAL1
 THERMOSTAT_MODE_HEAT	LITERAL1
+THERMOSTAT_AUTO_MODE_DISABLED	LITERAL1
+THERMOSTAT_AUTO_MODE_ENABLED	LITERAL1

libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp

@@ -165,7 +165,7 @@ MatterThermostat::~MatterThermostat() {
   end();
 }
 
-bool MatterThermostat::begin(ControlSequenceOfOperation_t _controlSequence, bool _hasAutoMode) {
+bool MatterThermostat::begin(ControlSequenceOfOperation_t _controlSequence, ThermostatAutoMode_t _autoMode) {
   ArduinoMatter::_init();
 
   if (getEndPointId() != 0) {
@@ -174,7 +174,7 @@ bool MatterThermostat::begin(ControlSequenceOfOperation_t _controlSequence, bool
   }
 
   // check if auto mode is allowed with the control sequence of operation - only allowed for Cooling & Heating
-  if (_hasAutoMode && _controlSequence != THERMOSTAT_SEQ_OP_COOLING_HEATING && _controlSequence != THERMOSTAT_SEQ_OP_COOLING_HEATING_REHEAT) {
+  if (_autoMode == THERMOSTAT_AUTO_MODE_ENABLED && _controlSequence != THERMOSTAT_SEQ_OP_COOLING_HEATING && _controlSequence != THERMOSTAT_SEQ_OP_COOLING_HEATING_REHEAT) {
     log_e("Thermostat in Auto Mode requires a Cooling & Heating Control Sequence of Operation.");
     return false;
   }
@@ -197,14 +197,14 @@ bool MatterThermostat::begin(ControlSequenceOfOperation_t _controlSequence, bool
     log_e("Failed to create Thermostat endpoint");
     return false;
   }
-  if (_hasAutoMode) {
+  if (_autoMode == THERMOSTAT_AUTO_MODE_ENABLED) {
     cluster_t *cluster = cluster::get(endpoint, Thermostat::Id);
     thermostat_config.thermostat.auto_mode.min_setpoint_dead_band = kDefaultDeadBand; // fixed by default to 2.5C
     cluster::thermostat::feature::auto_mode::add(cluster, &thermostat_config.thermostat.auto_mode);
   }
 
   controlSequence = _controlSequence;
-  hasAutoMode = _hasAutoMode;
+  autoMode = _autoMode;
   coolingSetpointTemperature = _coolingSetpointTemperature;
   heatingSetpointTemperature = _heatingSetpointTemperature;
   localTemperature = _localTemperature;
@@ -226,7 +226,7 @@ bool MatterThermostat::setMode(ThermostatMode_t _mode) {
     return false;
   }
 
-  if (!hasAutoMode && _mode == THERMOSTAT_MODE_AUTO) {
+  if (autoMode == THERMOSTAT_AUTO_MODE_DISABLED && _mode == THERMOSTAT_MODE_AUTO) {
     log_e("Thermostat can't set Auto Mode.");
     return false;
   }

libraries/Matter/src/MatterEndpoints/MatterThermostat.h

@@ -40,12 +40,17 @@ class MatterThermostat : public MatterEndPoint {
     THERMOSTAT_MODE_COOL = (uint8_t) Thermostat::SystemModeEnum::kCool,
     THERMOSTAT_MODE_HEAT = (uint8_t) Thermostat::SystemModeEnum::kHeat,
   };
+
+  enum ThermostatAutoMode_t {
+    THERMOSTAT_AUTO_MODE_DISABLED = (uint8_t) Thermostat::SystemModeEnum::kOff,
+    THERMOSTAT_AUTO_MODE_ENABLED  = (uint8_t) Thermostat::SystemModeEnum::kAuto,
+  };
   // clang-format on
 
   MatterThermostat();
   ~MatterThermostat();
   // begin Matter Thermostat endpoint with initial Operation Mode
-  bool begin(ControlSequenceOfOperation_t controlSequence = THERMOSTAT_SEQ_OP_COOLING, bool hasAutoMode = false);
+  bool begin(ControlSequenceOfOperation_t controlSequence = THERMOSTAT_SEQ_OP_COOLING, ThermostatAutoMode_t autoMode = THERMOSTAT_AUTO_MODE_DISABLED);
   // this will stop processing Thermostat Matter events
   void end();
 
@@ -218,7 +223,7 @@ class MatterThermostat : public MatterEndPoint {
 
   ThermostatMode_t currentMode = THERMOSTAT_MODE_OFF;
   ControlSequenceOfOperation_t controlSequence = THERMOSTAT_SEQ_OP_COOLING;
-  bool hasAutoMode = false;
+  ThermostatAutoMode_t autoMode = THERMOSTAT_AUTO_MODE_DISABLED;
 
   EndPointModeCB _onChangeModeCB = NULL;
   EndPointTemperatureCB _onChangeTemperatureCB = NULL;