iobroker.zigbee2mqtt 0.1.0 → 1.0.0

package/lib/exposes.js

@@ -7,6 +7,8 @@ const rgb = require('./rgb');
 const utils = require('./utils');
 const colors = require('./colors');
 
+const blacklistSimulatedBrightness = ['MFKZQ01LM'];
+
 function genState(expose, role, name, desc) {
 	let state;
 	const readable = true; //expose.access > 0;
@@ -87,6 +89,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 +121,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 +285,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 +322,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 +333,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 +388,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':
@@ -612,7 +624,6 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 							if (hasHold && hasRelease && actionName.includes('release')) continue;
 							// is hold state ?
 							if (hasHold && hasRelease && actionName.includes('hold')) {
-								const releaseActionName = actionName.replace('hold', 'release');
 								state = {
 									id: actionName.replace(/\*/g, ''),
 									prop: 'action',
@@ -621,8 +632,20 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 									role: 'button',
 									write: false,
 									read: true,
+									def: false,
 									type: 'boolean',
-									getter: payload => (payload.action === actionName) ? true : (payload.action === releaseActionName) ? false : undefined,
+									getter: (payload) => {
+										if (payload.action === actionName) {
+											return true;
+										}
+										if (payload.action === actionName.replace('hold', 'release')) {
+											return false;
+										}
+										if (payload.action === `${actionName}_release`) {
+											return false;
+										}
+										return undefined;
+									},
 								};
 							} else {
 								state = {
@@ -634,12 +657,30 @@ function createFromExposes(deviceID, ieee_address, definitions, power_source) {
 									write: false,
 									read: true,
 									type: 'boolean',
-									getter: payload => (payload.action === actionName) ? true : undefined,
+									def: false,
 									isEvent: true,
+									getter: payload => (payload.action === actionName) ? true : undefined,
 								};
 							}
 							pushToStates(state, expose.access);
 						}
+						if (!blacklistSimulatedBrightness.includes(definitions.model)) {
+							pushToStates({
+								id: 'simulated_brightness',
+								prop: 'brightness',
+								name: 'Simulated brightness',
+								icon: undefined,
+								role: 'level.dimmer',
+								write: true,
+								read: true,
+								type: 'number',
+								unit: '%',
+								def: 0,
+								getter: payload => {
+									return utils.bulbLevelToAdapterLevel(payload.brightness);
+								},
+							}, 1);
+						}
 						state = null;
 						break;
 					}
@@ -720,8 +761,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 +822,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 +830,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/messages.js

@@ -0,0 +1,18 @@
+async function adapterInfo(config, log) {
+	log.info(`Zigbee2MQTT Frontend Server: ${config.server}`);
+	log.info(`Zigbee2MQTT Frontend Port: ${config.port}`);
+	log.info(`Zigbee2MQTT Debug Log: ${config.debugLogEnabled ? 'activated' : 'deactivated'}`);
+	log.info(`Proxy Zigbee2MQTT Logs to ioBroker Logs: ${config.proxyZ2MLogs ? 'activated' : 'deactivated'}`);
+	log.info(`Use Kelvin: ${config.useKelvin ? 'yes' : 'no'}`);
+}
+
+async function zigbee2mqttInfo(payload, log) {
+	log.info(`Zigbee2MQTT Version: ${payload.version} `);
+	log.info(`Coordinator type: ${payload.coordinator.type} Version: ${payload.coordinator.meta.revision} Serial: ${payload.config.serial.port}`);
+	log.info(`Network panid ${payload.network.pan_id} channel: ${payload.network.channel} ext_pan_id: ${payload.network.extended_pan_id}`);
+}
+
+module.exports = {
+	adapterInfo: adapterInfo,
+	zigbee2mqttInfo: zigbee2mqttInfo,
+};