Skip to content

Commit f650c06

Browse files
pre-commit-ci-lite[bot]pre-commit-ci-lite[bot]
authored
ci(pre-commit): Apply automatic fixes
1 parent 5bd2ed1 commit f650c06

File tree

4 files changed

+106
-92
lines changed

4 files changed

+106
-92
lines changed

‎libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The example creates two multistate devices:
3737

3838
You can modify the state names and configurations by changing the following variables:
3939
- `multistate_custom_state_names[]`: Array of custom state names
40-
- Application type and length macros: `ZB_MULTISTATE_APPLICATION_TYPE_X_STATE_NAMES`,
40+
- Application type and length macros: `ZB_MULTISTATE_APPLICATION_TYPE_X_STATE_NAMES`,
4141
`ZB_MULTISTATE_APPLICATION_TYPE_X_NUM_STATES`, `ZB_MULTISTATE_APPLICATION_TYPE_X_INDEX`
4242
- Device descriptions and application types in the setup() function
4343

‎libraries/Zigbee/examples/Zigbee_Multistate_Input_Output/Zigbee_Multistate_Input_Output.ino‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414

1515
/**
1616
* @brief This example demonstrates Zigbee multistate input / output device.
17-
*
17+
*
1818
* The example demonstrates how to use Zigbee library to create a router multistate device.
1919
* In the example, we have two multistate devices:
2020
* - zbMultistateDevice: uses defined application states from Zigbee specification
2121
* - zbMultistateDeviceCustom: uses custom application states (user defined)
22-
*
22+
*
2323
* Proper Zigbee mode must be selected in Tools->Zigbee mode
2424
* and also the correct partition scheme must be selected in Tools->Partition Scheme.
2525
*
2626
* Please check the README.md for instructions and more detailed description.
27-
*
27+
*
2828
* NOTE: HomeAssistant ZHA does not support multistate input and output clusters yet.
2929
*
3030
* Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
@@ -47,13 +47,13 @@ ZigbeeMultistate zbMultistateDevice = ZigbeeMultistate(MULTISTATE_DEVICE_ENDPOIN
4747
// zbMultistateDeviceCustom will use custom application states (user defined)
4848
ZigbeeMultistate zbMultistateDeviceCustom = ZigbeeMultistate(MULTISTATE_DEVICE_ENDPOINT_NUMBER + 1);
4949

50-
const char* multistate_custom_state_names[6] = {"Off", "On", "UltraSlow", "Slow", "Fast", "SuperFast"};
50+
const char *multistate_custom_state_names[6] = {"Off", "On", "UltraSlow", "Slow", "Fast", "SuperFast"};
5151

5252
void onStateChange(uint16_t state) {
5353
// print the state
5454
Serial.printf("Received state change: %d\r\n", state);
5555
// print the state name using the stored state names
56-
const char* const* state_names = ZB_MULTISTATE_APPLICATION_TYPE_7_STATE_NAMES;
56+
const char *const *state_names = ZB_MULTISTATE_APPLICATION_TYPE_7_STATE_NAMES;
5757
if (state_names && state < zbMultistateDevice.getMultistateOutputStateNamesLength()) {
5858
Serial.printf("State name: %s\r\n", state_names[state]);
5959
}
@@ -73,27 +73,13 @@ void onStateChangeCustom(uint16_t state) {
7373

7474
Serial.print("Changing to fan mode to: ");
7575
switch (state) {
76-
case 0:
77-
Serial.println("Off");
78-
break;
79-
case 1:
80-
Serial.println("On");
81-
break;
82-
case 2:
83-
Serial.println("UltraSlow");
84-
break;
85-
case 3:
86-
Serial.println("Slow");
87-
break;
88-
case 4:
89-
Serial.println("Fast");
90-
break;
91-
case 5:
92-
Serial.println("SuperFast");
93-
break;
94-
default:
95-
Serial.println("Invalid state");
96-
break;
76+
case 0: Serial.println("Off"); break;
77+
case 1: Serial.println("On"); break;
78+
case 2: Serial.println("UltraSlow"); break;
79+
case 3: Serial.println("Slow"); break;
80+
case 4: Serial.println("Fast"); break;
81+
case 5: Serial.println("SuperFast"); break;
82+
default: Serial.println("Invalid state"); break;
9783
}
9884
}
9985

@@ -136,7 +122,7 @@ void setup() {
136122
zbMultistateDeviceCustom.setMultistateOutputDescription("Fan (on/off/slow/medium/fast)");
137123
zbMultistateDeviceCustom.setMultistateOutputStates(5);
138124

139-
// Set callback function for multistate output change
125+
// Set callback function for multistate output change
140126
log_d("Set callback function for multistate output change");
141127
zbMultistateDevice.onMultistateOutputChange(onStateChange);
142128
zbMultistateDeviceCustom.onMultistateOutputChange(onStateChangeCustom);

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

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@ extern "C" {
88
extern void esp_zb_zcl_multi_input_init_server(void);
99
extern void esp_zb_zcl_multi_input_init_client(void);
1010

11-
void esp_zb_zcl_multistate_input_init_server(void)
12-
{
13-
esp_zb_zcl_multi_input_init_server();
11+
void esp_zb_zcl_multistate_input_init_server(void) {
12+
esp_zb_zcl_multi_input_init_server();
1413
}
15-
void esp_zb_zcl_multistate_input_init_client(void)
16-
{
17-
esp_zb_zcl_multi_input_init_client();
14+
void esp_zb_zcl_multistate_input_init_client(void) {
15+
esp_zb_zcl_multi_input_init_client();
1816
}
1917
#ifdef __cplusplus
2018
}
@@ -29,7 +27,7 @@ ZigbeeMultistate::ZigbeeMultistate(uint8_t endpoint) : ZigbeeEP(endpoint) {
2927
esp_zb_cluster_list_add_identify_cluster(_cluster_list, esp_zb_identify_cluster_create(NULL), ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
3028

3129
_ep_config = {.endpoint = _endpoint, .app_profile_id = ESP_ZB_AF_HA_PROFILE_ID, .app_device_id = ESP_ZB_HA_SIMPLE_SENSOR_DEVICE_ID, .app_device_version = 0};
32-
30+
3331
// Initialize member variables
3432
_multistate_clusters = 0;
3533
_input_state = 0;
@@ -43,18 +41,15 @@ ZigbeeMultistate::ZigbeeMultistate(uint8_t endpoint) : ZigbeeEP(endpoint) {
4341

4442
bool ZigbeeMultistate::addMultistateInput() {
4543
esp_zb_multistate_input_cluster_cfg_t multistate_input_cfg = {
46-
.number_of_states = 3,
47-
.out_of_service = false,
48-
.present_value = 0,
49-
.status_flags = ESP_ZB_ZCL_MULTI_VALUE_STATUS_FLAGS_NORMAL
44+
.number_of_states = 3, .out_of_service = false, .present_value = 0, .status_flags = ESP_ZB_ZCL_MULTI_VALUE_STATUS_FLAGS_NORMAL
5045
};
5146

5247
esp_zb_attribute_list_t *multistate_input_cluster = esp_zb_multistate_input_cluster_create(&multistate_input_cfg);
5348

5449
// Create default description for Multistate Input
55-
char default_description[] = "\x10" // Size of the description text
56-
"Multistate Input"; // Description text
57-
uint32_t application_type = 0x00000000 | (0x0D << 24); // Application type
50+
char default_description[] = "\x10" // Size of the description text
51+
"Multistate Input"; // Description text
52+
uint32_t application_type = 0x00000000 | (0x0D << 24); // Application type
5853
// const char* state_text[] = { "Off", "On", "Auto" }; // State text array
5954

6055
esp_err_t ret = esp_zb_multistate_input_cluster_add_attr(multistate_input_cluster, ESP_ZB_ZCL_ATTR_MULTI_INPUT_DESCRIPTION_ID, (void *)default_description);
@@ -87,21 +82,19 @@ bool ZigbeeMultistate::addMultistateInput() {
8782

8883
bool ZigbeeMultistate::addMultistateOutput() {
8984
esp_zb_multistate_output_cluster_cfg_t multistate_output_cfg = {
90-
.number_of_states = 3,
91-
.out_of_service = false,
92-
.present_value = 0,
93-
.status_flags = ESP_ZB_ZCL_MULTI_VALUE_STATUS_FLAGS_NORMAL
85+
.number_of_states = 3, .out_of_service = false, .present_value = 0, .status_flags = ESP_ZB_ZCL_MULTI_VALUE_STATUS_FLAGS_NORMAL
9486
};
9587

9688
esp_zb_attribute_list_t *multistate_output_cluster = esp_zb_multistate_output_cluster_create(&multistate_output_cfg);
9789

9890
// Create default description for Multistate Output
99-
char default_description[] = "\x11" // Size of the description text
100-
"Multistate Output"; // Description text
91+
char default_description[] = "\x11" // Size of the description text
92+
"Multistate Output"; // Description text
10193
uint32_t application_type = 0x00000000 | (0x0E << 24);
10294
// const char* state_text[] = { "Off", "On", "Auto" }; // State text array
10395

104-
esp_err_t ret = esp_zb_multistate_output_cluster_add_attr(multistate_output_cluster, ESP_ZB_ZCL_ATTR_MULTI_OUTPUT_DESCRIPTION_ID, (void *)default_description);
96+
esp_err_t ret =
97+
esp_zb_multistate_output_cluster_add_attr(multistate_output_cluster, ESP_ZB_ZCL_ATTR_MULTI_OUTPUT_DESCRIPTION_ID, (void *)default_description);
10598
if (ret != ESP_OK) {
10699
log_e("Failed to add description attribute: 0x%x: %s", ret, esp_err_to_name(ret));
107100
return false;
@@ -288,7 +281,7 @@ bool ZigbeeMultistate::setMultistateOutputStates(uint16_t number_of_states) {
288281
log_e("Failed to set number of states: 0x%x: %s", ret, esp_err_to_name(ret));
289282
return false;
290283
}
291-
284+
292285
_output_state_names_length = number_of_states;
293286
return true;
294287
}
@@ -318,7 +311,7 @@ bool ZigbeeMultistate::setMultistateInputStates(const char * const states[], uin
318311
log_e("Failed to set number of states: 0x%x: %s", ret, esp_err_to_name(ret));
319312
return false;
320313
}
321-
314+
322315
// Store state names locally for getter access
323316
_input_state_names = states;
324317
_input_state_names_length = states_length;
@@ -348,7 +341,7 @@ bool ZigbeeMultistate::setMultistateOutputStates(const char * const states[], ui
348341
log_e("Failed to set number of states: 0x%x: %s", ret, esp_err_to_name(ret));
349342
return false;
350343
}
351-
344+
352345
// Store state names locally for getter access
353346
_output_state_names = states;
354347
_output_state_names_length = states_length;

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

Lines changed: 75 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -15,55 +15,91 @@
1515
// uint8_t chars for state names, with max of 16 chars ASCII
1616

1717
// Multistate Input/Output Application Types Defines
18-
#define ZB_MULTISTATE_APPLICATION_TYPE_0_INDEX 0x0000
19-
#define ZB_MULTISTATE_APPLICATION_TYPE_0_NUM_STATES 3
20-
#define ZB_MULTISTATE_APPLICATION_TYPE_0_STATE_NAMES (const char* const[]){"Off", "On", "Auto"}
18+
#define ZB_MULTISTATE_APPLICATION_TYPE_0_INDEX 0x0000
19+
#define ZB_MULTISTATE_APPLICATION_TYPE_0_NUM_STATES 3
20+
#define ZB_MULTISTATE_APPLICATION_TYPE_0_STATE_NAMES \
21+
(const char *const[]) { \
22+
"Off", "On", "Auto" \
23+
}
2124

22-
#define ZB_MULTISTATE_APPLICATION_TYPE_1_INDEX 0x0001
23-
#define ZB_MULTISTATE_APPLICATION_TYPE_1_NUM_STATES 4
24-
#define ZB_MULTISTATE_APPLICATION_TYPE_1_STATE_NAMES (const char* const[]){"Off", "Low", "Medium", "High"}
25+
#define ZB_MULTISTATE_APPLICATION_TYPE_1_INDEX 0x0001
26+
#define ZB_MULTISTATE_APPLICATION_TYPE_1_NUM_STATES 4
27+
#define ZB_MULTISTATE_APPLICATION_TYPE_1_STATE_NAMES \
28+
(const char *const[]) { \
29+
"Off", "Low", "Medium", "High" \
30+
}
2531

26-
#define ZB_MULTISTATE_APPLICATION_TYPE_2_INDEX 0x0002
27-
#define ZB_MULTISTATE_APPLICATION_TYPE_2_NUM_STATES 7
28-
#define ZB_MULTISTATE_APPLICATION_TYPE_2_STATE_NAMES (const char* const[]){"Auto", "Heat", "Cool", "Off", "Emergency Heat", "Fan Only", "Max Heat"}
32+
#define ZB_MULTISTATE_APPLICATION_TYPE_2_INDEX 0x0002
33+
#define ZB_MULTISTATE_APPLICATION_TYPE_2_NUM_STATES 7
34+
#define ZB_MULTISTATE_APPLICATION_TYPE_2_STATE_NAMES \
35+
(const char *const[]) { \
36+
"Auto", "Heat", "Cool", "Off", "Emergency Heat", "Fan Only", "Max Heat" \
37+
}
2938

30-
#define ZB_MULTISTATE_APPLICATION_TYPE_3_INDEX 0x0003
31-
#define ZB_MULTISTATE_APPLICATION_TYPE_3_NUM_STATES 4
32-
#define ZB_MULTISTATE_APPLICATION_TYPE_3_STATE_NAMES (const char* const[]){"Occupied", "Unoccupied", "Standby", "Bypass"}
39+
#define ZB_MULTISTATE_APPLICATION_TYPE_3_INDEX 0x0003
40+
#define ZB_MULTISTATE_APPLICATION_TYPE_3_NUM_STATES 4
41+
#define ZB_MULTISTATE_APPLICATION_TYPE_3_STATE_NAMES \
42+
(const char *const[]) { \
43+
"Occupied", "Unoccupied", "Standby", "Bypass" \
44+
}
3345

34-
#define ZB_MULTISTATE_APPLICATION_TYPE_4_INDEX 0x0004
35-
#define ZB_MULTISTATE_APPLICATION_TYPE_4_NUM_STATES 3
36-
#define ZB_MULTISTATE_APPLICATION_TYPE_4_STATE_NAMES (const char* const[]){"Inactive", "Active", "Hold"}
46+
#define ZB_MULTISTATE_APPLICATION_TYPE_4_INDEX 0x0004
47+
#define ZB_MULTISTATE_APPLICATION_TYPE_4_NUM_STATES 3
48+
#define ZB_MULTISTATE_APPLICATION_TYPE_4_STATE_NAMES \
49+
(const char *const[]) { \
50+
"Inactive", "Active", "Hold" \
51+
}
3752

38-
#define ZB_MULTISTATE_APPLICATION_TYPE_5_INDEX 0x0005
39-
#define ZB_MULTISTATE_APPLICATION_TYPE_5_NUM_STATES 8
40-
#define ZB_MULTISTATE_APPLICATION_TYPE_5_STATE_NAMES (const char* const[]){"Auto", "Warm-up", "Water Flush", "Autocalibration", "Shutdown Open", "Shutdown Closed", "Low Limit", "Test and Balance"}
53+
#define ZB_MULTISTATE_APPLICATION_TYPE_5_INDEX 0x0005
54+
#define ZB_MULTISTATE_APPLICATION_TYPE_5_NUM_STATES 8
55+
#define ZB_MULTISTATE_APPLICATION_TYPE_5_STATE_NAMES \
56+
(const char *const[]) { \
57+
"Auto", "Warm-up", "Water Flush", "Autocalibration", "Shutdown Open", "Shutdown Closed", "Low Limit", "Test and Balance" \
58+
}
4159

42-
#define ZB_MULTISTATE_APPLICATION_TYPE_6_INDEX 0x0006
43-
#define ZB_MULTISTATE_APPLICATION_TYPE_6_NUM_STATES 6
44-
#define ZB_MULTISTATE_APPLICATION_TYPE_6_STATE_NAMES (const char* const[]){"Off", "Auto", "Heat Cool", "Heat Only", "Cool Only", "Fan Only"}
60+
#define ZB_MULTISTATE_APPLICATION_TYPE_6_INDEX 0x0006
61+
#define ZB_MULTISTATE_APPLICATION_TYPE_6_NUM_STATES 6
62+
#define ZB_MULTISTATE_APPLICATION_TYPE_6_STATE_NAMES \
63+
(const char *const[]) { \
64+
"Off", "Auto", "Heat Cool", "Heat Only", "Cool Only", "Fan Only" \
65+
}
4566

46-
#define ZB_MULTISTATE_APPLICATION_TYPE_7_INDEX 0x0007
47-
#define ZB_MULTISTATE_APPLICATION_TYPE_7_NUM_STATES 3
48-
#define ZB_MULTISTATE_APPLICATION_TYPE_7_STATE_NAMES (const char* const[]){"High", "Normal", "Low"}
67+
#define ZB_MULTISTATE_APPLICATION_TYPE_7_INDEX 0x0007
68+
#define ZB_MULTISTATE_APPLICATION_TYPE_7_NUM_STATES 3
69+
#define ZB_MULTISTATE_APPLICATION_TYPE_7_STATE_NAMES \
70+
(const char *const[]) { \
71+
"High", "Normal", "Low" \
72+
}
4973

50-
#define ZB_MULTISTATE_APPLICATION_TYPE_8_INDEX 0x0008
51-
#define ZB_MULTISTATE_APPLICATION_TYPE_8_NUM_STATES 4
52-
#define ZB_MULTISTATE_APPLICATION_TYPE_8_STATE_NAMES (const char* const[]){"Occupied", "Unoccupied", "Startup", "Shutdown"}
74+
#define ZB_MULTISTATE_APPLICATION_TYPE_8_INDEX 0x0008
75+
#define ZB_MULTISTATE_APPLICATION_TYPE_8_NUM_STATES 4
76+
#define ZB_MULTISTATE_APPLICATION_TYPE_8_STATE_NAMES \
77+
(const char *const[]) { \
78+
"Occupied", "Unoccupied", "Startup", "Shutdown" \
79+
}
5380

54-
#define ZB_MULTISTATE_APPLICATION_TYPE_9_INDEX 0x0009
55-
#define ZB_MULTISTATE_APPLICATION_TYPE_9_NUM_STATES 3
56-
#define ZB_MULTISTATE_APPLICATION_TYPE_9_STATE_NAMES (const char* const[]){"Night", "Day", "Hold"}
81+
#define ZB_MULTISTATE_APPLICATION_TYPE_9_INDEX 0x0009
82+
#define ZB_MULTISTATE_APPLICATION_TYPE_9_NUM_STATES 3
83+
#define ZB_MULTISTATE_APPLICATION_TYPE_9_STATE_NAMES \
84+
(const char *const[]) { \
85+
"Night", "Day", "Hold" \
86+
}
5787

58-
#define ZB_MULTISTATE_APPLICATION_TYPE_10_INDEX 0x000A
59-
#define ZB_MULTISTATE_APPLICATION_TYPE_10_NUM_STATES 5
60-
#define ZB_MULTISTATE_APPLICATION_TYPE_10_STATE_NAMES (const char* const[]){"Off", "Cool", "Heat", "Auto", "Emergency Heat"}
88+
#define ZB_MULTISTATE_APPLICATION_TYPE_10_INDEX 0x000A
89+
#define ZB_MULTISTATE_APPLICATION_TYPE_10_NUM_STATES 5
90+
#define ZB_MULTISTATE_APPLICATION_TYPE_10_STATE_NAMES \
91+
(const char *const[]) { \
92+
"Off", "Cool", "Heat", "Auto", "Emergency Heat" \
93+
}
6194

62-
#define ZB_MULTISTATE_APPLICATION_TYPE_11_INDEX 0x000B
63-
#define ZB_MULTISTATE_APPLICATION_TYPE_11_NUM_STATES 7
64-
#define ZB_MULTISTATE_APPLICATION_TYPE_11_STATE_NAMES (const char* const[]){"Shutdown Closed", "Shutdown Open", "Satisfied", "Mixing", "Cooling", "Heating", "Suppl Heat"}
95+
#define ZB_MULTISTATE_APPLICATION_TYPE_11_INDEX 0x000B
96+
#define ZB_MULTISTATE_APPLICATION_TYPE_11_NUM_STATES 7
97+
#define ZB_MULTISTATE_APPLICATION_TYPE_11_STATE_NAMES \
98+
(const char *const[]) { \
99+
"Shutdown Closed", "Shutdown Open", "Satisfied", "Mixing", "Cooling", "Heating", "Suppl Heat" \
100+
}
65101

66-
#define ZB_MULTISTATE_APPLICATION_TYPE_OTHER_INDEX 0xFFFF
102+
#define ZB_MULTISTATE_APPLICATION_TYPE_OTHER_INDEX 0xFFFF
67103

68104
//enum for bits set to check what multistate cluster were added
69105
enum zigbee_multistate_clusters {
@@ -113,7 +149,7 @@ class ZigbeeMultistate : public ZigbeeEP {
113149
uint16_t getMultistateOutput() {
114150
return _output_state;
115151
}
116-
152+
117153
// Get state names and length
118154
uint16_t getMultistateInputStateNamesLength() {
119155
return _input_state_names_length;
@@ -141,13 +177,12 @@ class ZigbeeMultistate : public ZigbeeEP {
141177
uint8_t _multistate_clusters;
142178
uint16_t _output_state;
143179
uint16_t _input_state;
144-
180+
145181
// Local storage for state names
146182
uint16_t _input_state_names_length;
147183
uint16_t _output_state_names_length;
148184
// const char* const* _input_state_names;
149185
// const char* const* _output_state_names;
150-
151186
};
152187

153188
#endif // CONFIG_ZB_ENABLED

0 commit comments

Comments
 (0)