GH-43: User Set

UIC-3222: User set on User Operation Type
UIC-3222: More user types
UIC-3222: User SET fix
UIC-3222: Set User (delete) improvement
UIC-3222: Fix expiring minutes to Desired Or Reported to allow add
UIC-3222: User SET can look into desired attributes

Bug-SiliconLabs: UIC-3222
Bug-GitHub: #43
Signed-off-by: Philippe Coval <[email protected]>

Author: silabs-borisl

applications/zpc/components/zpc_attribute_store/include/attribute_store_defined_attribute_types.h

@@ -992,10 +992,18 @@ DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_MODIFIER_TYP
                  ((COMMAND_CLASS_USER_CREDENTIAL << 8) | 0x1D))
 DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_MODIFIER_NODE_ID,
                  ((COMMAND_CLASS_USER_CREDENTIAL << 8) | 0x1E))
+
+
 // Specific to Credential SET                 
 DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_OPERATION_TYPE,
                  ((COMMAND_CLASS_USER_CREDENTIAL << 8) | 0x1F))
 
+// Specific to USER SET                 
+DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_USER_OPERATION_TYPE,
+                 ((COMMAND_CLASS_USER_CREDENTIAL << 8) | 0x20))
+DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_USER_EXPIRING_TIMEOUT_MINUTES,
+                 ((COMMAND_CLASS_USER_CREDENTIAL << 8) | 0x21))
+
 /////////////////////////////////////////////////
 // Z-Wave Plus Info CC
 DEFINE_ATTRIBUTE(ATTRIBUTE_COMMAND_ZWAVEPLUS_INFO_VERSION,

applications/zpc/components/zpc_attribute_store/include/command_class_types/zwave_command_class_user_credential_types.h

@@ -40,19 +40,36 @@ typedef uint8_t user_credential_user_modifier_type_t;
 ///> User Modifier Node ID. uint16_t
 typedef uint16_t user_credential_user_modifier_node_id_t;
 ///> User Type. uint8_t
+#define USER_CREDENTIAL_USER_TYPE_GENERAL_USER 0x00
+#define USER_CREDENTIAL_USER_TYPE_PROGRAMMING_USER 0x03
+#define USER_CREDENTIAL_USER_TYPE_NON_ACCESS_USER 0x04
+#define USER_CREDENTIAL_USER_TYPE_DURESS_USER 0x05
+#define USER_CREDENTIAL_USER_TYPE_DISPOSABLE_USER 0x06
+#define USER_CREDENTIAL_USER_TYPE_EXPIRING_USER 0x07
+#define USER_CREDENTIAL_USER_TYPE_REMOTE_ONLY_USER 0x09
 typedef uint8_t user_credential_user_type_t;
+///> User active state (0 or 1). uint8_t
+typedef uint8_t user_credential_user_active_state_t;
+///> User name encoding. uint8_t
+typedef uint8_t user_credential_user_name_encoding_t;
 
 ///> Credential type. uint8_t
 typedef uint8_t user_credential_type_t;
 
+///> Credential rule. uint8_t
+typedef uint8_t user_credential_rule_t;
+
 ///> Credential slot. uint16_t
 typedef uint16_t user_credential_slot_t;
 
 ///> Operation type. uint8_t
+#define USER_CREDENTIAL_OPERATION_TYPE_ADD 0x00
+#define USER_CREDENTIAL_OPERATION_TYPE_MODIFY 0x01
+#define USER_CREDENTIAL_OPERATION_TYPE_DELETE 0x02
 typedef uint8_t user_credential_operation_type_t;
 
-///> Operation type. uint8_t
-typedef uint8_t user_credential_operation_type_t;
+///> Expiring Timeout for User (Minutes). uint16_t
+typedef uint16_t user_credential_expiring_timeout_minutes_t;
 
 #ifdef __cplusplus
 extern "C" {

applications/zpc/components/zpc_attribute_store/src/zpc_attribute_store_type_registration.cpp

@@ -397,8 +397,6 @@ static const std::vector<attribute_schema_t> attribute_schema = {
   {ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_SLOT, "User Credential Credential Slot", ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_TYPE, U16_STORAGE_TYPE},
   {ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_DATA_LENGTH, "User Credential Credential Data Length", ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_SLOT, U8_STORAGE_TYPE},
   {ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_DATA, "User Credential Credential Data", ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_DATA_LENGTH, BYTE_ARRAY_STORAGE_TYPE},
-
-
   {ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_READ_BACK, "User Credential Credential Read Back Flag", ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_SLOT, U8_STORAGE_TYPE},
   {ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_MODIFIER_TYPE, "User Credential Credential Modifier type", ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_SLOT, U8_STORAGE_TYPE},
   {ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_MODIFIER_NODE_ID, "User Credential Credential Node ID", ATTRIBUTE_COMMAND_CLASS_USER_CREDENTIAL_CREDENTIAL_SLOT, U16_STORAGE_TYPE},