Skip to content

Commit 81261f3

Browse files
Thomasdjbnkljajic
Thomasdjb
authored and
nkljajic
committed
GH-23: Replace get_allpin with get_all_pin
Bug-SiliconLabs: UIC-3201 Signed-off-by: Thomas du Boisrouvray <thdubois@silabs.com> Forwarded-SiliconLabs: thdubois/UIC-3072/c4/develop Last-Update: 2024-01-19 (cherry picked from commit 954cdcf4b91776e21760921e9c4f0f086328cc6c)
1 parent ee7bd98 commit 81261f3

22 files changed

+121
-122
lines changed

‎applications/zigpc/components/command_mapper/zap-generated/src/zigpc_cmdmapper_gen_cmd_publish.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,14 +316,14 @@ static void zigpc_command_mapper_publish_door_lock_getpin_code_response(
316316
) {
317317
std::string unid(zigpc_ucl::mqtt::build_unid(zigbee_eui64_to_uint(eui64)));
318318

319-
uic_mqtt_dotdot_door_lock_command_getpin_code_response_fields_t fields = {
319+
uic_mqtt_dotdot_door_lock_command_get_pin_code_response_fields_t fields = {
320320
(uint16_t) data->door_lock_getpin_code_response.userid,
321321
(DrlkUserStatus) data->door_lock_getpin_code_response.user_status,
322322
(DrlkUserType) data->door_lock_getpin_code_response.user_type,
323323
(const char*) data->door_lock_getpin_code_response.code
324324
};
325325

326-
uic_mqtt_dotdot_door_lock_publish_generated_getpin_code_response_command(
326+
uic_mqtt_dotdot_door_lock_publish_generated_get_pin_code_response_command(
327327
unid.c_str(),
328328
endpoint_id,
329329
&fields

‎applications/zigpc/components/command_mapper/zap-generated/src/zigpc_command_mapper_bygroup_handlers.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2275,7 +2275,7 @@ void zigpc_command_mapper_bygroup_door_lock_clear_allrfid_codes_handler(
22752275
* @param group_id UCL group identifier.
22762276
22772277
*/
2278-
void zigpc_command_mapper_bygroup_door_lock_get_allpin_codes_handler(
2278+
void zigpc_command_mapper_bygroup_door_lock_get_all_pin_codes_handler(
22792279
const dotdot_group_id_t group_id
22802280
) {
22812281

@@ -2286,7 +2286,7 @@ void zigpc_command_mapper_bygroup_door_lock_get_allpin_codes_handler(
22862286
group_id,
22872287
ZIGPC_ZCL_FRAME_TYPE_CMD_TO_SERVER,
22882288
ZIGPC_ZCL_CLUSTER_DOOR_LOCK,
2289-
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_GET_ALLPIN_CODES,
2289+
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_GET_ALL_PIN_CODES,
22902290
0,
22912291
nullptr
22922292
);
@@ -4100,7 +4100,7 @@ sl_status_t zigpc_command_mapper_mqtt_bygroup_handlers_init(void)
41004100
uic_mqtt_dotdot_by_group_door_lock_clearrfid_code_callback_set(zigpc_command_mapper_bygroup_door_lock_clearrfid_code_handler);
41014101
uic_mqtt_dotdot_by_group_door_lock_clear_allrfid_codes_callback_set(zigpc_command_mapper_bygroup_door_lock_clear_allrfid_codes_handler);
41024102
uic_mqtt_dotdot_by_group_door_lock_get_allpin_codes_callback_set(zigpc_command_mapper_bygroup_door_lock_get_allpin_codes_handler);
4103-
uic_mqtt_dotdot_by_group_door_lock_get_allpin_codes_callback_set(zigpc_command_mapper_bygroup_door_lock_get_allpin_codes_handler);
4103+
uic_mqtt_dotdot_by_group_door_lock_get_all_pin_codes_callback_set(zigpc_command_mapper_bygroup_door_lock_get_all_pin_codes_handler);
41044104
uic_mqtt_dotdot_by_group_thermostat_write_attributes_callback_set(zigpc_command_mapper_bygroup_thermostat_write_attributes_handler);
41054105
uic_mqtt_dotdot_by_group_thermostat_setpoint_raise_or_lower_callback_set(zigpc_command_mapper_bygroup_thermostat_setpoint_raise_or_lower_handler);
41064106
uic_mqtt_dotdot_by_group_thermostat_set_weekly_schedule_callback_set(zigpc_command_mapper_bygroup_thermostat_set_weekly_schedule_handler);

‎applications/zigpc/components/command_mapper/zap-generated/src/zigpc_command_mapper_handlers.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4240,7 +4240,7 @@ sl_status_t zigpc_command_mapper_door_lock_clear_allrfid_codes_handler(
42404240
* @return SL_STATUS_OK if callback_type == UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK and command is supported by the unid/endpoint
42414241
* @return SL_STATUS_NOT_AVAILABLE if callback_type == UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK and command is not supported by the unid/endpoint
42424242
*/
4243-
sl_status_t zigpc_command_mapper_door_lock_get_allpin_codes_handler(
4243+
sl_status_t zigpc_command_mapper_door_lock_get_all_pin_codes_handler(
42444244
const dotdot_unid_t unid,
42454245
const dotdot_endpoint_id_t endpoint,
42464246
uic_mqtt_dotdot_callback_call_type_t callback_type
@@ -4264,7 +4264,7 @@ sl_status_t zigpc_command_mapper_door_lock_get_allpin_codes_handler(
42644264
endpoint,
42654265
ZIGPC_ZCL_FRAME_TYPE_CMD_TO_SERVER,
42664266
ZIGPC_ZCL_CLUSTER_DOOR_LOCK,
4267-
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_GET_ALLPIN_CODES,
4267+
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_get_all_pin_CODES,
42684268
0,
42694269
nullptr
42704270
);
@@ -8146,9 +8146,8 @@ sl_status_t zigpc_command_mapper_register_dotdot_mqtt_handlers(void)
81468146
zigpc_command_mapper_door_lock_get_allpin_codes_handler
81478147
);
81488148
);
8149-
8150-
uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_set(
8151-
zigpc_command_mapper_door_lock_get_allpin_codes_handler
8149+
uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_set(
8150+
zigpc_command_mapper_door_lock_get_all_pin_codes_handler
81528151
uic_mqtt_dotdot_set_thermostat_write_attributes_callback(
81538152
zigpc_command_mapper_thermostat_write_attributes_handler
81548153
);

‎applications/zigpc/components/zcl_util/zap-generated/include/zcl_definitions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ typedef enum {
479479
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_CLEAR_ALLRFID_CODES_RESPONSE = 0x19,
480480
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_OPERATING_EVENT_NOTIFICATION = 0x20,
481481
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_PROGRAMMING_EVENT_NOTIFICATION = 0x21,
482-
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_GET_ALLPIN_CODES = 0x80,
482+
ZIGPC_ZCL_CLUSTER_DOOR_LOCK_COMMAND_GET_ALL_PIN_CODES = 0x80,
483483
} zigpc_zcl_door_lock_command_type_t;
484484

485485
/*****************************************************************

‎components/uic_dotdot/zap-generated/include/dotdot_cluster_command_id_definitions.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
#define DOTDOT_DOOR_LOCK_CLEAR_ALLRFID_CODES_RESPONSE_COMMAND_ID (0x19)
190190
#define DOTDOT_DOOR_LOCK_OPERATING_EVENT_NOTIFICATION_COMMAND_ID (0x20)
191191
#define DOTDOT_DOOR_LOCK_PROGRAMMING_EVENT_NOTIFICATION_COMMAND_ID (0x21)
192-
#define DOTDOT_DOOR_LOCK_GET_ALLPIN_CODES_COMMAND_ID (0x80)
192+
#define DOTDOT_DOOR_LOCK_GET_ALL_PIN_CODES_COMMAND_ID (0x80)
193193

194194
// Commands for cluster: WindowCovering
195195
#define DOTDOT_WINDOW_COVERING_UP_OR_OPEN_COMMAND_ID (0x0)

‎components/uic_dotdot/zap-generated/readme_ucl_mqtt_reference.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16706,7 +16706,7 @@ mosquitto_sub -t 'ucl/by-unid/<UNID>/<EP>/DoorLock/GeneratedCommands/Programming
1670616706

1670716707
<br><br>
1670816708

16709-
\subsection door_lock_get_allpin_codes_cmd DoorLock/GetAllPINCodes Command
16709+
\subsection door_lock_get_all_pin_codes_cmd DoorLock/GetAllPINCodes Command
1671016710

1671116711
**MQTT Topic Pattern:**
1671216712

‎components/uic_dotdot_mqtt/zap-generated/include/dotdot_mqtt.h‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9931,7 +9931,7 @@ typedef sl_status_t (*uic_mqtt_dotdot_door_lock_programming_event_notification_c
99319931
const char* data
99329932

99339933
);
9934-
typedef sl_status_t (*uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_t)(
9934+
typedef sl_status_t (*uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_t)(
99359935
dotdot_unid_t unid,
99369936
dotdot_endpoint_id_t endpoint,
99379937
uic_mqtt_dotdot_callback_call_type_t call_type
@@ -10167,7 +10167,7 @@ typedef struct {
1016710167
DrlkUserType user_type;
1016810168

1016910169
const char* code;
10170-
} uic_mqtt_dotdot_door_lock_command_getpin_code_response_fields_t;
10170+
} uic_mqtt_dotdot_door_lock_command_get_pin_code_response_fields_t;
1017110171

1017210172
/**
1017310173
* @brief Command fields for DoorLock/ClearPINCode
@@ -12704,44 +12704,44 @@ void uic_mqtt_dotdot_door_lock_generated_programming_event_notification_callback
1270412704
void uic_mqtt_dotdot_door_lock_generated_programming_event_notification_callback_clear();
1270512705
/**
1270612706
* @brief Setup callback to be called when a
12707-
* DoorLock/Commands/get_allpin_codes is received.
12707+
* DoorLock/Commands/get_all_pin_codes is received.
1270812708
*
1270912709
* Setting this callback will not overwrite the previous set callback
1271012710
* @param callback Function to be called on command reception
1271112711
*/
12712-
void uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_set(const uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_t callback);
12712+
void uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_set(const uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_t callback);
1271312713
/**
1271412714
* @brief Unsets callback to be called when a
12715-
* DoorLock/Commands/get_allpin_codes is received.
12715+
* DoorLock/Commands/get_all_pin_codes is received.
1271612716
*
1271712717
* @param callback Function to be no longer called on command reception
1271812718
*/
12719-
void uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_unset(const uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_t callback);
12719+
void uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_unset(const uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_t callback);
1272012720
/**
1272112721
* @brief Clears all callbacks registered for when
12722-
* DoorLock/Commands/get_allpin_codes is received.
12722+
* DoorLock/Commands/get_all_pin_codes is received.
1272312723
*/
12724-
void uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_clear();
12724+
void uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_clear();
1272512725

1272612726
/**
1272712727
* @brief Setup callback to be called when a
12728-
* +/DoorLock/GeneratedCommands/get_allpin_codes is received.
12728+
* +/DoorLock/GeneratedCommands/get_all_pin_codes is received.
1272912729
*
1273012730
* Setting this callback will not overwrite the previous set callback
1273112731
* @param callback Function to be called on command reception
1273212732
*/
12733-
void uic_mqtt_dotdot_door_lock_generated_get_allpin_codes_callback_set(const uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_t callback);
12733+
void uic_mqtt_dotdot_door_lock_generated_get_all_pin_codes_callback_set(const uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_t callback);
1273412734
/**
1273512735
* @brief Unsets callback to be called when a
12736-
* +/DoorLock/GeneratedCommands/get_allpin_codes is received.
12736+
* +/DoorLock/GeneratedCommands/get_all_pin_codes is received.
1273712737
* @param callback Function to be no longer called on command reception
1273812738
*/
12739-
void uic_mqtt_dotdot_door_lock_generated_get_allpin_codes_callback_unset(const uic_mqtt_dotdot_door_lock_get_allpin_codes_callback_t callback);
12739+
void uic_mqtt_dotdot_door_lock_generated_get_all_pin_codes_callback_unset(const uic_mqtt_dotdot_door_lock_get_all_pin_codes_callback_t callback);
1274012740
/**
1274112741
* @brief Clears all callbacks registered for when
12742-
* +/DoorLock/GeneratedCommands/get_allpin_codes is received.
12742+
* +/DoorLock/GeneratedCommands/get_all_pin_codes is received.
1274312743
*/
12744-
void uic_mqtt_dotdot_door_lock_generated_get_allpin_codes_callback_clear();
12744+
void uic_mqtt_dotdot_door_lock_generated_get_all_pin_codes_callback_clear();
1274512745

1274612746
/**
1274712747
* @brief Setup a callback for WriteAttribute to be called when a

‎components/uic_dotdot_mqtt/zap-generated/include/dotdot_mqtt_generated_commands.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,10 +1804,10 @@ void uic_mqtt_dotdot_door_lock_publish_generated_getpin_code_command(
18041804
* @param fields Struct pointer with the fields value of the command
18051805
*
18061806
*/
1807-
void uic_mqtt_dotdot_door_lock_publish_generated_getpin_code_response_command(
1807+
void uic_mqtt_dotdot_door_lock_publish_generated_get_pin_code_response_command(
18081808
const dotdot_unid_t unid,
18091809
const dotdot_endpoint_id_t endpoint,
1810-
const uic_mqtt_dotdot_door_lock_command_getpin_code_response_fields_t *fields
1810+
const uic_mqtt_dotdot_door_lock_command_get_pin_code_response_fields_t *fields
18111811

18121812
);
18131813
/**
@@ -2655,7 +2655,7 @@ void uic_mqtt_dotdot_door_lock_publish_generated_programming_event_notification_
26552655
*
26562656
*
26572657
*/
2658-
void uic_mqtt_dotdot_door_lock_publish_generated_get_allpin_codes_command(
2658+
void uic_mqtt_dotdot_door_lock_publish_generated_get_all_pin_codes_command(
26592659
const dotdot_unid_t unid,
26602660
const dotdot_endpoint_id_t endpoint
26612661
);

‎components/uic_dotdot_mqtt/zap-generated/include/dotdot_mqtt_group_commands.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ void uic_mqtt_dotdot_by_group_door_lock_getpin_code_callback_set(const uic_mqtt_
14051405
*/
14061406
typedef void (*uic_mqtt_dotdot_by_group_door_lock_getpin_code_response_callback_t)(
14071407
const dotdot_group_id_t group_id,
1408-
const uic_mqtt_dotdot_door_lock_command_getpin_code_response_fields_t *fields
1408+
const uic_mqtt_dotdot_door_lock_command_get_pin_code_response_fields_t *fields
14091409
);
14101410

14111411
/**
@@ -2057,17 +2057,17 @@ void uic_mqtt_dotdot_by_group_door_lock_programming_event_notification_callback_
20572057
/**
20582058
* @brief Callback signature for by-group DoorLock::GetAllPINCodes command.
20592059
*/
2060-
typedef void (*uic_mqtt_dotdot_by_group_door_lock_get_allpin_codes_callback_t)(
2060+
typedef void (*uic_mqtt_dotdot_by_group_door_lock_get_all_pin_codes_callback_t)(
20612061
const dotdot_group_id_t group_id
20622062
);
20632063

20642064
/**
20652065
* Setup handler to be called when a
2066-
* ucl/by-group/+/DoorLock/get_allpin_codes is received.
2066+
* ucl/by-group/+/DoorLock/get_all_pin_codes is received.
20672067
* Setting this callback will overwrite the previous set callback.
20682068
*
20692069
*/
2070-
void uic_mqtt_dotdot_by_group_door_lock_get_allpin_codes_callback_set(const uic_mqtt_dotdot_by_group_door_lock_get_allpin_codes_callback_t callback);
2070+
void uic_mqtt_dotdot_by_group_door_lock_get_all_pin_codes_callback_set(const uic_mqtt_dotdot_by_group_door_lock_get_all_pin_codes_callback_t callback);
20712071

20722072
typedef void (*uic_mqtt_dotdot_by_group_door_lock_write_attributes_callback_t)(
20732073
const dotdot_group_id_t group_id,

‎components/uic_dotdot_mqtt/zap-generated/include/dotdot_mqtt_send_commands.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2805,7 +2805,7 @@ void uic_mqtt_dotdot_door_lock_publish_getpin_code_command_to_group(
28052805
void uic_mqtt_dotdot_door_lock_publish_getpin_code_response_command(
28062806
const dotdot_unid_t destination_unid,
28072807
const dotdot_endpoint_id_t destination_endpoint,
2808-
const uic_mqtt_dotdot_door_lock_command_getpin_code_response_fields_t *fields
2808+
const uic_mqtt_dotdot_door_lock_command_get_pin_code_response_fields_t *fields
28092809

28102810
);
28112811

@@ -2823,7 +2823,7 @@ void uic_mqtt_dotdot_door_lock_publish_getpin_code_response_command(
28232823
*/
28242824
void uic_mqtt_dotdot_door_lock_publish_getpin_code_response_command_to_group(
28252825
uint16_t destination_group_id,
2826-
const uic_mqtt_dotdot_door_lock_command_getpin_code_response_fields_t *fields
2826+
const uic_mqtt_dotdot_door_lock_command_get_pin_code_response_fields_t *fields
28272827

28282828
);
28292829
/**
@@ -4383,7 +4383,7 @@ void uic_mqtt_dotdot_door_lock_publish_programming_event_notification_command_to
43834383
*
43844384
*
43854385
*/
4386-
void uic_mqtt_dotdot_door_lock_publish_get_allpin_codes_command(
4386+
void uic_mqtt_dotdot_door_lock_publish_get_all_pin_codes_command(
43874387
const dotdot_unid_t destination_unid,
43884388
const dotdot_endpoint_id_t destination_endpoint
43894389
);
@@ -4398,7 +4398,7 @@ void uic_mqtt_dotdot_door_lock_publish_get_allpin_codes_command(
43984398
* @param destination_group_id The GroupID that should receive the command.
43994399
*
44004400
*/
4401-
void uic_mqtt_dotdot_door_lock_publish_get_allpin_codes_command_to_group(
4401+
void uic_mqtt_dotdot_door_lock_publish_get_all_pin_codes_command_to_group(
44024402
uint16_t destination_group_id
44034403
);
44044404
/**

0 commit comments

Comments
 (0)