Merge branch 'fix/thermostat_bounds' into 'main'

dhrishi · dhrishi · commit 5cf4508bd140 · 2025-04-11T11:05:04.000+08:00
components/esp_matter: Fixed the data type and attribute bounds for thermostat attributes

See merge request app-frameworks/esp-matter!1093
diff --git a/components/esp_matter/esp_matter_attribute_bounds.cpp b/components/esp_matter/esp_matter_attribute_bounds.cpp
@@ -570,79 +570,79 @@ void add_bounds_cb(cluster_t *cluster)
             case Thermostat::Attributes::OccupiedSetback::Id: {
                 esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);
                 esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);
-                nullable<uint16_t> min = 0, max = UINT16_MAX;
+                nullable<uint8_t> min = 0, max = 254;
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMin::Id,
                                         &min_val) == ESP_OK)
                 {
-                    min = min_val.val.u16;
+                    min = min_val.val.u8;
                 }
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMax::Id,
                                         &max_val) == ESP_OK)
                 {
-                    max = max_val.val.u16;
+                    max = max_val.val.u8;
                 }
-                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
+                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
                 break;
             }
             case Thermostat::Attributes::OccupiedSetbackMin::Id: {
                 esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);
-                nullable<uint16_t> min = 0, max = UINT16_MAX;
+                nullable<uint8_t> min = 0, max = 254;
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMax::Id,
                                         &max_val) == ESP_OK)
                 {
-                    max = max_val.val.u16;
+                    max = max_val.val.u8;
                 }
-                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
+                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
                 break;
             }
             case Thermostat::Attributes::OccupiedSetbackMax::Id: {
                 esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);
-                nullable<uint16_t> min = 0, max = 2540;
+                nullable<uint8_t> min = 0, max = 254;
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMin::Id,
                                         &min_val) == ESP_OK)
                 {
-                    min = min_val.val.u16;
+                    min = min_val.val.u8;
                 }
-                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
+                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
                 break;
             }
             case Thermostat::Attributes::UnoccupiedSetback::Id: {
                 esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);
                 esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);
-                nullable<uint16_t> min = 0, max = UINT16_MAX;
+                nullable<uint8_t> min = 0, max = 254;
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMin::Id,
                                         &min_val) == ESP_OK)
                 {
-                    min = min_val.val.u16;
+                    min = min_val.val.u8;
                 }
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMax::Id,
                                         &max_val) == ESP_OK)
                 {
-                    max = max_val.val.u16;
+                    max = max_val.val.u8;
                 }
-                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
+                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
                 break;
             }
             case Thermostat::Attributes::UnoccupiedSetbackMin::Id: {
                 esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);
-                nullable<uint16_t> min = 0, max = UINT16_MAX;
+                nullable<uint8_t> min = 0, max = 254;
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMax::Id,
                                         &max_val) == ESP_OK)
                 {
-                    max = max_val.val.u16;
+                    max = max_val.val.u8;
                 }
-                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
+                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
                 break;
             }
             case Thermostat::Attributes::UnoccupiedSetbackMax::Id: {
                 esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);
-                nullable<uint16_t> min = 0, max = 2540;
+                nullable<uint8_t> min = 0, max = 254;
                 if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMin::Id,
                                         &min_val) == ESP_OK)
                 {
-                    min = min_val.val.u16;
+                    min = min_val.val.u8;
                 }
-                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
+                esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
                 break;
             }
             case Thermostat::Attributes::ACRefrigerantType::Id:

Original file line number	Diff line number	Diff line change
`@@ -570,79 +570,79 @@ void add_bounds_cb(cluster_t *cluster)`
`570`	`570`	`case Thermostat::Attributes::OccupiedSetback::Id: {`
`571`	`571`	`esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);`
`572`	`572`	`esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);`
`573`		`- nullable<uint16_t> min = 0, max = UINT16_MAX;`
	`573`	`+ nullable<uint8_t> min = 0, max = 254;`
`574`	`574`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMin::Id,`
`575`	`575`	`&min_val) == ESP_OK)`
`576`	`576`	`{`
`577`		`- min = min_val.val.u16;`
	`577`	`+ min = min_val.val.u8;`
`578`	`578`	`}`
`579`	`579`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMax::Id,`
`580`	`580`	`&max_val) == ESP_OK)`
`581`	`581`	`{`
`582`		`- max = max_val.val.u16;`
	`582`	`+ max = max_val.val.u8;`
