iobroker.zigbee 1.7.5 → 1.8.0

package/lib/states.js

@@ -2,9 +2,9 @@
 
 /*eslint no-unused-vars: ['off']*/
 
-const rgb = require(__dirname + '/rgb.js');
-const utils = require(__dirname + '/utils.js');
-const colors = require(__dirname + '/colors.js');
+const rgb = require('./rgb.js');
+const utils = require('./utils.js');
+const colors = require('./colors.js');
 
 /* states for device:
    id - sysname of state, id
@@ -43,20 +43,20 @@ const nameLookup = {
 
 const unitLookup = {
     'temperature': 'C',
-    'humidity':'%',
-    'altitude':'m',
-    'pressure':'Pa',
-    'quality':'ppm',
-    'particle_size':'psize',
-    'voltage':'V',
-    'current':'A',
-    'energy':'Wh',
-    'power':'W',
-    'frequency':'Hz',
-    'power_factor':'pf',
-    'illuminance_lux':'lx',
-
+    'humidity': '%',
+    'altitude': 'm',
+    'pressure': 'Pa',
+    'quality': 'ppm',
+    'particle_size': 'psize',
+    'voltage': 'V',
+    'current': 'A',
+    'energy': 'Wh',
+    'power': 'W',
+    'frequency': 'Hz',
+    'power_factor': 'pf',
+    'illuminance_lux': 'lx',
 };
+
 const timers = {};
 
 const states = {
@@ -140,7 +140,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'single') ? true : undefined,
+        getter: payload => payload.click === 'single' ? true : undefined,
     },
     double_click: {
         id: 'double_click',
@@ -152,7 +152,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'double') ? true : undefined,
+        getter: payload => payload.click === 'double' ? true : undefined,
     },
     action: {
         id: 'action',
@@ -173,7 +173,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single') ? true : undefined,
+        getter: payload => payload.action === 'single' ? true : undefined,
     },
     action_click: {
         id: 'click',
@@ -185,7 +185,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'click') ? true : undefined,
+        getter: payload => payload.action === 'click' ? true : undefined,
     },
     action_double_click: {
         id: 'double_click',
@@ -197,7 +197,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'double') ? true : undefined,
+        getter: payload => payload.action === 'double' ? true : undefined,
     },
     action_group: {
         id: 'action_group',
@@ -218,7 +218,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'triple') ? true : undefined,
+        getter: payload => payload.click === 'triple' ? true : undefined,
     },
     quad_click: {
         id: 'quad_click',
@@ -230,7 +230,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'quadruple') ? true : undefined,
+        getter: payload => payload.click === 'quadruple' ? true : undefined,
     },
     many_click: {
         id: 'many_click',
@@ -242,7 +242,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'many') ? true : undefined,
+        getter: payload => payload.click === 'many' ? true : undefined,
     },
     long_click: {
         id: 'long_click',
@@ -254,7 +254,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'long') ? true : undefined,
+        getter: payload => payload.click === 'long' ? true : undefined,
     },
     action_long_click: {
         id: 'long_click',
@@ -266,7 +266,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'long') ? true : undefined,
+        getter: payload => payload.action === 'long' ? true : undefined,
     },
     long_press: {
         id: 'long_press',
@@ -277,7 +277,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.click === 'long') ? true : (payload.click === 'long_release') ? false : undefined,
+        getter: payload => payload.click === 'long' ? true : payload.click === 'long_release' ? false : undefined,
     },
     voltage: {
         id: 'voltage',
@@ -324,7 +324,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'left') ? true : undefined,
+        getter: payload => payload.click === 'left' ? true : undefined,
     },
     right_click: {
         id: 'right_click',
@@ -336,7 +336,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'right') ? true : undefined,
+        getter: payload => payload.click === 'right' ? true : undefined,
     },
     both_click: {
         id: 'both_click',
@@ -348,7 +348,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'both') ? true : undefined,
+        getter: payload => payload.click === 'both' ? true : undefined,
     },
     left_click_single: {
         id: 'left_click',
@@ -360,7 +360,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'left_single') ? true : undefined,
+        getter: payload => payload.click === 'left_single' ? true : undefined,
     },
     right_click_single: {
         id: 'right_click',
@@ -372,7 +372,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'right_single') ? true : undefined,
+        getter: payload => payload.click === 'right_single' ? true : undefined,
     },
     both_click_single: {
         id: 'both_click',
@@ -384,7 +384,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'both_single') ? true : undefined,
+        getter: payload => payload.click === 'both_single' ? true : undefined,
     },
     left_click_long: {
         id: 'left_click_long',
@@ -396,7 +396,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'left_long') ? true : undefined,
+        getter: payload => payload.click === 'left_long' ? true : undefined,
     },
     left_click_double: {
         id: 'left_click_double',
@@ -408,7 +408,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'left_double') ? true : undefined,
+        getter: payload => payload.click === 'left_double' ? true : undefined,
     },
     right_click_long: {
         id: 'right_click_long',
@@ -420,7 +420,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'right_long') ? true : undefined,
+        getter: payload => payload.click === 'right_long' ? true : undefined,
     },
     right_click_double: {
         id: 'right_click_double',
@@ -432,7 +432,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'right_double') ? true : undefined,
+        getter: payload => payload.click === 'right_double' ? true : undefined,
     },
     both_click_long: {
         id: 'both_click_long',
@@ -444,7 +444,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'both_long') ? true : undefined,
+        getter: payload => payload.click === 'both_long' ? true : undefined,
     },
     both_click_double: {
         id: 'both_click_double',
@@ -456,7 +456,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'both_double') ? true : undefined,
+        getter: payload => payload.click === 'both_double' ? true : undefined,
     },
     state: {
         id: 'state',
@@ -466,10 +466,10 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setterOpt: (value, options) => {
-            const stateValue = (value ? 'ON' : 'OFF');
+            const stateValue = value ? 'ON' : 'OFF';
             return {...options, state: stateValue};
         },
         inOptions: true,
@@ -482,8 +482,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         epname: 'default',
     },
     left_state: {
@@ -495,8 +495,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_left === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_left === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'left',
     },
@@ -509,8 +509,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_right === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_right === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'right',
     },
@@ -523,8 +523,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_center === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_center === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'center',
     },
@@ -537,7 +537,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.button_left === 'hold')
+        getter: payload => payload.button_left === 'hold',
     },
     right_button: {
         id: 'right_button',
@@ -548,7 +548,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.button_right === 'hold'),
+        getter: payload => payload.button_right === 'hold',
     },
     temperature: {
         id: 'temperature',
@@ -784,7 +784,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'armmode_disarm') ? false : true,
+        getter: payload => payload.action !== 'armmode_disarm',
     },
     heiman_smart_controller_arm_mode: {
         id: 'arm_mode',
@@ -795,7 +795,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'armmode_arm_all_zones') ? 'full' : 'partial',
+        getter: payload => payload.action === 'armmode_arm_all_zones' ? 'full' : 'partial',
     },
     heiman_smart_controller_emergency: {
         id: 'emergency',
@@ -806,7 +806,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'emergency') ? true : false,
+        getter: payload => payload.action === 'emergency',
     },
     heiman_execute_warning: { // for HEIMAN HS2WD-E
         id: 'execute_warning',
@@ -817,9 +817,7 @@ const states = {
         write: true,
         read: true,
         type: 'number',
-        setter: (value) => {
-            return {strobe: true, duration: value};
-        },
+        setter: value => ({strobe: true, duration: value}),
     },
     heiman_execute_warning_strobe_only: { // for HEIMAN HS2WD-E
         id: 'execute_warning_strobe_only',
@@ -830,9 +828,7 @@ const states = {
         write: true,
         read: true,
         type: 'number',
-        setter: (value) => {
-            return {mode: 'stop', strobe: true, duration: value};
-        },
+        setter: value => ({mode: 'stop', strobe: true, duration: value}),
     },
     bitron_execute_warning: { // for Biton AV2010/24A
         id: 'execute_warning',
@@ -843,9 +839,7 @@ const states = {
         write: true,
         read: true,
         type: 'number',
-        setter: (value) => {
-            return {strobe: false, duration: value};
-        },
+        setter: value => ({strobe: false, duration: value}),
     },
     shake: {
         id: 'shake',
@@ -857,7 +851,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'shake') ? true : undefined,
+        getter: payload => payload.action === 'shake' ? true : undefined,
     },
     wakeup: {
         id: 'wakeup',
@@ -869,7 +863,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'wakeup') ? true : undefined,
+        getter: payload => payload.action === 'wakeup' ? true : undefined,
     },
     fall: {
         id: 'fall',
@@ -881,7 +875,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'fall') ? true : undefined,
+        getter: payload => payload.action === 'fall' ? true : undefined,
     },
     tap: {
         id: 'tap',
@@ -893,7 +887,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'tap') ? true : undefined,
+        getter: payload => payload.action === 'tap' ? true : undefined,
     },
     tap_side: {
         id: 'tap_side',
@@ -904,7 +898,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.action === 'tap') ? payload.side : undefined,
+        getter: payload => payload.action === 'tap' ? payload.side : undefined,
     },
     slide: {
         id: 'slide',
@@ -916,7 +910,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'slide') ? true : undefined,
+        getter: payload => payload.action === 'slide' ? true : undefined,
     },
     slide_side: {
         id: 'slide_side',
@@ -927,7 +921,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.action === 'slide') ? payload.side : undefined,
+        getter: payload => payload.action === 'slide' ? payload.side : undefined,
     },
     flip180: {
         id: 'flip180',
@@ -939,7 +933,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'flip180') ? true : undefined,
+        getter: payload => payload.action === 'flip180' ? true : undefined,
     },
     flip180_side: {
         id: 'flip180_side',
@@ -950,7 +944,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.action === 'flip180') ? payload.side : undefined,
+        getter: payload => payload.action === 'flip180' ? payload.side : undefined,
     },
     flip90: {
         id: 'flip90',
@@ -962,7 +956,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'flip90') ? true : undefined,
+        getter: payload => payload.action === 'flip90' ? true : undefined,
     },
     flip90_from: {
         id: 'flip90_from',
@@ -973,7 +967,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.action === 'flip90') ? payload.from_side : undefined,
+        getter: payload => payload.action === 'flip90' ? payload.from_side : undefined,
     },
     flip90_to: {
         id: 'flip90_to',
@@ -984,7 +978,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.action === 'flip90') ? payload.to_side : undefined,
+        getter: payload => payload.action === 'flip90' ? payload.to_side : undefined,
     },
     rotate_left: {
         id: 'rotate_left',
@@ -996,7 +990,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'rotate_left') ? true : undefined,
+        getter: payload => payload.action === 'rotate_left' ? true : undefined,
     },
     rotate_right: {
         id: 'rotate_right',
@@ -1008,7 +1002,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'rotate_right') ? true : undefined,
+        getter: payload => payload.action === 'rotate_right' ? true : undefined,
     },
     rotate_stop: {
         id: 'rotate_stop',
@@ -1020,7 +1014,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'rotate_stop') ? true : undefined,
+        getter: payload => payload.action === 'rotate_stop' ? true : undefined,
     },
     rotate_angle: {
         id: 'rotate_angle',
@@ -1042,7 +1036,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'play_pause') ? true : undefined,
+        getter: payload => payload.action === 'play_pause' ? true : undefined,
     },
     load_power: {
         id: 'load_power',
@@ -1151,9 +1145,7 @@ const states = {
         unit: '',
         min: 0,
         max: 100,
-        getter: payload => {
-            return utils.bulbLevelToAdapterLevel(payload.brightness);
-        },
+        getter: payload => utils.bulbLevelToAdapterLevel(payload.brightness),
     },
     brightness: {
         id: 'brightness',
@@ -1166,12 +1158,8 @@ const states = {
         unit: '',
         min: 0,
         max: 100,
-        getter: payload => {
-            return utils.bulbLevelToAdapterLevel(payload.brightness);
-        },
-        setter: (value, options) => {
-            return utils.adapterLevelToBulbLevel(value);
-        },
+        getter: payload => utils.bulbLevelToAdapterLevel(payload.brightness),
+        setter: (value, options) => utils.adapterLevelToBulbLevel(value),
         setterOpt: (value, options) => {
             const hasTransitionTime = options && options.hasOwnProperty('transition_time');
             const transitionTime = hasTransitionTime ? options.transition_time : 0;
@@ -1179,7 +1167,7 @@ const states = {
             preparedOptions.brightness = utils.adapterLevelToBulbLevel(value);
             return preparedOptions;
         },
-        readResponse: (resp) => {
+        readResponse: resp => {
             const respObj = resp[0];
             if (respObj.status === 0 && respObj.attrData != undefined) {
                 return utils.bulbLevelToAdapterLevel(respObj.attrData);
@@ -1195,7 +1183,7 @@ const states = {
         write: true,
         read: true,
         type: 'number',
-        setter: (value) => {
+        setter: value => {
             return utils.toMired(value);
         },
         setterOpt: (value, options) => {
@@ -1214,7 +1202,7 @@ const states = {
         write: true,
         read: true,
         type: 'string',
-        setter: (value) => {
+        setter: value => {
 
             // convert RGB to XY for set
             //            const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(value);
@@ -1243,7 +1231,7 @@ const states = {
         getter: payload => {
             if (payload.color && payload.color.hasOwnProperty('x') && payload.color.hasOwnProperty('y')) {
                 const colorval = rgb.cie_to_rgb(payload.color.x, payload.color.y);
-                return '#' + utils.decimalToHex(colorval[0]) + utils.decimalToHex(colorval[1]) + utils.decimalToHex(colorval[2]);
+                return `#${utils.decimalToHex(colorval[0])}${utils.decimalToHex(colorval[1])}${utils.decimalToHex(colorval[2])}`;
             } else {
                 return undefined;
             }
@@ -1269,7 +1257,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => {
+        setter: value => {
             return {button: 'single', state: value ? 'decoupled' : 'control_relay'};
         },
     },
@@ -1282,7 +1270,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => {
+        setter: value => {
             return {button: 'left', state: value ? 'decoupled' : 'control_left_relay'};
         },
     },
@@ -1295,7 +1283,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => {
+        setter: value => {
             return {button: 'right', state: value ? 'decoupled' : 'control_right_relay'};
         },
     },
@@ -1345,7 +1333,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'circle_click') ? 'press' : (payload.action === 'circle_hold') ? 'hold' : undefined,
+        getter: payload => payload.action === 'circle_click' ? 'press' : payload.action === 'circle_hold' ? 'hold' : undefined,
     },
     switch_state: {
         id: 'state',
@@ -1356,7 +1344,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'up') ? 'up' : (payload.action === 'down') ? 'down' : (payload.action === 'circle_click') ? 'circle' : undefined,
+        getter: payload => payload.action === 'up' ? 'up' : payload.action === 'down' ? 'down' : payload.action === 'circle_click' ? 'circle' : undefined,
     },
     switch_hold: {
         id: 'hold',
@@ -1367,7 +1355,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'up_hold') ? 'up' : (payload.action === 'down_hold') ? 'down' : (payload.action === 'circle_hold') ? 'circle':  undefined,
+        getter: payload => payload.action === 'up_hold' ? 'up' : payload.action === 'down_hold' ? 'down' : payload.action === 'circle_hold' ? 'circle':  undefined,
     },
     switch_release: {
         id: 'release',
@@ -1378,7 +1366,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'up_release') ? 'up' : (payload.action === 'down_release') ? 'down' : (payload.action === 'circle_release') ? 'circle':  undefined,
+        getter: payload => payload.action === 'up_release' ? 'up' : payload.action === 'down_release' ? 'down' : payload.action === 'circle_release' ? 'circle':  undefined,
     },
     // new RWL states
     rwl_state: {
@@ -1390,7 +1378,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on-press') ? true : (payload.action === 'off-press') ? false : undefined,
+        getter: payload => payload.action === 'on-press' ? true : payload.action === 'off-press' ? false : undefined,
     },
     rwl_up_button: {
         id: 'up_button',
@@ -1402,7 +1390,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'up-press') ? true : undefined
+        getter: payload => payload.action === 'up-press' ? true : undefined
     },
     rwl_up_hold: {
         id: 'up_hold',
@@ -1414,7 +1402,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'up-hold') ? true : undefined
+        getter: payload => payload.action === 'up-hold' ? true : undefined
     },
     rwl_down_button: {
         id: 'down_button',
@@ -1426,7 +1414,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'down-press') ? true : undefined
+        getter: payload => payload.action === 'down-press' ? true : undefined
     },
     rwl_down_hold: {
         id: 'down_hold',
@@ -1438,7 +1426,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'down-hold') ? true : undefined
+        getter: payload => payload.action === 'down-hold' ? true : undefined
     },
     rwl_counter: {
         id: 'click_count',
@@ -1485,8 +1473,8 @@ const states = {
         min:  0,
         max:  2,
         epname: 'ep2',
-        getter: (payload) => (['low','medium','high'].indexOf(payload)),
-        setter: (value) => (['low','medium','high'][value]),
+        getter: payload => ['low','medium','high'].indexOf(payload),
+        setter: value => ['low','medium','high'][value],
     },
     */
     sml_sensitivity: {
@@ -1541,8 +1529,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_left === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_left === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'left',
     },
