iobroker.zigbee2mqtt 0.1.0 → 0.2.0

package/lib/exposes.js

@@ -87,6 +87,7 @@ function genState(expose, role, name, desc) {
 
 			for (const val of expose.values) {
 				state.states[val] = val;
+				state.type = typeof (val);
 			}
 
 			if (expose.endpoint) {
@@ -118,7 +119,7 @@ function genState(expose, role, name, desc) {
 	return state;
 }
 
-function createFromExposes(deviceID, ieee_address, definitions, power_source) {
+function createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, useKelvin) {
 	const states = [];
 	// make the different (set and get) part of state is updatable if different exposes is used for get and set
 	// as example:
@@ -282,6 +283,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 								min: 0, // ignore expose.value_min
 								max: 100, // ignore expose.value_max
 								inOptions: true,
+								unit: '%',
 								getter: (value) => {
 									return utils.bulbLevelToAdapterLevel(value[stateNameB]);
 								},
@@ -318,10 +320,9 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 								write: true,
 								read: true,
 								type: 'number',
-								// Ignore min and max value, so setting mireds and Kelvin with conversion to mireds works.
-								// https://github.com/ioBroker/ioBroker.zigbee/pull/1433#issuecomment-1113837035
-								min: undefined,
-								max: undefined,
+								min: undefined, //useKelvin == true ? expose.value_min : utils.miredKelvinConversion(expose.value_min),
+								max: undefined, //useKelvin == true ? expose.value_min : utils.miredKelvinConversion(expose.value_max),
+								unit: useKelvin == true ? 'K' : 'mired',
 								setter: (value) => {
 									return utils.toMired(value);
 								},
@@ -330,6 +331,14 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 									const transitionTime = hasTransitionTime ? options.transition_time : 0;
 									return { ...options, transition: transitionTime };
 								},
+								getter: (payload) => {
+									if (useKelvin == true) {
+										return utils.miredKelvinConversion(payload.color_temp);
+									}
+									else {
+										return payload.color_temp;
+									}
+								},
 								epname: expose.endpoint,
 								setattr: 'color_temp',
 							}, prop.access);
@@ -377,163 +386,164 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 							}, 2);
 							break;
 						}
