Skip to content

Commit a0d57bb

Browse files
FaBjEFaBjE
committed
feat(Zigbee): Update Zigbee Dimmable light example config/define names
1 parent 538c57a commit a0d57bb

File tree

2 files changed

+43
-49
lines changed

2 files changed

+43
-49
lines changed

‎libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ZigbeeDimmableLight::ZigbeeDimmableLight(uint8_t endpoint) : ZigbeeEP(endpoint)
88
{
99
_device_id = ESP_ZB_HA_DIMMABLE_LIGHT_DEVICE_ID;
1010

11-
esp_zb_dimmable_light_cfg_t light_cfg = ESP_ZB_DEFAULT_DIMMABLE_LIGHT_CONFIG();
11+
zigbee_dimmable_light_cfg_t light_cfg = ZIGBEE_DEFAULT_DIMMABLE_LIGHT_CONFIG();
1212
_cluster_list = esp_zb_dimmable_light_clusters_create(&light_cfg);
1313

1414
_ep_config = {.endpoint = _endpoint, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_DIMMABLE_LIGHT_DEVICE_ID, .app_device_version = 0};
@@ -98,7 +98,7 @@ void ZigbeeDimmableLight::setLightLevel(uint8_t level)
9898
setLight(_current_state, level);
9999
}
100100