@@ -1555,8 +1543,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_right === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_right === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'right',
     },
@@ -1569,8 +1557,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_center === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_center === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'center',
     },
@@ -1583,8 +1571,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_bottom_left === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_bottom_left === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'bottom_left',
     },
@@ -1597,8 +1585,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_bottom_right === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_bottom_right === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'bottom_right',
     },
@@ -1611,8 +1599,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_top_left === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_top_left === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'top_left',
     },
@@ -1625,8 +1613,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_top_right === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_top_right === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'top_right',
     },
@@ -1640,7 +1628,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'vibration') ? true : undefined,
+        getter: payload => payload.action === 'vibration' ? true : undefined,
     },
     tilt_action: {
         id: 'tilt',
@@ -1652,7 +1640,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'tilt') ? true : undefined,
+        getter: payload => payload.action === 'tilt' ? true : undefined,
     },
     drop_action: {
         id: 'drop',
@@ -1664,7 +1652,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'drop') ? true : undefined,
+        getter: payload => payload.action === 'drop' ? true : undefined,
     },
     tilt_angle: {
         id: 'tilt_angle',
@@ -1736,7 +1724,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'toggle') ? true : undefined,
+        getter: payload => payload.action === 'toggle' ? true : undefined,
     },
     E1524_hold: {
         id: 'hold',
@@ -1748,7 +1736,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'toggle_hold') ? true : undefined,
+        getter: payload => payload.action === 'toggle_hold' ? true : undefined,
     },
     E1524_left_click: {
         id: 'left_click',
@@ -1760,7 +1748,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'arrow_left_click') ? true : undefined,
+        getter: payload => payload.action === 'arrow_left_click' ? true : undefined,
     },
     E1524_right_click: {
         id: 'right_click',
@@ -1772,7 +1760,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'arrow_right_click') ? true : undefined,
+        getter: payload => payload.action === 'arrow_right_click' ? true : undefined,
     },
     E1524_left_button: {
         id: 'left_button',
@@ -1783,7 +1771,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'arrow_left_hold') ? true : (payload.action === 'arrow_left_release') ? false : undefined,
+        getter: payload => payload.action === 'arrow_left_hold' ? true : payload.action === 'arrow_left_release' ? false : undefined,
     },
     E1524_right_button: {
         id: 'right_button',
@@ -1794,7 +1782,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'arrow_right_hold') ? true : (payload.action === 'arrow_right_release') ? false : undefined,
+        getter: payload => payload.action === 'arrow_right_hold' ? true : payload.action === 'arrow_right_release' ? false : undefined,
     },
 
     E1524_up_click: {
@@ -1807,7 +1795,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_up_click') ? true : undefined,
+        getter: payload => payload.action === 'brightness_up_click' ? true : undefined,
     },
     E1524_down_click: {
         id: 'down_click',
@@ -1819,7 +1807,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_down_click') ? true : undefined,
+        getter: payload => payload.action === 'brightness_down_click' ? true : undefined,
     },
     E1524_up_button: {
         id: 'up_button',
@@ -1830,7 +1818,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'brightness_up_hold') ? true : (payload.action === 'brightness_up_release') ? false : undefined,
+        getter: payload => payload.action === 'brightness_up_hold' ? true : payload.action === 'brightness_up_release' ? false : undefined,
     },
     E1743_onoff: {
         id: 'state',
@@ -1841,7 +1829,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.click === 'on') ? true : ((payload.click === 'off') ? false : undefined),
+        getter: payload => payload.click === 'on' ? true : (payload.click === 'off' ? false : undefined),
     },
     E1743_up_button: {
         id: 'up_button',
@@ -1852,7 +1840,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.click === 'brightness_up') ? true : ((payload.click === 'brightness_stop') ? false : undefined),
+        getter: payload => payload.click === 'brightness_up' ? true : (payload.click === 'brightness_stop' ? false : undefined),
     },
     E1743_down_button: {
         id: 'down_button',
@@ -1863,7 +1851,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.click === 'brightness_down') ? true : ((payload.click === 'brightness_stop') ? false : undefined),
+        getter: payload => payload.click === 'brightness_down' ? true : (payload.click === 'brightness_stop' ? false : undefined),
     },
     E1524_down_button: {
         id: 'down_button',
@@ -1874,7 +1862,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'brightness_down_hold') ? true : (payload.action === 'brightness_down_release') ? false : undefined,
+        getter: payload => payload.action === 'brightness_down_hold' ? true : payload.action === 'brightness_down_release' ? false : undefined,
     },
     tint404011_onoff: {
         id: 'state',
@@ -1885,7 +1873,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on') ? true : ((payload.action === 'off') ? false : undefined),
+        getter: payload => payload.action === 'on' ? true : (payload.action === 'off' ? false : undefined),
     },
     tint404011_brightness_up_click: {
         id: 'brightness_up_click',
@@ -1897,7 +1885,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_up_click') ? true : undefined,
+        getter: payload => payload.action === 'brightness_up_click' ? true : undefined,
     },
     tint404011_brightness_up_hold: {
         id: 'brightness_up_hold',
@@ -1909,7 +1897,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => (payload.action === 'brightness_up_hold') ? true : ( payload.action === 'brightness_up_release' ) ? false : undefined,
+        getter: payload => payload.action === 'brightness_up_hold' ? true :  payload.action === 'brightness_up_release'  ? false : undefined,
     },
     tint404011_brightness_down_click: {
         id: 'brightness_down_click',
@@ -1921,7 +1909,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_down_click') ? true : undefined,
+        getter: payload => payload.action === 'brightness_down_click' ? true : undefined,
     },
     tint404011_brightness_down_hold: {
         id: 'brightness_down_hold',
@@ -1933,7 +1921,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => (payload.action === 'brightness_down_hold') ? true : ( payload.action === 'brightness_down_release' ) ? false : undefined,
+        getter: payload => payload.action === 'brightness_down_hold' ? true :  payload.action === 'brightness_down_release'  ? false : undefined,
     },
     tint404011_colortemp_read: {
         id: 'colortemp',
@@ -1944,7 +1932,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.action === 'color_temp') ? payload.action_color_temperature : undefined,
+        getter: payload => payload.action === 'color_temp' ? payload.action_color_temperature : undefined,
     },
     tint404011_color_read: {
         id: 'color',
@@ -1955,7 +1943,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: (payload) => {
+        getter: payload => {
             if( payload.action === 'color_wheel') {
                 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]);
@@ -1975,7 +1963,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'scene_3') ? true : undefined,
+        getter: payload => payload.action === 'scene_3' ? true : undefined,
     },
     tint404011_scene_sunset:  {
         // starting with warm-white light at 50% brightness then dims after 15 minutes.
@@ -1989,7 +1977,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'scene_1') ? true : undefined,
+        getter: payload => payload.action === 'scene_1' ? true : undefined,
     },
     tint404011_scene_party: {
         // colourful continuous change of light color
@@ -2002,7 +1990,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'scene_2') ? true : undefined,
+        getter: payload => payload.action === 'scene_2' ? true : undefined,
     },
     tint404011_scene_nightlight: {
         // warm-white light dimmed to 5%
@@ -2015,7 +2003,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'scene_6') ? true : undefined,
+        getter: payload => payload.action === 'scene_6' ? true : undefined,
     },
     tint404011_scene_bonfire: {
         // simulates a bonfire with flickering colours between orange, red and white
@@ -2028,7 +2016,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'scene_4') ? true : undefined,
+        getter: payload => payload.action === 'scene_4' ? true : undefined,
     },
     tint404011_scene_romance: {
         // constantly transitioning colours between red, violet and pink
@@ -2041,7 +2029,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'scene_5') ? true : undefined,
+        getter: payload => payload.action === 'scene_5' ? true : undefined,
     },
     button_action_on: {
         // generic on button with 'action=on' as payload
@@ -2054,7 +2042,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'on') ? true : undefined,
+        getter: payload => payload.action === 'on' ? true : undefined,
     },
     button_action_off: {
         // generic on button with 'action=on' as payload
@@ -2067,7 +2055,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'off') ? true : undefined,
+        getter: payload => payload.action === 'off' ? true : undefined,
     },
     button_action_skip_forward: {
         // generic on button with 'action=on' as payload
@@ -2080,7 +2068,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'skip_forward') ? true : undefined,
+        getter: payload => payload.action === 'skip_forward' ? true : undefined,
     },
     button_action_skip_back: {
         // generic on button with 'action=on' as payload
@@ -2093,7 +2081,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'skip_backward') ? true : undefined,
+        getter: payload => payload.action === 'skip_backward' ? true : undefined,
     },
     button_action_press: {
         id: 'button_press',
@@ -2105,7 +2093,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => (payload.action === 'press') ? true : undefined,
+        getter: payload => payload.action === 'press' ? true : undefined,
     },
     button_action_hold: {
         id: 'button_hold',
@@ -2117,7 +2105,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => (payload.action === 'hold') ? true : undefined,
+        getter: payload => payload.action === 'hold' ? true : undefined,
     },
     button_action_release: {
         id: 'button_release',
@@ -2129,7 +2117,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => (payload.action === 'release') ? true : undefined,
+        getter: payload => payload.action === 'release' ? true : undefined,
     },
 
     // hvac Thermostat cluster - generic states
