feat(ui): add cc version (#2158)

Fixes #2147
zwave-js · Jan 10, 2022 · 83c4e42 · 83c4e42
1 parent 282f5b1
commit 83c4e42
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/ZwaveClient.ts b/lib/ZwaveClient.ts
@@ -252,6 +252,7 @@ export type Z2MValueId = {
 	isCurrentValue?: boolean
 	conf?: GatewayValue
 	allowManualEntry?: boolean
+	commandClassVersion?: number
 } & TranslatedValueID
 
 export type Z2MValueIdScene = Z2MValueId & {
@@ -3570,6 +3571,9 @@ class ZwaveClient extends TypedEventEmitter<ZwaveClientEventCallbacks> {
 			nodeId: zwaveNode.id,
 			commandClass: zwaveValue.commandClass,
 			commandClassName: zwaveValue.commandClassName,
+			commandClassVersion: zwaveNode
+				.getEndpoint(zwaveValue.endpoint)
+				.getCCVersion(zwaveValue.commandClass),
 			endpoint: zwaveValue.endpoint,
 			property: zwaveValue.property,
 			propertyName: zwaveValue.propertyName,

diff --git a/src/components/nodes-table/NodeDetails.vue b/src/components/nodes-table/NodeDetails.vue
@@ -386,14 +386,26 @@ export default {
 		...mapGetters(['mqtt']),
 		commandGroups() {
 			if (this.node) {
-				const groups = { Configuration: [] }
+				const groups = {}
+				let addConfiguration = true
+
 				for (const v of this.node.values) {
-					const className = v.commandClassName
+					const className =
+						v.commandClassName + ' v' + v.commandClassVersion
 					if (!groups[className]) {
+						if (v.commandClassName === 'Configuration') {
+							addConfiguration = false
+						}
 						groups[className] = []
 					}
 					groups[className].push(v)
 				}
+
+				// add empty confgiguration CC group
+				if (addConfiguration) {
+					groups.Configuration = []
+				}
+
 				return groups
 			} else {
 				return {}