101-
esp_zb_cluster_list_t *ZigbeeDimmableLight::esp_zb_dimmable_light_clusters_create(esp_zb_dimmable_light_cfg_t *light_cfg)
101+
esp_zb_cluster_list_t *ZigbeeDimmableLight::esp_zb_dimmable_light_clusters_create(zigbee_dimmable_light_cfg_t *light_cfg)
102102
{
103103
esp_zb_attribute_list_t *esp_zb_basic_cluster = esp_zb_basic_cluster_create(&light_cfg->basic_cfg);
104104
esp_zb_attribute_list_t *esp_zb_identify_cluster = esp_zb_identify_cluster_create(&light_cfg->identify_cfg);

‎libraries/Zigbee/src/ep/ZigbeeDimmableLight.h‎

Lines changed: 41 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,79 +15,73 @@
1515
*
1616
*
1717
*/
18-
typedef struct esp_zb_dimmable_light_cfg_s
19-
{
18+
typedef struct zigbee_dimmable_light_cfg_s {
2019
esp_zb_basic_cluster_cfg_t basic_cfg; /*!< Basic cluster configuration, @ref esp_zb_basic_cluster_cfg_s */
2120
esp_zb_identify_cluster_cfg_t identify_cfg; /*!< Identify cluster configuration, @ref esp_zb_identify_cluster_cfg_s */
2221
esp_zb_groups_cluster_cfg_t groups_cfg; /*!< Groups cluster configuration, @ref esp_zb_groups_cluster_cfg_s */
2322
esp_zb_scenes_cluster_cfg_t scenes_cfg; /*!< Scenes cluster configuration, @ref esp_zb_scenes_cluster_cfg_s */
2423
esp_zb_on_off_cluster_cfg_t on_off_cfg; /*!< On off cluster configuration, @ref esp_zb_on_off_cluster_cfg_s */
2524
esp_zb_level_cluster_cfg_t level_cfg; /*!< Level cluster configuration, @ref esp_zb_level_cluster_cfg_s */
26-
} esp_zb_dimmable_light_cfg_t;
25+
} zigbee_dimmable_light_cfg_t;
2726

2827
/**
2928
* @brief Zigbee HA standard dimmable light device default config value.
3029
* Added here as not supported by ESP Zigbee library.
3130
*
3231
*/
33-
#define ESP_ZB_DEFAULT_DIMMABLE_LIGHT_CONFIG() \
34-
{ \
35-
.basic_cfg = \
36-
{ \
37-
.zcl_version = ESP_ZB_ZCL_BASIC_ZCL_VERSION_DEFAULT_VALUE, \
38-
.power_source = ESP_ZB_ZCL_BASIC_POWER_SOURCE_DEFAULT_VALUE, \
39-
}, \
40-
.identify_cfg = \
41-
{ \
42-
.identify_time = ESP_ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE, \
43-
}, \
44-
.groups_cfg = \
45-
{ \
46-
.groups_name_support_id = ESP_ZB_ZCL_GROUPS_NAME_SUPPORT_DEFAULT_VALUE, \
47-
}, \
48-
.scenes_cfg = \
49-
{ \
50-
.scenes_count = ESP_ZB_ZCL_SCENES_SCENE_COUNT_DEFAULT_VALUE, \
51-
.current_scene = ESP_ZB_ZCL_SCENES_CURRENT_SCENE_DEFAULT_VALUE, \
52-
.current_group = ESP_ZB_ZCL_SCENES_CURRENT_GROUP_DEFAULT_VALUE, \
53-
.scene_valid = ESP_ZB_ZCL_SCENES_SCENE_VALID_DEFAULT_VALUE, \
54-
.name_support = ESP_ZB_ZCL_SCENES_NAME_SUPPORT_DEFAULT_VALUE, \
55-
}, \
56-
.on_off_cfg = \
57-
{ \
58-
.on_off = ESP_ZB_ZCL_ON_OFF_ON_OFF_DEFAULT_VALUE, \
59-
}, \
60-
.level_cfg = \
61-
{ \
62-
.current_level = ESP_ZB_ZCL_LEVEL_CONTROL_CURRENT_LEVEL_DEFAULT_VALUE, \
63-
}, \
32+
#define ZIGBEE_DEFAULT_DIMMABLE_LIGHT_CONFIG() \
33+
{ \
34+
.basic_cfg = \
35+
{ \
36+
.zcl_version = ESP_ZB_ZCL_BASIC_ZCL_VERSION_DEFAULT_VALUE, \
37+
.power_source = ESP_ZB_ZCL_BASIC_POWER_SOURCE_DEFAULT_VALUE, \
38+
}, \
39+
.identify_cfg = \
40+
{ \
41+
.identify_time = ESP_ZB_ZCL_IDENTIFY_IDENTIFY_TIME_DEFAULT_VALUE, \
42+
}, \
43+
.groups_cfg = \
44+
{ \
45+
.groups_name_support_id = ESP_ZB_ZCL_GROUPS_NAME_SUPPORT_DEFAULT_VALUE, \
46+
}, \
47+
.scenes_cfg = \
48+
{ \
49+
.scenes_count = ESP_ZB_ZCL_SCENES_SCENE_COUNT_DEFAULT_VALUE, \
50+
.current_scene = ESP_ZB_ZCL_SCENES_CURRENT_SCENE_DEFAULT_VALUE, \
51+
.current_group = ESP_ZB_ZCL_SCENES_CURRENT_GROUP_DEFAULT_VALUE, \
52+
.scene_valid = ESP_ZB_ZCL_SCENES_SCENE_VALID_DEFAULT_VALUE, \
53+
.name_support = ESP_ZB_ZCL_SCENES_NAME_SUPPORT_DEFAULT_VALUE, \
54+
}, \
55+
.on_off_cfg = \
56+
{ \
57+
.on_off = ESP_ZB_ZCL_ON_OFF_ON_OFF_DEFAULT_VALUE, \
58+
}, \
59+
.level_cfg = \
60+
{ \
61+
.current_level = ESP_ZB_ZCL_LEVEL_CONTROL_CURRENT_LEVEL_DEFAULT_VALUE, \
62+
}, \
6463
}
6564

66-
class ZigbeeDimmableLight : public ZigbeeEP
67-
{
65+
class ZigbeeDimmableLight : public ZigbeeEP {
6866
public:
6967
ZigbeeDimmableLight(uint8_t endpoint);
7068
~ZigbeeDimmableLight();
7169

72-
void onLightChange(void (*callback)(bool, uint8_t))
73-
{
70+
void onLightChange(void (*callback)(bool, uint8_t)) {
7471
_on_light_change = callback;
7572
}
76-
void restoreLight()
77-
{
73+
void restoreLight() {
7874
lightChanged();
7975
}
8076

8177
void setLightState(bool state);
8278
void setLightLevel(uint8_t level);
8379
void setLight(bool state, uint8_t level);
8480

85-
bool getLightState()
86-
{
81+
bool getLightState() {
8782
return _current_state;
8883
}
89-
uint8_t getLightLevel()
90-
{
84+
uint8_t getLightLevel() {
9185
return _current_level;
9286
}
9387

@@ -103,15 +97,15 @@ class ZigbeeDimmableLight : public ZigbeeEP
10397
* Added here as not supported by ESP Zigbee library.
10498
*
10599
* @note This contains basic, identify, groups, scenes, on-off, level, as server side.
106-
* @param[in] light_cfg Configuration parameters for this cluster lists defined by @ref esp_zb_dimmable_light_cfg_t
100+
* @param[in] light_cfg Configuration parameters for this cluster lists defined by @ref zigbee_dimmable_light_cfg_t
107101
*
108102
* @return Pointer to cluster list @ref esp_zb_cluster_list_s
109103
*
110104
*/
111-
esp_zb_cluster_list_t *esp_zb_dimmable_light_clusters_create(esp_zb_dimmable_light_cfg_t *light_cfg);
105+
esp_zb_cluster_list_t *esp_zb_dimmable_light_clusters_create(zigbee_dimmable_light_cfg_t *light_cfg);
112106

113107
bool _current_state;
114108
uint8_t _current_level;
115109
};
116110

117-
#endif // SOC_IEEE802154_SUPPORTED
111+
#endif // SOC_IEEE802154_SUPPORTED

0 commit comments

Comments
 (0)