@@ -2195,8 +2183,8 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.occupancy % 1 === 1),
-        setter: (value) => (value) ? 1 : 0,
+        getter: payload => payload.occupancy % 1 === 1,
+        setter: value => value ? 1 : 0,
         setattr: 'state',
         epname: 'left',
     },
@@ -2381,8 +2369,8 @@ const states = {
         min: 0,
         max: 100,
         unit: '%',
-        setter: value => { return Math.round(value * 2.55); },
-        getter: payload => { return Math.round(payload.eurotronic_valve_position / 2.55); },
+        setter: value => Math.round(value * 2.55),
+        getter: payload => Math.round(payload.eurotronic_valve_position / 2.55),
     },
     SPBZ0001_current_heating_setpoint: { //0x4003
         id: 'heating_setpnt_current',
@@ -2401,13 +2389,17 @@ const states = {
         // 1 = manual valve control
         // 2 = auto (default)
         id: 'spz_trv_mode',
-        name: 'TRV Mode (1 = manual | 2 = auto)',
+        name: 'TRV Mode',
         prop: 'eurotronic_trv_mode',
         icon: undefined,
-        role: 'level',
+        role: 'state',
         write: true,
         read: true,
         type: 'number',
+        states: {
+            1: 'manual',
+            2: 'automatic'
+        }
     },
     SPBZ0001_system_mode: { //0x4008
         // for compatibility only, bits accessible as own states via eurotronic_host_flags
@@ -2484,12 +2476,8 @@ const states = {
         read: true,
         type: 'boolean',
         inOptions: true,
-        setter: (value, options) => {
-            return {child_protection: value};
-        },
-        setterOpt: (value, options) => {
-            return {state: {eurotronic_host_flags: {...options, child_protection: !value}}};
-        },
+        setter: (value, options) => ({child_protection: value}),
+        setterOpt: (value, options) => ({state: {eurotronic_host_flags: {...options, child_protection: !value}}}),
         getter: payload => payload.eurotronic_host_flags.child_protection,
     },
 
@@ -2503,12 +2491,8 @@ const states = {
         read: true,
         type: 'boolean',
         inOptions: true,
-        setter: (value, options) => {
-            return {mirror_display: value};
-        },
-        setterOpt: (value, options) => {
-            return {state: {eurotronic_host_flags: {...options, mirror_display: !value}}};
-        },
+        setter: (value, options) => ({mirror_display: value}),
+        setterOpt: (value, options) => ({state: {eurotronic_host_flags: {...options, mirror_display: !value}}}),
         getter: payload => payload.eurotronic_host_flags.mirror_display,
     },
     danfoss_window_open: {
@@ -2582,7 +2566,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.mounted_mode ? 'not Mounted' : 'Mounted'),
+        getter: payload => payload.mounted_mode ? 'not Mounted' : 'Mounted',
     },
     danfoss_algorithm_scale: {
         id: 'algorithm_scale_factor',
@@ -2709,7 +2693,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.inserted === 'unknown') ? -1 : (payload.inserted === undefined ? null : parseInt(payload.inserted, 10)),
+        getter: payload => payload.inserted === 'unknown' ? -1 : (payload.inserted === undefined ? null : parseInt(payload.inserted, 10)),
     },
     forgotten: {
         id: 'forgotten',
@@ -2720,7 +2704,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.forgotten === undefined ? null : parseInt(payload.forgotten)),
+        getter: payload => payload.forgotten === undefined ? null : parseInt(payload.forgotten),
     },
     key_error: {
         id: 'key_error',
@@ -2742,8 +2726,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l1 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l1 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l1',
     },