`583`	`583`	`}`
`584`		`- esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));`
	`584`	`+ esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));`
`585`	`585`	`break;`
`586`	`586`	`}`
`587`	`587`	`case Thermostat::Attributes::OccupiedSetbackMin::Id: {`
`588`	`588`	`esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);`
`589`		`- nullable<uint16_t> min = 0, max = UINT16_MAX;`
	`589`	`+ nullable<uint8_t> min = 0, max = 254;`
`590`	`590`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMax::Id,`
`591`	`591`	`&max_val) == ESP_OK)`
`592`	`592`	`{`
`593`		`- max = max_val.val.u16;`
	`593`	`+ max = max_val.val.u8;`
`594`	`594`	`}`
`595`		`- esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));`
	`595`	`+ esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));`
`596`	`596`	`break;`
`597`	`597`	`}`
`598`	`598`	`case Thermostat::Attributes::OccupiedSetbackMax::Id: {`
`599`	`599`	`esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);`
`600`		`- nullable<uint16_t> min = 0, max = 2540;`
	`600`	`+ nullable<uint8_t> min = 0, max = 254;`
`601`	`601`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::OccupiedSetbackMin::Id,`
`602`	`602`	`&min_val) == ESP_OK)`
`603`	`603`	`{`
`604`		`- min = min_val.val.u16;`
	`604`	`+ min = min_val.val.u8;`
`605`	`605`	`}`
`606`		`- esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));`
	`606`	`+ esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));`
`607`	`607`	`break;`
`608`	`608`	`}`
`609`	`609`	`case Thermostat::Attributes::UnoccupiedSetback::Id: {`
`610`	`610`	`esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);`
`611`	`611`	`esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);`
`612`		`- nullable<uint16_t> min = 0, max = UINT16_MAX;`
	`612`	`+ nullable<uint8_t> min = 0, max = 254;`
`613`	`613`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMin::Id,`
`614`	`614`	`&min_val) == ESP_OK)`
`615`	`615`	`{`
`616`		`- min = min_val.val.u16;`
	`616`	`+ min = min_val.val.u8;`
`617`	`617`	`}`
`618`	`618`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMax::Id,`
`619`	`619`	`&max_val) == ESP_OK)`
`620`	`620`	`{`
`621`		`- max = max_val.val.u16;`
	`621`	`+ max = max_val.val.u8;`
`622`	`622`	`}`
`623`		`- esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));`
	`623`	`+ esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));`
`624`	`624`	`break;`
`625`	`625`	`}`
`626`	`626`	`case Thermostat::Attributes::UnoccupiedSetbackMin::Id: {`
`627`	`627`	`esp_matter_attr_val_t max_val = esp_matter_invalid(NULL);`
`628`		`- nullable<uint16_t> min = 0, max = UINT16_MAX;`
	`628`	`+ nullable<uint8_t> min = 0, max = 254;`
`629`	`629`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMax::Id,`
`630`	`630`	`&max_val) == ESP_OK)`
`631`	`631`	`{`
`632`		`- max = max_val.val.u16;`
	`632`	`+ max = max_val.val.u8;`
`633`	`633`	`}`
`634`		`- esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));`
	`634`	`+ esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));`
`635`	`635`	`break;`
`636`	`636`	`}`
`637`	`637`	`case Thermostat::Attributes::UnoccupiedSetbackMax::Id: {`
`638`	`638`	`esp_matter_attr_val_t min_val = esp_matter_invalid(NULL);`
`639`		`- nullable<uint16_t> min = 0, max = 2540;`
	`639`	`+ nullable<uint8_t> min = 0, max = 254;`
`640`	`640`	`if(cluster::get_attribute_value(cluster, Thermostat::Attributes::UnoccupiedSetbackMin::Id,`
`641`	`641`	`&min_val) == ESP_OK)`
`642`	`642`	`{`
`643`		`- min = min_val.val.u16;`
	`643`	`+ min = min_val.val.u8;`
`644`	`644`	`}`
`645`		`- esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));`
	`645`	`+ esp_matter::attribute::add_bounds(current_attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));`
`646`	`646`	`break;`
`647`	`647`	`}`
`648`	`648`	`case Thermostat::Attributes::ACRefrigerantType::Id:`