Skip to content

Commit 06683ba

Browse files
jadhavrohit924jadhavrohit924
committed
Fix type of min, max values for power source cluster
1 parent 52a95ea commit 06683ba

File tree

4 files changed

+66
-59
lines changed

4 files changed

+66
-59
lines changed

‎components/esp_matter/esp_matter_attribute.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -3694,25 +3694,25 @@ attribute_t *create_description(cluster_t *cluster, const char * value, uint16_t
36943694
return esp_matter::attribute::create(cluster, PowerSource::Attributes::Description::Id, ATTRIBUTE_FLAG_NONE, esp_matter_char_str((char *)value, length));
36953695
}
36963696

3697-
attribute_t *create_wired_assessed_input_voltage(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max)
3697+
attribute_t *create_wired_assessed_input_voltage(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max)
36983698
{
36993699
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::WiredAssessedInputVoltage::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
37003700
if (!attribute) {
37013701
ESP_LOGE(TAG, "Could not create attribute");
37023702
return NULL;
37033703
}
3704-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint32(min), esp_matter_uint32(max));
3704+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint32(min), esp_matter_nullable_uint32(max));
37053705
return attribute;
37063706
}
37073707

3708-
attribute_t *create_wired_assessed_input_frequency(cluster_t *cluster, nullable<uint16_t> value, uint16_t min, uint16_t max)
3708+
attribute_t *create_wired_assessed_input_frequency(cluster_t *cluster, nullable<uint16_t> value, nullable<uint16_t> min, nullable<uint16_t> max)
37093709
{
37103710
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::WiredAssessedInputFrequency::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint16(value));
37113711
if (!attribute) {
37123712
ESP_LOGE(TAG, "Could not create attribute");
37133713
return NULL;
37143714
}
3715-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint16(min), esp_matter_uint16(max));
3715+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint16(min), esp_matter_nullable_uint16(max));
37163716
return attribute;
37173717
}
37183718

@@ -3721,14 +3721,14 @@ attribute_t *create_wired_current_type(cluster_t *cluster, const uint8_t value)
37213721
return esp_matter::attribute::create(cluster, PowerSource::Attributes::WiredCurrentType::Id, ATTRIBUTE_FLAG_NONE, esp_matter_enum8(value));
37223722
}
37233723

3724-
attribute_t *create_wired_assessed_current(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max)
3724+
attribute_t *create_wired_assessed_current(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max)
37253725
{
37263726
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::WiredAssessedCurrent::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
37273727
if (!attribute) {
37283728
ESP_LOGE(TAG, "Could not create attribute");
37293729
return NULL;
37303730
}
3731-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint32(min), esp_matter_uint32(max));
3731+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint32(min), esp_matter_nullable_uint32(max));
37323732
return attribute;
37333733
}
37343734

@@ -3768,36 +3768,36 @@ attribute_t *create_active_wired_faults(cluster_t *cluster, uint8_t * value, uin
37683768
return esp_matter::attribute::create(cluster, PowerSource::Attributes::ActiveWiredFaults::Id, ATTRIBUTE_FLAG_NONE, esp_matter_array(value, length, count));
37693769
}
37703770

3771-
attribute_t *create_bat_voltage(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max)
3771+
attribute_t *create_bat_voltage(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max)
37723772
{
37733773
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::BatVoltage::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
37743774
if (!attribute) {
37753775
ESP_LOGE(TAG, "Could not create attribute");
37763776
return NULL;
37773777
}
3778-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint32(min), esp_matter_uint32(max));
3778+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint32(min), esp_matter_nullable_uint32(max));
37793779
return attribute;
37803780
}
37813781

3782-
attribute_t *create_bat_percent_remaining(cluster_t *cluster, nullable<uint8_t> value, uint8_t min, uint8_t max)
3782+
attribute_t *create_bat_percent_remaining(cluster_t *cluster, nullable<uint8_t> value, nullable<uint8_t> min, nullable<uint8_t> max)
37833783
{
37843784
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::BatPercentRemaining::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint8(value));
37853785
if (!attribute) {
37863786
ESP_LOGE(TAG, "Could not create attribute");
37873787
return NULL;
37883788
}
3789-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint8(min), esp_matter_uint8(max));
3789+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint8(min), esp_matter_nullable_uint8(max));
37903790
return attribute;
37913791
}
37923792

