@@ -48,8 +48,6 @@ static const attribute_store_type_t default_attributes[]
4848 ATTRIBUTE (CAPABILITIES )};
4949
5050static const attribute_store_type_t v2_attributes [] = {ATTRIBUTE (KEYPAD_MODE )};
51- static const attribute_store_type_t user_id_attributes []
52- = {ATTRIBUTE (CODE ), ATTRIBUTE (USER_ID_STATUS )};
5351
5452static const attribute_store_type_t capabilities_attributes []
5553 = {ATTRIBUTE (SUPPORTED_FLAGS ),
@@ -583,7 +581,7 @@ static sl_status_t zwave_command_class_user_code_keypad_mode_get(
583581 }
584582
585583 if (supporting_node_version == 1 ) {
586- sl_log_warning (LOG_TAG , "Admin Code attribute found for v1 node. Deleting" );
584+ sl_log_warning (LOG_TAG , "Keypad Mode attribute found for v1 node. Deleting" );
587585 attribute_store_delete_node (node );
588586 * frame_length = 0 ;
589587 return SL_STATUS_ALREADY_EXISTS ;
@@ -626,7 +624,7 @@ static sl_status_t zwave_command_class_user_code_keypad_mode_set(
626624 }
627625
628626 if (supporting_node_version == 1 ) {
629- sl_log_warning (LOG_TAG , "Admin Code attribute found for v1 node. Deleting" );
627+ sl_log_warning (LOG_TAG , "Keypad mode attribute found for v1 node. Deleting" );
630628 attribute_store_delete_node (node );
631629 * frame_length = 0 ;
632630 return SL_STATUS_ALREADY_EXISTS ;
@@ -952,18 +950,6 @@ static void zwave_command_class_user_code_on_number_of_users_update(
952950 attribute_store_node_t endpoint_node
953951 = attribute_store_get_first_parent_with_type (updated_node ,
954952 ATTRIBUTE_ENDPOINT_ID );
955- attribute_store_node_t version_node
956- = attribute_store_get_first_child_by_type (endpoint_node ,
957- ATTRIBUTE (VERSION ));
958- // We need to check the version of the supporting node:
959- zwave_cc_version_t supporting_node_version = 0 ;
960- attribute_store_get_reported (version_node ,
961- & supporting_node_version ,
962- sizeof (supporting_node_version ));
963- if (supporting_node_version == 1 ) {
964- sl_log_debug (LOG_TAG , "Skip creating User ID nodes for CC UserCode V1." );
965- return ;
966- }
967953
968954 attribute_store_node_t data_node
969955 = attribute_store_get_first_child_by_type (endpoint_node , ATTRIBUTE (DATA ));
@@ -976,12 +962,13 @@ static void zwave_command_class_user_code_on_number_of_users_update(
976962static void zwave_command_class_user_code_on_user_id_created (
977963 attribute_store_node_t node , attribute_store_change_t change )
978964{
965+ const uint8_t user_id_status = 0 ;
966+ const char empty_string = '\0' ;
979967 if (change != ATTRIBUTE_CREATED ) {
980968 return ;
981969 }
982- attribute_store_add_if_missing (node ,
983- user_id_attributes ,
984- COUNT_OF (user_id_attributes ));
970+ attribute_store_emplace (node , ATTRIBUTE (CODE ), & empty_string , sizeof (empty_string ));
971+ attribute_store_emplace (node , ATTRIBUTE (USER_ID_STATUS ), & user_id_status , sizeof (user_id_status ));
985972}
986973
987974static void zwave_command_class_user_code_on_capabilities_created (
@@ -1564,7 +1551,6 @@ sl_status_t zwave_command_class_user_code_init()
15641551 attribute_store_register_callback_by_type (
15651552 & zwave_command_class_user_code_on_capabilities_created ,
15661553 ATTRIBUTE (CAPABILITIES ));
1567-
15681554 // Attribute resolver rules
15691555 attribute_resolver_register_rule (ATTRIBUTE (NUMBER_OF_USERS ),
15701556 NULL ,
0 commit comments