@@ -2756,8 +2740,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l2 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l2 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l2',
     },
@@ -2770,8 +2754,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l1 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l1 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l1',
     },
@@ -2784,8 +2768,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l2 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l2 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l2',
     },
@@ -2798,8 +2782,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l3 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l3 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l3',
     },
@@ -2812,7 +2796,7 @@ const states = {
         write: true,
         read: true,
         type: 'string',
-        getter: payload => (payload.state === 'LOCK') ? 'locked' : (payload.state === 'UNLOCK') ? 'unlocked' : undefined,
+        getter: payload => payload.state === 'LOCK' ? 'locked' : payload.state === 'UNLOCK' ? 'unlocked' : undefined,
     },
     DIYRUZ_buzzer: {
         id: 'buzzer',
@@ -2823,8 +2807,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => (payload.state_center === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_center === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'center',
     },
@@ -2923,7 +2907,7 @@ const states = {
         min: 0,
         max: 100,
         unit: '%',
-        getter: payload => (payload.position !== null) && !isNaN(payload.position) ? payload.position : undefined,
+        getter: payload => payload.position !== null && !isNaN(payload.position) ? payload.position : undefined,
     },
     curtain_stop: {
         id: 'stop',
@@ -2935,7 +2919,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        setter: value => { return {state: 'stop'}; },
+        setter: value => ({state: 'stop'}),
     },
     curtain_reverse_direction: {
         id: 'reverse_direction',
@@ -2947,9 +2931,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        setterOpt: (value, options) => {
-            return {...options, reverse_direction: value};
-        },
+        setterOpt: (value, options) => ({...options, reverse_direction: value}),
     },
     curtain_xiaomi_reverse_direction: {
         id: 'reverse_direction',
@@ -2961,13 +2943,9 @@ const states = {
         read: true,
         type: 'boolean',
         inOptions: true,
-        getter: payload => (payload.options !== null) && payload.options.hasOwnProperty('reverse_direction') && !isNaN(payload.options.reverse_direction) ? payload.options.reverse_direction : undefined,
-        setterOpt: (value, options) => {
-            return {...options, reverse_direction: value};
-        },
-        setter: (value, options) => {
-            return {...options, reverse_direction: value};
-        },
+        getter: payload => payload.options !== null && payload.options.hasOwnProperty('reverse_direction') && !isNaN(payload.options.reverse_direction) ? payload.options.reverse_direction : undefined,
+        setterOpt: (value, options) => ({...options, reverse_direction: value}),
+        setter: (value, options) => ({...options, reverse_direction: value}),
     },
     curtain_xiaomi_hand_open: {
         id: 'hand_open',
@@ -2979,13 +2957,9 @@ const states = {
         read: true,
         type: 'boolean',
         inOptions: true,
-        getter: payload => (payload.options !== null) && payload.options.hasOwnProperty('hand_open') && !isNaN(payload.options.hand_open) ? payload.options.hand_open : undefined,
-        setterOpt: (value, options) => {
-            return {...options, hand_open: value};
-        },
-        setter: (value, options) => {
-            return {...options, hand_open: value};
-        },
+        getter: payload => payload.options !== null && payload.options.hasOwnProperty('hand_open') && !isNaN(payload.options.hand_open) ? payload.options.hand_open : undefined,
+        setterOpt: (value, options) => ({...options, hand_open: value}),
+        setter: (value, options) => ({...options, hand_open: value}),
     },
     curtain_xiaomi_reset_limits: {
         id: 'reset_limits',
@@ -2995,11 +2969,9 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (undefined),
+        getter: payload => undefined,
         inOptions: true,
-        setter: (value, options) => {
-            return {...options, reset_limits: value};
-        },
+        setter: (value, options) => ({...options, reset_limits: value}),
     },
     blind_position: {
         id: 'position',
@@ -3013,7 +2985,7 @@ const states = {
         min: 0,
         max: 100,
         unit: '%',
-        getter: payload => (payload.position !== null) && !isNaN(payload.position) ? payload.position : undefined,
+        getter: payload => payload.position !== null && !isNaN(payload.position) ? payload.position : undefined,
     },
     blind_stop: {
         id: 'stop',
@@ -3025,7 +2997,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        setter: value => { return 'STOP'; },
+        setter: value => 'STOP',
     },
     blind_open: {
         id: 'open',
@@ -3037,7 +3009,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        setter: value => { return 'OPEN'; },
+        setter: value => 'OPEN',
     },
     blind_close: {
         id: 'close',
@@ -3049,7 +3021,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        setter: value => { return 'CLOSE'; },
+        setter: value => 'CLOSE',
     },
     hold: {
         id: 'hold',
@@ -3060,7 +3032,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'hold') ? true : (payload.action === 'release') ? false : undefined,
+        getter: payload => payload.action === 'hold' ? true : payload.action === 'release' ? false : undefined,
     },
     keypad_btn1: {
         id: 'btn_1',
@@ -3082,7 +3054,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'stop') ? true : false,
+        getter: payload => payload.action === 'stop',
     },
     ZYCT202_on: {
         id: 'off',
@@ -3094,7 +3066,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'on') ? true : false,
+        getter: payload => payload.action === 'on',
     },
     ZYCT202_off: {
         id: 'off',
@@ -3106,7 +3078,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'off') ? true : false,
+        getter: payload => payload.action === 'off',
     },
     ZYCT202_up: {
         id: 'up',
@@ -3118,7 +3090,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'up-press') ? true : false,
+        getter: payload => payload.action === 'up-press',
     },
     ZYCT202_down: {
         id: 'down',
@@ -3130,7 +3102,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'down-press') ? true : false,
+        getter: payload => payload.action === 'down-press',
     },
     keypad_btn2: {
         id: 'btn_2',
@@ -3331,7 +3303,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.occupancy === true) ? payload.side : undefined,
+        getter: payload => payload.occupancy === true ? payload.side : undefined,
     },
     btn1_pressed: {
         id: 'btn_1_pressed',
@@ -3342,7 +3314,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_1 === 'hold') ? true : (payload.btn_1 === 'release') ? false : undefined,
+        getter: payload => payload.btn_1 === 'hold' ? true : payload.btn_1 === 'release' ? false : undefined,
     },
     btn1_click: {
         id: 'btn_1',
@@ -3352,7 +3324,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_1 === 'click') ? true : undefined,
+        getter: payload => payload.btn_1 === 'click' ? true : undefined,
         isEvent: true,
     },
     btn2_pressed: {
@@ -3364,7 +3336,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_2 === 'hold') ? true : (payload.btn_2 === 'release') ? false : undefined,
+        getter: payload => payload.btn_2 === 'hold' ? true : payload.btn_2 === 'release' ? false : undefined,
     },
     btn2_click: {
         id: 'btn_2',
@@ -3374,7 +3346,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_2 === 'click') ? true : undefined,
+        getter: payload => payload.btn_2 === 'click' ? true : undefined,
         isEvent: true,
     },
     btn3_pressed: {
@@ -3386,7 +3358,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_3 === 'hold') ? true : (payload.btn_3 === 'release') ? false : undefined,
+        getter: payload => payload.btn_3 === 'hold' ? true : payload.btn_3 === 'release' ? false : undefined,
     },
     btn3_click: {
         id: 'btn_3',
@@ -3396,7 +3368,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_3 === 'click') ? true : undefined,
+        getter: payload => payload.btn_3 === 'click' ? true : undefined,
         isEvent: true,
     },
     btn4_pressed: {
@@ -3408,7 +3380,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_4 === 'hold') ? true : (payload.btn_4 === 'release') ? false : undefined,
+        getter: payload => payload.btn_4 === 'hold' ? true : payload.btn_4 === 'release' ? false : undefined,
     },
     btn4_click: {
         id: 'btn_4',
@@ -3418,7 +3390,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.btn_4 === 'click') ? true : undefined,
+        getter: payload => payload.btn_4 === 'click' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_1: {
@@ -3430,7 +3402,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_1_single') ? true : undefined,
+        getter: payload => payload.action === 'button_1_single' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_1_double: {
@@ -3442,7 +3414,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_1_double') ? true : undefined,
+        getter: payload => payload.action === 'button_1_double' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_1_triple: {
@@ -3454,7 +3426,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_1_triple') ? true : undefined,
+        getter: payload => payload.action === 'button_1_triple' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_1_hold: {
@@ -3466,7 +3438,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_1_hold') ? true : (payload.action === 'button_1_release') ? false : undefined,
+        getter: payload => payload.action === 'button_1_hold' ? true : payload.action === 'button_1_release' ? false : undefined,
     },
     aqara_opple_2: {
         id: 'button_2_click',
@@ -3477,7 +3449,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_2_single') ? true : undefined,
+        getter: payload => payload.action === 'button_2_single' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_2_double: {
@@ -3489,7 +3461,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_2_double') ? true : undefined,
+        getter: payload => payload.action === 'button_2_double' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_2_triple: {
@@ -3501,7 +3473,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_2_triple') ? true : undefined,
+        getter: payload => payload.action === 'button_2_triple' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_2_hold: {
@@ -3513,7 +3485,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_2_hold') ? true : (payload.action === 'button_2_release') ? false : undefined,
+        getter: payload => payload.action === 'button_2_hold' ? true : payload.action === 'button_2_release' ? false : undefined,
     },
     aqara_opple_3: {
         id: 'button_3_click',
@@ -3524,7 +3496,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_3_single') ? true : undefined,
+        getter: payload => payload.action === 'button_3_single' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_3_double: {
@@ -3536,7 +3508,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_3_double') ? true : undefined,
+        getter: payload => payload.action === 'button_3_double' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_3_triple: {
@@ -3548,7 +3520,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_3_triple') ? true : undefined,
+        getter: payload => payload.action === 'button_3_triple' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_3_hold: {
@@ -3560,7 +3532,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_3_hold') ? true : (payload.action === 'button_3_release') ? false : undefined,
+        getter: payload => payload.action === 'button_3_hold' ? true : payload.action === 'button_3_release' ? false : undefined,
     },
     aqara_opple_4: {
         id: 'button_4_click',
@@ -3571,7 +3543,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_4_single') ? true : undefined,
+        getter: payload => payload.action === 'button_4_single' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_4_double: {
@@ -3583,7 +3555,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_4_double') ? true : undefined,
+        getter: payload => payload.action === 'button_4_double' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_4_triple: {
@@ -3595,7 +3567,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_4_triple') ? true : undefined,
+        getter: payload => payload.action === 'button_4_triple' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_4_hold: {
@@ -3607,7 +3579,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_4_hold') ? true : (payload.action === 'button_4_release') ? false : undefined,
+        getter: payload => payload.action === 'button_4_hold' ? true : payload.action === 'button_4_release' ? false : undefined,
     },
     aqara_opple_5: {
         id: 'button_5_click',
@@ -3618,7 +3590,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_5_single') ? true : undefined,
+        getter: payload => payload.action === 'button_5_single' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_5_double: {
@@ -3630,7 +3602,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_5_double') ? true : undefined,
+        getter: payload => payload.action === 'button_5_double' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_5_triple: {
@@ -3642,7 +3614,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_5_triple') ? true : undefined,
+        getter: payload => payload.action === 'button_5_triple' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_5_hold: {
@@ -3654,7 +3626,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_5_hold') ? true : (payload.action === 'button_5_release') ? false : undefined,
+        getter: payload => payload.action === 'button_5_hold' ? true : payload.action === 'button_5_release' ? false : undefined,
     },
     aqara_opple_6: {
         id: 'button_6_click',
@@ -3665,7 +3637,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_6_single') ? true : undefined,
+        getter: payload => payload.action === 'button_6_single' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_6_double: {
@@ -3677,7 +3649,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_6_double') ? true : undefined,
+        getter: payload => payload.action === 'button_6_double' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_6_triple: {
@@ -3689,7 +3661,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_6_triple') ? true : undefined,
+        getter: payload => payload.action === 'button_6_triple' ? true : undefined,
         isEvent: true,
     },
     aqara_opple_6_hold: {
@@ -3701,7 +3673,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'button_6_hold') ? true : (payload.action === 'button_6_release') ? false : undefined,
+        getter: payload => payload.action === 'button_6_hold' ? true : payload.action === 'button_6_release' ? false : undefined,
     },
     aqara_opple_mode: {
         id: 'mode',
@@ -3712,7 +3684,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => (value) ? 'command' : 'event',
+        setter: value => value ? 'command' : 'event',
     },
     genOnOff: {
         id: 'genOnOff',
@@ -3724,7 +3696,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: false,
-        getter: payload => (payload.click === 'on' ? true : payload.click === 'off' ? false : undefined),
+        getter: payload => payload.click === 'on' ? true : payload.click === 'off' ? false : undefined,
     },
     sensitivity: {
         id: 'sensitivity',
@@ -3747,7 +3719,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'release') ? true : undefined,
+        getter: payload => payload.click === 'release' ? true : undefined,
     },
     cover_open: {
         id: 'cover_open',
@@ -3759,7 +3731,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'open') ? true : undefined,
+        getter: payload => payload.click === 'open' ? true : undefined,
     },
     cover_release: {
         id: 'cover_release',
@@ -3771,7 +3743,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'release') ? true : undefined,
+        getter: payload => payload.click === 'release' ? true : undefined,
     },
     cover_close: {
         id: 'cover_close',
@@ -3783,7 +3755,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.click === 'close') ? true : undefined,
+        getter: payload => payload.click === 'close' ? true : undefined,
     },
     disarm: {
         id: 'disarm',
@@ -3795,7 +3767,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'disarm') ? true : undefined,
+        getter: payload => payload.action === 'disarm' ? true : undefined,
     },
     arm_stay: {
         id: 'arm_stay',
@@ -3807,7 +3779,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'arm_day_zones') ? true : undefined,
+        getter: payload => payload.action === 'arm_day_zones' ? true : undefined,
     },
     arm_away: {
         id: 'arm_away',
@@ -3819,7 +3791,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'arm_all_zones') ? true : undefined,
+        getter: payload => payload.action === 'arm_all_zones' ? true : undefined,
     },
     emergency: {
         id: 'emergency',
@@ -3831,7 +3803,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'emergency') ? true : undefined,
+        getter: payload => payload.action === 'emergency' ? true : undefined,
     },
     white_brightness: {
         id: 'white_brightness',
@@ -3869,8 +3841,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         epname: 'white',
     },
     white_colortemp: {
@@ -3925,8 +3897,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         epname: 'cct',
     },
     white8_colortemp: {
@@ -3953,11 +3925,9 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
-        setterOpt: (value, options) => {
-            return {...options, state: {white_value: -1}};
-        },
+        getter: payload => payload.state === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
+        setterOpt: (value, options) => ({...options, state: {white_value: -1}}),
         inOptions: true,
         epname: 'rgb',
     },
@@ -4012,13 +3982,13 @@ const states = {
         write: true,
         read: true,
         type: 'string',
-        setter: (value) => {
+        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]
+                y: xy[1],
             };
         },
         setterOpt: (value, options) => {
@@ -4037,8 +4007,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.system_mode === 'heat'),
-        setter: (value) => (value) ? 'heat' : 'off',
+        getter: payload => payload.system_mode === 'heat',
+        setter: value => value ? 'heat' : 'off',
     },
     moes_trv_system_mode: {
         id: 'system_mode',
@@ -4061,7 +4031,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.heat === 'ON'),
+        getter: payload => payload.heat === 'ON',
     },
     moes_trv_sensor: {
         id: 'sensor',
@@ -4073,7 +4043,7 @@ const states = {
         read: true,
         type: 'string', // valid: IN, AL, OU
         states: 'IN:IN;AL:AL;OU:OU',
-        setter: (value) => (value) === 'IN' ? 0 : (value) === 'AL' ? 1 : (value) === 'OU' ? 2 : 0,
+        setter: value => value === 'IN' ? 0 : (value === 'AL' ? 1 : (value === 'OU' ? 2 : 0)),
     },
     tuya_trv_target_temperature: {
         id: 'target_temperature',
@@ -4097,8 +4067,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.child_lock === 'LOCKED'),
-        setter: (value) => (value) ? 'LOCK': 'UNLOCK',
+        getter: payload => payload.child_lock === 'LOCKED',
+        setter: value => value ? 'LOCK': 'UNLOCK',
     },
     tuya_trv_window_detected: {
         id: 'window_detected',
@@ -4109,7 +4079,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.window_detection === 'ON'),
+        getter: payload => payload.window_detection === 'ON',
     },
     tuya_trv_valve_detected: {
         id: 'valve_detected',
@@ -4120,7 +4090,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.valve_detection === 'ON'),
+        getter: payload => payload.valve_detection === 'ON',
     },
     tuya_trv_auto_lock: {
         id: 'auto_lock',
@@ -4131,7 +4101,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.auto_lock === 'AUTO'),
+        getter: payload => payload.auto_lock === 'AUTO',
     },
     tuya_trv_min_temp: {
         id: 'min_temperature',
@@ -4229,8 +4199,8 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'ON') ? true : false,
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.action === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     climate_system_mode: {
         id: 'mode',
@@ -4288,7 +4258,7 @@ const states = {
         write: false,
         read: true,
         type: 'number',
-        getter: payload => (payload.click === 'off') ? 0 : (payload.click === 'on') ? 1 : parseInt(payload.click) + 1,
+        getter: payload => payload.click === 'off' ? 0 : (payload.click === 'on' ? 1 : (parseInt(payload.click) + 1)),
     },
     icasa_click: {
         id: 'click',
@@ -4299,7 +4269,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.click === 'off') ? false : (payload.click === 'on') ? true : undefined,
+        getter: payload => payload.click === 'off' ? false : (payload.click === 'on' ? true : undefined),
     },
     icasa_action: {
         id: 'rotation',
@@ -4310,7 +4280,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action === 'rotate_left') ? 'left' : (payload.action === 'rotate_right') ? 'right' : (payload.action === 'rotate_stop') ? 'stop' : undefined,
+        getter: payload => payload.action === 'rotate_left' ? 'left' : (payload.action === 'rotate_right' ? 'right' : (payload.action === 'rotate_stop' ? 'stop' : undefined)),
     },
     icasa_brightness: {
         id: 'brightness',
@@ -4332,8 +4302,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_top === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_top === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'top',
     },
@@ -4346,8 +4316,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_bottom === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_bottom === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'bottom',
     },