3793-
attribute_t *create_bat_time_remaining(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max)
3793+
attribute_t *create_bat_time_remaining(cluster_t *cluster, nullable< uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max)
37943794
{
37953795
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::BatTimeRemaining::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
37963796
if (!attribute) {
37973797
ESP_LOGE(TAG, "Could not create attribute");
37983798
return NULL;
37993799
}
3800-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint32(min), esp_matter_uint32(max));
3800+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint32(min), esp_matter_nullable_uint32(max));
38013801
return attribute;
38023802
}
38033803

@@ -3906,14 +3906,14 @@ attribute_t *create_bat_charge_state(cluster_t *cluster, uint8_t value)
39063906
return esp_matter::attribute::create(cluster, PowerSource::Attributes::BatChargeState::Id, ATTRIBUTE_FLAG_NONE, esp_matter_enum8(value));
39073907
}
39083908

3909-
attribute_t *create_bat_time_to_full_charge(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max)
3909+
attribute_t *create_bat_time_to_full_charge(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max)
39103910
{
39113911
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::BatTimeToFullCharge::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
39123912
if (!attribute) {
39133913
ESP_LOGE(TAG, "Could not create attribute");
39143914
return NULL;
39153915
}
3916-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint32(min), esp_matter_uint32(max));
3916+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint32(min), esp_matter_nullable_uint32(max));
39173917
return attribute;
39183918
}
39193919

@@ -3922,14 +3922,14 @@ attribute_t *create_bat_functional_while_charging(cluster_t *cluster, bool value
39223922
return esp_matter::attribute::create(cluster, PowerSource::Attributes::BatFunctionalWhileCharging::Id, ATTRIBUTE_FLAG_NONE, esp_matter_bool(value));
39233923
}
39243924

3925-
attribute_t *create_bat_charging_current(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max)
3925+
attribute_t *create_bat_charging_current(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max)
39263926
{
39273927
attribute_t *attribute = esp_matter::attribute::create(cluster, PowerSource::Attributes::BatChargingCurrent::Id, ATTRIBUTE_FLAG_NULLABLE, esp_matter_nullable_uint32(value));
39283928
if (!attribute) {
39293929
ESP_LOGE(TAG, "Could not create attribute");
39303930
return NULL;
39313931
}
3932-
esp_matter::attribute::add_bounds(attribute, esp_matter_uint32(min), esp_matter_uint32(max));
3932+
esp_matter::attribute::add_bounds(attribute, esp_matter_nullable_uint32(min), esp_matter_nullable_uint32(max));
39333933
return attribute;
39343934
}
39353935

‎components/esp_matter/esp_matter_attribute.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -863,17 +863,17 @@ namespace attribute {
863863
attribute_t *create_status(cluster_t *cluster, uint8_t value);
864864
attribute_t *create_order(cluster_t *cluster, uint8_t value, uint8_t min, uint8_t max);
865865
attribute_t *create_description(cluster_t *cluster, const char * value, uint16_t length);
866-
attribute_t *create_wired_assessed_input_voltage(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max);
867-
attribute_t *create_wired_assessed_input_frequency(cluster_t *cluster, nullable<uint16_t> value, uint16_t min, uint16_t max);
866+
attribute_t *create_wired_assessed_input_voltage(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max);
867+
attribute_t *create_wired_assessed_input_frequency(cluster_t *cluster, nullable<uint16_t> value, nullable<uint16_t> min, nullable<uint16_t> max);
868868
attribute_t *create_wired_current_type(cluster_t *cluster, const uint8_t value);
869-
attribute_t *create_wired_assessed_current(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max);
869+
attribute_t *create_wired_assessed_current(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max);
870870
attribute_t *create_wired_nominal_voltage(cluster_t *cluster, const uint32_t value, uint32_t min, uint32_t max);
871871
attribute_t *create_wired_maximum_current(cluster_t *cluster, const uint32_t value, uint32_t min, uint32_t max);
872872
attribute_t *create_wired_present(cluster_t *cluster, bool value);
873873
attribute_t *create_active_wired_faults(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count);
874-
attribute_t *create_bat_voltage(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max);
875-
attribute_t *create_bat_percent_remaining(cluster_t *cluster, nullable<uint8_t> value, uint8_t min, uint8_t max);
876-
attribute_t *create_bat_time_remaining(cluster_t *cluster, nullable< uint32_t> value, uint32_t min, uint32_t max);
874+
attribute_t *create_bat_voltage(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max);
875+
attribute_t *create_bat_percent_remaining(cluster_t *cluster, nullable<uint8_t> value, nullable<uint8_t> min, nullable<uint8_t> max);
876+
attribute_t *create_bat_time_remaining(cluster_t *cluster, nullable< uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max);
877877
attribute_t *create_bat_charge_level(cluster_t *cluster, uint8_t value);
878878
attribute_t *create_bat_replacement_needed(cluster_t *cluster, bool value);
879879
attribute_t *create_bat_replaceability(cluster_t *cluster, const uint8_t value);
@@ -887,9 +887,9 @@ attribute_t *create_bat_approved_chemistry(cluster_t *cluster, const uint8_t val
887887
attribute_t *create_bat_capacity(cluster_t *cluster, const uint32_t value, uint32_t min, uint32_t max);
888888
attribute_t *create_bat_quantity(cluster_t *cluster, const uint8_t value, uint8_t min, uint8_t max);
889889
attribute_t *create_bat_charge_state(cluster_t *cluster, uint8_t value);
890-
attribute_t *create_bat_time_to_full_charge(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max);
890+
attribute_t *create_bat_time_to_full_charge(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max);
891891
attribute_t *create_bat_functional_while_charging(cluster_t *cluster, bool value);
892-
attribute_t *create_bat_charging_current(cluster_t *cluster, nullable<uint32_t> value, uint32_t min, uint32_t max);
892+
attribute_t *create_bat_charging_current(cluster_t *cluster, nullable<uint32_t> value, nullable<uint32_t> min, nullable<uint32_t> max);
893893
attribute_t *create_active_bat_charge_faults(cluster_t *cluster, uint8_t * value, uint16_t length, uint16_t count);
894894
} /* attribute */
895895
} /* power_source */

