iobroker.zigbee2mqtt 2.13.4 → 2.13.6

package/lib/exposes.js

@@ -301,819 +301,849 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
             scenes = scenes.concat(devicesMessag.endpoints[key].scenes);
         }
     }
-
-    for (const expose of definition.exposes) {
-        let state;
-
-        switch (expose.type) {
-            case 'light':
-                for (const prop of expose.features) {
-                    switch (prop.name) {
-                        case 'state': {
-                            const stateName = expose.endpoint ? `state_${expose.endpoint}` : 'state';
-                            pushToStates({
-                                id: stateName,
-                                name: `Switch state ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-                                options: ['transition'],
-                                icon: undefined,
-                                role: 'switch',
-                                write: true,
-                                read: true,
-                                type: 'boolean',
-                                getter: (payload) => (payload[stateName] === (prop.value_on || 'ON')),
-                                setter: (value) => (value) ? prop.value_on || 'ON' : ((prop.value_off != undefined) ? prop.value_off : 'OFF'),
-                                epname: expose.endpoint,
-                                //setattr: stateName,
-                            }, prop.access);
-                            // features contains TOGGLE?
-                            if (prop.value_toggle) {
+    try {
+        for (const expose of definition.exposes) {
+            let state;
+
+            switch (expose.type) {
+                case 'light':
+                    for (const prop of expose.features) {
+                        switch (prop.name) {
+                            case 'state': {
+                                const stateName = expose.endpoint ? `state_${expose.endpoint}` : 'state';
                                 pushToStates({
-                                    id: `${stateName}_toggle`,
-                                    prop: `${stateName}_toggle`,
-                                    name: `Toggle state of the ${stateName}`,
+                                    id: stateName,
+                                    name: `Switch state ${expose.endpoint ? expose.endpoint : ''}`.trim(),
                                     options: ['transition'],
                                     icon: undefined,
-                                    role: 'button',
-                                    write: true,
-                                    read: true,
-                                    type: 'boolean',
-                                    def: true,
-                                    setattr: stateName,
-                                    setter: (value) => (value) ? prop.value_toggle : undefined
-                                });
-                            }
-                            break;
-                        }
-                        case 'brightness': {
-                            const stateName = expose.endpoint ? `brightness_${expose.endpoint}` : 'brightness';
-                            pushToStates({
-                                id: stateName,
-                                name: `Brightness ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-                                options: ['transition'],
-                                icon: undefined,
-                                role: 'level.dimmer',
-                                write: true,
-                                read: true,
-                                type: 'number',
-                                min: 0, // ignore expose.value_min
-                                max: 100, // ignore expose.value_max
-                                def: 100,
-                                unit: '%',
-                                getter: (value) => {
-                                    return utils.bulbLevelToAdapterLevel(value[stateName]);
-                                },
-                                setter: (value) => {
-                                    return utils.adapterLevelToBulbLevel(value);
-                                },
-                            }, prop.access);
-                            // brightnessMoveOnOff
-                            const brmPropName = config.brightnessMoveOnOff == true ? `${stateName}_move_onoff` : `${stateName}_move`;
-                            pushToStates({
-                                id: `${stateName}_move`,
-                                prop: brmPropName,
-                                name: 'Increases or decreases the brightness by X units per second',
-                                icon: undefined,
-                                role: 'state',
-                                write: true,
-                                read: false,
-                                type: 'number',
-                                min: -50,
-                                max: 50,
-                                def: 0
-                            }, z2mAccess.SET);
-                            // brightnessStepOnOff
-                            const brspropName = config.brightnessStepOnOff == true ? `${stateName}_step_onoff` : `${stateName}_step`;
-                            pushToStates({
-                                id: `${stateName}_step`,
-                                prop: brspropName,
-                                name: 'Increases or decreases brightness by X steps',
-                                options: ['transition'],
-                                icon: undefined,
-                                role: 'state',
-                                write: true,
-                                read: false,
-                                type: 'number',
-                                min: -255,
-                                max: 255,
-                                def: 0
-                            }, z2mAccess.SET);
-                            break;
-                        }
-                        case 'color_temp': {
-                            const stateName = expose.endpoint ? `colortemp_${expose.endpoint}` : 'colortemp';
-                            const propName = expose.endpoint ? `color_temp_${expose.endpoint}` : 'color_temp';
-                            const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
-                            pushToStates({
-                                id: stateName,
-                                prop: propName,
-                                name: `Color temperature ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-                                options: ['transition'],
-                                icon: undefined,
-                                role: 'level.color.temperature',
-                                write: true,
-                                read: true,
-                                type: 'number',
-                                min: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_max) : prop.value_min,
-                                max: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_min) : prop.value_max,
-                                def: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_min) : prop.value_max,
-                                unit: config.useKelvin == true ? 'K' : 'mired',
-                                setter: (value) => {
-                                    return utils.toMired(value);
-                                },
-                                getter: (payload) => {
-                                    if (payload[colorMode] != 'color_temp') {
-                                        return undefined;
-                                    }
-                                    if (config.useKelvin == true) {
-                                        return utils.miredKelvinConversion(payload[propName]);
-                                    } else {
-                                        return payload[propName];
-                                    }
-                                },
-                            }, prop.access);
-                            // Colortemp
-                            pushToStates({
-                                id: `${stateName}_move`,
-                                prop: `${propName}_move`,
-                                name: 'Colortemp change',
-                                icon: undefined,
-                                role: 'state',
-                                write: true,
-                                read: false,
-                                type: 'number',
-                                min: -50,
-                                max: 50,
-                                def: 0
-                            }, prop.access);
-                            break;
-                        }
-                        case 'color_temp_startup': {
-                            const stateName = expose.endpoint ? `colortempstartup_${expose.endpoint}` : 'colortempstartup';
-                            const propName = expose.endpoint ? `color_temp_startup_${expose.endpoint}` : 'color_temp_startup';
-                            //const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
-                            pushToStates({
-                                id: stateName,
-                                prop: propName,
-                                name: `${prop.description} ${expose.endpoint ? `(${expose.endpoint})` : ''}`.trim(),
-                                //options: ['transition'],
-                                icon: undefined,
-                                role: 'level.color.temperature',
-                                write: true,
-                                read: true,
-                                type: 'number',
-                                min: 0,
-                                max: 65535,
-                                def: undefined,
-                                unit: config.useKelvin == true ? 'K' : 'mired',
-                                setter: (value) => {
-                                    return utils.toMired(value);
-                                },
-                                getter: (payload) => {
-                                    //if (payload[colorMode] != 'color_temp') {
-                                    //    return undefined;
-                                    //}
-                                    if (config.useKelvin == true) {
-                                        return utils.miredKelvinConversion(payload[propName]);
-                                    } else {
-                                        return payload[propName];
-                                    }
-                                },
-                            }, prop.access);
-                            break;
-                        }
-                        case 'color_xy': {
-                            const stateName = expose.endpoint ? `color_${expose.endpoint}` : 'color';
-                            const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
-                            pushToStates({
-                                id: stateName,
-                                name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-                                options: ['transition'],
-                                icon: undefined,
-                                role: 'level.color.rgb',
-                                write: true,
-                                read: true,
-                                type: 'string',
-                                def: '#ff00ff',
-                                setter: (value) => {
-
-                                    let xy = [0, 0];
-                                    const rgbcolor = colors.ParseColor(value);
-
-                                    xy = rgb.rgb_to_cie(rgbcolor.r, rgbcolor.g, rgbcolor.b);
-                                    return {
-                                        x: xy[0],
-                                        y: xy[1]
-                                    };
-
-                                },
-                                getter: payload => {
-                                    if (payload[colorMode] != 'xy' && config.colorTempSyncColor == false) {
-                                        return undefined;
-                                    }
-                                    if (payload[stateName] && payload[stateName].hasOwnProperty('x') && payload[stateName].hasOwnProperty('y')) {
-                                        const colorval = rgb.cie_to_rgb(payload[stateName].x, payload[stateName].y);
-                                        return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
-                                    } else {
-                                        return undefined;
-                                    }
-                                },
-                                epname: expose.endpoint,
-                            }, prop.access);
-                            break;
-                        }
-                        case 'color_hs': {
-                            const stateName = expose.endpoint ? `color_${expose.endpoint}` : 'color';
-                            const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
-                            pushToStates({
-                                id: stateName,
-                                name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
-                                options: ['transition'],
-                                icon: undefined,
-                                role: 'level.color.rgb',
-                                write: true,
-                                read: true,
-                                type: 'string',
-                                def: '#ff00ff',
-                                setter: (value) => {
-                                    const _rgb = colors.ParseColor(value);
-                                    const hsv = rgb.rgbToHSV(_rgb.r, _rgb.g, _rgb.b, true);
-                                    return {
-                                        h: Math.min(Math.max(hsv.h, 1), 359),
-                                        s: hsv.s,
-                                        //b: Math.round(hsv.v * 2.55),
-
-                                    };
-                                },
-                                getter: payload => {
-                                    if (!['hs', 'xy'].includes(payload[colorMode]) && config.colorTempSyncColor == false) {
-                                        return undefined;
-                                    }
-
-                                    if (payload[stateName] && payload[stateName].hasOwnProperty('h') && payload[stateName].hasOwnProperty('s') & payload[stateName].hasOwnProperty('b')) {
-                                        return rgb.hsvToRGBString(payload[stateName].h, payload[stateName].s, Math.round(payload[stateName].b / 2.55));
-                                    }
-
-                                    if (payload[stateName] && payload[stateName].hasOwnProperty('x') && payload[stateName].hasOwnProperty('y')) {
-                                        const colorval = rgb.cie_to_rgb(payload[stateName].x, payload[stateName].y);
-                                        return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
-                                    }
-                                    return undefined;
-
-                                },
-                            }, prop.access);
-                            break;
-                        }
-                        default:
-                            pushToStates(genState(prop), prop.access);
-                            break;
-                    }
-                }
-                pushToStates(statesDefs.transition, z2mAccess.SET);
-                break;
-
-            case 'switch':
-                for (const prop of expose.features) {
-                    switch (prop.name) {
-                        case 'state':
-                            pushToStates(genState(prop, 'switch'), prop.access);
-                            // features contains TOGGLE?
-                            if (prop.value_toggle) {
-                                pushToStates({
-                                    id: `${prop.property}_toggle`,
-                                    prop: `${prop.property}_toggle`,
-                                    name: `Toggle state of the ${prop.property}`,
-                                    icon: undefined,
-                                    role: 'button',
+                                    role: 'switch',
                                     write: true,
                                     read: true,
                                     type: 'boolean',
-                                    def: true,
-                                    setattr: prop.property,
-                                    setter: (value) => (value) ? prop.value_toggle : undefined
-                                });
-                            }
-                            break;
-                        default:
-                            pushToStates(genState(prop), prop.access);
-                            break;
-                    }
-                }
-                break;
-
-            case 'numeric':
-                if (expose.endpoint) {
-                    state = genState(expose);
-                } else {
-                    switch (expose.name) {
-                        case 'linkquality':
-                            state = statesDefs.link_quality;
-                            break;
-
-                        case 'battery':
-                            state = statesDefs.battery;
-                            break;
-
-                        case 'temperature':
-                            state = statesDefs.temperature;
-                            break;
-
-                        case 'device_temperature':
-                            state = statesDefs.device_temperature;
-                            break;
-
-                        case 'humidity':
-                            state = statesDefs.humidity;
-                            break;
-
-                        case 'pressure':
-                            state = statesDefs.pressure;
-                            break;
-
-                        case 'illuminance':
-                            state = statesDefs.illuminance_raw;
-                            break;
-
-                        case 'illuminance_lux':
-                            state = statesDefs.illuminance;
-                            break;
-
-                        case 'power':
-                            state = statesDefs.load_power;
-                            break;
-
-                        case 'current':
-                            state = statesDefs.load_current;
-                            break;
-
-                        case 'voltage':
-                            state = statesDefs.voltage;
-                            if (power_source == 'Battery') {
-                                state = statesDefs.battery_voltage;
-                            }
-                            if (expose.unit == 'mV') {
-                                state.getter = payload => payload.voltage / 1000;
-                            }
-                            break;
-
-                        case 'energy':
-                            state = statesDefs.energy;
-                            break;
-
-                        default:
-                            state = genState(expose);
-                            break;
-                    }
-                }
-                if (state) pushToStates(state, expose.access);
-                break;
-
-            case 'enum':
-                switch (expose.name) {
-                    case 'action': {
-
-                        if (!Array.isArray(expose.values)) {
-                            break;
-                        }
-
-                        // Support for DIYRuZ Device
-                        const wildcardValues = expose.values.filter(x => x.startsWith('*'));
-                        if (wildcardValues && wildcardValues.length > 0) {
-                            for (const endpointName of [...new Set(definition.exposes.filter(x => x.endpoint).map(x => x.endpoint))]) {
-                                for (const value of wildcardValues) {
-                                    const actionName = value.replace('*', endpointName);
+                                    getter: (payload) => (payload[stateName] === (prop.value_on || 'ON')),
+                                    setter: (value) => (value) ? prop.value_on || 'ON' : ((prop.value_off != undefined) ? prop.value_off : 'OFF'),
+                                    epname: expose.endpoint,
+                                    //setattr: stateName,
+                                }, prop.access);
+                                // features contains TOGGLE?
+                                if (prop.value_toggle) {
                                     pushToStates({
-                                        id: actionName,
-                                        prop: 'action',
-                                        name: `Triggered action ${value.replace('*_', endpointName)}`,
+                                        id: `${stateName}_toggle`,
+                                        prop: `${stateName}_toggle`,
+                                        name: `Toggle state of the ${stateName}`,
+                                        options: ['transition'],
                                         icon: undefined,
                                         role: 'button',
-                                        write: false,
+                                        write: true,
                                         read: true,
                                         type: 'boolean',
-                                        def: false,
-                                        isEvent: true,
-                                        getter: payload => (payload.action === actionName) ? true : undefined,
-                                    }, expose.access);
+                                        def: true,
+                                        setattr: stateName,
+                                        setter: (value) => (value) ? prop.value_toggle : undefined
+                                    });
                                 }
+                                break;
                             }
-                            break;
-                        }
-
-                        for (const actionName of expose.values) {
-
-                            // is release -> hold state? - skip
-                            if (config.simpleHoldReleaseState == true && actionName.endsWith('release') && expose.values.find((x) => x == actionName.replace('release', 'hold'))) {
-                                continue;
-                            }
-
-                            // is stop - move state? - skip
-                            if (config.simpleMoveStopState == true && actionName.endsWith('stop') && expose.values.find((x) => x.includes(actionName.replace('stop', 'move')))) {
-                                continue;
-                            }
-
-                            // is release -> press state? - skip
-                            if (config.simplePressReleaseState == true && actionName.endsWith('release') && expose.values.find((x) => x == actionName.replace('release', 'press'))) {
-                                continue;
-                            }
-
-                            // is hold -> release state ?
-                            if (config.simpleHoldReleaseState == true && actionName.endsWith('hold') && expose.values.find((x) => x == actionName.replace('hold', 'release'))) {
+                            case 'brightness': {
+                                const stateName = expose.endpoint ? `brightness_${expose.endpoint}` : 'brightness';
                                 pushToStates({
-                                    id: actionName.replace(/\*/g, ''),
-                                    prop: 'action',
-                                    name: actionName,
+                                    id: stateName,
+                                    name: `Brightness ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                    options: ['transition'],
                                     icon: undefined,
-                                    role: 'button',
-                                    write: false,
+                                    role: 'level.dimmer',
+                                    write: true,
                                     read: true,
-                                    def: false,
-                                    type: 'boolean',
-                                    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;
+                                    type: 'number',
+                                    min: 0, // ignore expose.value_min
+                                    max: 100, // ignore expose.value_max
+                                    def: 100,
+                                    unit: '%',
+                                    getter: (value) => {
+                                        return utils.bulbLevelToAdapterLevel(value[stateName]);
                                     },
-                                }, expose.access);
-                            }
-                            // is move -> stop state ?
-                            else if (config.simpleMoveStopState == true && actionName.includes('move') && expose.values.find((x) => x == `${actionName.split('_')[0]}_stop`)) {
+                                    setter: (value) => {
+                                        return utils.adapterLevelToBulbLevel(value);
+                                    },
+                                }, prop.access);
+                                // brightnessMoveOnOff
+                                const brmPropName = config.brightnessMoveOnOff == true ? `${stateName}_move_onoff` : `${stateName}_move`;
                                 pushToStates({
-                                    id: actionName.replace(/\*/g, ''),
-                                    prop: 'action',
-                                    name: actionName,
+                                    id: `${stateName}_move`,
+                                    prop: brmPropName,
+                                    name: 'Increases or decreases the brightness by X units per second',
                                     icon: undefined,
-                                    role: 'button',
-                                    write: false,
-                                    read: true,
-                                    def: false,
-                                    type: 'boolean',
-                                    getter: (payload) => {
-                                        if (payload.action === actionName) {
-                                            return true;
-                                        }
-                                        if (payload.action === `${actionName.split('_')[0]}_stop`) {
-                                            return false;
-                                        }
-                                        return undefined;
-                                    },
-                                }, expose.access);
+                                    role: 'state',
+                                    write: true,
+                                    read: false,
+                                    type: 'number',
+                                    min: -50,
+                                    max: 50,
+                                    def: 0
+                                }, z2mAccess.SET);
+                                // brightnessStepOnOff
+                                const brspropName = config.brightnessStepOnOff == true ? `${stateName}_step_onoff` : `${stateName}_step`;
+                                pushToStates({
+                                    id: `${stateName}_step`,
+                                    prop: brspropName,
+                                    name: 'Increases or decreases brightness by X steps',
+                                    options: ['transition'],
+                                    icon: undefined,
+                                    role: 'state',
+                                    write: true,
+                                    read: false,
+                                    type: 'number',
+                                    min: -255,
+                                    max: 255,
+                                    def: 0
+                                }, z2mAccess.SET);
+                                break;
                             }