-						case 'color_hs': {
-							const stateNameH = expose.endpoint ? `color_${expose.endpoint}` : 'color';
-							pushToStates({
-								id: stateNameH,
-								prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
-								name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-								icon: undefined,
-								role: 'level.color.rgb',
-								write: true,
-								read: true,
-								type: 'string',
-								setter: (value) => {
-									const _rgb = colors.ParseColor(value);
-									const hsv = rgb.rgbToHSV(_rgb.r, _rgb.g, _rgb.b, true);
-									return {
-										hue: Math.min(Math.max(hsv.h, 1), 359),
-										saturation: hsv.s,
-										//                                        brightness: Math.floor(hsv.v * 2.55),
-
-									};
-								},
-								setterOpt: (_value, options) => {
-									const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-									const transitionTime = hasTransitionTime ? options.transition_time : 0;
-									return { ...options, transition: transitionTime };
-								},
-								epname: expose.endpoint,
-								setattr: 'color',
-							}, prop.access);
-							pushToStates({
-								id: expose.endpoint ? `hue_${expose.endpoint}` : 'hue',
-								prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
-								name: `Hue ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-								icon: undefined,
-								role: 'level.color.hue',
-								write: true,
-								read: false,
-								type: 'number',
-								min: 0,
-								max: 360,
-								inOptions: true,
-								setter: (value, options) => {
-									return {
-										hue: value,
-										saturation: options.saturation,
-									};
-								},
-								setterOpt: (_value, options) => {
-									const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-									const transitionTime = hasTransitionTime ? options.transition_time : 0;
-									const hasHueCalibrationTable = options && options.hasOwnProperty('hue_calibration');
-									if (hasHueCalibrationTable)
-										try {
-											return { ...options, transition: transitionTime, hue_correction: JSON.parse(options.hue_calibration) };
-										}
-										catch (err) {
-											const hue_correction_table = [];
-											options.hue_calibration.split(',').forEach(element => {
-												const match = /([0-9]+):([0-9]+)/.exec(element);
-												if (match && match.length == 3)
-													hue_correction_table.push({ in: Number(match[1]), out: Number(match[2]) });
-											});
-											if (hue_correction_table.length > 0)
-												return { ...options, transition: transitionTime, hue_correction: hue_correction_table };
-										}
-									return { ...options, transition: transitionTime };
-								},
-
-							}, prop.access);
-							pushToStates({
-								id: expose.endpoint ? `saturation_${expose.endpoint}` : 'saturation',
-								prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
-								name: `Saturation ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-								icon: undefined,
-								role: 'level.color.saturation',
-								write: true,
-								read: false,
-								type: 'number',
-								min: 0,
-								max: 100,
-								inOptions: true,
-								setter: (value, options) => {
-									return {
-										hue: options.hue,
-										saturation: value,
-									};
-								},
-								setterOpt: (_value, options) => {
-									const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-									const transitionTime = hasTransitionTime ? options.transition_time : 0;
-									const hasHueCalibrationTable = options && options.hasOwnProperty('hue_calibration');
-									if (hasHueCalibrationTable)
-										try {
-											return { ...options, transition: transitionTime, hue_correction: JSON.parse(options.hue_calibration) };
-										}
-										catch (err) {
-											const hue_correction_table = [];
-											options.hue_calibration.split(',').forEach(element => {
-												const match = /([0-9]+):([0-9]+)/.exec(element);
-												if (match && match.length == 3)
-													hue_correction_table.push({ in: Number(match[1]), out: Number(match[2]) });
-											});
-											if (hue_correction_table.length > 0)
-												return { ...options, transition: transitionTime, hue_correction: hue_correction_table };
-										}
-									return { ...options, transition: transitionTime };
-								},
-
-							}, prop.access);
-							pushToStates(statesDefs.hue_move, prop.access);
-							pushToStates(statesDefs.saturation_move, prop.access);
-							pushToStates({
-								id: 'hue_calibration',
-								prop: 'color',
-								name: 'Hue color calibration table',
-								icon: undefined,
-								role: 'table',
-								write: true,
-								read: false,
-								type: 'string',
-								inOptions: true,
-								setter: (_value, options) => {
-									return {
-										hue: options.hue,
-										saturation: options.saturation,
-									};
-								},
-								setterOpt: (_value, options) => {
-									const hasTransitionTime = options && options.hasOwnProperty('transition_time');
-									const transitionTime = hasTransitionTime ? options.transition_time : 0;
-									const hasHueCalibrationTable = options && options.hasOwnProperty('hue_calibration');
-									if (hasHueCalibrationTable)
-										try {
-											return { ...options, transition: transitionTime, hue_correction: JSON.parse(options.hue_calibration) };
-										}
-										catch (err) {
-											const hue_correction_table = [];
-											options.hue_calibration.split(',').forEach(element => {
-												const match = /([0-9]+):([0-9]+)/.exec(element);
-												if (match && match.length == 3)
-													hue_correction_table.push({ in: Number(match[1]), out: Number(match[2]) });
-											});
-											if (hue_correction_table.length > 0)
-												return { ...options, transition: transitionTime, hue_correction: hue_correction_table };
-										}
-									return { ...options, transition: transitionTime };
-								},
-
-							}, prop.access);
-							break;
-						}
+						// case 'color_hs': {
+						// 	const stateNameH = expose.endpoint ? `color_${expose.endpoint}` : 'color';
+						// 	pushToStates({
+						// 		id: stateNameH,
+						// 		prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
+						// 		name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+						// 		icon: undefined,
+						// 		role: 'level.color.rgb',
+						// 		write: true,
+						// 		read: true,
+						// 		type: 'string',
+						// 		setter: (value) => {
+						// 			const _rgb = colors.ParseColor(value);
+						// 			const hsv = rgb.rgbToHSV(_rgb.r, _rgb.g, _rgb.b, true);
+						// 			return {
+						// 				hue: Math.min(Math.max(hsv.h, 1), 359),
+						// 				saturation: hsv.s,
+						// 				//                                        brightness: Math.floor(hsv.v * 2.55),
+
+						// 			};
+						// 		},
+						// 		setterOpt: (_value, options) => {
+						// 			const hasTransitionTime = options && options.hasOwnProperty('transition_time');
+						// 			const transitionTime = hasTransitionTime ? options.transition_time : 0;
+						// 			return { ...options, transition: transitionTime };
+						// 		},
+						// 		epname: expose.endpoint,
+						// 		setattr: 'color',
+						// 	}, prop.access);
+						// 	pushToStates({
+						// 		id: expose.endpoint ? `hue_${expose.endpoint}` : 'hue',
+						// 		prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
+						// 		name: `Hue ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+						// 		icon: undefined,
+						// 		role: 'level.color.hue',
+						// 		write: true,
+						// 		read: false,
+						// 		type: 'number',
+						// 		min: 0,
+						// 		max: 360,
+						// 		inOptions: true,
+						// 		setter: (value, options) => {
+						// 			return {
+						// 				hue: value,
+						// 				saturation: options.saturation,
+						// 			};
+						// 		},
+						// 		setterOpt: (_value, options) => {
+						// 			const hasTransitionTime = options && options.hasOwnProperty('transition_time');
+						// 			const transitionTime = hasTransitionTime ? options.transition_time : 0;
+						// 			const hasHueCalibrationTable = options && options.hasOwnProperty('hue_calibration');
+						// 			if (hasHueCalibrationTable)
+						// 				try {
+						// 					return { ...options, transition: transitionTime, hue_correction: JSON.parse(options.hue_calibration) };
+						// 				}
+						// 				catch (err) {
+						// 					const hue_correction_table = [];
+						// 					options.hue_calibration.split(',').forEach(element => {
+						// 						const match = /([0-9]+):([0-9]+)/.exec(element);
+						// 						if (match && match.length == 3)
+						// 							hue_correction_table.push({ in: Number(match[1]), out: Number(match[2]) });
+						// 					});
+						// 					if (hue_correction_table.length > 0)
+						// 						return { ...options, transition: transitionTime, hue_correction: hue_correction_table };
+						// 				}
+						// 			return { ...options, transition: transitionTime };
+						// 		},
+
+						// 	}, prop.access);
+						// 	pushToStates({
+						// 		id: expose.endpoint ? `saturation_${expose.endpoint}` : 'saturation',
+						// 		prop: expose.endpoint ? `color_${expose.endpoint}` : 'color',
+						// 		name: `Saturation ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+						// 		icon: undefined,
+						// 		role: 'level.color.saturation',
+						// 		write: true,
+						// 		read: false,
+						// 		type: 'number',
+						// 		min: 0,
+						// 		max: 100,
+						// 		inOptions: true,
+						// 		setter: (value, options) => {
+						// 			return {
+						// 				hue: options.hue,
+						// 				saturation: value,
+						// 			};
+						// 		},
+						// 		setterOpt: (_value, options) => {
+						// 			const hasTransitionTime = options && options.hasOwnProperty('transition_time');
+						// 			const transitionTime = hasTransitionTime ? options.transition_time : 0;
+						// 			const hasHueCalibrationTable = options && options.hasOwnProperty('hue_calibration');
+						// 			if (hasHueCalibrationTable)
+						// 				try {
+						// 					return { ...options, transition: transitionTime, hue_correction: JSON.parse(options.hue_calibration) };
+						// 				}
+						// 				catch (err) {
+						// 					const hue_correction_table = [];
+						// 					options.hue_calibration.split(',').forEach(element => {
+						// 						const match = /([0-9]+):([0-9]+)/.exec(element);
+						// 						if (match && match.length == 3)
+						// 							hue_correction_table.push({ in: Number(match[1]), out: Number(match[2]) });
+						// 					});
+						// 					if (hue_correction_table.length > 0)
+						// 						return { ...options, transition: transitionTime, hue_correction: hue_correction_table };
+						// 				}
+						// 			return { ...options, transition: transitionTime };
+						// 		},
+
+						// 	}, prop.access);
+						// 	pushToStates(statesDefs.hue_move, prop.access);
+						// 	pushToStates(statesDefs.saturation_move, prop.access);
+						// 	pushToStates({
+						// 		id: 'hue_calibration',
+						// 		prop: 'color',
+						// 		name: 'Hue color calibration table',
+						// 		icon: undefined,
+						// 		role: 'table',
+						// 		write: true,
+						// 		read: false,
+						// 		type: 'string',
+						// 		inOptions: true,
+						// 		setter: (_value, options) => {
+						// 			return {
+						// 				hue: options.hue,
+						// 				saturation: options.saturation,
+						// 			};
+						// 		},
+						// 		setterOpt: (_value, options) => {
+						// 			const hasTransitionTime = options && options.hasOwnProperty('transition_time');
+						// 			const transitionTime = hasTransitionTime ? options.transition_time : 0;
+						// 			const hasHueCalibrationTable = options && options.hasOwnProperty('hue_calibration');
+						// 			if (hasHueCalibrationTable)
+						// 				try {
+						// 					return { ...options, transition: transitionTime, hue_correction: JSON.parse(options.hue_calibration) };
+						// 				}
+						// 				catch (err) {
+						// 					const hue_correction_table = [];
+						// 					options.hue_calibration.split(',').forEach(element => {
+						// 						const match = /([0-9]+):([0-9]+)/.exec(element);
+						// 						if (match && match.length == 3)
+						// 							hue_correction_table.push({ in: Number(match[1]), out: Number(match[2]) });
+						// 					});
+						// 					if (hue_correction_table.length > 0)
+						// 						return { ...options, transition: transitionTime, hue_correction: hue_correction_table };
+						// 				}
+						// 			return { ...options, transition: transitionTime };
+						// 		},
+
+						// 	}, prop.access);
+						// 	break;
+						// }
 						default:
 							pushToStates(genState(prop), prop.access);
 							break;
 					}
 				}
