Merge branch 'master' into feat-long-range

api/hass/devices.ts

@@ -50,12 +50,12 @@ const THERMOSTAT_2GIG: HassDevice = {
 	type: 'climate',
 	object_id: 'thermostat',
 	values: [
-		'49-1-Air temperature',
-		'64-1-mode',
-		'66-1-state',
-		'67-1-setpoint-1',
-		'67-1-setpoint-2',
-		'68-1-mode',
+		'49-0-Air temperature',
+		'64-0-mode',
+		'66-0-state',
+		'67-0-setpoint-1',
+		'67-0-setpoint-2',
+		'68-0-mode',
 	],
 	action_map: {
 		0: 'idle',
@@ -73,21 +73,21 @@ const THERMOSTAT_2GIG: HassDevice = {
 		on: 1,
 	},
 	setpoint_topic: {
-		1: '67-1-setpoint-1',
-		2: '67-1-setpoint-2',
+		1: '67-0-setpoint-1',
+		2: '67-0-setpoint-2',
 	},
-	default_setpoint: '67-1-setpoint-1',
+	default_setpoint: '67-0-setpoint-1',
 	discovery_payload: {
 		min_temp: 50,
 		max_temp: 85,
 		modes: ['off', 'heat', 'cool'],
 		fan_modes: ['auto', 'on'],
-		action_topic: '66-1-state',
-		current_temperature_topic: '49-1-Air temperature',
+		action_topic: '66-0-state',
+		current_temperature_topic: '49-0-Air temperature',
 		current_temperature_template: '{{ value_json.value }}',
-		fan_mode_state_topic: '68-1-mode',
+		fan_mode_state_topic: '68-0-mode',
 		fan_mode_command_topic: true,
-		mode_state_topic: '64-1-mode',
+		mode_state_topic: '64-0-mode',
 		mode_command_topic: true,
 		temperature_state_template: '{{ value_json.value }}',
 		temperature_command_topic: true,

api/lib/Gateway.ts

@@ -1319,9 +1319,7 @@ export default class Gateway {
 					} else return
 					break
 				case CommandClasses['Central Scene']:
-					if (!valueId.readable || valueId.writeable) {
-						return
-					}
+				case CommandClasses['Scene Activation']:
 					cfg = utils.copy(hassCfg.central_scene)
 
 					// Combile unique Object id, by using all possible scenarios
@@ -1330,9 +1328,6 @@ export default class Gateway {
 						valueId.property,
 						valueId.propertyKey,
 					)
-					if (valueId.type === 'number') {
-						cfg.discovery_payload.state_class = 'measurement'
-					}
 					break
 				case CommandClasses['Binary Sensor']: {
 					// https://github.com/zwave-js/node-zwave-js/blob/master/packages/zwave-js/src/lib/commandclass/BinarySensorCC.ts#L41