code sync

deconz-community · Dec 11, 2023 · 67d9a21 · 67d9a21
1 parent 69b29d7
commit 67d9a21
Show file tree

Hide file tree

Showing 274 changed files with 496 additions and 52 deletions.
diff --git a/devices/3A-Nue/lxn59-1s7lx1.0.json b/devices/3A-Nue/lxn59-1s7lx1.0.json
@@ -4,7 +4,7 @@
   "modelid": "LXN59-1S7LX1.0",
   "product": "Another Smart socket plug",
   "sleeper": false,
-  "status": "Silver",
+  "status": "Gold",
   "subdevices": [
     {
       "type": "$TYPE_SMART_PLUG",
@@ -67,6 +67,6 @@
     }
   ],
   "uuid": "fff897ed-e8a0-43c1-8a22-753692a666fb",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "version_deconz": ">2.19.3"
 }
diff --git a/devices/blitzwolf/bw_is4_multisensor.json b/devices/blitzwolf/bw_is4_multisensor.json
@@ -144,7 +144,7 @@
             "ep": 1,
             "cl": "0x0000",
             "at": "0x0001",
-            "script": "tuya_swversion.js"
+            "script": "../tuya/tuya_swversion.js"
           },
           "read": {
             "fn": "zcl:attr",

diff --git a/devices/bosch/bwa-1_water_sensor.json b/devices/bosch/bwa-1_water_sensor.json
@@ -8,7 +8,7 @@
   "status": "Gold",
   "subdevices": [
     {
-      "type": "ZHAWater",
+      "type": "$TYPE_WATER_LEAK_SENSOR",
       "restapi": "/sensors",
       "uuid": [
         "$address.ext",

diff --git a/devices/develco/heszb-120_heat_detector.json b/devices/develco/heszb-120_heat_detector.json
@@ -193,7 +193,7 @@
       ]
     },
     {
-      "type": "Warning device",
+      "type": "$TYPE_WARNING_DEVICE",
       "restapi": "/lights",
       "uuid": [
         "$address.ext",

diff --git a/devices/develco/smszb-120_smoke_detector.json b/devices/develco/smszb-120_smoke_detector.json
@@ -198,7 +198,7 @@
       ]
     },
     {
-      "type": "Warning device",
+      "type": "$TYPE_WARNING_DEVICE",
       "restapi": "/lights",
       "uuid": [
         "$address.ext",

diff --git a/devices/fantem/zb003-x_multi_sensor.json b/devices/fantem/zb003-x_multi_sensor.json
@@ -52,7 +52,7 @@
             "ep": 1,
             "cl": "0x0000",
             "at": "0x0001",
-            "script": "tuya_swversion.js"
+            "script": "../tuya/tuya_swversion.js"
           },
           "read": {
             "fn": "zcl:attr",
@@ -220,7 +220,7 @@
             "ep": 1,
             "cl": "0x0000",
             "at": "0x0001",
-            "script": "tuya_swversion.js"
+            "script": "../tuya/tuya_swversion.js"
           },
           "read": {
             "fn": "zcl:attr",
@@ -316,7 +316,7 @@
             "ep": 1,
             "cl": "0x0000",
             "at": "0x0001",
-            "script": "tuya_swversion.js"
+            "script": "../tuya/tuya_swversion.js"
           },
           "read": {
             "fn": "zcl:attr",
@@ -412,7 +412,7 @@
             "ep": 1,
             "cl": "0x0000",
             "at": "0x0001",
-            "script": "tuya_swversion.js"
+            "script": "../tuya/tuya_swversion.js"
           },
           "read": {
             "fn": "zcl:attr",

diff --git a/devices/frient/heszb-120_heat_detector.json b/devices/frient/heszb-120_heat_detector.json
@@ -193,7 +193,7 @@
       ]
     },
     {
-      "type": "Warning device",
+      "type": "$TYPE_WARNING_DEVICE",
       "restapi": "/lights",
       "uuid": [
         "$address.ext",

diff --git a/devices/frient/smszb-120_smoke_detector.json b/devices/frient/smszb-120_smoke_detector.json
@@ -193,7 +193,7 @@
       ]
     },
     {
-      "type": "Warning device",
+      "type": "$TYPE_WARNING_DEVICE",
       "restapi": "/lights",
       "uuid": [
         "$address.ext",

diff --git a/...color_control_cluster/parse_color_mode.js → ...color_control_cluster/parse_color_mode.js b/...color_control_cluster/parse_color_mode.js → ...color_control_cluster/parse_color_mode.js
diff --git a/generic/constants.json → devices/generic/constants.json b/generic/constants.json → devices/generic/constants.json
diff --git a/.../illuminance_cluster/lux_to_lightlevel.js → .../illuminance_cluster/lux_to_lightlevel.js b/.../illuminance_cluster/lux_to_lightlevel.js → .../illuminance_cluster/lux_to_lightlevel.js
diff --git a/...ic/illuminance_cluster/sml_light_level.js → ...ic/illuminance_cluster/sml_light_level.js b/...ic/illuminance_cluster/sml_light_level.js → ...ic/illuminance_cluster/sml_light_level.js
diff --git a/generic/items/attr_id_item.json → devices/generic/items/attr_id_item.json b/generic/items/attr_id_item.json → devices/generic/items/attr_id_item.json
diff --git a/generic/items/attr_lastannounced_item.json → ...eneric/items/attr_lastannounced_item.json b/generic/items/attr_lastannounced_item.json → ...eneric/items/attr_lastannounced_item.json
diff --git a/generic/items/attr_lastseen_item.json → ...ces/generic/items/attr_lastseen_item.json b/generic/items/attr_lastseen_item.json → ...ces/generic/items/attr_lastseen_item.json
diff --git a/...ric/items/attr_manufacturername_item.json → ...ric/items/attr_manufacturername_item.json b/...ric/items/attr_manufacturername_item.json → ...ric/items/attr_manufacturername_item.json
diff --git a/generic/items/attr_mode_item.json → devices/generic/items/attr_mode_item.json b/generic/items/attr_mode_item.json → devices/generic/items/attr_mode_item.json
diff --git a/generic/items/attr_modelid_item.json → devices/generic/items/attr_modelid_item.json b/generic/items/attr_modelid_item.json → devices/generic/items/attr_modelid_item.json
diff --git a/generic/items/attr_name_item.json → devices/generic/items/attr_name_item.json b/generic/items/attr_name_item.json → devices/generic/items/attr_name_item.json
diff --git a/generic/items/attr_poweronct_item.json → ...es/generic/items/attr_poweronct_item.json b/generic/items/attr_poweronct_item.json → ...es/generic/items/attr_poweronct_item.json
diff --git a/generic/items/attr_poweronlevel_item.json → ...generic/items/attr_poweronlevel_item.json b/generic/items/attr_poweronlevel_item.json → ...generic/items/attr_poweronlevel_item.json
diff --git a/generic/items/attr_powerup_item.json → devices/generic/items/attr_powerup_item.json b/generic/items/attr_powerup_item.json → devices/generic/items/attr_powerup_item.json
diff --git a/generic/items/attr_productid_item.json → ...es/generic/items/attr_productid_item.json b/generic/items/attr_productid_item.json → ...es/generic/items/attr_productid_item.json
diff --git a/generic/items/attr_productname_item.json → .../generic/items/attr_productname_item.json b/generic/items/attr_productname_item.json → .../generic/items/attr_productname_item.json
diff --git a/generic/items/attr_swconfigid_item.json → ...s/generic/items/attr_swconfigid_item.json b/generic/items/attr_swconfigid_item.json → ...s/generic/items/attr_swconfigid_item.json
diff --git a/generic/items/attr_swversion_bis_item.json → ...eneric/items/attr_swversion_bis_item.json b/generic/items/attr_swversion_bis_item.json → ...eneric/items/attr_swversion_bis_item.json
diff --git a/generic/items/attr_swversion_item.json → ...es/generic/items/attr_swversion_item.json b/generic/items/attr_swversion_item.json → ...es/generic/items/attr_swversion_item.json
diff --git a/generic/items/attr_type_item.json → devices/generic/items/attr_type_item.json b/generic/items/attr_type_item.json → devices/generic/items/attr_type_item.json
diff --git a/generic/items/attr_uniqueid_item.json → ...ces/generic/items/attr_uniqueid_item.json b/generic/items/attr_uniqueid_item.json → ...ces/generic/items/attr_uniqueid_item.json
diff --git a/.../items/cap_alert_trigger_effect_item.json → .../items/cap_alert_trigger_effect_item.json b/.../items/cap_alert_trigger_effect_item.json → .../items/cap_alert_trigger_effect_item.json
diff --git a/...ric/items/cap_bri_min_dim_level_item.json → ...ric/items/cap_bri_min_dim_level_item.json b/...ric/items/cap_bri_min_dim_level_item.json → ...ric/items/cap_bri_min_dim_level_item.json
diff --git a/...c/items/cap_bri_move_with_onoff_item.json → ...c/items/cap_bri_move_with_onoff_item.json b/...c/items/cap_bri_move_with_onoff_item.json → ...c/items/cap_bri_move_with_onoff_item.json
diff --git a/...ic/items/cap_color_capabilities_item.json → ...ic/items/cap_color_capabilities_item.json b/...ic/items/cap_color_capabilities_item.json → ...ic/items/cap_color_capabilities_item.json
diff --git a/.../items/cap_color_ct_computes_xy_item.json → .../items/cap_color_ct_computes_xy_item.json b/.../items/cap_color_ct_computes_xy_item.json → .../items/cap_color_ct_computes_xy_item.json
diff --git a/generic/items/cap_color_ct_max_item.json → .../generic/items/cap_color_ct_max_item.json b/generic/items/cap_color_ct_max_item.json → .../generic/items/cap_color_ct_max_item.json
diff --git a/generic/items/cap_color_ct_min_item.json → .../generic/items/cap_color_ct_min_item.json b/generic/items/cap_color_ct_min_item.json → .../generic/items/cap_color_ct_min_item.json
diff --git a/generic/items/cap_color_effects_item.json → ...generic/items/cap_color_effects_item.json b/generic/items/cap_color_effects_item.json → ...generic/items/cap_color_effects_item.json
diff --git a/generic/items/cap_color_gamut_type_item.json → ...eric/items/cap_color_gamut_type_item.json b/generic/items/cap_color_gamut_type_item.json → ...eric/items/cap_color_gamut_type_item.json
diff --git a/...cap_color_gradient_max_segments_item.json → ...cap_color_gradient_max_segments_item.json b/...cap_color_gradient_max_segments_item.json → ...cap_color_gradient_max_segments_item.json
diff --git a/.../cap_color_gradient_pixel_count_item.json → .../cap_color_gradient_pixel_count_item.json b/.../cap_color_gradient_pixel_count_item.json → .../cap_color_gradient_pixel_count_item.json
diff --git a/...cap_color_gradient_pixel_length_item.json → ...cap_color_gradient_pixel_length_item.json b/...cap_color_gradient_pixel_length_item.json → ...cap_color_gradient_pixel_length_item.json
diff --git a/...items/cap_color_gradient_styles_item.json → ...items/cap_color_gradient_styles_item.json b/...items/cap_color_gradient_styles_item.json → ...items/cap_color_gradient_styles_item.json
diff --git a/generic/items/cap_color_xy_blue_x_item.json → ...neric/items/cap_color_xy_blue_x_item.json b/generic/items/cap_color_xy_blue_x_item.json → ...neric/items/cap_color_xy_blue_x_item.json
diff --git a/generic/items/cap_color_xy_blue_y_item.json → ...neric/items/cap_color_xy_blue_y_item.json b/generic/items/cap_color_xy_blue_y_item.json → ...neric/items/cap_color_xy_blue_y_item.json
diff --git a/generic/items/cap_color_xy_green_x_item.json → ...eric/items/cap_color_xy_green_x_item.json b/generic/items/cap_color_xy_green_x_item.json → ...eric/items/cap_color_xy_green_x_item.json
diff --git a/generic/items/cap_color_xy_green_y_item.json → ...eric/items/cap_color_xy_green_y_item.json b/generic/items/cap_color_xy_green_y_item.json → ...eric/items/cap_color_xy_green_y_item.json
diff --git a/generic/items/cap_color_xy_red_x_item.json → ...eneric/items/cap_color_xy_red_x_item.json b/generic/items/cap_color_xy_red_x_item.json → ...eneric/items/cap_color_xy_red_x_item.json
diff --git a/generic/items/cap_color_xy_red_y_item.json → ...eneric/items/cap_color_xy_red_y_item.json b/generic/items/cap_color_xy_red_y_item.json → ...eneric/items/cap_color_xy_red_y_item.json
diff --git a/generic/items/cap_group_item.json → devices/generic/items/cap_group_item.json b/generic/items/cap_group_item.json → devices/generic/items/cap_group_item.json
diff --git a/.../items/cap_groups_not_supported_item.json → .../items/cap_groups_not_supported_item.json b/.../items/cap_groups_not_supported_item.json → .../items/cap_groups_not_supported_item.json
diff --git a/...ic/items/cap_measured_value_max_item.json → ...ic/items/cap_measured_value_max_item.json b/...ic/items/cap_measured_value_max_item.json → ...ic/items/cap_measured_value_max_item.json
diff --git a/...ic/items/cap_measured_value_min_item.json → ...ic/items/cap_measured_value_min_item.json b/...ic/items/cap_measured_value_min_item.json → ...ic/items/cap_measured_value_min_item.json
diff --git a/...ems/cap_measured_value_quantity_item.json → ...ems/cap_measured_value_quantity_item.json b/...ems/cap_measured_value_quantity_item.json → ...ems/cap_measured_value_quantity_item.json
diff --git a/...ms/cap_measured_value_substance_item.json → ...ms/cap_measured_value_substance_item.json b/...ms/cap_measured_value_substance_item.json → ...ms/cap_measured_value_substance_item.json
diff --git a/...c/items/cap_measured_value_unit_item.json → ...c/items/cap_measured_value_unit_item.json b/...c/items/cap_measured_value_unit_item.json → ...c/items/cap_measured_value_unit_item.json
diff --git a/...ic/items/cap_on_off_with_effect_item.json → ...ic/items/cap_on_off_with_effect_item.json b/...ic/items/cap_on_off_with_effect_item.json → ...ic/items/cap_on_off_with_effect_item.json
diff --git a/generic/items/cap_sleeper_item.json → devices/generic/items/cap_sleeper_item.json b/generic/items/cap_sleeper_item.json → devices/generic/items/cap_sleeper_item.json
diff --git a/generic/items/cap_transition_block_item.json → ...eric/items/cap_transition_block_item.json b/generic/items/cap_transition_block_item.json → ...eric/items/cap_transition_block_item.json
diff --git a/generic/items/config_alert_item.json → devices/generic/items/config_alert_item.json b/generic/items/config_alert_item.json → devices/generic/items/config_alert_item.json
diff --git a/...ric/items/config_allowtouchlink_item.json → ...ric/items/config_allowtouchlink_item.json b/...ric/items/config_allowtouchlink_item.json → ...ric/items/config_allowtouchlink_item.json
diff --git a/generic/items/config_battery_bis_item.json → ...eneric/items/config_battery_bis_item.json b/generic/items/config_battery_bis_item.json → ...eneric/items/config_battery_bis_item.json
diff --git a/generic/items/config_battery_item.json → ...es/generic/items/config_battery_item.json b/generic/items/config_battery_item.json → ...es/generic/items/config_battery_item.json
diff --git a/...items/config_bri_execute_if_off_item.json → ...items/config_bri_execute_if_off_item.json b/...items/config_bri_execute_if_off_item.json → ...items/config_bri_execute_if_off_item.json
diff --git a/generic/items/config_bri_max_item.json → ...es/generic/items/config_bri_max_item.json b/generic/items/config_bri_max_item.json → ...es/generic/items/config_bri_max_item.json
diff --git a/generic/items/config_bri_min_item.json → ...es/generic/items/config_bri_min_item.json b/generic/items/config_bri_min_item.json → ...es/generic/items/config_bri_min_item.json
diff --git a/generic/items/config_bri_on_level_item.json → ...neric/items/config_bri_on_level_item.json b/generic/items/config_bri_on_level_item.json → ...neric/items/config_bri_on_level_item.json
diff --git a/...config_bri_onoff_transitiontime_item.json → ...config_bri_onoff_transitiontime_item.json b/...config_bri_onoff_transitiontime_item.json → ...config_bri_onoff_transitiontime_item.json
diff --git a/generic/items/config_bri_startup_item.json → ...eneric/items/config_bri_startup_item.json b/generic/items/config_bri_startup_item.json → ...eneric/items/config_bri_startup_item.json
diff --git a/generic/items/config_checkin_item.json → ...es/generic/items/config_checkin_item.json b/generic/items/config_checkin_item.json → ...es/generic/items/config_checkin_item.json
diff --git a/generic/items/config_clickmode_item.json → .../generic/items/config_clickmode_item.json b/generic/items/config_clickmode_item.json → .../generic/items/config_clickmode_item.json
diff --git a/...c/items/config_color_ct_startup_item.json → ...c/items/config_color_ct_startup_item.json b/...c/items/config_color_ct_startup_item.json → ...c/items/config_color_ct_startup_item.json
diff --git a/...ems/config_color_execute_if_off_item.json → ...ems/config_color_execute_if_off_item.json b/...ems/config_color_execute_if_off_item.json → ...ems/config_color_execute_if_off_item.json
diff --git a/...nfig_color_gradient_pixel_count_item.json → ...nfig_color_gradient_pixel_count_item.json b/...nfig_color_gradient_pixel_count_item.json → ...nfig_color_gradient_pixel_count_item.json
diff --git a/.../config_color_gradient_reversed_item.json → .../config_color_gradient_reversed_item.json b/.../config_color_gradient_reversed_item.json → .../config_color_gradient_reversed_item.json
diff --git a/...items/config_color_xy_startup_x_item.json → ...items/config_color_xy_startup_x_item.json b/...items/config_color_xy_startup_x_item.json → ...items/config_color_xy_startup_x_item.json
diff --git a/...items/config_color_xy_startup_y_item.json → ...items/config_color_xy_startup_y_item.json b/...items/config_color_xy_startup_y_item.json → ...items/config_color_xy_startup_y_item.json
diff --git a/.../items/config_colorcapabilities_item.json → .../items/config_colorcapabilities_item.json b/.../items/config_colorcapabilities_item.json → .../items/config_colorcapabilities_item.json
diff --git a/generic/items/config_configured_item.json → ...generic/items/config_configured_item.json b/generic/items/config_configured_item.json → ...generic/items/config_configured_item.json
diff --git a/...ic/items/config_controlsequence_item.json → ...ic/items/config_controlsequence_item.json b/...ic/items/config_controlsequence_item.json → ...ic/items/config_controlsequence_item.json
diff --git a/generic/items/config_coolsetpoint_item.json → ...neric/items/config_coolsetpoint_item.json b/generic/items/config_coolsetpoint_item.json → ...neric/items/config_coolsetpoint_item.json
diff --git a/generic/items/config_ctmax_item.json → devices/generic/items/config_ctmax_item.json b/generic/items/config_ctmax_item.json → devices/generic/items/config_ctmax_item.json
diff --git a/generic/items/config_ctmin_item.json → devices/generic/items/config_ctmin_item.json b/generic/items/config_ctmin_item.json → devices/generic/items/config_ctmin_item.json
diff --git a/generic/items/config_delay_item.json → devices/generic/items/config_delay_item.json b/generic/items/config_delay_item.json → devices/generic/items/config_delay_item.json
diff --git a/...ric/items/config_devicemode_bis_item.json → ...ric/items/config_devicemode_bis_item.json b/...ric/items/config_devicemode_bis_item.json → ...ric/items/config_devicemode_bis_item.json
diff --git a/generic/items/config_devicemode_item.json → ...generic/items/config_devicemode_item.json b/generic/items/config_devicemode_item.json → ...generic/items/config_devicemode_item.json
diff --git a/...ric/items/config_displayflipped_item.json → ...ric/items/config_displayflipped_item.json b/...ric/items/config_displayflipped_item.json → ...ric/items/config_displayflipped_item.json
diff --git a/generic/items/config_duration_item.json → ...s/generic/items/config_duration_item.json b/generic/items/config_duration_item.json → ...s/generic/items/config_duration_item.json
diff --git a/generic/items/config_enrolled_item.json → ...s/generic/items/config_enrolled_item.json b/generic/items/config_enrolled_item.json → ...s/generic/items/config_enrolled_item.json
diff --git a/...items/config_externalsensortemp_item.json → ...items/config_externalsensortemp_item.json b/...items/config_externalsensortemp_item.json → ...items/config_externalsensortemp_item.json
diff --git a/...items/config_externalwindowopen_item.json → ...items/config_externalwindowopen_item.json b/...items/config_externalwindowopen_item.json → ...items/config_externalwindowopen_item.json
diff --git a/generic/items/config_fadingtime_item.json → ...generic/items/config_fadingtime_item.json b/generic/items/config_fadingtime_item.json → ...generic/items/config_fadingtime_item.json
diff --git a/generic/items/config_fanmode_item.json → ...es/generic/items/config_fanmode_item.json b/generic/items/config_fanmode_item.json → ...es/generic/items/config_fanmode_item.json
diff --git a/...ric/items/config_filterlifetime_item.json → ...ric/items/config_filterlifetime_item.json b/...ric/items/config_filterlifetime_item.json → ...ric/items/config_filterlifetime_item.json
diff --git a/generic/items/config_group_item.json → devices/generic/items/config_group_item.json b/generic/items/config_group_item.json → devices/generic/items/config_group_item.json
diff --git a/generic/items/config_heatsetpoint_item.json → ...neric/items/config_heatsetpoint_item.json b/generic/items/config_heatsetpoint_item.json → ...neric/items/config_heatsetpoint_item.json
diff --git a/generic/items/config_interfacemode_item.json → ...eric/items/config_interfacemode_item.json b/generic/items/config_interfacemode_item.json → ...eric/items/config_interfacemode_item.json
diff --git a/generic/items/config_ledindication_item.json → ...eric/items/config_ledindication_item.json b/generic/items/config_ledindication_item.json → ...eric/items/config_ledindication_item.json
diff --git a/generic/items/config_lock_item.json → devices/generic/items/config_lock_item.json b/generic/items/config_lock_item.json → devices/generic/items/config_lock_item.json
diff --git a/generic/items/config_locked_item.json → ...ces/generic/items/config_locked_item.json b/generic/items/config_locked_item.json → ...ces/generic/items/config_locked_item.json
diff --git a/generic/items/config_melody_item.json → ...ces/generic/items/config_melody_item.json b/generic/items/config_melody_item.json → ...ces/generic/items/config_melody_item.json
diff --git a/generic/items/config_mode_item.json → devices/generic/items/config_mode_item.json b/generic/items/config_mode_item.json → devices/generic/items/config_mode_item.json
diff --git a/generic/items/config_mountingmode_item.json → ...neric/items/config_mountingmode_item.json b/generic/items/config_mountingmode_item.json → ...neric/items/config_mountingmode_item.json
diff --git a/generic/items/config_offset_item.json → ...ces/generic/items/config_offset_item.json b/generic/items/config_offset_item.json → ...ces/generic/items/config_offset_item.json
diff --git a/generic/items/config_on_item.json → devices/generic/items/config_on_item.json b/generic/items/config_on_item.json → devices/generic/items/config_on_item.json
diff --git a/generic/items/config_on_startup_item.json → ...generic/items/config_on_startup_item.json b/generic/items/config_on_startup_item.json → ...generic/items/config_on_startup_item.json
diff --git a/generic/items/config_pending_item.json → ...es/generic/items/config_pending_item.json b/generic/items/config_pending_item.json → ...es/generic/items/config_pending_item.json
diff --git a/generic/items/config_preset_item.json → ...ces/generic/items/config_preset_item.json b/generic/items/config_preset_item.json → ...ces/generic/items/config_preset_item.json
diff --git a/...items/config_pulseconfiguration_item.json → ...items/config_pulseconfiguration_item.json b/...items/config_pulseconfiguration_item.json → ...items/config_pulseconfiguration_item.json
diff --git a/generic/items/config_reachable_item.json → .../generic/items/config_reachable_item.json b/generic/items/config_reachable_item.json → .../generic/items/config_reachable_item.json
diff --git a/generic/items/config_reportgrid_item.json → ...generic/items/config_reportgrid_item.json b/generic/items/config_reportgrid_item.json → ...generic/items/config_reportgrid_item.json
diff --git a/generic/items/config_resetpresence_item.json → ...eric/items/config_resetpresence_item.json b/generic/items/config_resetpresence_item.json → ...eric/items/config_resetpresence_item.json
diff --git a/generic/items/config_reversed_item.json → ...s/generic/items/config_reversed_item.json b/generic/items/config_reversed_item.json → ...s/generic/items/config_reversed_item.json
diff --git a/generic/items/config_schedule_item.json → ...s/generic/items/config_schedule_item.json b/generic/items/config_schedule_item.json → ...s/generic/items/config_schedule_item.json
diff --git a/generic/items/config_schedule_on_item.json → ...eneric/items/config_schedule_on_item.json b/generic/items/config_schedule_on_item.json → ...eneric/items/config_schedule_on_item.json
diff --git a/generic/items/config_selftest_item.json → ...s/generic/items/config_selftest_item.json b/generic/items/config_selftest_item.json → ...s/generic/items/config_selftest_item.json
diff --git a/...ic/items/config_sensitivity_bis_item.json → ...ic/items/config_sensitivity_bis_item.json b/...ic/items/config_sensitivity_bis_item.json → ...ic/items/config_sensitivity_bis_item.json
diff --git a/generic/items/config_sensitivity_item.json → ...eneric/items/config_sensitivity_item.json b/generic/items/config_sensitivity_item.json → ...eneric/items/config_sensitivity_item.json
diff --git a/...ric/items/config_sensitivitymax_item.json → ...ric/items/config_sensitivitymax_item.json b/...ric/items/config_sensitivitymax_item.json → ...ric/items/config_sensitivitymax_item.json
diff --git a/generic/items/config_speed_item.json → devices/generic/items/config_speed_item.json b/generic/items/config_speed_item.json → devices/generic/items/config_speed_item.json
diff --git a/generic/items/config_swingmode_item.json → .../generic/items/config_swingmode_item.json b/generic/items/config_swingmode_item.json → .../generic/items/config_swingmode_item.json
diff --git a/generic/items/config_temperature_item.json → ...eneric/items/config_temperature_item.json b/generic/items/config_temperature_item.json → ...eneric/items/config_temperature_item.json
diff --git a/generic/items/config_tholddark_item.json → .../generic/items/config_tholddark_item.json b/generic/items/config_tholddark_item.json → .../generic/items/config_tholddark_item.json
diff --git a/generic/items/config_tholdoffset_item.json → ...eneric/items/config_tholdoffset_item.json b/generic/items/config_tholdoffset_item.json → ...eneric/items/config_tholdoffset_item.json
diff --git a/...tems/config_triggerdistance_bis_item.json → ...tems/config_triggerdistance_bis_item.json b/...tems/config_triggerdistance_bis_item.json → ...tems/config_triggerdistance_bis_item.json
diff --git a/...ic/items/config_triggerdistance_item.json → ...ic/items/config_triggerdistance_item.json b/...ic/items/config_triggerdistance_item.json → ...ic/items/config_triggerdistance_item.json
diff --git a/generic/items/config_tuya_unlock_item.json → ...eneric/items/config_tuya_unlock_item.json b/generic/items/config_tuya_unlock_item.json → ...eneric/items/config_tuya_unlock_item.json
diff --git a/...s/config_unoccupiedheatsetpoint_item.json → ...s/config_unoccupiedheatsetpoint_item.json b/...s/config_unoccupiedheatsetpoint_item.json → ...s/config_unoccupiedheatsetpoint_item.json
diff --git a/generic/items/config_usertest_item.json → ...s/generic/items/config_usertest_item.json b/generic/items/config_usertest_item.json → ...s/generic/items/config_usertest_item.json
diff --git a/generic/items/config_volume_item.json → ...ces/generic/items/config_volume_item.json b/generic/items/config_volume_item.json → ...ces/generic/items/config_volume_item.json
diff --git a/...items/config_windowcoveringtype_item.json → ...items/config_windowcoveringtype_item.json b/...items/config_windowcoveringtype_item.json → ...items/config_windowcoveringtype_item.json
diff --git a/...ric/items/config_windowopen_set_item.json → ...ric/items/config_windowopen_set_item.json b/...ric/items/config_windowopen_set_item.json → ...ric/items/config_windowopen_set_item.json
diff --git a/generic/items/state_action_item.json → devices/generic/items/state_action_item.json b/generic/items/state_action_item.json → devices/generic/items/state_action_item.json
diff --git a/generic/items/state_airquality_bis_item.json → ...eric/items/state_airquality_bis_item.json b/generic/items/state_airquality_bis_item.json → ...eric/items/state_airquality_bis_item.json
diff --git a/generic/items/state_airquality_item.json → .../generic/items/state_airquality_item.json b/generic/items/state_airquality_item.json → .../generic/items/state_airquality_item.json
diff --git a/...c/items/state_airqualityppb_bis_item.json → ...c/items/state_airqualityppb_bis_item.json b/...c/items/state_airqualityppb_bis_item.json → ...c/items/state_airqualityppb_bis_item.json
diff --git a/generic/items/state_airqualityppb_item.json → ...neric/items/state_airqualityppb_item.json b/generic/items/state_airqualityppb_item.json → ...neric/items/state_airqualityppb_item.json
diff --git a/generic/items/state_alarm_item.json → devices/generic/items/state_alarm_item.json b/generic/items/state_alarm_item.json → devices/generic/items/state_alarm_item.json
diff --git a/generic/items/state_alert_item.json → devices/generic/items/state_alert_item.json b/generic/items/state_alert_item.json → devices/generic/items/state_alert_item.json
diff --git a/generic/items/state_angle_item.json → devices/generic/items/state_angle_item.json b/generic/items/state_angle_item.json → devices/generic/items/state_angle_item.json
diff --git a/generic/items/state_battery_item.json → ...ces/generic/items/state_battery_item.json b/generic/items/state_battery_item.json → ...ces/generic/items/state_battery_item.json
diff --git a/generic/items/state_bri_item.json → devices/generic/items/state_bri_item.json b/generic/items/state_bri_item.json → devices/generic/items/state_bri_item.json
diff --git a/generic/items/state_buttonevent_item.json → ...generic/items/state_buttonevent_item.json b/generic/items/state_buttonevent_item.json → ...generic/items/state_buttonevent_item.json
diff --git a/generic/items/state_carbonmonoxide_item.json → ...eric/items/state_carbonmonoxide_item.json b/generic/items/state_carbonmonoxide_item.json → ...eric/items/state_carbonmonoxide_item.json
diff --git a/generic/items/state_charging_item.json → ...es/generic/items/state_charging_item.json b/generic/items/state_charging_item.json → ...es/generic/items/state_charging_item.json
diff --git a/generic/items/state_colormode_item.json → ...s/generic/items/state_colormode_item.json b/generic/items/state_colormode_item.json → ...s/generic/items/state_colormode_item.json
diff --git a/generic/items/state_consumption_2_item.json → ...neric/items/state_consumption_2_item.json b/generic/items/state_consumption_2_item.json → ...neric/items/state_consumption_2_item.json
diff --git a/generic/items/state_consumption_item.json → ...generic/items/state_consumption_item.json b/generic/items/state_consumption_item.json → ...generic/items/state_consumption_item.json
diff --git a/generic/items/state_ct_item.json → devices/generic/items/state_ct_item.json b/generic/items/state_ct_item.json → devices/generic/items/state_ct_item.json
diff --git a/generic/items/state_current_item.json → ...ces/generic/items/state_current_item.json b/generic/items/state_current_item.json → ...ces/generic/items/state_current_item.json
diff --git a/generic/items/state_current_p1_item.json → .../generic/items/state_current_p1_item.json b/generic/items/state_current_p1_item.json → .../generic/items/state_current_p1_item.json
diff --git a/generic/items/state_current_p2_item.json → .../generic/items/state_current_p2_item.json b/generic/items/state_current_p2_item.json → .../generic/items/state_current_p2_item.json
diff --git a/generic/items/state_current_p3_item.json → .../generic/items/state_current_p3_item.json b/generic/items/state_current_p3_item.json → .../generic/items/state_current_p3_item.json
diff --git a/generic/items/state_dark_item.json → devices/generic/items/state_dark_item.json b/generic/items/state_dark_item.json → devices/generic/items/state_dark_item.json
diff --git a/generic/items/state_daylight_item.json → ...es/generic/items/state_daylight_item.json b/generic/items/state_daylight_item.json → ...es/generic/items/state_daylight_item.json
diff --git a/generic/items/state_deviceruntime_item.json → ...neric/items/state_deviceruntime_item.json b/generic/items/state_deviceruntime_item.json → ...neric/items/state_deviceruntime_item.json
diff --git a/generic/items/state_effect_item.json → devices/generic/items/state_effect_item.json b/generic/items/state_effect_item.json → devices/generic/items/state_effect_item.json
diff --git a/generic/items/state_errorcode_item.json → ...s/generic/items/state_errorcode_item.json b/generic/items/state_errorcode_item.json → ...s/generic/items/state_errorcode_item.json
diff --git a/generic/items/state_eventduration_item.json → ...neric/items/state_eventduration_item.json b/generic/items/state_eventduration_item.json → ...neric/items/state_eventduration_item.json
diff --git a/...ems/state_expectedeventduration_item.json → ...ems/state_expectedeventduration_item.json b/...ems/state_expectedeventduration_item.json → ...ems/state_expectedeventduration_item.json
diff --git a/...ic/items/state_expectedrotation_item.json → ...ic/items/state_expectedrotation_item.json b/...ic/items/state_expectedrotation_item.json → ...ic/items/state_expectedrotation_item.json
diff --git a/generic/items/state_filterruntime_item.json → ...neric/items/state_filterruntime_item.json b/generic/items/state_filterruntime_item.json → ...neric/items/state_filterruntime_item.json
diff --git a/generic/items/state_fire_item.json → devices/generic/items/state_fire_item.json b/generic/items/state_fire_item.json → devices/generic/items/state_fire_item.json
diff --git a/generic/items/state_gesture_item.json → ...ces/generic/items/state_gesture_item.json b/generic/items/state_gesture_item.json → ...ces/generic/items/state_gesture_item.json
diff --git a/generic/items/state_gradient_item.json → ...es/generic/items/state_gradient_item.json b/generic/items/state_gradient_item.json → ...es/generic/items/state_gradient_item.json
diff --git a/generic/items/state_heating_item.json → ...ces/generic/items/state_heating_item.json b/generic/items/state_heating_item.json → ...ces/generic/items/state_heating_item.json
diff --git a/generic/items/state_hue_item.json → devices/generic/items/state_hue_item.json b/generic/items/state_hue_item.json → devices/generic/items/state_hue_item.json
diff --git a/generic/items/state_humidity_bis_item.json → ...eneric/items/state_humidity_bis_item.json b/generic/items/state_humidity_bis_item.json → ...eneric/items/state_humidity_bis_item.json
diff --git a/generic/items/state_humidity_item.json → ...es/generic/items/state_humidity_item.json b/generic/items/state_humidity_item.json → ...es/generic/items/state_humidity_item.json
diff --git a/generic/items/state_lastcheckin_item.json → ...generic/items/state_lastcheckin_item.json b/generic/items/state_lastcheckin_item.json → ...generic/items/state_lastcheckin_item.json
diff --git a/generic/items/state_lastset_item.json → ...ces/generic/items/state_lastset_item.json b/generic/items/state_lastset_item.json → ...ces/generic/items/state_lastset_item.json
diff --git a/generic/items/state_lastupdated_item.json → ...generic/items/state_lastupdated_item.json b/generic/items/state_lastupdated_item.json → ...generic/items/state_lastupdated_item.json
diff --git a/generic/items/state_lift_item.json → devices/generic/items/state_lift_item.json b/generic/items/state_lift_item.json → devices/generic/items/state_lift_item.json
diff --git a/generic/items/state_lightlevel_item.json → .../generic/items/state_lightlevel_item.json b/generic/items/state_lightlevel_item.json → .../generic/items/state_lightlevel_item.json
diff --git a/generic/items/state_localtime_item.json → ...s/generic/items/state_localtime_item.json b/generic/items/state_localtime_item.json → ...s/generic/items/state_localtime_item.json
diff --git a/generic/items/state_lockstate_item.json → ...s/generic/items/state_lockstate_item.json b/generic/items/state_lockstate_item.json → ...s/generic/items/state_lockstate_item.json
diff --git a/generic/items/state_lowbattery_item.json → .../generic/items/state_lowbattery_item.json b/generic/items/state_lowbattery_item.json → .../generic/items/state_lowbattery_item.json
diff --git a/generic/items/state_lux_item.json → devices/generic/items/state_lux_item.json b/generic/items/state_lux_item.json → devices/generic/items/state_lux_item.json
diff --git a/generic/items/state_measured_value_item.json → ...eric/items/state_measured_value_item.json b/generic/items/state_measured_value_item.json → ...eric/items/state_measured_value_item.json
diff --git a/generic/items/state_moisture_item.json → ...es/generic/items/state_moisture_item.json b/generic/items/state_moisture_item.json → ...es/generic/items/state_moisture_item.json
diff --git a/.../items/state_mountingmodeactive_item.json → .../items/state_mountingmodeactive_item.json b/.../items/state_mountingmodeactive_item.json → .../items/state_mountingmodeactive_item.json
diff --git a/generic/items/state_music_sync_item.json → .../generic/items/state_music_sync_item.json b/generic/items/state_music_sync_item.json → .../generic/items/state_music_sync_item.json
diff --git a/generic/items/state_on_item.json → devices/generic/items/state_on_item.json b/generic/items/state_on_item.json → devices/generic/items/state_on_item.json
diff --git a/generic/items/state_open_bis_item.json → ...es/generic/items/state_open_bis_item.json b/generic/items/state_open_bis_item.json → ...es/generic/items/state_open_bis_item.json
diff --git a/generic/items/state_open_item.json → devices/generic/items/state_open_item.json b/generic/items/state_open_item.json → devices/generic/items/state_open_item.json
diff --git a/generic/items/state_orientation_x_item.json → ...neric/items/state_orientation_x_item.json b/generic/items/state_orientation_x_item.json → ...neric/items/state_orientation_x_item.json
diff --git a/generic/items/state_orientation_y_item.json → ...neric/items/state_orientation_y_item.json b/generic/items/state_orientation_y_item.json → ...neric/items/state_orientation_y_item.json
diff --git a/generic/items/state_orientation_z_item.json → ...neric/items/state_orientation_z_item.json b/generic/items/state_orientation_z_item.json → ...neric/items/state_orientation_z_item.json
diff --git a/generic/items/state_panel_item.json → devices/generic/items/state_panel_item.json b/generic/items/state_panel_item.json → devices/generic/items/state_panel_item.json
diff --git a/generic/items/state_pm2_5_item.json → devices/generic/items/state_pm2_5_item.json b/generic/items/state_pm2_5_item.json → devices/generic/items/state_pm2_5_item.json
diff --git a/generic/items/state_power_item.json → devices/generic/items/state_power_item.json b/generic/items/state_power_item.json → devices/generic/items/state_power_item.json
diff --git a/generic/items/state_presence_item.json → ...es/generic/items/state_presence_item.json b/generic/items/state_presence_item.json → ...es/generic/items/state_presence_item.json
diff --git a/generic/items/state_presenceevent_item.json → ...neric/items/state_presenceevent_item.json b/generic/items/state_presenceevent_item.json → ...neric/items/state_presenceevent_item.json
diff --git a/generic/items/state_pressure_bis_item.json → ...eneric/items/state_pressure_bis_item.json b/generic/items/state_pressure_bis_item.json → ...eneric/items/state_pressure_bis_item.json
diff --git a/generic/items/state_pressure_item.json → ...es/generic/items/state_pressure_item.json b/generic/items/state_pressure_item.json → ...es/generic/items/state_pressure_item.json
diff --git a/generic/items/state_production_item.json → .../generic/items/state_production_item.json b/generic/items/state_production_item.json → .../generic/items/state_production_item.json
diff --git a/generic/items/state_reachable_item.json → ...s/generic/items/state_reachable_item.json b/generic/items/state_reachable_item.json → ...s/generic/items/state_reachable_item.json
diff --git a/generic/items/state_replacefilter_item.json → ...neric/items/state_replacefilter_item.json b/generic/items/state_replacefilter_item.json → ...neric/items/state_replacefilter_item.json
diff --git a/generic/items/state_rotaryevent_item.json → ...generic/items/state_rotaryevent_item.json b/generic/items/state_rotaryevent_item.json → ...generic/items/state_rotaryevent_item.json
diff --git a/generic/items/state_sat_item.json → devices/generic/items/state_sat_item.json b/generic/items/state_sat_item.json → devices/generic/items/state_sat_item.json
diff --git a/...c/items/state_seconds_remaining_item.json → ...c/items/state_seconds_remaining_item.json b/...c/items/state_seconds_remaining_item.json → ...c/items/state_seconds_remaining_item.json
diff --git a/generic/items/state_speed_item.json → devices/generic/items/state_speed_item.json b/generic/items/state_speed_item.json → devices/generic/items/state_speed_item.json
diff --git a/generic/items/state_tampered_item.json → ...es/generic/items/state_tampered_item.json b/generic/items/state_tampered_item.json → ...es/generic/items/state_tampered_item.json
diff --git a/generic/items/state_targetdistance_item.json → ...eric/items/state_targetdistance_item.json b/generic/items/state_targetdistance_item.json → ...eric/items/state_targetdistance_item.json
diff --git a/...ric/items/state_temperature_bis_item.json → ...ric/items/state_temperature_bis_item.json b/...ric/items/state_temperature_bis_item.json → ...ric/items/state_temperature_bis_item.json
diff --git a/generic/items/state_temperature_item.json → ...generic/items/state_temperature_item.json b/generic/items/state_temperature_item.json → ...generic/items/state_temperature_item.json
diff --git a/generic/items/state_test_item.json → devices/generic/items/state_test_item.json b/generic/items/state_test_item.json → devices/generic/items/state_test_item.json
diff --git a/generic/items/state_tilt_item.json → devices/generic/items/state_tilt_item.json b/generic/items/state_tilt_item.json → devices/generic/items/state_tilt_item.json
diff --git a/generic/items/state_tiltangle_item.json → ...s/generic/items/state_tiltangle_item.json b/generic/items/state_tiltangle_item.json → ...s/generic/items/state_tiltangle_item.json
diff --git a/generic/items/state_utc_item.json → devices/generic/items/state_utc_item.json b/generic/items/state_utc_item.json → devices/generic/items/state_utc_item.json
diff --git a/generic/items/state_valve_item.json → devices/generic/items/state_valve_item.json b/generic/items/state_valve_item.json → devices/generic/items/state_valve_item.json
diff --git a/generic/items/state_vibration_item.json → ...s/generic/items/state_vibration_item.json b/generic/items/state_vibration_item.json → ...s/generic/items/state_vibration_item.json
diff --git a/...c/items/state_vibrationstrength_item.json → ...c/items/state_vibrationstrength_item.json b/...c/items/state_vibrationstrength_item.json → ...c/items/state_vibrationstrength_item.json
diff --git a/generic/items/state_voltage_item.json → ...ces/generic/items/state_voltage_item.json b/generic/items/state_voltage_item.json → ...ces/generic/items/state_voltage_item.json
diff --git a/generic/items/state_water_bis_item.json → ...s/generic/items/state_water_bis_item.json b/generic/items/state_water_bis_item.json → ...s/generic/items/state_water_bis_item.json
diff --git a/generic/items/state_water_item.json → devices/generic/items/state_water_item.json b/generic/items/state_water_item.json → devices/generic/items/state_water_item.json
diff --git a/generic/items/state_windowopen_item.json → .../generic/items/state_windowopen_item.json b/generic/items/state_windowopen_item.json → .../generic/items/state_windowopen_item.json
diff --git a/generic/items/state_x_item.json → devices/generic/items/state_x_item.json b/generic/items/state_x_item.json → devices/generic/items/state_x_item.json
diff --git a/generic/items/state_y_item.json → devices/generic/items/state_y_item.json b/generic/items/state_y_item.json → devices/generic/items/state_y_item.json
diff --git a/generic/subdevices/air_purifier.json → devices/generic/subdevices/air_purifier.json b/generic/subdevices/air_purifier.json → devices/generic/subdevices/air_purifier.json
diff --git a/generic/subdevices/air_quality_sensor.json → ...eneric/subdevices/air_quality_sensor.json b/generic/subdevices/air_quality_sensor.json → ...eneric/subdevices/air_quality_sensor.json
diff --git a/generic/subdevices/alarm_sensor.json → devices/generic/subdevices/alarm_sensor.json b/generic/subdevices/alarm_sensor.json → devices/generic/subdevices/alarm_sensor.json
diff --git a/generic/subdevices/ancillary_control.json → ...generic/subdevices/ancillary_control.json b/generic/subdevices/ancillary_control.json → ...generic/subdevices/ancillary_control.json
diff --git a/generic/subdevices/battery_sensor.json → ...es/generic/subdevices/battery_sensor.json b/generic/subdevices/battery_sensor.json → ...es/generic/subdevices/battery_sensor.json
diff --git a/generic/subdevices/carbondioxide_sensor.json → ...eric/subdevices/carbondioxide_sensor.json b/generic/subdevices/carbondioxide_sensor.json → ...eric/subdevices/carbondioxide_sensor.json
diff --git a/...ric/subdevices/carbonmonoxide_sensor.json → ...ric/subdevices/carbonmonoxide_sensor.json b/...ric/subdevices/carbonmonoxide_sensor.json → ...ric/subdevices/carbonmonoxide_sensor.json
diff --git a/generic/subdevices/color_light.json → devices/generic/subdevices/color_light.json b/generic/subdevices/color_light.json → devices/generic/subdevices/color_light.json
diff --git a/...c/subdevices/color_temperature_light.json → ...c/subdevices/color_temperature_light.json b/...c/subdevices/color_temperature_light.json → ...c/subdevices/color_temperature_light.json
diff --git a/generic/subdevices/consumption_sensor.json → ...eneric/subdevices/consumption_sensor.json b/generic/subdevices/consumption_sensor.json → ...eneric/subdevices/consumption_sensor.json
diff --git a/generic/subdevices/dimmable_light.json → ...es/generic/subdevices/dimmable_light.json b/generic/subdevices/dimmable_light.json → ...es/generic/subdevices/dimmable_light.json
diff --git a/generic/subdevices/dimmable_plugin_unit.json → ...eric/subdevices/dimmable_plugin_unit.json b/generic/subdevices/dimmable_plugin_unit.json → ...eric/subdevices/dimmable_plugin_unit.json
diff --git a/generic/subdevices/door_lock.json → devices/generic/subdevices/door_lock.json b/generic/subdevices/door_lock.json → devices/generic/subdevices/door_lock.json
diff --git a/generic/subdevices/door_lock_controller.json → ...eric/subdevices/door_lock_controller.json b/generic/subdevices/door_lock_controller.json → ...eric/subdevices/door_lock_controller.json
diff --git a/generic/subdevices/door_lock_sensor.json → .../generic/subdevices/door_lock_sensor.json b/generic/subdevices/door_lock_sensor.json → .../generic/subdevices/door_lock_sensor.json
diff --git a/generic/subdevices/extended_color_light.json → ...eric/subdevices/extended_color_light.json b/generic/subdevices/extended_color_light.json → ...eric/subdevices/extended_color_light.json
diff --git a/generic/subdevices/fire_sensor.json → devices/generic/subdevices/fire_sensor.json b/generic/subdevices/fire_sensor.json → devices/generic/subdevices/fire_sensor.json
diff --git a/generic/subdevices/formaldehyde_sensor.json → ...neric/subdevices/formaldehyde_sensor.json b/generic/subdevices/formaldehyde_sensor.json → ...neric/subdevices/formaldehyde_sensor.json
diff --git a/generic/subdevices/humidity_sensor.json → ...s/generic/subdevices/humidity_sensor.json b/generic/subdevices/humidity_sensor.json → ...s/generic/subdevices/humidity_sensor.json
diff --git a/generic/subdevices/level_control_switch.json → ...eric/subdevices/level_control_switch.json b/generic/subdevices/level_control_switch.json → ...eric/subdevices/level_control_switch.json
diff --git a/generic/subdevices/light_level_sensor.json → ...eneric/subdevices/light_level_sensor.json b/generic/subdevices/light_level_sensor.json → ...eneric/subdevices/light_level_sensor.json
diff --git a/generic/subdevices/moisture_sensor.json → ...s/generic/subdevices/moisture_sensor.json b/generic/subdevices/moisture_sensor.json → ...s/generic/subdevices/moisture_sensor.json
diff --git a/generic/subdevices/on_off_light.json → devices/generic/subdevices/on_off_light.json b/generic/subdevices/on_off_light.json → devices/generic/subdevices/on_off_light.json
diff --git a/generic/subdevices/on_off_output.json → ...ces/generic/subdevices/on_off_output.json b/generic/subdevices/on_off_output.json → ...ces/generic/subdevices/on_off_output.json
diff --git a/generic/subdevices/on_off_plugin_unit.json → ...eneric/subdevices/on_off_plugin_unit.json b/generic/subdevices/on_off_plugin_unit.json → ...eneric/subdevices/on_off_plugin_unit.json
diff --git a/generic/subdevices/open_close_sensor.json → ...generic/subdevices/open_close_sensor.json b/generic/subdevices/open_close_sensor.json → ...generic/subdevices/open_close_sensor.json
diff --git a/.../subdevices/particulatematter_sensor.json → .../subdevices/particulatematter_sensor.json b/.../subdevices/particulatematter_sensor.json → .../subdevices/particulatematter_sensor.json
diff --git a/generic/subdevices/power_sensor.json → devices/generic/subdevices/power_sensor.json b/generic/subdevices/power_sensor.json → devices/generic/subdevices/power_sensor.json
diff --git a/generic/subdevices/presence_sensor.json → ...s/generic/subdevices/presence_sensor.json b/generic/subdevices/presence_sensor.json → ...s/generic/subdevices/presence_sensor.json
diff --git a/generic/subdevices/pressure_sensor.json → ...s/generic/subdevices/pressure_sensor.json b/generic/subdevices/pressure_sensor.json → ...s/generic/subdevices/pressure_sensor.json
diff --git a/generic/subdevices/range_extender.json → ...es/generic/subdevices/range_extender.json b/generic/subdevices/range_extender.json → ...es/generic/subdevices/range_extender.json
diff --git a/generic/subdevices/relative_rotary.json → ...s/generic/subdevices/relative_rotary.json b/generic/subdevices/relative_rotary.json → ...s/generic/subdevices/relative_rotary.json
diff --git a/generic/subdevices/smart_plug.json → devices/generic/subdevices/smart_plug.json b/generic/subdevices/smart_plug.json → devices/generic/subdevices/smart_plug.json
diff --git a/generic/subdevices/switch.json → devices/generic/subdevices/switch.json b/generic/subdevices/switch.json → devices/generic/subdevices/switch.json
diff --git a/generic/subdevices/temperature_sensor.json → ...eneric/subdevices/temperature_sensor.json b/generic/subdevices/temperature_sensor.json → ...eneric/subdevices/temperature_sensor.json
diff --git a/generic/subdevices/thermostat.json → devices/generic/subdevices/thermostat.json b/generic/subdevices/thermostat.json → devices/generic/subdevices/thermostat.json
diff --git a/generic/subdevices/time.json → devices/generic/subdevices/time.json b/generic/subdevices/time.json → devices/generic/subdevices/time.json
diff --git a/generic/subdevices/vibration_sensor.json → .../generic/subdevices/vibration_sensor.json b/generic/subdevices/vibration_sensor.json → .../generic/subdevices/vibration_sensor.json
diff --git a/generic/subdevices/warning_device.json → ...es/generic/subdevices/warning_device.json b/generic/subdevices/warning_device.json → ...es/generic/subdevices/warning_device.json
diff --git a/generic/subdevices/water_leak_sensor.json → ...generic/subdevices/water_leak_sensor.json b/generic/subdevices/water_leak_sensor.json → ...generic/subdevices/water_leak_sensor.json
diff --git a/...ic/subdevices/window_covering_device.json → ...ic/subdevices/window_covering_device.json b/...ic/subdevices/window_covering_device.json → ...ic/subdevices/window_covering_device.json
diff --git a/generic/subdevices/zgp_switch.json → devices/generic/subdevices/zgp_switch.json b/generic/subdevices/zgp_switch.json → devices/generic/subdevices/zgp_switch.json
diff --git a/...ing_cluster/1000_get_group_identifiers.js → ...ing_cluster/1000_get_group_identifiers.js b/...ing_cluster/1000_get_group_identifiers.js → ...ing_cluster/1000_get_group_identifiers.js
diff --git a/...ikea/tradfri_bulb_e27_cws_opal_806lm.json → devices/ikea/tradfri_bulb_cws_A.json b/...ikea/tradfri_bulb_e27_cws_opal_806lm.json → devices/ikea/tradfri_bulb_cws_A.json
@@ -1,8 +1,14 @@
 {
   "schema": "devcap1.schema.json",
-  "manufacturername": "$MF_IKEA",
-  "modelid": "TRADFRI bulb E27 CWS 806lm",
-  "product": "TRADFRI bulb E27 CWS 806lm",
+  "manufacturername": [
+    "$MF_IKEA",
+    "$MF_IKEA"
+  ],
+  "modelid": [
+    "TRADFRI bulb E27 CWS 806lm",
+    "TRADFRI bulb GU10 CWS 345lm"
+  ],
+  "product": "TRÅDFRI LED bulb E27 806lm color/white spectrum globe, TRÅDFRI LED bulb GU10 345lm color/white spectrum",
   "sleeper": false,
   "status": "Gold",
   "subdevices": [
@@ -393,7 +399,7 @@
       ]
     }
   ],
-  "uuid": "32ed6433-304f-46fb-9d75-a4b910e5d948",
+  "uuid": "2bc4502d-b565-4c7e-bf21-c01f2c3ee4ef",
   "version": "1.0.0",
   "version_deconz": ">2.19.3"
 }
diff --git a/devices/lidl/hg08673.json b/devices/lidl/hg08673.json
@@ -12,7 +12,7 @@
   ],
   "product": "HG08673 LIDL SilverCrest smart plug with monitoring (DK, EU, FR)",
   "sleeper": false,
-  "status": "Silver",
+  "status": "Gold",
   "subdevices": [
     {
       "type": "$TYPE_SMART_PLUG",
@@ -278,6 +278,6 @@
     }
   ],
   "uuid": "cd6685c8-8e38-42b9-9461-185588a4a170",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "version_deconz": ">2.19.3"
 }