-				pushToStates(statesDefs.transition_time, 2);
+				// First don't create a transition_time datapoint, this will be set in the backend
+				//pushToStates(statesDefs.transition_time, 2);
 				break;
 
 			case 'switch':
@@ -720,8 +730,13 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 						case 'running_mode':
 							pushToStates(statesDefs.climate_running_mode, prop.access);
 							break;
-						default:
-							pushToStates(genState(prop), prop.access);
+						default: {
+							if (prop.name.includes('heating_setpoint')) {
+								pushToStates(genState(prop, 'level.temperature'), prop.access);
+							} else {
+								pushToStates(genState(prop), prop.access);
+							}
+						}
 							break;
 					}
 				}
@@ -776,7 +791,7 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 	// Add default states
 	pushToStates(statesDefs.available, 1);
 
-	const newDev = {
+	const newDevice = {
 		id: deviceID,
 		ieee_address: ieee_address,
 		icon: icon,
@@ -784,14 +799,31 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 		states: states,
 	};
 
-	return newDev;
+	// Create buttons for scenes
+	for (const scene of scenes) {
+		const sceneSate = {
+			id: `scene_${scene.id}`,
+			prop: `scene_recall`,
+			name: scene.name,
+			icon: undefined,
+			role: 'button',
+			write: true,
+			read: true,
+			type: 'boolean',
+			setter: (value) => (value) ? scene.id : undefined
+		};
+		// @ts-ignore
+		newDevice.states.push(sceneSate);
+	}
+
+	return newDevice;
 }
 
