Skip to content

Commit 66bfbce

Browse files
pre-commit-ci-lite[bot]pre-commit-ci-lite[bot]
authored
ci(pre-commit): Apply automatic fixes
1 parent 6392dd3 commit 66bfbce

File tree

5 files changed

+34
-47
lines changed

5 files changed

+34
-47
lines changed

‎libraries/Zigbee/examples/Zigbee_Analog_Input_Output/Zigbee_Analog_Input_Output.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ void setup() {
7979
zbAnalogTemp.setAnalogInputApplication(ESP_ZB_ZCL_AI_TEMPERATURE_OTHER);
8080
zbAnalogTemp.setAnalogInputDescription("Temperature");
8181
zbAnalogTemp.setAnalogInputResolution(0.1);
82-
82+
8383
// Set up analog input
8484
zbAnalogFan.addAnalogInput();
8585
zbAnalogFan.setAnalogInputApplication(ESP_ZB_ZCL_AI_RPM_OTHER);
8686
zbAnalogFan.setAnalogInputDescription("RPM");
8787
zbAnalogFan.setAnalogInputResolution(1);
88-
88+
8989
// Set up analog input
9090
zbAnalogPercent.addAnalogInput();
9191
zbAnalogPercent.setAnalogInputApplication(ESP_ZB_ZCL_AI_PERCENTAGE_OTHER);
@@ -126,9 +126,9 @@ void loop() {
126126
float analog = (float)analogRead(analogPin);
127127
Serial.printf("Updating analog input to %.1f\r\n", analog);
128128
zbAnalogDevice.setAnalogInput(analog);
129-
zbAnalogTemp.setAnalogInput(analog/100);
129+
zbAnalogTemp.setAnalogInput(analog / 100);
130130
zbAnalogFan.setAnalogInput(analog);
131-
zbAnalogPercent.setAnalogInput(analog/10);
131+
zbAnalogPercent.setAnalogInput(analog / 10);
132132

133133
// Analog input supports reporting
134134
zbAnalogDevice.reportAnalogInput();

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

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,31 @@ ZigbeeAnalog::ZigbeeAnalog(uint8_t endpoint) : ZigbeeEP(endpoint) {
1414

1515
bool ZigbeeAnalog::addAnalogInput() {
1616
esp_zb_attribute_list_t *esp_zb_analog_input_cluster = esp_zb_analog_input_cluster_create(NULL);
17-
17+
1818
// Create default description for Analog Input
19-
char default_description[] = "\x0C""Analog Input";
19+
char default_description[] = "\x0C"
20+
"Analog Input";
2021
uint32_t application_type = 0x00000000 | (ESP_ZB_ZCL_AI_GROUP_ID << 24);
2122
float resolution = 0.1; // Default resolution of 0.1
22-
23-
esp_err_t ret = esp_zb_analog_input_cluster_add_attr(
24-
esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_DESCRIPTION_ID, (void *)default_description
25-
);
23+
24+
esp_err_t ret = esp_zb_analog_input_cluster_add_attr(esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_DESCRIPTION_ID, (void *)default_description);
2625
if (ret != ESP_OK) {
2726
log_e("Failed to add description attribute: 0x%x: %s", ret, esp_err_to_name(ret));
2827
return false;
2928
}
3029

31-
ret = esp_zb_analog_input_cluster_add_attr(
32-
esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_APPLICATION_TYPE_ID, (void *)&application_type
33-
);
30+
ret = esp_zb_analog_input_cluster_add_attr(esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_APPLICATION_TYPE_ID, (void *)&application_type);
3431
if (ret != ESP_OK) {
3532
log_e("Failed to add application type attribute: 0x%x: %s", ret, esp_err_to_name(ret));
3633
return false;
3734
}
3835

39-
ret = esp_zb_analog_input_cluster_add_attr(
40-
esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_RESOLUTION_ID, (void *)&resolution
41-
);
36+
ret = esp_zb_analog_input_cluster_add_attr(esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_RESOLUTION_ID, (void *)&resolution);
4237
if (ret != ESP_OK) {
4338
log_e("Failed to add resolution attribute: 0x%x: %s", ret, esp_err_to_name(ret));
4439
return false;
4540
}
46-
41+
4742
ret = esp_zb_cluster_list_add_analog_input_cluster(_cluster_list, esp_zb_analog_input_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
4843
if (ret != ESP_OK) {
4944
log_e("Failed to add Analog Input cluster: 0x%x: %s", ret, esp_err_to_name(ret));
@@ -75,31 +70,27 @@ bool ZigbeeAnalog::setAnalogInputApplication(uint32_t application_type) {
7570

7671
bool ZigbeeAnalog::addAnalogOutput() {
7772
esp_zb_attribute_list_t *esp_zb_analog_output_cluster = esp_zb_analog_output_cluster_create(NULL);
78-
73+
7974
// Create default description for Analog Output
80-
char default_description[] = "\x0D""Analog Output";
75+
char default_description[] = "\x0D"
76+
"Analog Output";
8177
uint32_t application_type = 0x00000000 | (ESP_ZB_ZCL_AO_GROUP_ID << 24);
8278
float resolution = 1; // Default resolution of 1
8379

84-
esp_err_t ret = esp_zb_analog_output_cluster_add_attr(
85-
esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_DESCRIPTION_ID, (void *)default_description
86-
);
80+
esp_err_t ret =
81+
esp_zb_analog_output_cluster_add_attr(esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_DESCRIPTION_ID, (void *)default_description);
8782
if (ret != ESP_OK) {
8883
log_e("Failed to add description attribute: 0x%x: %s", ret, esp_err_to_name(ret));
8984
return false;
9085
}
9186

92-
ret = esp_zb_analog_output_cluster_add_attr(
93-
esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_APPLICATION_TYPE_ID, (void *)&application_type
94-
);
87+
ret = esp_zb_analog_output_cluster_add_attr(esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_APPLICATION_TYPE_ID, (void *)&application_type);
9588
if (ret != ESP_OK) {
9689
log_e("Failed to add application type attribute: 0x%x: %s", ret, esp_err_to_name(ret));
9790
return false;
9891
}
9992

100-
ret = esp_zb_analog_output_cluster_add_attr(
101-
esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_RESOLUTION_ID, (void *)&resolution
102-
);
93+
ret = esp_zb_analog_output_cluster_add_attr(esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_RESOLUTION_ID, (void *)&resolution);
10394
if (ret != ESP_OK) {
10495
log_e("Failed to add resolution attribute: 0x%x: %s", ret, esp_err_to_name(ret));
10596
return false;
@@ -230,7 +221,7 @@ bool ZigbeeAnalog::setAnalogInputDescription(const char *description) {
230221

231222
// Allocate a new array of size length + 2 (1 for the length, 1 for null terminator)
232223
char zb_description[ZB_MAX_NAME_LENGTH + 2];
233-
224+
234225
// Convert description to ZCL string
235226
size_t description_length = strlen(description);
236227
if (description_length > ZB_MAX_NAME_LENGTH) {
@@ -270,7 +261,7 @@ bool ZigbeeAnalog::setAnalogOutputDescription(const char *description) {
270261

271262
// Allocate a new array of size length + 2 (1 for the length, 1 for null terminator)
272263
char zb_description[ZB_MAX_NAME_LENGTH + 2];
273-
264+
274265
// Convert description to ZCL string
275266
size_t description_length = strlen(description);
276267
if (description_length > ZB_MAX_NAME_LENGTH) {
@@ -344,5 +335,4 @@ bool ZigbeeAnalog::setAnalogOutputResolution(float resolution) {
344335
return true;
345336
}
346337

347-
348338
#endif // CONFIG_ZB_ENABLED

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ class ZigbeeAnalog : public ZigbeeEP {
3232
bool addAnalogOutput();
3333

3434
// Set the application type and description for the analog input
35-
bool setAnalogInputApplication(uint32_t application_type); // Check esp_zigbee_zcl_analog_input.h for application type values
35+
bool setAnalogInputApplication(uint32_t application_type); // Check esp_zigbee_zcl_analog_input.h for application type values
3636
bool setAnalogInputDescription(const char *description);
3737
bool setAnalogInputResolution(float resolution);
3838

3939
// Set the application type and description for the analog output
40-
bool setAnalogOutputApplication(uint32_t application_type); // Check esp_zigbee_zcl_analog_output.h for application type values
40+
bool setAnalogOutputApplication(uint32_t application_type); // Check esp_zigbee_zcl_analog_output.h for application type values
4141
bool setAnalogOutputDescription(const char *description);
4242
bool setAnalogOutputResolution(float resolution);
43-
43+
4444
// Use to set a cb function to be called on analog output change
4545
void onAnalogOutputChange(void (*callback)(float analog)) {
4646
_on_analog_output_change = callback;

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

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,24 @@ ZigbeeBinary::ZigbeeBinary(uint8_t endpoint) : ZigbeeEP(endpoint) {
1414

1515
bool ZigbeeBinary::addBinaryInput() {
1616
esp_zb_attribute_list_t *esp_zb_binary_input_cluster = esp_zb_binary_input_cluster_create(NULL);
17-
17+
1818
// Create default description for Binary Input
19-
char default_description[] = "\x0C""Binary Input";
19+
char default_description[] = "\x0C"
20+
"Binary Input";
2021
uint32_t application_type = 0x00000000 | (0x03 << 24); // Group ID 0x03
21-
22-
esp_err_t ret = esp_zb_binary_input_cluster_add_attr(
23-
esp_zb_binary_input_cluster, ESP_ZB_ZCL_ATTR_BINARY_INPUT_DESCRIPTION_ID, (void *)default_description
24-
);
22+
23+
esp_err_t ret = esp_zb_binary_input_cluster_add_attr(esp_zb_binary_input_cluster, ESP_ZB_ZCL_ATTR_BINARY_INPUT_DESCRIPTION_ID, (void *)default_description);
2524
if (ret != ESP_OK) {
2625
log_e("Failed to add description attribute: 0x%x: %s", ret, esp_err_to_name(ret));
2726
return false;
2827
}
2928

30-
ret = esp_zb_binary_input_cluster_add_attr(
31-
esp_zb_binary_input_cluster, ESP_ZB_ZCL_ATTR_BINARY_INPUT_APPLICATION_TYPE_ID, (void *)&application_type
32-
);
29+
ret = esp_zb_binary_input_cluster_add_attr(esp_zb_binary_input_cluster, ESP_ZB_ZCL_ATTR_BINARY_INPUT_APPLICATION_TYPE_ID, (void *)&application_type);
3330
if (ret != ESP_OK) {
3431
log_e("Failed to add application type attribute: 0x%x: %s", ret, esp_err_to_name(ret));
3532
return false;
3633
}
37-
34+
3835
ret = esp_zb_cluster_list_add_binary_input_cluster(_cluster_list, esp_zb_binary_input_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
3936
if (ret != ESP_OK) {
4037
log_e("Failed to add Binary Input cluster: 0x%x: %s", ret, esp_err_to_name(ret));
@@ -112,7 +109,7 @@ bool ZigbeeBinary::setBinaryInputDescription(const char *description) {
112109

113110
// Allocate a new array of size length + 2 (1 for the length, 1 for null terminator)
114111
char zb_description[ZB_MAX_NAME_LENGTH + 2];
115-
112+
116113
// Convert description to ZCL string
117114
size_t description_length = strlen(description);
118115
if (description_length > ZB_MAX_NAME_LENGTH) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ class ZigbeeBinary : public ZigbeeEP {
5555
// bool addBinaryOutput();
5656

5757
// Set the application type and description for the binary input
58-
bool setBinaryInputApplication(uint32_t application_type); // Check esp_zigbee_zcl_binary_input.h for application type values
58+
bool setBinaryInputApplication(uint32_t application_type); // Check esp_zigbee_zcl_binary_input.h for application type values
5959
bool setBinaryInputDescription(const char *description);
6060

6161
// Set the application type and description for the binary output
6262
// bool setBinaryOutputApplication(uint32_t application_type); // Check esp_zigbee_zcl_binary_output.h for application type values
6363
// bool setBinaryOutputDescription(const char *description);
64-
64+
6565
// Use to set a cb function to be called on binary output change
6666
// void onBinaryOutputChange(void (*callback)(bool binary_output)) {
6767
// _on_binary_output_change = callback;

0 commit comments

Comments
 (0)