diff --git a/devices/namron/4512765_hum_temp.json b/devices/namron/4512765_hum_temp.json
@@ -0,0 +1,197 @@
+{
+  "schema": "devcap1.schema.json",
+  "manufacturername": "Namron AS",
+  "modelid": "4512765",
+  "product": "S903TH-ZG",
+  "sleeper": false,
+  "status": "Gold",
+  "subdevices": [
+    {
+      "type": "$TYPE_TEMPERATURE_SENSOR",
+      "restapi": "/sensors",
+      "uuid": [
+        "$address.ext",
+        "0x01",
+        "0x0402"
+      ],
+      "items": [
+        {
+          "name": "attr/id"
+        },
+        {
+          "name": "attr/lastannounced"
+        },
+        {
+          "name": "attr/lastseen"
+        },
+        {
+          "name": "attr/manufacturername"
+        },
+        {
+          "name": "attr/modelid"
+        },
+        {
+          "name": "attr/name"
+        },
+        {
+          "name": "attr/swversion"
+        },
+        {
+          "name": "attr/type"
+        },
+        {
+          "name": "attr/uniqueid"
+        },
+        {
+          "name": "config/battery",
+          "read": {
+            "at": "0x0021",
+            "cl": "0x0001",
+            "ep": 1,
+            "fn": "zcl:attr"
+          },
+          "parse": {
+            "at": "0x0021",
+            "cl": "0x0001",
+            "ep": 1,
+            "fn": "zcl:attr",
+            "eval": "Item.val = Attr.val / 2"
+          },
+          "default": 0
+        },
+        {
+          "name": "config/offset"
+        },
+        {
+          "name": "config/on"
+        },
+        {
+          "name": "config/reachable"
+        },
+        {
+          "name": "state/lastupdated"
+        },
+        {
+          "name": "state/temperature"
+        }
+      ]
+    },
+    {
+      "type": "$TYPE_HUMIDITY_SENSOR",
+      "restapi": "/sensors",
+      "uuid": [
+        "$address.ext",
+        "0x01",
+        "0x0405"
+      ],
+      "items": [
+        {
+          "name": "attr/id"
+        },
+        {
+          "name": "attr/lastannounced"
+        },
+        {
+          "name": "attr/lastseen"
+        },
+        {
+          "name": "attr/manufacturername"
+        },
+        {
+          "name": "attr/modelid"
+        },
+        {
+          "name": "attr/name"
+        },
+        {
+          "name": "attr/swversion"
+        },
+        {
+          "name": "attr/type"
+        },
+        {
+          "name": "attr/uniqueid"
+        },
+        {
+          "name": "config/battery",
+          "read": {
+            "at": "0x0021",
+            "cl": "0x0001",
+            "ep": 1,
+            "fn": "zcl:attr"
+          },
+          "parse": {
+            "at": "0x0021",
+            "cl": "0x0001",
+            "ep": 1,
+            "fn": "zcl:attr",
+            "eval": "Item.val = Attr.val / 2"
+          },
+          "default": 0
+        },
+        {
+          "name": "config/offset"
+        },
+        {
+          "name": "config/on"
+        },
+        {
+          "name": "config/reachable"
+        },
+        {
+          "name": "state/humidity"
+        },
+        {
+          "name": "state/lastupdated"
+        }
+      ]
+    }
+  ],
+  "bindings": [
+    {
+      "bind": "unicast",
+      "src.ep": 1,
+      "cl": "0x0402",
+      "report": [
+        {
+          "at": "0x0000",
+          "dt": "0x29",
+          "min": 60,
+          "max": 300,
+          "change": "0x00000032"
+        }
+      ]
+    },
+    {
+      "bind": "unicast",
+      "src.ep": 1,
+      "cl": "0x0405",
+      "report": [
+        {
+          "at": "0x0000",
+          "dt": "0x21",
+          "min": 60,
+          "max": 300,
+          "change": "0x0000000A"
+        }
+      ]
+    },
+    {
+      "bind": "unicast",
+      "src.ep": 1,
+      "cl": "0x0001",
+      "report": [
+        {
+          "at": "0x0021",
+          "dt": "0x20",
+          "min": 60,
+          "max": 3600,
+          "change": "0x00000001"
+        }
+      ]
+    }
+  ],
+  "uuid": "95c8bf72-da79-4735-8137-42962f4d754c",
+  "version": "1.0.0",
+  "version_deconz": ">2.19.3"
+}
diff --git a/devices/third_reality/3RWS18BZ_water_sensor.json b/devices/third_reality/3RWS18BZ_water_sensor.json
@@ -7,7 +7,7 @@
   "status": "Silver",
   "subdevices": [
     {
-      "type": "ZHAWater",
+      "type": "$TYPE_WATER_LEAK_SENSOR",
       "restapi": "/sensors",
       "uuid": [
         "$address.ext",

diff --git a/devices/tuya/_TZ3000_bmfw9ykl_vibration_sensor.json b/devices/tuya/_TZ3000_bmfw9ykl_vibration_sensor.json
@@ -8,7 +8,7 @@
   "status": "Gold",
   "subdevices": [
     {
-      "type": "ZHAPresence",
+      "type": "$TYPE_PRESENCE_SENSOR",
       "restapi": "/sensors",
       "uuid": [
         "$address.ext",

diff --git a/devices/woox/Woox_R7049_Smart_Smoke_Alarm.json b/devices/woox/Woox_R7049_Smart_Smoke_Alarm.json
@@ -51,7 +51,7 @@
             "ep": 1,
             "cl": "0x0000",
             "at": "0x0001",
-            "script": "tuya_swversion.js"
+            "script": "../tuya/tuya_swversion.js"
           },
           "read": {
             "fn": "zcl:attr",

diff --git a/devices/xiaomi/xiaomi_jtqj-bf-01lm_gas_leak_detector.json b/devices/xiaomi/xiaomi_jtqj-bf-01lm_gas_leak_detector.json
@@ -8,7 +8,7 @@
   "status": "Gold",
   "subdevices": [
     {
-      "type": "ZHACarbonMonoxide",
+      "type": "$TYPE_CARBONMONOXIDE_SENSOR",
       "restapi": "/sensors",
       "uuid": [
         "$address.ext",