-function defineDeviceFromExposes(devices, deviceID, ieee_address, definitions, power_source) {
+function defineDeviceFromExposes(devices, deviceID, ieee_address, definitions, power_source, scenes, useKelvin) {
 	// if the device is already present in the cache, remove it
 	utils.removeDeviceByIeee(devices, ieee_address);
 	if (definitions.hasOwnProperty('exposes')) {
-		const newDevice = createFromExposes(deviceID, ieee_address, definitions, power_source);
+		const newDevice = createFromExposes(deviceID, ieee_address, definitions, power_source, scenes, useKelvin);
 		devices.push(newDevice);
 	}
 }

package/lib/groups.js

@@ -1,7 +1,7 @@
 const states = require('./states').states;
 const utils = require('./utils');
 
-function defineGroupDevice(devices, groupID, ieee_address, scenes) {
+function defineGroupDevice(devices, groupID, ieee_address, scenes, useKelvin) {
 	const newDevice = {
 		id: groupID,
 		ieee_address: ieee_address,
@@ -9,15 +9,38 @@ function defineGroupDevice(devices, groupID, ieee_address, scenes) {
 		states: [
 			states.state,
 			states.brightness,
-			states.colortemp,
 			states.color,
 			states.brightness_move,
 			states.colortemp_move,
-			states.transition_time,
-			//states.brightness_step
 		],
 	};
 
+	const colortemp = {
+		id: 'colortemp',
+		prop: 'color_temp',
+		name: 'Color temperature',
+		icon: undefined,
+		role: 'level.color.temperature',
+		write: true,
+		read: true,
+		type: 'number',
+		unit: useKelvin == true ? 'K' : 'mired',
+		setter: (value) => {
+			return utils.toMired(value);
+		},
+		getter: (payload) => {
+			if (useKelvin == true) {
+				return utils.miredKelvinConversion(payload.color_temp);
+			}
+			else {
+				return payload.color_temp;
+			}
+		},
+	};
+
+	// @ts-ignore
+	newDevice.states.push(colortemp);
+
 	// Create buttons for scenes
 	for (const scene of scenes) {
 		const sceneSate = {