@@ -4380,7 +4350,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '2_single') ? true : undefined,
+        getter: payload => payload.action === '2_single' ? true : undefined,
         isEvent: true,
     },
     ts0042_left_click: {
@@ -4392,7 +4362,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '1_single') ? true : undefined,
+        getter: payload => payload.action === '1_single' ? true : undefined,
         isEvent: true,
     },
     ts0042_right_double: {
@@ -4404,7 +4374,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '2_double') ? true : undefined,
+        getter: payload => payload.action === '2_double' ? true : undefined,
         isEvent: true,
     },
     ts0042_left_double: {
@@ -4416,7 +4386,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '1_double') ? true : undefined,
+        getter: payload => payload.action === '1_double' ? true : undefined,
         isEvent: true,
     },
     ts0042_right_hold: {
@@ -4428,7 +4398,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '2_hold') ? true : undefined,
+        getter: payload => payload.action === '2_hold' ? true : undefined,
         isEvent: true,
     },
     ts0042_left_hold: {
@@ -4440,7 +4410,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '1_hold') ? true : undefined,
+        getter: payload => payload.action === '1_hold' ? true : undefined,
         isEvent: true,
     },
     ts0043_right_click: {
@@ -4452,7 +4422,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '3_single') ? true : undefined,
+        getter: payload => payload.action === '3_single' ? true : undefined,
         isEvent: true,
     },
     ts0043_middle_click: {
@@ -4464,7 +4434,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '2_single') ? true : undefined,
+        getter: payload => payload.action === '2_single' ? true : undefined,
         isEvent: true,
     },
     ts0043_left_click: {
@@ -4476,7 +4446,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '1_single') ? true : undefined,
+        getter: payload => payload.action === '1_single' ? true : undefined,
         isEvent: true,
     },
     ts0043_right_double: {
@@ -4488,7 +4458,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '3_double') ? true : undefined,
+        getter: payload => payload.action === '3_double' ? true : undefined,
         isEvent: true,
     },
     ts0043_middle_double: {
@@ -4500,7 +4470,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '2_double') ? true : undefined,
+        getter: payload => payload.action === '2_double' ? true : undefined,
         isEvent: true,
     },
     ts0043_left_double: {
@@ -4512,7 +4482,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '1_double') ? true : undefined,
+        getter: payload => payload.action === '1_double' ? true : undefined,
         isEvent: true,
     },
     ts0043_right_hold: {
@@ -4524,7 +4494,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '3_hold') ? true : undefined,
+        getter: payload => payload.action === '3_hold' ? true : undefined,
         isEvent: true,
     },
     ts0043_middle_hold: {
@@ -4536,7 +4506,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '2_hold') ? true : undefined,
+        getter: payload => payload.action === '2_hold' ? true : undefined,
         isEvent: true,
     },
     ts0043_left_hold: {
@@ -4548,7 +4518,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === '1_hold') ? true : undefined,
+        getter: payload => payload.action === '1_hold' ? true : undefined,
         isEvent: true,
     },
     rm01_row_2: {
@@ -4560,8 +4530,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'row_2_on') ? true : (payload.action === 'row_2_off') ? false : undefined,
-        setter: (value) => (value) ? 'row_2_on' : 'row_2_off',
+        getter: payload => payload.action === 'row_2_on' ? true : payload.action === 'row_2_off' ? false : undefined,
+        setter: value => value ? 'row_2_on' : 'row_2_off',
     },
     rm01_row_3: {
         id: 'rm01_row_3',
@@ -4572,8 +4542,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'row_3_on') ? true : (payload.action === 'row_3_off') ? false : undefined,
-        setter: (value) => (value) ? 'row_3_on' : 'row_3_off',
+        getter: payload => payload.action === 'row_3_on' ? true : payload.action === 'row_3_off' ? false : undefined,
+        setter: value => value ? 'row_3_on' : 'row_3_off',
     },
     rm01_row_4: {
         id: 'rm01_row_4',
@@ -4584,8 +4554,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'row_4_on') ? true : (payload.action === 'row_4_off') ? false : undefined,
-        setter: (value) => (value) ? 'row_4_on' : 'row_4_off',
+        getter: payload => payload.action === 'row_4_on' ? true : (payload.action === 'row_4_off' ? false : undefined),
+        setter: value => value ? 'row_4_on' : 'row_4_off',
     },
     left_top_click: {
         id: 'left_top_click',
@@ -4597,7 +4567,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_top_click') ? true : undefined,
+        getter: payload => payload.action === 'left_top_click' ? true : undefined,
     },
     right_top_click: {
         id: 'right_top_click',
@@ -4609,7 +4579,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_top_click') ? true : undefined,
+        getter: payload => payload.action === 'right_top_click' ? true : undefined,
     },
     left_bottom_click: {
         id: 'left_bottom_click',
@@ -4621,7 +4591,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_bottom_click') ? true : undefined,
+        getter: payload => payload.action === 'left_bottom_click' ? true : undefined,
     },
     right_bottom_click: {
         id: 'right_bottom_click',
@@ -4633,7 +4603,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_bottom_click') ? true : undefined,
+        getter: payload => payload.action === 'right_bottom_click' ? true : undefined,
     },
     left_top_hold: {
         id: 'left_top_hold',
@@ -4645,7 +4615,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_top_hold') ? true : undefined,
+        getter: payload => payload.action === 'left_top_hold' ? true : undefined,
     },
     right_top_hold: {
         id: 'right_top_hold',
@@ -4657,7 +4627,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_top_hold') ? true : undefined,
+        getter: payload => payload.action === 'right_top_hold' ? true : undefined,
     },
     left_bottom_hold: {
         id: 'left_bottom_hold',
@@ -4669,7 +4639,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_bottom_hold') ? true : undefined,
+        getter: payload => payload.action === 'left_bottom_hold' ? true : undefined,
     },
     right_bottom_hold: {
         id: 'right_bottom_hold',
@@ -4681,7 +4651,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_bottom_hold') ? true : undefined,
+        getter: payload => payload.action === 'right_bottom_hold' ? true : undefined,
     },
     left_top_release: {
         id: 'left_top_release',
@@ -4693,7 +4663,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_top_release') ? true : undefined,
+        getter: payload => payload.action === 'left_top_release' ? true : undefined,
     },
     right_top_release: {
         id: 'right_top_release',
@@ -4705,7 +4675,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_top_release') ? true : undefined,
+        getter: payload => payload.action === 'right_top_release' ? true : undefined,
     },
     left_bottom_release: {
         id: 'left_bottom_release',
@@ -4717,7 +4687,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_bottom_release') ? true : undefined,
+        getter: payload => payload.action === 'left_bottom_release' ? true : undefined,
     },
     right_bottom_release: {
         id: 'right_bottom_release',
@@ -4729,7 +4699,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_bottom_release') ? true : undefined,
+        getter: payload => payload.action === 'right_bottom_release' ? true : undefined,
     },
     lumi_left_click: {
         id: 'left_click',
@@ -4741,7 +4711,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left') ? true : undefined,
+        getter: payload => payload.action === 'left' ? true : undefined,
     },
     lumi_right_click: {
         id: 'right_click',
@@ -4753,7 +4723,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right') ? true : undefined,
+        getter: payload => payload.action === 'right' ? true : undefined,
     },
     lumi_both_click: {
         id: 'both_click',
@@ -4765,7 +4735,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'both') ? true : undefined,
+        getter: payload => payload.action === 'both' ? true : undefined,
     },
     lumi_left_click_long: {
         id: 'left_click_long',
@@ -4777,7 +4747,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_long') ? true : undefined,
+        getter: payload => payload.action === 'left_long' ? true : undefined,
     },
     lumi_right_click_long: {
         id: 'right_click_long',
@@ -4789,7 +4759,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_long') ? true : undefined,
+        getter: payload => payload.action === 'right_long' ? true : undefined,
     },
     lumi_left_click_double: {
         id: 'left_click_double',
@@ -4801,7 +4771,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'left_double') ? true : undefined,
+        getter: payload => payload.action === 'left_double' ? true : undefined,
     },
     lumi_right_click_double: {
         id: 'right_click_double',
@@ -4813,7 +4783,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'right_double') ? true : undefined,
+        getter: payload => payload.action === 'right_double' ? true : undefined,
     },
     lumi_both_click_long: {
         id: 'both_click_long',
@@ -4825,7 +4795,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'both_long') ? true : undefined,
+        getter: payload => payload.action === 'both_long' ? true : undefined,
     },
     lumi_both_click_double: {
         id: 'both_click_double',
@@ -4837,7 +4807,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'both_double') ? true : undefined,
+        getter: payload => payload.action === 'both_double' ? true : undefined,
     },
     plug_summdelivered: {
         id: 'energy',
@@ -4959,8 +4929,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l1 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l1 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l1',
     },
