Skip to content

Commit 417dfa6

Browse files
dhrishidhrishi
committed
Merge branch 'add_bounds1' into 'main'
esp-matter/components: Set bounds to fan_control and thermostat cluster See merge request app-frameworks/esp-matter!879
2 parents 0ade16c + 8892808 commit 417dfa6

7 files changed

+391
-144
lines changed

‎components/esp_matter/esp_matter_attribute.cpp

+22-85
Original file line numberDiff line numberDiff line change
@@ -1459,94 +1459,45 @@ attribute_t *create_primary_n_intensity(cluster_t *cluster, nullable<uint8_t> va
14591459
namespace fan_control {
14601460
namespace attribute {
14611461

1462-
attribute_t *create_fan_mode(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
1462+
attribute_t *create_fan_mode(cluster_t *cluster, uint8_t value)
14631463
{
1464-
attribute_t *attribute =
1465-
esp_matter::attribute::create(cluster, FanControl::Attributes::FanMode::Id,
1466-
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
1467-
if (!attribute) {
1468-
ESP_LOGE(TAG, "Could not create attribute");
1469-
return NULL;
1470-
}
1471-
esp_matter::attribute::add_bounds(attribute, esp_matter_enum8(min), esp_matter_enum8(max));
1472-
return attribute;
1464+
return esp_matter::attribute::create(cluster, FanControl::Attributes::FanMode::Id,
1465+
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
14731466
}
14741467

1475-
attribute_t *create_fan_mode_sequence(cluster_t *cluster, const uint8_t value, uint8_t min, uint8_t max)
1468+
attribute_t *create_fan_mode_sequence(cluster_t *cluster, const uint8_t value)
14761469
{
1477-
attribute_t *attribute =
1478-
esp_matter::attribute::create(cluster, FanControl::Attributes::FanModeSequence::Id,
1470+
return esp_matter::attribute::create(cluster, FanControl::Attributes::FanModeSequence::Id,
14791471
ATTRIBUTE_FLAG_NONE, esp_matter_enum8(value));
1480-
if (!attribute) {
1481-
ESP_LOGE(TAG, "Could not create attribute");
1482-
return NULL;
1483-
}
1484-
esp_matter::attribute::add_bounds(attribute, esp_matter_enum8(min), esp_matter_enum8(max));
1485-
return attribute;
14861472
}
14871473

1488-
attribute_t *create_percent_setting(cluster_t *cluster, nullable<uint8_t> value, nullable<uint8_t> min, nullable<uint8_t> max)
1474+
attribute_t *create_percent_setting(cluster_t *cluster, nullable<uint8_t> value)
14891475
{
1490-
attribute_t *attribute =
1491-
esp_matter::attribute::create(cluster, FanControl::Attributes::PercentSetting::Id,
1476+
return esp_matter::attribute::create(cluster, FanControl::Attributes::PercentSetting::Id,
14921477
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_WRITABLE,
14931478
esp_matter_nullable_uint8(value));
1494-
if (!attribute) {
1495-
ESP_LOGE(TAG, "Could not create attribute");
1496-
return NULL;
1497-
}
1498-
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
1499-
return attribute;
15001479
}
15011480

1502-
attribute_t *create_percent_current(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
1481+
attribute_t *create_percent_current(cluster_t *cluster, uint8_t value)
15031482
{
1504-
attribute_t *attribute =
1505-
esp_matter::attribute::create(cluster, FanControl::Attributes::PercentCurrent::Id, ATTRIBUTE_FLAG_NONE,
1483+
return esp_matter::attribute::create(cluster, FanControl::Attributes::PercentCurrent::Id, ATTRIBUTE_FLAG_NONE,
15061484
esp_matter_uint8(value));
1507-
if (!attribute) {
1508-
ESP_LOGE(TAG, "Could not create attribute");
1509-
return NULL;
1510-
}
1511-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint8(min), esp_matter_uint8(max));
1512-
return attribute;
15131485
}
15141486

1515-
attribute_t *create_speed_max(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
1487+
attribute_t *create_speed_max(cluster_t *cluster, uint8_t value)
15161488
{
1517-
attribute_t *attribute =
1518-
esp_matter::attribute::create(cluster, FanControl::Attributes::SpeedMax::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint8(value));
1519-
if (!attribute) {
1520-
ESP_LOGE(TAG, "Could not create attribute");
1521-
return NULL;
1522-
}
1523-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint8(min), esp_matter_uint8(max));
1524-
return attribute;
1489+
return esp_matter::attribute::create(cluster, FanControl::Attributes::SpeedMax::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint8(value));
15251490
}
15261491

1527-
attribute_t *create_speed_setting(cluster_t *cluster, nullable<uint8_t> value, nullable<uint8_t> min, nullable<uint8_t> max)
1492+
attribute_t *create_speed_setting(cluster_t *cluster, nullable<uint8_t> value)
15281493
{
1529-
attribute_t *attribute =
1530-
esp_matter::attribute::create(cluster, FanControl::Attributes::SpeedSetting::Id,
1531-
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_nullable_uint8(value));
1532-
if (!attribute) {
1533-
ESP_LOGE(TAG, "Could not create attribute");
1534-
return NULL;
1535-
}
1536-
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
1537-
return attribute;
1494+
return esp_matter::attribute::create(cluster, FanControl::Attributes::SpeedSetting::Id,
1495+
ATTRIBUTE_FLAG_NULLABLE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_nullable_uint8(value));
15381496
}
15391497

1540-
attribute_t *create_speed_current(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
1498+
attribute_t *create_speed_current(cluster_t *cluster, uint8_t value)
15411499
{
1542-
attribute_t *attribute =
1543-
esp_matter::attribute::create(cluster, FanControl::Attributes::SpeedCurrent::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint8(value));
1544-
if (!attribute) {
1545-
ESP_LOGE(TAG, "Could not create attribute");
1546-
return NULL;
1547-
}
1548-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint8(min), esp_matter_uint8(max));
1549-
return attribute;
1500+
return esp_matter::attribute::create(cluster, FanControl::Attributes::SpeedCurrent::Id, ATTRIBUTE_FLAG_NONE, esp_matter_uint8(value));
15501501
}
15511502

15521503
attribute_t *create_rock_support(cluster_t *cluster, uint8_t value)
@@ -1711,30 +1662,16 @@ attribute_t *create_remote_sensing(cluster_t *cluster, uint8_t value)
17111662
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_bitmap8(value));
17121663
}
17131664

1714-
attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
1665+
attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t value)
17151666
{
1716-
attribute_t *attribute =
1717-
esp_matter::attribute::create(cluster, Thermostat::Attributes::ControlSequenceOfOperation::Id,
1718-
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
1719-
if (!attribute) {
1720-
ESP_LOGE(TAG, "Could not create attribute");
1721-
return NULL;
1722-
}
1723-
esp_matter::attribute::add_bounds(attribute, esp_matter_enum8(min), esp_matter_enum8(max));
1724-
return attribute;
1667+
return esp_matter::attribute::create(cluster, Thermostat::Attributes::ControlSequenceOfOperation::Id,
1668+
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
17251669
}
17261670

1727-
attribute_t *create_system_mode(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max)
1671+
attribute_t *create_system_mode(cluster_t *cluster, uint8_t value)
17281672
{
1729-
attribute_t *attribute =
1730-
esp_matter::attribute::create(cluster, Thermostat::Attributes::SystemMode::Id,
1731-
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
1732-
if (!attribute) {
1733-
ESP_LOGE(TAG, "Could not create attribute");
1734-
return NULL;
1735-
}
1736-
esp_matter::attribute::add_bounds(attribute, esp_matter_enum8(min), esp_matter_enum8(max));
1737-
return attribute;
1673+
return esp_matter::attribute::create(cluster, Thermostat::Attributes::SystemMode::Id,
1674+
ATTRIBUTE_FLAG_NONVOLATILE | ATTRIBUTE_FLAG_WRITABLE, esp_matter_enum8(value));
17381675
}
17391676

17401677
attribute_t *create_thermostat_running_mode(cluster_t *cluster, uint8_t value)

‎components/esp_matter/esp_matter_attribute.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -387,13 +387,13 @@ attribute_t *create_primary_n_intensity(cluster_t * cluster, nullable<uint8_t> v
387387

388388
namespace fan_control {
389389
namespace attribute {
390-
attribute_t *create_fan_mode(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
391-
attribute_t *create_fan_mode_sequence(cluster_t *cluster, const uint8_t value, uint8_t min, uint8_t max);
392-
attribute_t *create_percent_setting(cluster_t *cluster, nullable<uint8_t> value, nullable<uint8_t> min, nullable<uint8_t> max);
393-
attribute_t *create_percent_current(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
394-
attribute_t *create_speed_max(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
395-
attribute_t *create_speed_setting(cluster_t *cluster, nullable<uint8_t> value, nullable<uint8_t> min, nullable<uint8_t> max);
396-
attribute_t *create_speed_current(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
390+
attribute_t *create_fan_mode(cluster_t *cluster, uint8_t value);
391+
attribute_t *create_fan_mode_sequence(cluster_t *cluster, const uint8_t value);
392+
attribute_t *create_percent_setting(cluster_t *cluster, nullable<uint8_t> value);
393+
attribute_t *create_percent_current(cluster_t *cluster, uint8_t value);
394+
attribute_t *create_speed_max(cluster_t *cluster, uint8_t value);
395+
attribute_t *create_speed_setting(cluster_t *cluster, nullable<uint8_t> value);
396+
attribute_t *create_speed_current(cluster_t *cluster, uint8_t value);
397397
attribute_t *create_rock_support(cluster_t *cluster, uint8_t value);
398398
attribute_t *create_rock_setting(cluster_t *cluster, uint8_t value);
399399
attribute_t *create_wind_support(cluster_t *cluster, uint8_t value);
@@ -425,8 +425,8 @@ attribute_t *create_min_cool_setpoint_limit(cluster_t *cluster, int16_t value);
425425
attribute_t *create_max_cool_setpoint_limit(cluster_t *cluster, int16_t value);
426426
attribute_t *create_min_setpoint_dead_band(cluster_t *cluster, int8_t value);
427427
attribute_t *create_remote_sensing(cluster_t *cluster, uint8_t value);
428-
attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
429-
attribute_t *create_system_mode(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
428+
attribute_t *create_control_sequence_of_operation(cluster_t *cluster, uint8_t value);
429+
attribute_t *create_system_mode(cluster_t *cluster, uint8_t value);
430430
attribute_t *create_thermostat_running_mode(cluster_t *cluster, uint8_t value);
431431
attribute_t *create_start_of_week(cluster_t *cluster, uint8_t value);
432432
attribute_t *create_number_of_weekly_transitions(cluster_t *cluster, uint8_t value);

0 commit comments

Comments
 (0)