‎examples/all_device_types_app/main/device_types.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ enum device_type_enum {
3838
ESP_MATTER_DISH_WASHER,
3939
ESP_MATTER_SMOKE_CO_ALARM,
4040
ESP_MATTER_WATER_LEAK_DETECTOR,
41+
ESP_MATTER_POWER_SOURCE,
4142
ESP_MATTER_DEVICE_TYPE_MAX
4243
};
4344

@@ -81,6 +82,7 @@ const device_type_name device_type_list[ESP_MATTER_DEVICE_TYPE_MAX] = {
8182
{"laundry_washer", ESP_MATTER_LAUNDRY_WASHER},
8283
{"dish_washer", ESP_MATTER_DISH_WASHER},
8384
{"smoke_co_alarm", ESP_MATTER_SMOKE_CO_ALARM},
84-
{"water_leak_detector", ESP_MATTER_WATER_LEAK_DETECTOR}
85+
{"water_leak_detector", ESP_MATTER_WATER_LEAK_DETECTOR},
86+
{"power_source", ESP_MATTER_POWER_SOURCE}
8587
};
8688
} /* namespace esp_matter */

‎examples/all_device_types_app/main/esp_matter_console_helpers.cpp

+39-34
Original file line numberDiff line numberDiff line change
@@ -311,34 +311,34 @@ int create(uint8_t device_type_index)
311311
cluster::temperature_control::feature::temperature_number::add(cluster, &temperature_number_config);
312312
break;
313313
}
314-
case ESP_MATTER_AIR_PURIFIER: {
315-
esp_matter::endpoint::air_purifier::config_t air_purifier_config;
316-
endpoint = esp_matter::endpoint::air_purifier::create(node, &air_purifier_config, ENDPOINT_FLAG_NONE, NULL);
317-
break;
318-
}
319-
case ESP_MATTER_AIR_QUALITY_SENSOR: {
314+
case ESP_MATTER_AIR_PURIFIER: {
315+
esp_matter::endpoint::air_purifier::config_t air_purifier_config;
316+
endpoint = esp_matter::endpoint::air_purifier::create(node, &air_purifier_config, ENDPOINT_FLAG_NONE, NULL);
317+
break;
318+
}
319+
case ESP_MATTER_AIR_QUALITY_SENSOR: {
320320
esp_matter::endpoint::air_quality_sensor::config_t air_quality_sensor_config;
321-
endpoint = esp_matter::endpoint::air_quality_sensor::create(node, &air_quality_sensor_config, ENDPOINT_FLAG_NONE, NULL);
322-
break;
323-
}
324-
case ESP_MATTER_ROBOTIC_VACUUM_CLEANER: {
325-
esp_matter::endpoint::robotic_vacuum_cleaner::config_t robotic_vacuum_cleaner_config;
326-
endpoint = esp_matter::endpoint::robotic_vacuum_cleaner::create(node, &robotic_vacuum_cleaner_config, ENDPOINT_FLAG_NONE, NULL);
327-
break;
328-
}
329-
case ESP_MATTER_LAUNDRY_WASHER: {
330-
esp_matter::endpoint::laundry_washer::config_t laundry_washer_config;
331-
endpoint = esp_matter::endpoint::laundry_washer::create(node, &laundry_washer_config, ENDPOINT_FLAG_NONE, NULL);
332-
break;
333-
}
334-
case ESP_MATTER_DISH_WASHER: {
335-
esp_matter::endpoint::dish_washer::config_t dish_washer_config;
336-
endpoint = esp_matter::endpoint::dish_washer::create(node, &dish_washer_config, ENDPOINT_FLAG_NONE, NULL);
337-
break;
338-
}
339-
case ESP_MATTER_SMOKE_CO_ALARM: {
340-
esp_matter::endpoint::smoke_co_alarm::config_t smoke_co_alarm_config;
341-
endpoint = esp_matter::endpoint::smoke_co_alarm::create(node, &smoke_co_alarm_config, ENDPOINT_FLAG_NONE, NULL);
321+
endpoint = esp_matter::endpoint::air_quality_sensor::create(node, &air_quality_sensor_config, ENDPOINT_FLAG_NONE, NULL);
322+
break;
323+
}
324+
case ESP_MATTER_ROBOTIC_VACUUM_CLEANER: {
325+
esp_matter::endpoint::robotic_vacuum_cleaner::config_t robotic_vacuum_cleaner_config;
326+
endpoint = esp_matter::endpoint::robotic_vacuum_cleaner::create(node, &robotic_vacuum_cleaner_config, ENDPOINT_FLAG_NONE, NULL);
327+
break;
328+
}
329+
case ESP_MATTER_LAUNDRY_WASHER: {
330+
esp_matter::endpoint::laundry_washer::config_t laundry_washer_config;
331+
endpoint = esp_matter::endpoint::laundry_washer::create(node, &laundry_washer_config, ENDPOINT_FLAG_NONE, NULL);
332+
break;
333+
}
334+
case ESP_MATTER_DISH_WASHER: {
335+
esp_matter::endpoint::dish_washer::config_t dish_washer_config;
336+
endpoint = esp_matter::endpoint::dish_washer::create(node, &dish_washer_config, ENDPOINT_FLAG_NONE, NULL);
337+
break;
338+
}
339+
case ESP_MATTER_SMOKE_CO_ALARM: {
340+
esp_matter::endpoint::smoke_co_alarm::config_t smoke_co_alarm_config;
341+
endpoint = esp_matter::endpoint::smoke_co_alarm::create(node, &smoke_co_alarm_config, ENDPOINT_FLAG_NONE, NULL);
342342

343343
esp_matter::endpoint::power_source_device::config_t power_source_config;
344344
esp_matter::endpoint_t *ps_endpoint = esp_matter::endpoint::power_source_device::create(node, &power_source_config, ENDPOINT_FLAG_NONE, NULL);
@@ -347,13 +347,18 @@ int create(uint8_t device_type_index)
347347
ESP_LOGE(TAG, "Matter create endpoint failed");
348348
return 1;
349349
}
350-
break;
351-
}
352-
case ESP_MATTER_WATER_LEAK_DETECTOR: {
353-
esp_matter::endpoint::water_leak_detector::config_t water_leak_detector_config;
354-
endpoint = esp_matter::endpoint::water_leak_detector::create(node, &water_leak_detector_config, ENDPOINT_FLAG_NONE, NULL);
355-
break;
356-
}
350+
break;
351+
}
352+
case ESP_MATTER_WATER_LEAK_DETECTOR: {
353+
esp_matter::endpoint::water_leak_detector::config_t water_leak_detector_config;
354+
endpoint = esp_matter::endpoint::water_leak_detector::create(node, &water_leak_detector_config, ENDPOINT_FLAG_NONE, NULL);
355+
break;
356+
}
357+
case ESP_MATTER_POWER_SOURCE: {
358+
esp_matter::endpoint::power_source_device::config_t power_source_device_config;
359+
endpoint = esp_matter::endpoint::power_source_device::create(node, &power_source_device_config, ENDPOINT_FLAG_NONE, NULL);
360+
break;
361+
}
357362
default: {
358363
ESP_LOGE(TAG, "Please input a valid device type");
359364
break;

0 commit comments

Comments
 (0)