-                            // is press -> release  state ?
-                            else if (config.simplePressReleaseState == true && actionName.endsWith('press') && expose.values.find((x) => x == actionName.replace('press', 'release'))) {
+                            case 'color_temp': {
+                                const stateName = expose.endpoint ? `colortemp_${expose.endpoint}` : 'colortemp';
+                                const propName = expose.endpoint ? `color_temp_${expose.endpoint}` : 'color_temp';
+                                const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
                                 pushToStates({
-                                    id: actionName.replace(/\*/g, ''),
-                                    prop: 'action',
-                                    name: actionName,
+                                    id: stateName,
+                                    prop: propName,
+                                    name: `Color temperature ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                    options: ['transition'],
                                     icon: undefined,
-                                    role: 'button',
-                                    write: false,
+                                    role: 'level.color.temperature',
+                                    write: true,
                                     read: true,
-                                    def: false,
-                                    type: 'boolean',
+                                    type: 'number',
+                                    min: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_max) : prop.value_min,
+                                    max: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_min) : prop.value_max,
+                                    def: config.useKelvin == true ? utils.miredKelvinConversion(prop.value_min) : prop.value_max,
+                                    unit: config.useKelvin == true ? 'K' : 'mired',
+                                    setter: (value) => {
+                                        return utils.toMired(value);
+                                    },
                                     getter: (payload) => {
-                                        if (payload.action === actionName) {
-                                            return true;
+                                        if (payload[colorMode] != 'color_temp') {
+                                            return undefined;
                                         }
-                                        if (payload.action === actionName.replace('press', 'release')) {
-                                            return false;
+                                        if (config.useKelvin == true) {
+                                            return utils.miredKelvinConversion(payload[propName]);
+                                        } else {
+                                            return payload[propName];
                                         }
-                                        return undefined;
                                     },
-                                }, expose.access);
+                                }, prop.access);
+                                // Colortemp
+                                pushToStates({
+                                    id: `${stateName}_move`,
+                                    prop: `${propName}_move`,
+                                    name: 'Colortemp change',
+                                    icon: undefined,
+                                    role: 'state',
+                                    write: true,
+                                    read: false,
+                                    type: 'number',
+                                    min: -50,
+                                    max: 50,
+                                    def: 0
+                                }, prop.access);
+                                break;
                             }
-                            else if (actionName == 'color_temperature_move') {
+                            case 'color_temp_startup': {
+                                const stateName = expose.endpoint ? `colortempstartup_${expose.endpoint}` : 'colortempstartup';
+                                const propName = expose.endpoint ? `color_temp_startup_${expose.endpoint}` : 'color_temp_startup';
+                                //const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
                                 pushToStates({
-                                    id: 'color_temperature_move',
-                                    prop: 'action',
-                                    name: 'Color temperature move value',
+                                    id: stateName,
+                                    prop: propName,
+                                    name: `${prop.description} ${expose.endpoint ? `(${expose.endpoint})` : ''}`.trim(),
+                                    //options: ['transition'],
                                     icon: undefined,
                                     role: 'level.color.temperature',
-                                    write: false,
+                                    write: true,
                                     read: true,
                                     type: 'number',
-                                    def: config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
-                                    min: config.useKelvin == true ? utils.miredKelvinConversion(500) : 150,
-                                    max: config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+                                    min: 0,
+                                    max: 65535,
+                                    def: undefined,
                                     unit: config.useKelvin == true ? 'K' : 'mired',
-                                    isEvent: true,
+                                    setter: (value) => {
+                                        return utils.toMired(value);
+                                    },
                                     getter: (payload) => {
-                                        if (payload.action != 'color_temperature_move') {
-                                            return undefined;
-                                        }
-
-                                        if (payload.action_color_temperature) {
-                                            if (config.useKelvin == true) {
-                                                return utils.miredKelvinConversion(payload.action_color_temperature);
-                                            }
-                                            else {
-                                                return payload.action_color_temperature;
-                                            }
+                                        //if (payload[colorMode] != 'color_temp') {
+                                        //    return undefined;
+                                        //}
+                                        if (config.useKelvin == true) {
+                                            return utils.miredKelvinConversion(payload[propName]);
+                                        } else {
+                                            return payload[propName];
                                         }
                                     },
-                                }, expose.access);
-
+                                }, prop.access);
+                                break;
                             }
-                            else if (actionName == 'color_move') {
+                            case 'color_xy': {
+                                const stateName = expose.endpoint ? `color_${expose.endpoint}` : 'color';
+                                const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
                                 pushToStates({
-                                    id: 'color_move',
-                                    prop: 'action',
-                                    name: 'Color move value',
+                                    id: stateName,
+                                    name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                    options: ['transition'],
                                     icon: undefined,
                                     role: 'level.color.rgb',
-                                    write: false,
+                                    write: true,
                                     read: true,
                                     type: 'string',
-                                    def: '#ffffff',
-                                    isEvent: true,
-                                    getter: (payload) => {
-                                        if (payload.action != 'color_move') {
+                                    def: '#ff00ff',
+                                    setter: (value) => {
+
+                                        let xy = [0, 0];
+                                        const rgbcolor = colors.ParseColor(value);
+
+                                        xy = rgb.rgb_to_cie(rgbcolor.r, rgbcolor.g, rgbcolor.b);
+                                        return {
+                                            x: xy[0],
+                                            y: xy[1]
+                                        };
+
+                                    },
+                                    getter: payload => {
+                                        if (payload[colorMode] != 'xy' && config.colorTempSyncColor == false) {
                                             return undefined;
                                         }
-
-                                        if (payload.action_color && payload.action_color.hasOwnProperty('x') && payload.action_color.hasOwnProperty('y')) {
-                                            const colorval = rgb.cie_to_rgb(payload.action_color.x, payload.action_color.y);
+                                        if (payload[stateName] && payload[stateName].hasOwnProperty('x') && payload[stateName].hasOwnProperty('y')) {
+                                            const colorval = rgb.cie_to_rgb(payload[stateName].x, payload[stateName].y);
                                             return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
-                                        }
-                                        else {
+                                        } else {
                                             return undefined;
                                         }
-                                    }
-                                }, expose.access);
+                                    },
+                                    epname: expose.endpoint,
+                                }, prop.access);
+                                break;
                             }
-                            else if (actionName == 'brightness_move_to_level') {
+                            case 'color_hs': {
+                                const stateName = expose.endpoint ? `color_${expose.endpoint}` : 'color';
+                                const colorMode = expose.endpoint ? `color_mode_${expose.endpoint}` : 'color_mode';
                                 pushToStates({
-                                    id: 'brightness_move_to_level',
-                                    name: 'Brightness move to level',
+                                    id: stateName,
+                                    name: `Color ${expose.endpoint ? expose.endpoint : ''}`.trim(),
+                                    options: ['transition'],
                                     icon: undefined,
-                                    role: 'level.dimmer',
-                                    write: false,
+                                    role: 'level.color.rgb',
+                                    write: true,
                                     read: true,
-                                    type: 'number',
-                                    min: 0,
-                                    max: 100,
-                                    def: 100,
-                                    unit: '%',
-                                    isEvent: true,
-                                    getter: (payload) => {
-                                        if (payload.action != 'brightness_move_to_level') {
+                                    type: 'string',
+                                    def: '#ff00ff',
+                                    setter: (value) => {
+                                        const _rgb = colors.ParseColor(value);
+                                        const hsv = rgb.rgbToHSV(_rgb.r, _rgb.g, _rgb.b, true);
+                                        return {
+                                            h: Math.min(Math.max(hsv.h, 1), 359),
+                                            s: hsv.s,
+                                            //b: Math.round(hsv.v * 2.55),
+
+                                        };
+                                    },
+                                    getter: payload => {
+                                        if (!['hs', 'xy'].includes(payload[colorMode]) && config.colorTempSyncColor == false) {
                                             return undefined;
                                         }
 
-                                        if (payload.action_level) {
-                                            return utils.bulbLevelToAdapterLevel(payload.action_level);
-                                        } else {
-                                            return undefined;
-                                        }
-                                    }
-                                }, expose.access);
-                            }
-                            else if (actionName == 'move_to_saturation') {
-                                pushToStates({
-                                    id: 'move_to_saturation',
-                                    name: 'Move to level saturation',
-                                    icon: undefined,
-                                    role: 'level.color.saturation',
-                                    write: false,
-                                    read: true,
-                                    type: 'number',
-                                    // min: 0,
-                                    // max: 100,
-                                    def: 0,
-                                    isEvent: true,
-                                    getter: (payload) => {
-                                        if (payload.action != 'move_to_saturation') {
-                                            return undefined;
+                                        if (payload[stateName] && payload[stateName].hasOwnProperty('h') && payload[stateName].hasOwnProperty('s') & payload[stateName].hasOwnProperty('b')) {
+                                            return rgb.hsvToRGBString(payload[stateName].h, payload[stateName].s, Math.round(payload[stateName].b / 2.55));
                                         }
 
-                                        if (payload.action_level) {
-                                            return payload.action_saturation;
-                                        } else {
-                                            return undefined;
+                                        if (payload[stateName] && payload[stateName].hasOwnProperty('x') && payload[stateName].hasOwnProperty('y')) {
+                                            const colorval = rgb.cie_to_rgb(payload[stateName].x, payload[stateName].y);
+                                            return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
                                         }
-                                    }
-                                }, expose.access);
-                            }
-                            // else if (actionName == 'hue_move') {
-                            //     pushToStates({
-                            //         id: 'hue_move',
-                            //         name: 'Hue move rate',
-                            //         icon: undefined,
-                            //         role: 'level.color.hue',
-                            //         write: false,
-                            //         read: true,
-                            //         type: 'number',
-                            //         min: 0,
-                            //         max: 360,
-                            //         def: 0,
-                            //         isEvent: true,
-                            //         getter: (payload) => {
-                            //             if (payload.action != 'hue_move') {
-                            //                 return undefined;
-                            //             }
-
-                            //             if (payload.action_level) {
-                            //                 return payload.action_level;
-                            //             } else {
-                            //                 return undefined;
-                            //             }
-                            //         }
-                            //     }, expose.access);
-                            // }
-                            else {
-                                pushToStates({
-                                    id: actionName.replace(/\*/g, ''),
-                                    prop: 'action',
-                                    name: actionName,
-                                    icon: undefined,
-                                    role: 'button',
-                                    write: false,
-                                    read: true,
-                                    type: 'boolean',
-                                    def: false,
-                                    isEvent: true,
-                                    getter: payload => (payload.action === actionName) ? true : undefined,
-                                }, expose.access);
+                                        return undefined;
+
+                                    },
+                                }, prop.access);
+                                break;
                             }
+                            default:
+                                pushToStates(genState(prop), prop.access);
+                                break;
                         }
-                        // Can the device simulated_brightness?
-                        if (definition.options && definition.options.find(x => x.property == 'simulated_brightness')) {
-                            pushToStates(statesDefs.simulated_brightness, z2mAccess.STATE);
+                    }
+                    pushToStates(statesDefs.transition, z2mAccess.SET);
+                    break;
+
+                case 'switch':
+                    for (const prop of expose.features) {
+                        switch (prop.name) {
+                            case 'state':
+                                pushToStates(genState(prop, 'switch'), prop.access);
+                                // features contains TOGGLE?
+                                if (prop.value_toggle) {
+                                    pushToStates({
+                                        id: `${prop.property}_toggle`,
+                                        prop: `${prop.property}_toggle`,
+                                        name: `Toggle state of the ${prop.property}`,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: true,
+                                        read: true,
+                                        type: 'boolean',
+                                        def: true,
+                                        setattr: prop.property,
+                                        setter: (value) => (value) ? prop.value_toggle : undefined
+                                    });
+                                }
+                                break;
+                            default:
+                                pushToStates(genState(prop), prop.access);
+                                break;
                         }
-                        state = null;
-                        break;
                     }
-                    default:
+                    break;
+
+                case 'numeric':
+                    if (expose.endpoint) {
                         state = genState(expose);
-                        break;
-                }
-                if (state) pushToStates(state, expose.access);
-                break;
+                    } else {
+                        switch (expose.name) {
+                            case 'linkquality':
+                                state = statesDefs.link_quality;
+                                break;
+
+                            case 'battery':
+                                state = statesDefs.battery;
+                                break;
+
+                            case 'temperature':
+                                state = statesDefs.temperature;
+                                break;
+
+                            case 'device_temperature':
+                                state = statesDefs.device_temperature;
+                                break;
+
+                            case 'humidity':
+                                state = statesDefs.humidity;
+                                break;
+
+                            case 'pressure':
+                                state = statesDefs.pressure;
+                                break;
+
+                            case 'illuminance':
+                                state = statesDefs.illuminance_raw;
+                                break;
+
+                            case 'illuminance_lux':
+                                state = statesDefs.illuminance;
+                                break;
+
+                            case 'power':
+                                state = statesDefs.load_power;
+                                break;
+
+                            case 'current':
+                                state = statesDefs.load_current;
+                                break;
+
+                            case 'voltage':
+                                state = statesDefs.voltage;
+                                if (power_source == 'Battery') {
+                                    state = statesDefs.battery_voltage;
+                                }
+                                if (expose.unit == 'mV') {
+                                    state.getter = payload => payload.voltage / 1000;
+                                }
+                                break;
 
-            case 'binary':
-                if (expose.endpoint) {
-                    state = genState(expose);
-                } else {
+                            case 'energy':
+                                state = statesDefs.energy;
+                                break;
+
+                            default:
+                                state = genState(expose);
+                                break;
+                        }
+                    }
+                    if (state) pushToStates(state, expose.access);
+                    break;
+
+                case 'enum':
                     switch (expose.name) {
-                        case 'contact':
-                            state = statesDefs.contact;
-                            pushToStates(statesDefs.opened, expose.access);
-                            break;
+                        case 'action': {
 
-                        case 'battery_low':
-                            state = statesDefs.heiman_batt_low;
-                            break;
+                            if (!Array.isArray(expose.values)) {
+                                break;
+                            }
 
-                        case 'tamper':
-                            state = statesDefs.tamper;
-                            break;
+                            // Support for DIYRuZ Device
+                            const wildcardValues = expose.values.filter(x => x.startsWith('*'));
+                            if (wildcardValues && wildcardValues.length > 0) {
+                                for (const endpointName of [...new Set(definition.exposes.filter(x => x.endpoint).map(x => x.endpoint))]) {
+                                    for (const value of wildcardValues) {
+                                        const actionName = value.replace('*', endpointName);
+                                        pushToStates({
+                                            id: actionName,
+                                            prop: 'action',
+                                            name: `Triggered action ${value.replace('*_', endpointName)}`,
+                                            icon: undefined,
+                                            role: 'button',
+                                            write: false,
+                                            read: true,
+                                            type: 'boolean',
+                                            def: false,
+                                            isEvent: true,
+                                            getter: payload => (payload.action === actionName) ? true : undefined,
+                                        }, expose.access);
+                                    }
+                                }
+                                break;
+                            }
 
-                        case 'water_leak':
-                            state = statesDefs.water_detected;
-                            break;
+                            for (const actionName of expose.values) {
 
-                        case 'lock':
-                            state = statesDefs.child_lock;
-                            break;
+                                // is release -> hold state? - skip
+                                if (config.simpleHoldReleaseState == true && actionName.endsWith('release') && expose.values.find((x) => x == actionName.replace('release', 'hold'))) {
+                                    continue;
+                                }
 
-                        case 'occupancy':
-                            state = statesDefs.occupancy;
-                            break;
+                                // is stop - move state? - skip
+                                if (config.simpleMoveStopState == true && actionName.endsWith('stop') && expose.values.find((x) => x.includes(actionName.replace('stop', 'move')))) {
+                                    continue;
+                                }
 
-                        default:
-                            state = genState(expose);
-                            break;
-                    }
-                }
-                if (state) pushToStates(state, expose.access);
-                break;
+                                // is release -> press state? - skip
+                                if (config.simplePressReleaseState == true && actionName.endsWith('release') && expose.values.find((x) => x == actionName.replace('release', 'press'))) {
+                                    continue;
+                                }
 
-            case 'text':
-                state = genState(expose);
-                pushToStates(state, expose.access);
-                break;
+                                // is hold -> release state ?
+                                if (config.simpleHoldReleaseState == true && actionName.endsWith('hold') && expose.values.find((x) => x == actionName.replace('hold', 'release'))) {
+                                    pushToStates({
+                                        id: actionName.replace(/\*/g, ''),
+                                        prop: 'action',
+                                        name: actionName,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: false,
+                                        read: true,
+                                        def: false,
+                                        type: 'boolean',
+                                        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;
+                                        },
+                                    }, expose.access);
+                                }
+                                // is move -> stop state ?
+                                else if (config.simpleMoveStopState == true && actionName.includes('move') && expose.values.find((x) => x == `${actionName.split('_')[0]}_stop`)) {
+                                    pushToStates({
+                                        id: actionName.replace(/\*/g, ''),
+                                        prop: 'action',
+                                        name: actionName,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: false,
+                                        read: true,
+                                        def: false,
+                                        type: 'boolean',
+                                        getter: (payload) => {
+                                            if (payload.action === actionName) {
+                                                return true;
+                                            }
+                                            if (payload.action === `${actionName.split('_')[0]}_stop`) {
+                                                return false;
+                                            }
+                                            return undefined;
+                                        },
+                                    }, expose.access);
+                                }
+                                // is press -> release  state ?
+                                else if (config.simplePressReleaseState == true && actionName.endsWith('press') && expose.values.find((x) => x == actionName.replace('press', 'release'))) {
+                                    pushToStates({
+                                        id: actionName.replace(/\*/g, ''),
+                                        prop: 'action',
+                                        name: actionName,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: false,
+                                        read: true,
+                                        def: false,
+                                        type: 'boolean',
+                                        getter: (payload) => {
+                                            if (payload.action === actionName) {
+                                                return true;
+                                            }
+                                            if (payload.action === actionName.replace('press', 'release')) {
+                                                return false;
+                                            }
+                                            return undefined;
+                                        },
+                                    }, expose.access);
+                                }
+                                else if (actionName == 'color_temperature_move') {
+                                    pushToStates({
+                                        id: 'color_temperature_move',
+                                        prop: 'action',
+                                        name: 'Color temperature move value',
+                                        icon: undefined,
+                                        role: 'level.color.temperature',
+                                        write: false,
+                                        read: true,
+                                        type: 'number',
+                                        def: config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+                                        min: config.useKelvin == true ? utils.miredKelvinConversion(500) : 150,
+                                        max: config.useKelvin == true ? utils.miredKelvinConversion(150) : 500,
+                                        unit: config.useKelvin == true ? 'K' : 'mired',
+                                        isEvent: true,
+                                        getter: (payload) => {
+                                            if (payload.action != 'color_temperature_move') {
+                                                return undefined;
+                                            }
 
-            case 'lock':
-            case 'fan':
-            case 'cover':
-                for (const prop of expose.features) {
-                    switch (prop.name) {
-                        case 'state':
-                            pushToStates(genState(prop, 'switch'), prop.access);
-                            // features contains TOGGLE?
-                            if (prop.value_toggle) {
-                                pushToStates({
-                                    id: `${prop.property}_toggle`,
-                                    prop: `${prop.property}_toggle`,
-                                    name: `Toggle state of the ${prop.property}`,
-                                    icon: undefined,
-                                    role: 'button',
-                                    write: true,
-                                    read: true,
-                                    def: true,
-                                    type: 'boolean',
-                                    setattr: prop.property,
-                                    setter: (value) => (value) ? prop.value_toggle : undefined
-                                });
+                                            if (payload.action_color_temperature) {
+                                                if (config.useKelvin == true) {
+                                                    return utils.miredKelvinConversion(payload.action_color_temperature);
+                                                }
+                                                else {
+                                                    return payload.action_color_temperature;
+                                                }
+                                            }
+                                        },
+                                    }, expose.access);
+
+                                }
+                                else if (actionName == 'color_move') {
+                                    pushToStates({
+                                        id: 'color_move',
+                                        prop: 'action',
+                                        name: 'Color move value',
+                                        icon: undefined,
+                                        role: 'level.color.rgb',
+                                        write: false,
+                                        read: true,
+                                        type: 'string',
+                                        def: '#ffffff',
+                                        isEvent: true,
+                                        getter: (payload) => {
+                                            if (payload.action != 'color_move') {
+                                                return undefined;
+                                            }
+
+                                            if (payload.action_color && payload.action_color.hasOwnProperty('x') && payload.action_color.hasOwnProperty('y')) {
+                                                const colorval = rgb.cie_to_rgb(payload.action_color.x, payload.action_color.y);
+                                                return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
+                                            }
+                                            else {
+                                                return undefined;
+                                            }
+                                        }
+                                    }, expose.access);
+                                }
+                                else if (actionName == 'brightness_move_to_level') {
+                                    pushToStates({
+                                        id: 'brightness_move_to_level',
+                                        name: 'Brightness move to level',
+                                        icon: undefined,
+                                        role: 'level.dimmer',
+                                        write: false,
+                                        read: true,
+                                        type: 'number',
+                                        min: 0,
+                                        max: 100,
+                                        def: 100,
+                                        unit: '%',
+                                        isEvent: true,
+                                        getter: (payload) => {
+                                            if (payload.action != 'brightness_move_to_level') {
+                                                return undefined;
+                                            }
+
+                                            if (payload.action_level) {
+                                                return utils.bulbLevelToAdapterLevel(payload.action_level);
+                                            } else {
+                                                return undefined;
+                                            }
+                                        }
+                                    }, expose.access);
+                                }
+                                else if (actionName == 'move_to_saturation') {
+                                    pushToStates({
+                                        id: 'move_to_saturation',
+                                        name: 'Move to level saturation',
+                                        icon: undefined,
+                                        role: 'level.color.saturation',
+                                        write: false,
+                                        read: true,
+                                        type: 'number',
+                                        // min: 0,
+                                        // max: 100,
+                                        def: 0,
+                                        isEvent: true,
+                                        getter: (payload) => {
+                                            if (payload.action != 'move_to_saturation') {
+                                                return undefined;
+                                            }
+
+                                            if (payload.action_level) {
+                                                return payload.action_saturation;
+                                            } else {
+                                                return undefined;
+                                            }
+                                        }
+                                    }, expose.access);
+                                }
+                                else if (actionName == 'enhanced_move_to_hue_and_saturation') {
+                                    pushToStates({
+                                        id: 'enhanced_move_to_hue_and_saturation',
+                                        prop: 'action',
+                                        name: 'Enhanced move to hue and saturation value',
+                                        icon: undefined,
+                                        role: 'level.color.hue',
+                                        write: false,
+                                        read: true,
+                                        type: 'number',
+                                        min: 0,
+                                        max: 65536,
+                                        def: 0,
+                                        isEvent: true,
+                                        getter: (payload) => {
+                                            if (payload.action != 'enhanced_move_to_hue_and_saturation') {
+                                                return undefined;
+                                            }
+
+                                            if (payload.action_enhanced_hue) {
+                                                return payload.action_enhanced_hue;
+                                            } else {
+                                                return undefined;
+                                            }
+                                        }
+                                    }, expose.access);
+                                }
+                                // else if (actionName == 'hue_move') {
+                                //     pushToStates({
+                                //         id: 'hue_move',
+                                //         name: 'Hue move rate',
+                                //         icon: undefined,
+                                //         role: 'level.color.hue',
+                                //         write: false,
+                                //         read: true,
+                                //         type: 'number',
+                                //         min: 0,
+                                //         max: 360,
+                                //         def: 0,
+                                //         isEvent: true,
+                                //         getter: (payload) => {
+                                //             if (payload.action != 'hue_move') {
+                                //                 return undefined;
+                                //             }
+
+                                //             if (payload.action_level) {
+                                //                 return payload.action_level;
+                                //             } else {
+                                //                 return undefined;
+                                //             }
+                                //         }
+                                //     }, expose.access);
+                                // }
+                                else {
+                                    pushToStates({
+                                        id: actionName.replace(/\*/g, ''),
+                                        prop: 'action',
+                                        name: actionName,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: false,
+                                        read: true,
+                                        type: 'boolean',
+                                        def: false,
+                                        isEvent: true,
+                                        getter: payload => (payload.action === actionName) ? true : undefined,
+                                    }, expose.access);
+                                }
                             }
+                            // Can the device simulated_brightness?
+                            if (definition.options && definition.options.find(x => x.property == 'simulated_brightness')) {
+                                pushToStates(statesDefs.simulated_brightness, z2mAccess.STATE);
+                            }
+                            state = null;
                             break;
+                        }
                         default:
-                            pushToStates(genState(prop), prop.access);
+                            state = genState(expose);
                             break;
                     }
-                }
-                break;
+                    if (state) pushToStates(state, expose.access);
+                    break;
 
-            case 'climate':
-                for (const prop of expose.features) {
-                    switch (prop.name) {
-                        case 'away_mode':
-                            pushToStates(statesDefs.climate_away_mode, prop.access);
-                            break;
-                        case 'system_mode':
-                            pushToStates(statesDefs.climate_system_mode, prop.access);
-                            break;
-                        case 'running_mode':
-                            pushToStates(statesDefs.climate_running_mode, prop.access);
-                            break;
-                        case 'local_temperature':
-                            pushToStates(statesDefs.hvacThermostat_local_temp, prop.access);
-                            break;
-                        case 'local_temperature_calibration':
-                            pushToStates(statesDefs.hvacThermostat_local_temp_calibration, prop.access);
-                            break;
-                        default:
-                            {
-                                if (prop.name.includes('heating_setpoint')) {
-                                    pushToStates(genState(prop, 'level.temperature'), prop.access);
-                                } else {
-                                    pushToStates(genState(prop), prop.access);
-                                }
-                            }
-                            break;
+                case 'binary':
+                    if (expose.endpoint) {
+                        state = genState(expose);
+                    } else {
+                        switch (expose.name) {
+                            case 'contact':
+                                state = statesDefs.contact;
+                                pushToStates(statesDefs.opened, expose.access);
+                                break;
+
+                            case 'battery_low':
+                                state = statesDefs.heiman_batt_low;
+                                break;
+
+                            case 'tamper':
+                                state = statesDefs.tamper;
+                                break;
+
+                            case 'water_leak':
+                                state = statesDefs.water_detected;
+                                break;
+
+                            case 'lock':
+                                state = statesDefs.child_lock;
+                                break;
+
+                            case 'occupancy':
+                                state = statesDefs.occupancy;
+                                break;
+
+                            default:
+                                state = genState(expose);
+                                break;
+                        }
                     }
-                }
-                break;
+                    if (state) pushToStates(state, expose.access);
+                    break;
 
-            case 'composite':
-                for (const prop of expose.features) {
-                    // let state;
-                    // if (prop.type == 'list' && prop.features) {
-                    //     const listName = prop.name;
-
-                    //     for (const feature of prop.features) {
-                    //         genState(feature, 'state', `${listName}_${feature.name}`, prop.description);
-                    //     }
-                    // }
-
-                    const state = genState(prop);
-                    // Workaround for FP1 new state (region_upsert)
-                    if (!state) {
-                        break;
+                case 'text':
+                    state = genState(expose);
+                    pushToStates(state, expose.access);
+                    break;
+
+                case 'lock':
+                case 'fan':
+                case 'cover':
+                    for (const prop of expose.features) {
+                        switch (prop.name) {
+                            case 'state':
+                                pushToStates(genState(prop, 'switch'), prop.access);
+                                // features contains TOGGLE?
+                                if (prop.value_toggle) {
+                                    pushToStates({
+                                        id: `${prop.property}_toggle`,
+                                        prop: `${prop.property}_toggle`,
+                                        name: `Toggle state of the ${prop.property}`,
+                                        icon: undefined,
+                                        role: 'button',
+                                        write: true,
+                                        read: true,
+                                        def: true,
+                                        type: 'boolean',
+                                        setattr: prop.property,
+                                        setter: (value) => (value) ? prop.value_toggle : undefined
+                                    });
+                                }
+                                break;
+                            default:
+                                pushToStates(genState(prop), prop.access);
+                                break;
+                        }
                     }
-                    state.prop = expose.property;
-                    state.inOptions = true;
-                    // I'm not fully sure, as it really needed, but
-                    state.setterOpt = (value, options) => {
-                        const result = {};
-                        options[prop.property] = value;
-                        result[expose.property] = options;
-                        return result;
-                    };
-                    // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
-                    if (prop.access & z2mAccess.SET) {
-                        state.setter = (value, options) => {
+                    break;
+
+                case 'climate':
+                    for (const prop of expose.features) {
+                        switch (prop.name) {
+                            case 'away_mode':
+                                pushToStates(statesDefs.climate_away_mode, prop.access);
+                                break;
+                            case 'system_mode':
+                                pushToStates(statesDefs.climate_system_mode, prop.access);
+                                break;
+                            case 'running_mode':
+                                pushToStates(statesDefs.climate_running_mode, prop.access);
+                                break;
+                            case 'local_temperature':
+                                pushToStates(statesDefs.hvacThermostat_local_temp, prop.access);
+                                break;
+                            case 'local_temperature_calibration':
+                                pushToStates(statesDefs.hvacThermostat_local_temp_calibration, prop.access);
+                                break;
+                            default:
+                                {
+                                    if (prop.name.includes('heating_setpoint')) {
+                                        pushToStates(genState(prop, 'level.temperature'), prop.access);
+                                    } else {
+                                        pushToStates(genState(prop), prop.access);
+                                    }
+                                }
+                                break;
+                        }
+                    }
+                    break;
+
+                case 'composite':
+                    for (const prop of expose.features) {
+                        // let state;
+                        // if (prop.type == 'list' && prop.features) {
+                        //     const listName = prop.name;
+
+                        //     for (const feature of prop.features) {
+                        //         genState(feature, 'state', `${listName}_${feature.name}`, prop.description);
+                        //     }
+                        // }
+
+                        const state = genState(prop);
+                        // Workaround for FP1 new state (region_upsert)
+                        if (!state) {
+                            break;
+                        }
+                        state.prop = expose.property;
+                        state.inOptions = true;
+                        // I'm not fully sure, as it really needed, but
+                        state.setterOpt = (value, options) => {
                             const result = {};
                             options[prop.property] = value;
                             result[expose.property] = options;
                             return result;
                         };
-                        state.setattr = expose.property;
-                    }
-                    // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
-                    if (prop.access & z2mAccess.STATE) {
-                        state.getter = payload => {
-                            if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
-                                return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
-                            } else {
-                                return undefined;
-                            }
-                        };
-                    } else {
-                        state.getter = _payload => { return undefined; };
+                        // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
+                        if (prop.access & z2mAccess.SET) {
+                            state.setter = (value, options) => {
+                                const result = {};
+                                options[prop.property] = value;
+                                result[expose.property] = options;
+                                return result;
+                            };
+                            state.setattr = expose.property;
+                        }
+                        // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
+                        if (prop.access & z2mAccess.STATE) {
+                            state.getter = payload => {
+                                if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
+                                    return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
+                                } else {
+                                    return undefined;
+                                }
+                            };
+                        } else {
+                            state.getter = _payload => { return undefined; };
+                        }
+                        pushToStates(state, prop.access);
                     }
-                    pushToStates(state, prop.access);
-                }
-                break;
-            default:
-                console.log(`Unhandled expose type ${expose.type} for device ${deviceID}`);
+                    break;
+                default:
+                    console.log(`Unhandled expose type ${expose.type} for device ${deviceID}`);
+            }
         }
+    } catch (err) {
+        console.log(`ERROR in expose for device ${deviceID} : ${err}`);
     }
 
     // If necessary, add states defined for this device model.