@@ -4973,8 +4943,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l2 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l2 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l2',
     },
@@ -4987,8 +4957,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l3 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l3 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l3',
     },
@@ -5001,8 +4971,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l4 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l4 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l4',
     },
@@ -5015,8 +4985,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l5 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l5 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l5',
     },
@@ -5029,8 +4999,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l6 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l6 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l6',
     },
@@ -5043,8 +5013,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l7 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l7 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l7',
     },
@@ -5057,8 +5027,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.state_l8 === 'ON'),
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload.state_l8 === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
         setattr: 'state',
         epname: 'l8',
     },
@@ -5072,7 +5042,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_1') ? true : undefined,
+        getter: payload => payload.action === 'single_1' ? true : undefined,
     },
     btn2_single: {
         id: 'btn2_single',
@@ -5084,7 +5054,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_2') ? true : undefined,
+        getter: payload => payload.action === 'single_2' ? true : undefined,
     },
     btn3_single: {
         id: 'btn3_single',
@@ -5096,7 +5066,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_3') ? true : undefined,
+        getter: payload => payload.action === 'single_3' ? true : undefined,
     },
     btn4_single: {
         id: 'btn4_single',
@@ -5108,7 +5078,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_4') ? true : undefined,
+        getter: payload => payload.action === 'single_4' ? true : undefined,
     },
     btn5_single: {
         id: 'btn5_single',
@@ -5120,7 +5090,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_5') ? true : undefined,
+        getter: payload => payload.action === 'single_5' ? true : undefined,
     },
     btn6_single: {
         id: 'btn6_single',
@@ -5132,7 +5102,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_6') ? true : undefined,
+        getter: payload => payload.action === 'single_6' ? true : undefined,
     },
     btn7_single: {
         id: 'btn7_single',
@@ -5144,7 +5114,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_7') ? true : undefined,
+        getter: payload => payload.action === 'single_7' ? true : undefined,
     },
     btn8_single: {
         id: 'btn8_single',
@@ -5156,7 +5126,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'single_8') ? true : undefined,
+        getter: payload => payload.action === 'single_8' ? true : undefined,
     },
     radioactive_events_per_minute: {
         id: 'radioactive_events_per_minute',
@@ -5187,7 +5157,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on') ? true : ((payload.action === 'off') ? false : undefined),
+        getter: payload => payload.action === 'on' ? true : (payload.action === 'off' ? false : undefined),
     },
     geiger_sensitivity: {
         id: 'sensitivity',
@@ -5207,7 +5177,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        setter: value => value ? 'ON' : 'OFF',
     },
     geiger_buzzer_feedback: {
         id: 'buzzer_feedback',
@@ -5217,7 +5187,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        setter: value => value ? 'ON' : 'OFF',
     },
     geiger_sensors_count: {
         id: 'sensors_count',
@@ -5238,7 +5208,7 @@ const states = {
         read: true,
         type: 'string',
         states: '0:СБМ-20/СТС-5/BOI-33;1:СБМ-19/СТС-6;3:Other',
-        setter: (value) => parseInt(value),
+        setter: value => parseInt(value),
     },
     geiger_alert_threshold: {
         id: 'alert_threshold',
@@ -5259,7 +5229,7 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: payload => (payload.action.startsWith('scene_')) ? payload.action.split('_')[1] : undefined,
+        getter: payload => payload.action.startsWith('scene_') ? payload.action.split('_')[1] : undefined,
     },
     brightness_step: {
         id: 'brightness_step',
@@ -5331,7 +5301,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_step_up') ? true : undefined,
+        getter: payload => payload.action === 'brightness_step_up' ? true : undefined,
     },
     brightness_step_down: {
         id: 'brightness_step_down',
@@ -5343,7 +5313,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_step_down') ? true : undefined,
+        getter: payload => payload.action === 'brightness_step_down' ? true : undefined,
     },
     brightness_step_up_size: {
         id: 'brightness_step_up_size',
@@ -5355,7 +5325,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'brightness_step_up') ? payload.action_step_size : undefined,
+        getter: payload => payload.action === 'brightness_step_up' ? payload.action_step_size : undefined,
     },
     brightness_step_down_size: {
         id: 'brightness_step_down_size',
@@ -5367,7 +5337,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'brightness_step_down') ? payload.action_step_size : undefined,
+        getter: payload => payload.action === 'brightness_step_down' ? payload.action_step_size : undefined,
     },
     brightness_stop: {
         id: 'brightness_stop',
@@ -5379,7 +5349,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_stop') ? true : undefined,
+        getter: payload => payload.action === 'brightness_stop' ? true : undefined,
     },
     color_temperature_move: {
         id: 'color_temperature_move',
@@ -5391,7 +5361,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'color_temperature_move') ? true : undefined,
+        getter: payload => payload.action === 'color_temperature_move' ? true : undefined,
     },
     color_temperature_move_value: {
         id: 'color_temperature_move_value',
@@ -5403,7 +5373,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'color_temperature_move') ? payload.action_color_temperature : undefined,
+        getter: payload => payload.action === 'color_temperature_move' ? payload.action_color_temperature : undefined,
     },
     color_move: {
         id: 'color_move',
@@ -5415,7 +5385,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'color_move') ? true : undefined,
+        getter: payload => payload.action === 'color_move' ? true : undefined,
     },
     color_move_value: {
         id: 'color_move_value',
@@ -5426,10 +5396,10 @@ const states = {
         write: false,
         read: true,
         type: 'string',
-        getter: (payload) => {
+        getter: payload => {
             if( payload.action === 'color_move') {
                 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]);
+                return `#${utils.decimalToHex(colorval[0])}${utils.decimalToHex(colorval[1])}${utils.decimalToHex(colorval[2])}`;
             } else {
                 return undefined;
             }
@@ -5445,7 +5415,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_move_up') ? true : undefined,
+        getter: payload => payload.action === 'brightness_move_up' ? true : undefined,
     },
     brightness_move_up_size: {
         id: 'brightness_move_up_size',
@@ -5457,7 +5427,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'brightness_move_up') ? payload.action_rate : undefined,
+        getter: payload => payload.action === 'brightness_move_up' ? payload.action_rate : undefined,
     },
     brightness_move_down: {
         id: 'brightness_move_down',
@@ -5469,7 +5439,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'brightness_move_down') ? true : undefined,
+        getter: payload => payload.action === 'brightness_move_down' ? true : undefined,
     },
     brightness_move_down_size: {
         id: 'brightness_move_down_size',
@@ -5481,7 +5451,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'brightness_move_down') ? payload.action_rate : undefined,
+        getter: payload => payload.action === 'brightness_move_down' ? payload.action_rate : undefined,
     },
     enhanced_move_to_hue_and_saturation: {
         id: 'enhanced_move',
@@ -5493,7 +5463,7 @@ const states = {
         read: true,
         type: 'boolean',
         isEvent: true,
-        getter: payload => (payload.action === 'enhanced_move_to_hue_and_saturation') ? true : undefined,
+        getter: payload => payload.action === 'enhanced_move_to_hue_and_saturation' ? true : undefined,
     },
     enhanced_move_enhanced_hue: {
         id: 'enhanced_move_enhanced_hue',
@@ -5505,7 +5475,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'enhanced_move_to_hue_and_saturation') ? payload.action_enhanced_hue : undefined,
+        getter: payload => payload.action === 'enhanced_move_to_hue_and_saturation' ? payload.action_enhanced_hue : undefined,
     },
     enhanced_move_hue: {
         id: 'enhanced_move_hue',
@@ -5517,7 +5487,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'enhanced_move_to_hue_and_saturation') ? payload.action_hue : undefined,
+        getter: payload => payload.action === 'enhanced_move_to_hue_and_saturation' ? payload.action_hue : undefined,
     },
     enhanced_move_saturation: {
         id: 'enhanced_move_saturation',
@@ -5529,7 +5499,7 @@ const states = {
         read: true,
         type: 'number',
         unit: '',
-        getter: payload => (payload.action === 'enhanced_move_to_hue_and_saturation') ? payload.action_saturation : undefined,
+        getter: payload => payload.action === 'enhanced_move_to_hue_and_saturation' ? payload.action_saturation : undefined,
     },
     density: {
         id: 'density',
@@ -5638,7 +5608,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on_1') ? false : ( payload.action === 'off_1' ) ? true : undefined,
+        getter: payload => payload.action === 'on_1' ? false : (payload.action === 'off_1'  ? true : undefined),
         isEvent: true,
     },
     rob_2_click: {
@@ -5650,7 +5620,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on_2') ? false : ( payload.action === 'off_2' ) ? true : undefined,
+        getter: payload => payload.action === 'on_2' ? false : (payload.action === 'off_2'  ? true : undefined),
         isEvent: true,
     },
     rob_3_click: {
@@ -5662,7 +5632,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on_3') ? false : ( payload.action === 'off_3' ) ? true : undefined,
+        getter: payload => payload.action === 'on_3' ? false : (payload.action === 'off_3'  ? true : undefined),
         isEvent: true,
     },
     rob_4_click: {
@@ -5674,7 +5644,7 @@ const states = {
         write: false,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.action === 'on_4') ? false : ( payload.action === 'off_4' ) ? true : undefined,
+        getter: payload => payload.action === 'on_4' ? false : (payload.action === 'off_4'  ? true : undefined),
         isEvent: true,
     },
 
@@ -5698,8 +5668,8 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: payload => (payload.child_lock === 'LOCKED'),
-        setter: (value) => (value) ? 'LOCKED' : 'UNLOCKED',
+        getter: payload => payload.child_lock === 'LOCKED',
+        setter: value => value ? 'LOCKED' : 'UNLOCKED',
     },
     volume_percent: {
         id: 'volume',
@@ -5763,7 +5733,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        setter: value => value ? 'ON' : 'OFF',
     },
     airsense_enable_abc: {
         id: 'enable_abc',
@@ -5773,7 +5743,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        setter: value => value ? 'ON' : 'OFF',
     },
     airsense_threshold1: {
         id: 'threshold1',
@@ -5809,25 +5779,26 @@ const states = {
         states: 'steady:steady;snow:snow;rainbow:rainbow;snake:snake;twinkle:twinkle;firework:firework;horizontal_flag:horizontal_flag;waves:waves;updown:updown;vintage:vintage;fading:fading;collide:collide;strobe:strobe;sparkles:sparkles;carnaval:carnaval;glow:glow',
         setter: (value, options) => {
             const effectjson = {
-                colors:[{r: 255,g: 0,b: 0},{r: 0,g: 255,b: 0},{r: 0,g: 0,b: 255}],
-                speed:10,
-                effect:'glow',
+                colors: [{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
+                speed: 10,
+                effect: 'glow',
             };
-            if (options && options.hasOwnProperty('effect_speed'))
+            if (options && options.hasOwnProperty('effect_speed')) {
                 effectjson.speed = options.effect_speed;
-            if (options && options.hasOwnProperty('effect_colors'))
-            {
+            }
+            if (options && options.hasOwnProperty('effect_colors')) {
                 effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
             }
             effectjson.effect = value;
             return effectjson;
         },
-        getter: (payload) => {
-            if (payload && payload.effect && payload.effect.hasOwnProperty('effect')) return payload.effect.effect;
-            return "steady";
+        getter: payload => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('effect')) {
+                return payload.effect.effect;
+            }
+            return 'steady';
         }
-
-     },
+    },
     effect_json: {
         id: 'effect_json',
         name: 'Effect',
@@ -5840,19 +5811,21 @@ const states = {
         setter: (value, options) => {
             try {
                 return JSON.parse(value);
-            }
-            catch {
+            } catch {
                 const effectjson = {
-                    colors:[{r: 255,g: 0,b: 0},{r: 0,g: 255,b: 0},{r: 0,g: 0,b: 255}],
-                    speed:10,
-                    effect:'glow',
+                    colors: [{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
+                    speed: 10,
+                    effect: 'glow',
                 };
-                if (options && options.hasOwnProperty('effect_speed'))
+                if (options && options.hasOwnProperty('effect_speed')) {
                     effectjson.speed = options.effect_speed;
-                if (options && options.hasOwnProperty('effect_colors'))
+                }
+                if (options && options.hasOwnProperty('effect_colors')) {
                     effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
-                if (options && options.hasOwnProperty('effect_type'))
+                }
+                if (options && options.hasOwnProperty('effect_type')) {
                     effectjson.effect = options.effect_type;
+                }
                 value = JSON.stringify(effectjson);
                 return effectjson;
             }
@@ -5873,19 +5846,23 @@ const states = {
         unit: '',
         setter: (value, options) => {
             const effectjson = {
-                colors:[{r: 255,g: 0,b: 0},{r: 0,g: 255,b: 0},{r: 0,g: 0,b: 255}],
-                speed:10,
-                effect:'snake',
+                colors:[{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
+                speed: 10,
+                effect: 'snake',
             };
-            if (options && options.hasOwnProperty('effect_type'))
+            if (options && options.hasOwnProperty('effect_type')) {
                 effectjson.effect = options.effect_type;
-            if (options && options.hasOwnProperty('effect_colors'))
+            }
+            if (options && options.hasOwnProperty('effect_colors')) {
                 effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
+            }
             effectjson.speed = value;
             return effectjson;
         },
-        getter: (payload) => {
-            if (payload && payload.effect && payload.effect.hasOwnProperty('speed')) return payload.effect.speed;
+        getter: payload => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('speed')) {
+                return payload.effect.speed;
+            }
             return 1;
         }
     },
@@ -5902,20 +5879,24 @@ const states = {
         type: 'string',
         setter: (value, options) => {
             const effectjson = {
-                colors:[{r: 255,g: 0,b: 0},{r: 0,g: 255,b: 0},{r: 0,g: 0,b: 255}],
-                speed:10,
-                effect:'sparkle',
+                colors: [{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
+                speed: 10,
+                effect: 'sparkle',
             };
 
-            if (options && options.hasOwnProperty('effect_speed'))
+            if (options && options.hasOwnProperty('effect_speed')) {
                 effectjson.speed = options.effect_speed;
-            if (options && options.hasOwnProperty('effect_type'))
+            }
+            if (options && options.hasOwnProperty('effect_type')) {
                 effectjson.effect = options.effect_type;
+            }
             effectjson.colors = rgb.colorArrayFromString(value);
             return effectjson;
         },
-        getter: (payload) => {
-            if (payload && payload.effect && payload.effect.hasOwnProperty('colors')) return rgb.colorStringFromRGBArray(payload.effect.colors);
+        getter: payload => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('colors')) {
+                return rgb.colorStringFromRGBArray(payload.effect.colors);
+            }
             return '#ffff00,#ff00ff,#00ffff,#0000ff,#00ff00,#ff0000';
         }
     },
@@ -5945,19 +5926,20 @@ const states = {
             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),
+                hue: Math.min(Math.max(hsv.h, 1), 359),
                 saturation: hsv.s,
                 brightness: Math.floor(hsv.v * 2.55),
-
             };
         },
-        getter: (payload) => {
+        getter: payload => {
             if (payload.color) {
                 const c = payload.color;
-                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("b"))
-                  return rgb.hsvToRGBString(c.h, c.s, c.b * 100 / 255);
-                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("v"))
-                  return rgb.hsvToRGBString(c.h, c.s, c.v * 100);
+                if (c.hasOwnProperty('h') && c.hasOwnProperty('s') && c.hasOwnProperty('b')) {
+                    return rgb.hsvToRGBString(c.h, c.s, c.b * 100 / 255);
+                }
+                if (c.hasOwnProperty('h') && c.hasOwnProperty('s') && c.hasOwnProperty('v')) {
+                    return rgb.hsvToRGBString(c.h, c.s, c.v * 100);
+                }
             }
         },
         setterOpt: (value, options) => {
@@ -5998,9 +5980,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l1) == 'string' ? payload.device_l1.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l1) == 'string' ? payload.device_l1.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6014,12 +5996,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l1;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6035,9 +6018,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l2) == 'string' ? payload.device_l2.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l2) == 'string' ? payload.device_l2.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6051,12 +6034,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l2;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6072,9 +6056,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l3) == 'string' ? payload.device_l3.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l3) == 'string' ? payload.device_l3.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6088,12 +6072,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l3;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}`: `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6109,9 +6094,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l4) == 'string' ? payload.device_l4.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l4) == 'string' ? payload.device_l4.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6125,12 +6110,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l4;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6146,9 +6132,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l5) == 'string' ? payload.device_l5.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l5) == 'string' ? payload.device_l5.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6162,12 +6148,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l5;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6183,9 +6170,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l6) == 'string' ? payload.device_l6.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l6) == 'string' ? payload.device_l6.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6199,12 +6186,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l6;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6220,9 +6208,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l7) == 'string' ? payload.device_l7.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l7) == 'string' ? payload.device_l7.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6236,12 +6224,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l7;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6257,9 +6246,9 @@ const states = {
         type: 'number',
         write: false,
         read: true,
-        getter: (payload) => {
+        getter: payload => {
             const rv = {};
-            const id = (typeof(payload.device_l8) == 'string' ? payload.device_l8.replace(/[-. ]/g, ''):'unset');
+            const id = typeof(payload.device_l8) == 'string' ? payload.device_l8.replace(/[-. ]/g, '') : 'unset';
             let unit = undefined;
             let measurement = undefined;
             for (const item in payload) {
@@ -6273,12 +6262,13 @@ const states = {
                     }
                 }
             }
-            if (measurement)
-                rv.stateid = id + '_'+measurement;
-            else
+            if (measurement) {
+                rv.stateid = `${id}_${measurement}`;
+            } else {
                 rv.stateid = id;
+            }
             rv.value = payload.l8;
-            rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
+            rv.name = measurement ? `${measurement} 0x${id}` : `0x${id}`;
             rv.unit = unit;
             rv.role = measurement;
 
@@ -6295,8 +6285,8 @@ const states = {
         read: true,
         type: 'boolean',
         setattr: 'l1',
-        getter: (payload) => payload === 'ON',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     ptvo_switch_2: {
         id: 'channel_2.switch',
@@ -6308,8 +6298,8 @@ const states = {
         read: true,
         type: 'boolean',
         setattr: 'l2',
-        getter: (payload) => payload === 'ON',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     ptvo_switch_3: {
         id: 'channel_3.switch',
@@ -6321,8 +6311,8 @@ const states = {
         read: true,
         type: 'boolean',
         setattr: 'l3',
-        getter: (payload) => payload === 'ON',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     ptvo_switch_4: {
         id: 'channel_4.switch',
@@ -6333,7 +6323,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => payload === 'ON',
+        getter: payload => payload === 'ON',
         setattr: 'l4',
     },
     ptvo_switch_5: {
@@ -6346,8 +6336,8 @@ const states = {
         read: true,
         type: 'boolean',
         setattr: 'l5',
-        getter: (payload) => payload === 'ON',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     ptvo_switch_6: {
         id: 'channel_6.switch',
@@ -6358,7 +6348,7 @@ const states = {
         write: true,
         read: true,
         type: 'boolean',
-        getter: (payload) => payload === 'ON',
+        getter: payload => payload === 'ON',
         setattr: 'l6',
     },
     ptvo_switch_7: {
@@ -6371,8 +6361,8 @@ const states = {
         read: true,
         type: 'boolean',
         setattr: 'l7',
-        getter: (payload) => payload === 'ON',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     ptvo_switch_8: {
         id: 'channel_8.switch',
@@ -6384,8 +6374,8 @@ const states = {
         read: true,
         type: 'boolean',
         setattr: 'l8',
-        getter: (payload) => payload === 'ON',
-        setter: (value) => (value) ? 'ON' : 'OFF',
+        getter: payload => payload === 'ON',
+        setter: value => value ? 'ON' : 'OFF',
     },
     ptvo_trigger: {
         id: 'trigger',
@@ -6410,7 +6400,7 @@ const states = {
 };
 
 module.exports = {
-    states: states,
-    unitLookup: unitLookup,
-    nameLookup: nameLookup,
+    states,
+    unitLookup,
+    nameLookup,
 };