diff --git a/devices/3A-Nue/Lxn59-2s7lX1.0.json b/devices/3A-Nue/Lxn59-2s7lX1.0.json index 07f8fab99c..713794050e 100644 --- a/devices/3A-Nue/Lxn59-2s7lX1.0.json +++ b/devices/3A-Nue/Lxn59-2s7lX1.0.json @@ -3,7 +3,8 @@ "uuid":"417af879-4d80-4816-ba08-b1b74aeead77", "manufacturername":"3A Smart Home DE", "modelid":"LXN59-2S7LX1.0", - "product":"2 gang switch", + "vendor": "Zemismart", + "product":"2 gang inline switch (ZW-EU-02)", "sleeper":false, "status":"Gold", "subdevices":[ diff --git a/devices/3A-Nue/lxn59-1s7lx1.0.json b/devices/3A-Nue/lxn59-1s7lx1.0.json index f4e8b5bc14..d391d82fb8 100644 --- a/devices/3A-Nue/lxn59-1s7lx1.0.json +++ b/devices/3A-Nue/lxn59-1s7lx1.0.json @@ -3,7 +3,8 @@ "uuid": "724fdfb6-6e4b-4247-9d91-d3a92bf41622", "manufacturername": "3A Smart Home DE", "modelid": "LXN59-1S7LX1.0", - "product": "Another Smart socket plug", + "vendor": "Zemismart", + "product": "1 gang inline switch (ZW-EU-01)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/3A-Nue/lxt56-ls27lx1.7.json b/devices/3A-Nue/lxt56-ls27lx1.7.json index 7ec36c9711..5adf790052 100644 --- a/devices/3A-Nue/lxt56-ls27lx1.7.json +++ b/devices/3A-Nue/lxt56-ls27lx1.7.json @@ -3,8 +3,8 @@ "uuid": "73cc635e-9c11-4623-af5a-e6a7a8fb68f8", "manufacturername": "3A Smart Home DE", "modelid": "LXT56-LS27LX1.7", - "vendor": "Zemismart", - "product": "3A12S-15", + "vendor": "3A Nue", + "product": "RGBW LED strip controller (3A12S-15)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/Jasco-GE/GE45856_wall_switch.json b/devices/Jasco-GE/GE45856_wall_switch.json index 3210199a8b..fd51babcb8 100644 --- a/devices/Jasco-GE/GE45856_wall_switch.json +++ b/devices/Jasco-GE/GE45856_wall_switch.json @@ -3,8 +3,8 @@ "uuid": "548bbc95-bc25-40b6-86a8-161a2edba487", "manufacturername": "Jasco Products", "modelid": "45856", - "vendor": "GE", - "product": "45856", + "vendor": "Jasco", + "product": "GE ZigBee in-wall smart switch (45856GE)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/adeo/ldsenk08_door_vibration_sensor.json b/devices/adeo/ldsenk08_door_vibration_sensor.json index c6f29841e7..9518d8fe7b 100644 --- a/devices/adeo/ldsenk08_door_vibration_sensor.json +++ b/devices/adeo/ldsenk08_door_vibration_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "ADEO", "modelid": "LDSENK08", "vendor": "Adeo", - "product": "Smart Zigbee Door Window Contact and vibration", + "product": "Lexman door window sensor with vibration (LDSENK08)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/adeo/ldsenk09_keyfob.json b/devices/adeo/ldsenk09_keyfob.json index fe9641a9d1..27ff3ba0ac 100644 --- a/devices/adeo/ldsenk09_keyfob.json +++ b/devices/adeo/ldsenk09_keyfob.json @@ -3,9 +3,9 @@ "uuid": "7113fa6e-cf32-43a2-a9ba-8836ef9c226e", "manufacturername": "ADEO", "modelid": "LDSENK09", - "product": "LDSENK09", - "status": "Gold", "vendor": "Adeo", + "product": "Lexman smart compact keyfob (LDSENK09)", + "status": "Gold", "sleeper": true, "subdevices": [ { diff --git a/devices/aeotec/WG001-Z01_range_extender.json b/devices/aeotec/WG001-Z01_range_extender.json index f85acad4f4..299c0b19d4 100644 --- a/devices/aeotec/WG001-Z01_range_extender.json +++ b/devices/aeotec/WG001-Z01_range_extender.json @@ -3,7 +3,8 @@ "uuid": "b2f57433-5a72-4fcf-9a67-3fb092863948", "manufacturername": "AL001", "modelid": "WG001-Z01", - "product": "Aeotec Range Extender Zi", + "vendor": "Aeotec", + "product": "Range extender zi (ZAG001-C15)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/aubess/aubess_multi_sensor_TZ3000_bguser20.json b/devices/aubess/aubess_multi_sensor_TZ3000_bguser20.json index e03ffed063..0847ddf99a 100644 --- a/devices/aubess/aubess_multi_sensor_TZ3000_bguser20.json +++ b/devices/aubess/aubess_multi_sensor_TZ3000_bguser20.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_bguser20", "modelid": "TS0201", "vendor": "Aubess", - "product": "TS0201", + "product": "Temperature and humidity sensor (WSD500A)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/aubess/aubess_plug_TZ3000_hdopuwv6.json b/devices/aubess/aubess_plug_TZ3000_hdopuwv6.json index 478b990386..db2b5ac2c7 100644 --- a/devices/aubess/aubess_plug_TZ3000_hdopuwv6.json +++ b/devices/aubess/aubess_plug_TZ3000_hdopuwv6.json @@ -3,6 +3,8 @@ "uuid": "2e59bb74-2555-4de7-a458-8041eabb5924", "manufacturername": "_TZ3000_hdopuwv6", "modelid": "TS011F", + "vendor": "Aubess", + "product": "Smart plug 16A EU (TS011F)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/blitzwolf/bw_is4_multisensor.json b/devices/blitzwolf/bw_is4_multisensor.json index 37cb92b336..80c204ca1b 100644 --- a/devices/blitzwolf/bw_is4_multisensor.json +++ b/devices/blitzwolf/bw_is4_multisensor.json @@ -3,8 +3,8 @@ "uuid": "2492f20f-5bff-4f59-9ba5-f4767a5ccd42", "manufacturername": "_TYZB01_hjsgdkfl", "modelid": "TS0201", - "product": "BW-IS4", - "vendor": "Blitzwolf", + "vendor": "BlitzWolf", + "product": "Temperature and humidity sensor with display (BW-IS4)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/blitzwolf/bw_shp13_smart_plug.json b/devices/blitzwolf/bw_shp13_smart_plug.json index 0464ea5a84..e4e2219705 100644 --- a/devices/blitzwolf/bw_shp13_smart_plug.json +++ b/devices/blitzwolf/bw_shp13_smart_plug.json @@ -3,8 +3,8 @@ "uuid": "0ba557b8-580f-43a0-b0e3-ce76f4f71b96", "manufacturername": ["_TZ3000_g5xawfcq", "_TZ3000_amdymr7l"], "modelid": ["TS0121", "TS011F"], - "product": "BW-SHP13", - "vendor": "Blitzwolf", + "vendor": "BlitzWolf", + "product": "Electricity metering 16A EU plug (BW-SHP13)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/blitzwolf/bw_shp15_smart_plug.json b/devices/blitzwolf/bw_shp15_smart_plug.json index b31c1b9d15..35d63af34f 100644 --- a/devices/blitzwolf/bw_shp15_smart_plug.json +++ b/devices/blitzwolf/bw_shp15_smart_plug.json @@ -3,8 +3,8 @@ "uuid": "90a67336-789a-4284-89a9-6f07bcbd2c9a", "manufacturername": ["_TZ3000_mraovvmm", "_TZ3000_u5u4cakc"], "modelid": ["TS011F", "TS011F"], - "product": "BW-SHP15", - "vendor": "Blitzwolf", + "vendor": "BlitzWolf", + "product": "Power monitoring 16A 3680W EU plug (BW-SHP15)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/bosch/bmct-slz_shutter_light_control2.json b/devices/bosch/bmct-slz_shutter_light_control2.json index 750fbd8cfa..6533cc2def 100644 --- a/devices/bosch/bmct-slz_shutter_light_control2.json +++ b/devices/bosch/bmct-slz_shutter_light_control2.json @@ -1,10 +1,10 @@ { "schema": "devcap1.schema.json", "uuid": "39410b10-dfa0-4b25-aad3-b1d170d11b36", - "manufacturername": "Bosch", + "manufacturername": "$MF_BOSCH", "modelid": "RBSH-MMS-ZB-EU", "vendor": "Bosch", - "product": "Light/shutter control II (BMCT-SLZ)", + "product": "Light and shutter control II (BMCT-SLZ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/bosch/bsd-2-smoke-alarm.json b/devices/bosch/bsd-2-smoke-alarm.json index 9d686dd659..c25aa965bb 100644 --- a/devices/bosch/bsd-2-smoke-alarm.json +++ b/devices/bosch/bsd-2-smoke-alarm.json @@ -4,7 +4,7 @@ "manufacturername": "$MF_BOSCH", "modelid": "RBSH-SD-ZB-EU", "vendor": "Bosch", - "product": "Smoke Alarm II", + "product": "Smoke alarm II (BSD-2)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/bosch/bwa-1_water_sensor.json b/devices/bosch/bwa-1_water_sensor.json index 7f5700c5f7..59c9411f94 100644 --- a/devices/bosch/bwa-1_water_sensor.json +++ b/devices/bosch/bwa-1_water_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "$MF_BOSCH", "modelid": "RBSH-WS-ZB-EU", "vendor": "Bosch", - "product": "BWA-1 water sensor", + "product": "Water alarm (BWA-1)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/bosch/plug_compact.json b/devices/bosch/plug_compact.json index d4eb5c7fa5..1631f828d8 100644 --- a/devices/bosch/plug_compact.json +++ b/devices/bosch/plug_compact.json @@ -4,7 +4,7 @@ "manufacturername": "BOSCH", "modelid": "RBSH-SP-ZB-EU", "vendor": "Bosch", - "product": "Plug compact EU BSP-FZ2", + "product": "Plug compact EU (BSP-FZ2)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/bosch/thermostat2.json b/devices/bosch/thermostat2.json index b736e5fd93..c231d9214b 100644 --- a/devices/bosch/thermostat2.json +++ b/devices/bosch/thermostat2.json @@ -4,7 +4,7 @@ "manufacturername": "BOSCH", "modelid": "RBSH-TRV0-ZB-EU", "vendor": "Bosch", - "product": "Thermostat II BTH-RA", + "product": "Thermostat II (BTH-RA)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/centralite/motion_sensor-a.json b/devices/centralite/motion_sensor-a.json index 85885a3a1d..6aa592c3a6 100644 --- a/devices/centralite/motion_sensor-a.json +++ b/devices/centralite/motion_sensor-a.json @@ -3,8 +3,8 @@ "uuid": "f9941e52-4b42-4f5c-9d12-c8ea7843051e", "manufacturername": "CentraLite", "modelid": "Motion Sensor-A", + "vendor": "Osram", "product": "Motion Sensor-A", - "vendor": "OSRAM", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/computime-salus/ss909zb_temp_sensor.json b/devices/computime-salus/ss909zb_temp_sensor.json index f6807a43c2..c0156e26b1 100644 --- a/devices/computime-salus/ss909zb_temp_sensor.json +++ b/devices/computime-salus/ss909zb_temp_sensor.json @@ -4,7 +4,8 @@ "uuid": "27bc348d-0253-40be-9983-b93d33636e3f", "manufacturername": "Computime", "modelid": "SS909ZB", - "product": "Salus PS600 Temperature Sensor", + "vendor": "Salus", + "product": "Pipe temperature sensor (PS600)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/danalock/danalock_v3.json b/devices/danalock/danalock_v3.json index 47fb32cb4e..b0b3f72a53 100644 --- a/devices/danalock/danalock_v3.json +++ b/devices/danalock/danalock_v3.json @@ -10,7 +10,8 @@ "V3-BTZBE", "V3-BTZB" ], - "product": "Danalock V3", + "vendor": "Danalock", + "product": "V3 smart lock (V3-BTZB/V3-BTZBE)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/danfoss/ally_temp_hum_sensor.json b/devices/danfoss/ally_temp_hum_sensor.json index 599accfe8d..edf255a6be 100644 --- a/devices/danfoss/ally_temp_hum_sensor.json +++ b/devices/danfoss/ally_temp_hum_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_mxzo5rhf", "modelid": "TS0201", "vendor": "Danfoss", - "product": "Ally temp./hum. sensor", + "product": "Ally temperature and humidity sensor (014G2480)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/danfoss/etrv0100_thermostat.json b/devices/danfoss/etrv0100_thermostat.json index 65ae6d1be0..7e777189b4 100644 --- a/devices/danfoss/etrv0100_thermostat.json +++ b/devices/danfoss/etrv0100_thermostat.json @@ -4,7 +4,7 @@ "manufacturername": ["Danfoss", "Danfoss", "D5X84YU", "D5X84YU", "Danfoss"], "modelid": ["eTRV0100", "eTRV0103", "eT093WRO", "eT093WRG", "TRV001"], "vendor": "Danfoss", - "product": "Ally thermostat", + "product": "Ally radiator thermostat (014G2461)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/develco/aqszb-110_voc_sensor.json b/devices/develco/aqszb-110_voc_sensor.json index eba1541cff..c0465e549d 100644 --- a/devices/develco/aqszb-110_voc_sensor.json +++ b/devices/develco/aqszb-110_voc_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "Develco Products A/S", "modelid": "AQSZB-110", "vendor": "Develco Products", - "product": "AQSZB-110 TVOC sensor", + "product": "Air quality sensor (AQSZB-110)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/develco/heszb-120_heat_detector.json b/devices/develco/heszb-120_heat_detector.json index 1d441e8658..c9f5e52880 100644 --- a/devices/develco/heszb-120_heat_detector.json +++ b/devices/develco/heszb-120_heat_detector.json @@ -4,7 +4,7 @@ "manufacturername": "Develco Products A/S", "modelid": "HESZB-120", "vendor": "Develco Products", - "product": "HESZB-120 heat sensor", + "product": "Intelligent heat alarm (HESZB-120)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/develco/hmszb_temp_hum_sensor.json b/devices/develco/hmszb_temp_hum_sensor.json index 5677464f65..d1c80f3d2e 100644 --- a/devices/develco/hmszb_temp_hum_sensor.json +++ b/devices/develco/hmszb_temp_hum_sensor.json @@ -4,7 +4,7 @@ "manufacturername": ["Develco Products A/S", "Develco Products A/S"], "modelid": ["HMSZB-110", "HMSZB-120"], "vendor": "Develco Products", - "product": "Temperature/humidity sensor HMSZB-110/HMSZB-120", + "product": "Temperature and humidity sensor (HMSZB-110/HMSZB-120)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/develco/iomzb-110_switch_module.json b/devices/develco/iomzb-110_switch_module.json index c3ca690371..c3eefb1398 100644 --- a/devices/develco/iomzb-110_switch_module.json +++ b/devices/develco/iomzb-110_switch_module.json @@ -3,7 +3,8 @@ "uuid": "316cc916-be3f-43e3-956c-ac379e6da4c3", "manufacturername": "Develco Products A/S", "modelid": "IOMZB-110", - "product": "IOMZB-110 switch module", + "vendor": "Develco Products", + "product": "Dry contact IO-module (IOMZB-110)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/develco/moszb-140_motion_sensor.json b/devices/develco/moszb-140_motion_sensor.json index 9cb5a0b9cd..ec57d5aab3 100644 --- a/devices/develco/moszb-140_motion_sensor.json +++ b/devices/develco/moszb-140_motion_sensor.json @@ -4,7 +4,7 @@ "manufacturername": ["Develco Products A/S", "Develco Products A/S"], "modelid": ["MOSZB-130", "MOSZB-140"], "vendor": "Develco Products", - "product": "MOSZB-130/140 motion sensor pro", + "product": "Motion sensor (MOSZB-130/MOSZB-140)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/develco/moszb-141_motion_sensor.json b/devices/develco/moszb-141_motion_sensor.json index a2fa1a4bf4..e075a4dd8c 100644 --- a/devices/develco/moszb-141_motion_sensor.json +++ b/devices/develco/moszb-141_motion_sensor.json @@ -4,7 +4,7 @@ "manufacturername": ["Develco Products A/S", "frient A/S"], "modelid": ["MOSZB-141", "MOSZB-141"], "vendor": "Develco Products", - "product": "MOSZB-141 motion sensor", + "product": "Motion sensor (MOSZB-141)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/develco/smszb-120_smoke_detector.json b/devices/develco/smszb-120_smoke_detector.json index 02f318a33b..76036cc0df 100644 --- a/devices/develco/smszb-120_smoke_detector.json +++ b/devices/develco/smszb-120_smoke_detector.json @@ -4,7 +4,7 @@ "manufacturername": "Develco Products A/S", "modelid": "SMSZB-120", "vendor": "Develco Products", - "product": "SMSZB-120 smoke sensor", + "product": "Intelligent smoke alarm (SMSZB-120)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/develco/splzb-131_smart_plug.json b/devices/develco/splzb-131_smart_plug.json index 3383026bbe..655fd4e270 100644 --- a/devices/develco/splzb-131_smart_plug.json +++ b/devices/develco/splzb-131_smart_plug.json @@ -4,7 +4,7 @@ "manufacturername": "Develco Products A/S", "modelid": "SPLZB-131", "vendor": "Develco Products", - "product": "SPLZB-131 smart plug (Schuko)", + "product": "Smart plug mini type F - Schuko (SPLZB-131)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/develco/wiszb-120_open_close_sensor.json b/devices/develco/wiszb-120_open_close_sensor.json index 33340a786f..3796964d60 100644 --- a/devices/develco/wiszb-120_open_close_sensor.json +++ b/devices/develco/wiszb-120_open_close_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "Develco Products A/S", "modelid": "WISZB-120", "vendor": "Develco Products", - "product": "WISZB-120 open/close sensor", + "product": "Entry sensor pro (WISZB-120)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/develco/wiszb-121_open_close_sensor.json b/devices/develco/wiszb-121_open_close_sensor.json index 92baf08c86..6b03881f1e 100644 --- a/devices/develco/wiszb-121_open_close_sensor.json +++ b/devices/develco/wiszb-121_open_close_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "Develco Products A/S", "modelid": "WISZB-121", "vendor": "Develco Products", - "product": "WISZB-121 open/close sensor", + "product": "Entry sensor (WISZB-121)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/develco/zhemi101_external_meter_interface.json b/devices/develco/zhemi101_external_meter_interface.json index 8291e2e54e..bdb7424110 100644 --- a/devices/develco/zhemi101_external_meter_interface.json +++ b/devices/develco/zhemi101_external_meter_interface.json @@ -3,8 +3,8 @@ "uuid": "fccf500b-00d4-4bf6-b42d-27784e3803c2", "manufacturername": ["Develco Products A/S", "frient A/S", "Develco"], "modelid": ["ZHEMI101", "ZHEMI101", "ZHEMI101"], - "vendor": "Develco products", - "product": "External meter interface ZHEMI101", + "vendor": "Develco Products", + "product": "Electricity meter interface (ZHEMI101)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/dresden_elektronik/fls_pp3.json b/devices/dresden_elektronik/fls_pp3.json index 80786d5f74..c2a3414d3a 100644 --- a/devices/dresden_elektronik/fls_pp3.json +++ b/devices/dresden_elektronik/fls_pp3.json @@ -3,7 +3,8 @@ "uuid": "330ac513-ca70-4a25-8a28-9ae251e7107e", "manufacturername": ["dresden elektronik", "dresden elektronik"], "modelid": ["FLS-PP3", "FLS-PP3 White"], - "product": "FLS-PP lp", + "vendor": "dresden elektronik", + "product": "Wireless electronic ballast power-PWM (FLS-PP)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/dresden_elektronik/hive.json b/devices/dresden_elektronik/hive.json index 59a94d22d8..4cb1003e27 100644 --- a/devices/dresden_elektronik/hive.json +++ b/devices/dresden_elektronik/hive.json @@ -3,7 +3,8 @@ "uuid": "ba595349-3541-41d6-a79f-965115d547a7", "manufacturername": "Phoscon", "modelid": "Hive", - "product": "Hive", + "vendor": "dresden elektronik", + "product": "Portable ambient light (Phoscon Hive)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/dresden_elektronik/kobold.json b/devices/dresden_elektronik/kobold.json index 198f9bfb2e..84f1547468 100644 --- a/devices/dresden_elektronik/kobold.json +++ b/devices/dresden_elektronik/kobold.json @@ -3,7 +3,8 @@ "uuid": "563992e6-fe20-416b-a7ba-b9ebfe362b90", "manufacturername": "dresden elektronik", "modelid": "Kobold", - "product": "Kobold", + "vendor": "dresden elektronik", + "product": "Smart dimmer switch (Kobold)", "sleeper": false, "supportsMgmtBind": true, "status": "Gold", diff --git a/devices/dresden_elektronik/lighting_switch.json b/devices/dresden_elektronik/lighting_switch.json index aabfff0783..3f1ca50202 100644 --- a/devices/dresden_elektronik/lighting_switch.json +++ b/devices/dresden_elektronik/lighting_switch.json @@ -3,7 +3,8 @@ "uuid": "bd19625b-6d14-4843-b69f-971bf6585348", "manufacturername": "dresden elektronik", "modelid": "Lighting Switch", - "product": "Lighting Switch", + "vendor": "dresden elektronik", + "product": "Multifunctional wireless switch (Lighting switch)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/dresden_elektronik/scene_switch.json b/devices/dresden_elektronik/scene_switch.json index 09eed5f970..8aeb003cd3 100644 --- a/devices/dresden_elektronik/scene_switch.json +++ b/devices/dresden_elektronik/scene_switch.json @@ -3,7 +3,8 @@ "uuid": "57f972c5-ead9-4ee2-be54-2b89b0deedf2", "manufacturername": "dresden elektronik", "modelid": "Scene Switch", - "product": "Scene Switch", + "vendor": "dresden elektronik", + "product": "Multifunctional wireless switch (Scene switch)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/easyaccess/easyfingertouch_doorlock.json b/devices/easyaccess/easyfingertouch_doorlock.json index 7f69d1c78d..0090449bb0 100644 --- a/devices/easyaccess/easyfingertouch_doorlock.json +++ b/devices/easyaccess/easyfingertouch_doorlock.json @@ -3,8 +3,8 @@ "uuid": "01f14344-531a-4b8a-831c-7dbdb134f755", "manufacturername": ["Onesti Products AS", "Onesti Products AS", "Onesti Products AS", "Onesti Products AS", "Onesti Products AS", "Onesti Products AS"], "modelid": ["EasyFingerTouch", "EasyCodeTouch", "NimlyPRO", "NimlyCode", "NimlyTouch", "NimlyIn"], - "vendor": "Onesti Products AS", - "product": "Keypad Doorlock", + "vendor": "Onesti", + "product": "Keypad doorlock (Various models)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/elko/thermostat_16_a.json b/devices/elko/thermostat_16_a.json index 7dd86fa805..f255d67df0 100644 --- a/devices/elko/thermostat_16_a.json +++ b/devices/elko/thermostat_16_a.json @@ -3,7 +3,8 @@ "uuid": "e4ee14c0-c6a8-431c-8bff-4b4aa32d5de3", "manufacturername": "Schneider Electric", "modelid": "EKO07259", - "product": "Elko Smart ZB Thermostat 16 A", + "vendor": "Schneider Electric", + "product": "Connected thermostat elko smart plus 16A (EKO07259)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/eva/powermeter.json b/devices/eva/powermeter.json index e67feef098..d42a041559 100644 --- a/devices/eva/powermeter.json +++ b/devices/eva/powermeter.json @@ -4,7 +4,7 @@ "manufacturername": "Eva", "modelid": "Meter Reader", "vendor": "Eva", - "product": "Powermeter", + "product": "Meter Reader", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/fantem/zb003-x_multi_sensor.json b/devices/fantem/zb003-x_multi_sensor.json index 0eaef02cfd..ee2b5ac99b 100644 --- a/devices/fantem/zb003-x_multi_sensor.json +++ b/devices/fantem/zb003-x_multi_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3210_wuhzzfqg", "modelid": "TS0202", "vendor": "Fantem", - "product": "Multi sensor ZB003-X", + "product": "Multi sensor 4 in 1 (ZB003-X)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/frient/aqszb-110_voc_sensor.json b/devices/frient/aqszb-110_voc_sensor.json index 50a2743e04..bad4a3c6b6 100644 --- a/devices/frient/aqszb-110_voc_sensor.json +++ b/devices/frient/aqszb-110_voc_sensor.json @@ -3,8 +3,8 @@ "uuid": "14bd9844-c3e9-4831-a92d-91093da03de8", "manufacturername": "frient A/S", "modelid": "AQSZB-110", - "vendor": "Develco Products", - "product": "AQSZB-110 TVOC sensor", + "vendor": "Frient", + "product": "Air quality sensor (AQSZB-110)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/frient/heszb-120_heat_detector.json b/devices/frient/heszb-120_heat_detector.json index 772e6f530a..0580b67d11 100644 --- a/devices/frient/heszb-120_heat_detector.json +++ b/devices/frient/heszb-120_heat_detector.json @@ -3,8 +3,8 @@ "uuid": "027828c2-c94a-44fc-ac44-b948e50174e1", "manufacturername": "frient A/S", "modelid": "HESZB-120", - "vendor": "Develco Products", - "product": "HESZB-120 heat sensor", + "vendor": "Frient", + "product": "Intelligent heat alarm (HESZB-120)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/frient/hmszb_temp_hum_sensor.json b/devices/frient/hmszb_temp_hum_sensor.json index 9c74ecd512..a9c8a4d47a 100644 --- a/devices/frient/hmszb_temp_hum_sensor.json +++ b/devices/frient/hmszb_temp_hum_sensor.json @@ -3,8 +3,8 @@ "uuid": "74183c57-8b6f-42e8-b564-ec4930f7596f", "manufacturername": ["frient A/S", "frient A/S"], "modelid": ["HMSZB-110", "HMSZB-120"], - "vendor": "Develco Products", - "product": "Temperature/humidity sensor HMSZB-110/HMSZB-120", + "vendor": "Frient", + "product": "Temperature and humidity sensor (HMSZB-110/HMSZB-120)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/frient/kepzb-110_keypad.json b/devices/frient/kepzb-110_keypad.json index ac1d49f975..9c4d9699bc 100644 --- a/devices/frient/kepzb-110_keypad.json +++ b/devices/frient/kepzb-110_keypad.json @@ -2,9 +2,9 @@ "schema":"devcap1.schema.json", "uuid":"cb65ebbd-876d-4f46-9167-3a6cb183ede4", "manufacturername": ["Develco Products A/S", "frient A/S"], - "product":"KEPZB-110 Keypad", - "vendor": "Develco Products", "modelid": ["KEPZB-110", "KEPZB-110"], + "vendor": "Frient", + "product": "Wireless keypad (KEPZB-110)", "sleeper":false, "status":"Bronze", "subdevices":[ diff --git a/devices/frient/moszb-140_motion_sensor.json b/devices/frient/moszb-140_motion_sensor.json index 356747da18..b961bcbfb9 100644 --- a/devices/frient/moszb-140_motion_sensor.json +++ b/devices/frient/moszb-140_motion_sensor.json @@ -3,8 +3,8 @@ "uuid": "09c704bf-e3a1-4a45-abf2-7b8420ec4031", "manufacturername": "frient A/S", "modelid": "MOSZB-140", - "vendor": "Develco Products", - "product": "MOSZB-140 motion sensor pro", + "vendor": "Frient", + "product": "Motion sensor pro (MOSZB-140)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/frient/moszb-154_motion_sensor.json b/devices/frient/moszb-154_motion_sensor.json index 5f65d0a467..6a7b2bbc77 100644 --- a/devices/frient/moszb-154_motion_sensor.json +++ b/devices/frient/moszb-154_motion_sensor.json @@ -3,8 +3,8 @@ "uuid": "ae54681f-9243-47b3-95f2-58b1a3c19451", "manufacturername": "frient A/S", "modelid": "MOSZB-154", - "vendor": "Develco Products", - "product": "MOSZB-154 motion sensor pro", + "vendor": "Frient", + "product": "Motion sensor pro (MOSZB-154)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/frient/smszb-120_smoke_detector.json b/devices/frient/smszb-120_smoke_detector.json index eb34ab15fd..5076c4fba9 100644 --- a/devices/frient/smszb-120_smoke_detector.json +++ b/devices/frient/smszb-120_smoke_detector.json @@ -3,8 +3,8 @@ "uuid": "b755930f-483c-481f-ba64-4afe439869b2", "manufacturername": "frient A/S", "modelid": "SMSZB-120", - "vendor": "Develco Products", - "product": "SMSZB-120 smoke sensor", + "vendor": "Frient", + "product": "Intelligent smoke alarm (SMSZB-120)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/frient/splzb-131_smart_plug.json b/devices/frient/splzb-131_smart_plug.json index 9fef8b4502..4e4e49ddf6 100644 --- a/devices/frient/splzb-131_smart_plug.json +++ b/devices/frient/splzb-131_smart_plug.json @@ -3,7 +3,8 @@ "uuid": "ca5aa4de-3709-4d5f-9cb4-6748d155798f", "manufacturername": ["frient A/S", "frient A/S", "frient A/S"], "modelid": ["SPLZB-131", "SPLZB-134", "SPLZB-141"], - "product": "SPLZB-131, SPLZB-134 and SPLZB-141 smart plug", + "vendor": "Frient", + "product": "Smart plug mini (SPLZB-131/SPLZB-134/SPLZB-141)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/frient/wiszb-120_open_close_sensor.json b/devices/frient/wiszb-120_open_close_sensor.json index 01236b6461..704dd4bfa8 100644 --- a/devices/frient/wiszb-120_open_close_sensor.json +++ b/devices/frient/wiszb-120_open_close_sensor.json @@ -3,8 +3,8 @@ "uuid": "32b8cf7f-77c7-4887-9782-467158c9dc60", "manufacturername": "frient A/S", "modelid": "WISZB-120", - "vendor": "Develco Products", - "product": "WISZB-120 open/close sensor", + "vendor": "Frient", + "product": "Entry sensor pro (WISZB-120)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/frient/wiszb-121_open_close_sensor.json b/devices/frient/wiszb-121_open_close_sensor.json index fac8a859c0..fd53e4d9c4 100644 --- a/devices/frient/wiszb-121_open_close_sensor.json +++ b/devices/frient/wiszb-121_open_close_sensor.json @@ -3,8 +3,8 @@ "uuid": "7a0b8719-70b6-42d5-b430-14d38f87bfd4", "manufacturername": "frient A/S", "modelid": "WISZB-121", - "vendor": "Develco Products", - "product": "WISZB-121 open/close sensor", + "vendor": "Frient", + "product": "Entry sensor (WISZB-121)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/gledopto/gledopto.json b/devices/gledopto/floodlight.json similarity index 99% rename from devices/gledopto/gledopto.json rename to devices/gledopto/floodlight.json index dc6cc19ed6..dcb0e5d056 100644 --- a/devices/gledopto/gledopto.json +++ b/devices/gledopto/floodlight.json @@ -10,7 +10,8 @@ "RGBW" ], "matchexpr": "R.endpoints.indexOf(0x0a) !== -1 && R.endpoints.indexOf(0x0b) !== -1", - "product": "GLEDOPTO floodlight", + "vendor": "Gledopto", + "product": "Floodlight", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/gledopto/gl-sd-002_switch.json b/devices/gledopto/gl-sd-002_switch.json index 19177065f1..c3a50475a4 100644 --- a/devices/gledopto/gl-sd-002_switch.json +++ b/devices/gledopto/gl-sd-002_switch.json @@ -3,7 +3,8 @@ "uuid": "d0cde800-0de6-4189-b5c7-bda17882ee0f", "manufacturername": "GLEDOPTO", "modelid": "GL-SD-002", - "product": "GL-SD-002", + "vendor": "Gledopto", + "product": "Switch module (GL-SD-002)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/greeble/jz-rgbw-z01.json b/devices/greeble/jz-rgbw-z01.json index 8aec7a3370..07a4c0b4c0 100644 --- a/devices/greeble/jz-rgbw-z01.json +++ b/devices/greeble/jz-rgbw-z01.json @@ -3,7 +3,8 @@ "uuid": "e8018b76-1282-4299-b796-c0028638a213", "manufacturername": "GREEBLE", "modelid": "JZ-RGBW-Z01", - "product": "JZ-RGBW-Z01", + "vendor": "Greeble", + "product": "Extended color light (JZ-RGBW-Z01)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/heiman/HS3AQ_air_quality_sensor.json b/devices/heiman/HS3AQ_air_quality_sensor.json index 556056b671..0a10b779e3 100644 --- a/devices/heiman/HS3AQ_air_quality_sensor.json +++ b/devices/heiman/HS3AQ_air_quality_sensor.json @@ -3,7 +3,8 @@ "uuid": "b90bdc10-b593-4ea1-b837-757cb7cf1d33", "manufacturername": "HEIMAN", "modelid": "HS3AQ-EFA-3.0", - "product": "HHS3AQ carbondioxide detector", + "vendor": "Heiman", + "product": "Air quality monitor (HS3AQ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/heiman/hs1rc_keyfob.json b/devices/heiman/hs1rc_keyfob.json index e57bf521bc..c9c212ee6a 100644 --- a/devices/heiman/hs1rc_keyfob.json +++ b/devices/heiman/hs1rc_keyfob.json @@ -4,7 +4,7 @@ "manufacturername": ["HEIMAN", "Heiman", "HEIMAN"], "modelid": ["RC-EF-3.0", "RC_V14", "RC-EM"], "vendor": "Heiman", - "product": "Keyfob HS1RC/HS1RC-M//HS1RC-E", + "product": "Remote controller (HS1RC)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/heiman/hs1sa_smoke_sensor.json b/devices/heiman/hs1sa_smoke_sensor.json index 44c9d70eb1..4512bddbae 100644 --- a/devices/heiman/hs1sa_smoke_sensor.json +++ b/devices/heiman/hs1sa_smoke_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "Heiman", "modelid": "SmokeSensor-EF-3.0", "vendor": "Heiman", - "product": "HS1SA", + "product": "Smoke sensor (HS1SA)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/heiman/hs2wd-e_smart_siren.json b/devices/heiman/hs2wd-e_smart_siren.json index 72bd584d82..1d18574cc4 100644 --- a/devices/heiman/hs2wd-e_smart_siren.json +++ b/devices/heiman/hs2wd-e_smart_siren.json @@ -10,7 +10,7 @@ "WarningDevice-EF-3.0" ], "vendor": "Heiman", - "product": "Smart siren HS2WD-E", + "product": "Sound and flash siren (HS2WD)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/heiman/smartplug.json b/devices/heiman/smartplug.json index 930b2d28b5..dab4e4c005 100644 --- a/devices/heiman/smartplug.json +++ b/devices/heiman/smartplug.json @@ -3,7 +3,8 @@ "uuid": "14938c50-2781-41e4-80a4-d38b3a996ca1", "manufacturername": "Heiman", "modelid": "SmartPlug", - "product": "SmartPlug", + "vendor": "Heiman", + "product": "Metering Plug (HS2SK)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/home2link/H2L-ZBPH-RS.json b/devices/home2link/H2L-ZBPH-RS.json index aa6a78bd13..a49310baec 100644 --- a/devices/home2link/H2L-ZBPH-RS.json +++ b/devices/home2link/H2L-ZBPH-RS.json @@ -3,7 +3,8 @@ "uuid": "d9ed5ba0-4957-47b5-9e75-d7f7bf1fa153", "manufacturername": "H2L-ZBPH-RS", "modelid": "H2L-ZBPH-RS", - "product": "H2L-ZBPH-RS", + "vendor": "Home2Link", + "product": "Hue Curtain Motor controller (H2L-ZBPH-RS)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/hzc_electric/s900w-zg_water_leak_sensor.json b/devices/hzc_electric/s900w-zg_water_leak_sensor.json index d0cc7b822e..8a970e0ebc 100644 --- a/devices/hzc_electric/s900w-zg_water_leak_sensor.json +++ b/devices/hzc_electric/s900w-zg_water_leak_sensor.json @@ -3,8 +3,8 @@ "uuid": "8f8b987f-fb65-4d21-8f44-df439c916d91", "manufacturername": "Shyugj", "modelid": "WaterLeakageSensor-ZB3.0", - "vendor": "HZC electric", - "product": "S900W-ZG Water leak sensor", + "vendor": "HZC Electronics", + "product": "Water leak sensor (S900W-ZG)", "sleeper": true, "status": "Silver", "subdevices": [ diff --git a/devices/icasa/ICZB-IW11D.json b/devices/icasa/ICZB-IW11D.json index 14b11249f6..eff233d8dd 100644 --- a/devices/icasa/ICZB-IW11D.json +++ b/devices/icasa/ICZB-IW11D.json @@ -3,7 +3,8 @@ "uuid": "979778dc-e197-425e-8d44-4ccddc00b433", "manufacturername": "icasa", "modelid": "ICZB-IW11D", - "product": "AC Dimmer", + "vendor": "iCasa", + "product": "AC dimmer (ICZB-IW11D)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/askvader_on_off_switch.json b/devices/ikea/askvader_on_off_switch.json index a738bd9e80..08f74ddfbb 100644 --- a/devices/ikea/askvader_on_off_switch.json +++ b/devices/ikea/askvader_on_off_switch.json @@ -4,7 +4,7 @@ "manufacturername": "$MF_IKEA", "modelid": "ASKVADER on/off switch", "vendor": "IKEA", - "product": "ASKVADER on/off switch - E1836", + "product": "Askvader On/off switch (E1836)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/badring_water_leak_sensor.json b/devices/ikea/badring_water_leak_sensor.json index 3601e4efd4..c5c6f5b164 100644 --- a/devices/ikea/badring_water_leak_sensor.json +++ b/devices/ikea/badring_water_leak_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "$MF_IKEA", "modelid": "BADRING Water Leakage Sensor", "vendor": "IKEA", - "product": "BADRING Water Leakage Sensor", + "product": "Badring Water leakage sensor (E2202)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/blind.json b/devices/ikea/blind.json index 89ebb6fcfc..6f67e51ef9 100644 --- a/devices/ikea/blind.json +++ b/devices/ikea/blind.json @@ -13,6 +13,8 @@ "PRAKTLYSING cellular blind", "TREDANSEN block-out cellul blind" ], + "vendor": "IKEA", + "product": "Blinds (FYRTUR/KADRILJ/PRAKTLYSING/TREDANSEN)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/e14_ws_opal_400lm_light.json b/devices/ikea/e14_ws_opal_400lm_light.json index fb34b12883..b400ae2e0c 100644 --- a/devices/ikea/e14_ws_opal_400lm_light.json +++ b/devices/ikea/e14_ws_opal_400lm_light.json @@ -3,7 +3,8 @@ "uuid": "8ecd84ad-4015-4b9e-bee2-311e750ee974", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E14 WS opal 400lm", - "product": "TRÅDFRI bulb E14 WS opal 400lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E14 400 lumen (LED1536G5)", "sleeper": false, "status": "Bronze", "subdevices": [ diff --git a/devices/ikea/gu10_ws_400lm_light.json b/devices/ikea/gu10_ws_400lm_light.json index fc592f7e89..b36211f537 100644 --- a/devices/ikea/gu10_ws_400lm_light.json +++ b/devices/ikea/gu10_ws_400lm_light.json @@ -3,7 +3,8 @@ "uuid": "fa44b7d1-6b46-4bae-9264-2dea7c216d9e", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb GU10 WS 400lm", - "product": "TRÅDFRI bulb GU10 WS 400lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb GU10 400lm (LED1737R5)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/ormanas_led_strip.json b/devices/ikea/ormanas_led_strip.json index 8c2d58418d..c478d46492 100644 --- a/devices/ikea/ormanas_led_strip.json +++ b/devices/ikea/ormanas_led_strip.json @@ -3,7 +3,8 @@ "uuid": "6b05491f-10ed-40e3-9fd2-d2f7758cb5a1", "manufacturername": "$MF_IKEA", "modelid": "ORMANAS LED Strip", - "product": "ORMANAS LED Strip", + "vendor": "IKEA", + "product": "Ormanas LED lighting strip (L2112)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/parasoll_open_close_sensor.json b/devices/ikea/parasoll_open_close_sensor.json index 11645e1156..9307e4f6ae 100644 --- a/devices/ikea/parasoll_open_close_sensor.json +++ b/devices/ikea/parasoll_open_close_sensor.json @@ -3,7 +3,8 @@ "uuid": "9cc2db31-a047-4431-b646-1e72d9a3fd0f", "manufacturername": "$MF_IKEA", "modelid": "PARASOLL Door/Window Sensor", - "product": "PARASOLL Door/Window Sensor", + "vendor": "IKEA", + "product": "Parasoll door/window sensor (E2013)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/rodret_dimmer.json b/devices/ikea/rodret_dimmer.json index 34f3b4e821..421c299e4c 100644 --- a/devices/ikea/rodret_dimmer.json +++ b/devices/ikea/rodret_dimmer.json @@ -3,7 +3,8 @@ "uuid": "3d671c73-06da-4adc-99f1-076b3dfb3122", "manufacturername": "$MF_IKEA", "modelid": "RODRET Dimmer", - "product": "RODRET Dimmer - E2201", + "vendor": "IKEA", + "product": "Rodret Wireless Dimmer (E2201)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/somrig_shortcut_button.json b/devices/ikea/somrig_shortcut_button.json index ccdfd581c0..0d45042caf 100644 --- a/devices/ikea/somrig_shortcut_button.json +++ b/devices/ikea/somrig_shortcut_button.json @@ -3,7 +3,8 @@ "uuid": "d55d8889-d7b5-476f-9d88-be86348f0ca4", "manufacturername": "IKEA of Sweden", "modelid": "SOMRIG shortcut button", - "product": "SOMRIG Shortcut Button", + "vendor": "IKEA", + "product": "Somrig shortcut button (E2201)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/starkvind_air_purifier.json b/devices/ikea/starkvind_air_purifier.json index bfa9b07d93..b2253e9941 100644 --- a/devices/ikea/starkvind_air_purifier.json +++ b/devices/ikea/starkvind_air_purifier.json @@ -9,7 +9,8 @@ "STARKVIND Air purifier", "STARKVIND Air purifier table" ], - "product": "STARKVIND Air purifier", + "vendor": "IKEA", + "product": "Starkvind Air purifier (E2006/E2007)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/styrbar_remote_control.json b/devices/ikea/styrbar_remote_control.json index 5ceee8e2ed..2c1bd9210b 100644 --- a/devices/ikea/styrbar_remote_control.json +++ b/devices/ikea/styrbar_remote_control.json @@ -3,7 +3,8 @@ "uuid": "a21e11e2-f595-4703-9cb2-83c89e1bb59e", "manufacturername": "$MF_IKEA", "modelid": "Remote Control N2", - "product": "STYRBAR remote control - E2002", + "vendor": "IKEA", + "product": "Styrbar remote control (E2002)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/symfonisk_sound_contoller.json b/devices/ikea/symfonisk_sound_contoller.json index 6e63025f6b..5de34f9201 100644 --- a/devices/ikea/symfonisk_sound_contoller.json +++ b/devices/ikea/symfonisk_sound_contoller.json @@ -3,7 +3,8 @@ "uuid": "bc0e6601-5492-4a98-b5e8-687923af249b", "manufacturername": "$MF_IKEA", "modelid": "SYMFONISK Sound Controller", - "product": "SYMFONISK Sound Controller - E1744", + "vendor": "IKEA", + "product": "Symfonisk sound controller (E1744)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/symfonisk_sound_remote_gen2.json b/devices/ikea/symfonisk_sound_remote_gen2.json index 2f01b58ddb..ecbe484f04 100644 --- a/devices/ikea/symfonisk_sound_remote_gen2.json +++ b/devices/ikea/symfonisk_sound_remote_gen2.json @@ -3,7 +3,8 @@ "uuid": "644ac55d-0763-41f3-9e22-42690b720512", "manufacturername": "$MF_IKEA", "modelid": "SYMFONISK sound remote gen2", - "product": "SYMFONISK sound remote gen2 - E2123", + "vendor": "IKEA", + "product": "Symfonisk sound remote gen2 (E2123)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_cws_A.json b/devices/ikea/tradfri_bulb_cws_A.json index d957be7a88..361a7f4746 100644 --- a/devices/ikea/tradfri_bulb_cws_A.json +++ b/devices/ikea/tradfri_bulb_cws_A.json @@ -9,7 +9,8 @@ "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", + "vendor": "IKEA", + "product": "Tradfri LED bulb E27 806 lumen CWS and GU10 345 lumen CWS (LED2004G8/LED2110R3)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e14_w_opal_400lm.json b/devices/ikea/tradfri_bulb_e14_w_opal_400lm.json index 0d87bb3016..5d19479428 100644 --- a/devices/ikea/tradfri_bulb_e14_w_opal_400lm.json +++ b/devices/ikea/tradfri_bulb_e14_w_opal_400lm.json @@ -3,7 +3,8 @@ "uuid": "c10e59de-f978-46ac-b7b2-14a1de9415d9", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E14 W op/ch 400lm", - "product": "TRADFRI bulb E14 W op/ch 400lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E12 400 lumen, wireless dimmable warm white, chandelier opal (LED1649C5)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e14_ws_opal_600lm.json b/devices/ikea/tradfri_bulb_e14_ws_opal_600lm.json index bdf61fd9f0..54e54b682f 100644 --- a/devices/ikea/tradfri_bulb_e14_ws_opal_600lm.json +++ b/devices/ikea/tradfri_bulb_e14_ws_opal_600lm.json @@ -3,7 +3,8 @@ "uuid": "605e6c67-92fb-4c0e-a195-7e0261a012d2", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E14 WS opal 600lm", - "product": "TRADFRI bulb E14 WS opal 600lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E14 600 lumen, dimmable white spectrum opal white (LED1733G7)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e14_ww_clear_250lm.json b/devices/ikea/tradfri_bulb_e14_ww_clear_250lm.json index 58236c4a6d..367870d246 100644 --- a/devices/ikea/tradfri_bulb_e14_ww_clear_250lm.json +++ b/devices/ikea/tradfri_bulb_e14_ww_clear_250lm.json @@ -3,7 +3,8 @@ "uuid": "70d4ffdd-afdc-476d-8d5d-c217ac240b8f", "manufacturername": "$MF_IKEA", "modelid": "TRADFRIbulbE14WWclear250lm", - "product": "TRÅDFRI LED bulb E14 250lm warm white clear chandelier", + "vendor": "IKEA", + "product": "Tradfri LED bulb E14 250 lumen WW clear, dimmable (LED1935C3)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e27_cws_opal_600lm.json b/devices/ikea/tradfri_bulb_e27_cws_opal_600lm.json index 05409893b4..30a2e5a832 100644 --- a/devices/ikea/tradfri_bulb_e27_cws_opal_600lm.json +++ b/devices/ikea/tradfri_bulb_e27_cws_opal_600lm.json @@ -3,7 +3,8 @@ "uuid": "81c78560-e623-4741-b7e4-340174df83f7", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E27 CWS opal 600lm", - "product": "TRADFRI bulb E27 CWS opal 600lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E27 600lm, dimmable colour and white spectrum opal white (LED1624G9)", "status": "Gold", "subdevices": [ { diff --git a/devices/ikea/tradfri_bulb_e27_w_opal_1000lm.json b/devices/ikea/tradfri_bulb_e27_w_opal_1000lm.json index 2c89560a10..b256278653 100644 --- a/devices/ikea/tradfri_bulb_e27_w_opal_1000lm.json +++ b/devices/ikea/tradfri_bulb_e27_w_opal_1000lm.json @@ -3,7 +3,8 @@ "uuid": "1b8d58d2-1487-4b10-8c4a-23e6e83ca51d", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E27 W opal 1000lm", - "product": "TRADFRI bulb E27 W opal 1000lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E27 1000 lumen, dimmable warm white globe opal white (LED1623G12)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e27_ws_opal_1000lm.json b/devices/ikea/tradfri_bulb_e27_ws_opal_1000lm.json index 9217355121..ccaa837503 100644 --- a/devices/ikea/tradfri_bulb_e27_ws_opal_1000lm.json +++ b/devices/ikea/tradfri_bulb_e27_ws_opal_1000lm.json @@ -3,7 +3,8 @@ "uuid": "75aad11e-f313-4ce0-a5b1-5c62566ed1d6", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E27 WS opal 1000lm", - "product": "TRADFRI bulb E27 WS opal 1000lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E27 1000 lumen, dimmable white spectrum opal white (LED1732G11)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e27_ws_opal_980lm.json b/devices/ikea/tradfri_bulb_e27_ws_opal_980lm.json index 68e8f5c149..629a466bfc 100644 --- a/devices/ikea/tradfri_bulb_e27_ws_opal_980lm.json +++ b/devices/ikea/tradfri_bulb_e27_ws_opal_980lm.json @@ -3,7 +3,8 @@ "uuid": "43b5d1f9-25c9-4ca9-bd89-0300571221fc", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E27 WS opal 980lm", - "product": "TRADFRI bulb E27 WS opal 980lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E26/E27 980 lumen, dimmable, white spectrum, opal white (LED1545G12)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_e27_ww_806lm.json b/devices/ikea/tradfri_bulb_e27_ww_806lm.json index b46446505e..c25315a2c1 100644 --- a/devices/ikea/tradfri_bulb_e27_ww_806lm.json +++ b/devices/ikea/tradfri_bulb_e27_ww_806lm.json @@ -3,7 +3,8 @@ "uuid": "833cf9e4-5d14-407a-a3c4-deff36c22a49", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb E27 WW 806lm", - "product": "TRADFRI bulb E27 WW 806lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E27 806 lumen, smart wireless dimmable/white spectrum globe (LED1836G9)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_gu10_w_400lm.json b/devices/ikea/tradfri_bulb_gu10_w_400lm.json index d9629acde2..a4742ea8ad 100644 --- a/devices/ikea/tradfri_bulb_gu10_w_400lm.json +++ b/devices/ikea/tradfri_bulb_gu10_w_400lm.json @@ -3,7 +3,8 @@ "uuid": "5dcc0fdc-fa3a-40a7-9598-96f2801195b6", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb GU10 W 400lm", - "product": "TRADFRI bulb GU10 W 400lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb GU10 400 lumen, dimmable white (LED1650R5)", "sleeper": false, "status": "Silver", "subdevices": [ diff --git a/devices/ikea/tradfri_bulb_gu10_ww_400lm.json b/devices/ikea/tradfri_bulb_gu10_ww_400lm.json index 6f0f031f01..120e733616 100644 --- a/devices/ikea/tradfri_bulb_gu10_ww_400lm.json +++ b/devices/ikea/tradfri_bulb_gu10_ww_400lm.json @@ -3,7 +3,8 @@ "uuid": "9c445b95-57d9-4364-8c29-09f556659886", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI bulb GU10 WW 400lm", - "product": "TRADFRI bulb GU10 WW 400lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb GU10 400 lumen, dimmable/warm white (LED1837R5)", "sleeper": false, "status": "Gold", "path": "", diff --git a/devices/ikea/tradfri_control_outlet.json b/devices/ikea/tradfri_control_outlet.json index ee225b554a..2912353b60 100644 --- a/devices/ikea/tradfri_control_outlet.json +++ b/devices/ikea/tradfri_control_outlet.json @@ -4,7 +4,7 @@ "manufacturername": "$MF_IKEA", "modelid": "TRADFRI control outlet", "vendor": "IKEA", - "product": "TRADFRI control outlet", + "product": "Tradfri Control Outlet (E1603)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_driver_30w.json b/devices/ikea/tradfri_driver_30w.json index 2e17d9c266..d3297e6c0d 100644 --- a/devices/ikea/tradfri_driver_30w.json +++ b/devices/ikea/tradfri_driver_30w.json @@ -3,7 +3,8 @@ "uuid": "ff9f8ad1-4527-4004-896b-4ef947eb382b", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI Driver 30W", - "product": "TRADFRI Driver 30W", + "vendor": "IKEA", + "product": "Tradfri LED Driver for Wireless Control 30W (ICPSHC24-10EU-IL-1/ICPSHC24-10NA-IL-1)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_motion_sensor.json b/devices/ikea/tradfri_motion_sensor.json index c27e0864c2..ebe76ab8e4 100644 --- a/devices/ikea/tradfri_motion_sensor.json +++ b/devices/ikea/tradfri_motion_sensor.json @@ -3,7 +3,8 @@ "uuid": "3b5a1753-f33f-468b-85d0-73eb8d7e5606", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI motion sensor", - "product": "TRADFRI motion sensor - E1525, E1745", + "vendor": "IKEA", + "product": "Tradfri motion sensor (E1525/E1745)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_on_off_switch.json b/devices/ikea/tradfri_on_off_switch.json index 0a9b1ea092..b19bf70cc4 100644 --- a/devices/ikea/tradfri_on_off_switch.json +++ b/devices/ikea/tradfri_on_off_switch.json @@ -3,7 +3,9 @@ "uuid": "e950d4c7-56ba-4de3-81f4-99a5619b942b", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI on/off switch", - "product": "TRADFRI on/off switch - E1743", + "vendor": "IKEA", + "product": "Tradfri on/off switch (E1743)", + "comment": "Required firmware version 0x23079631 or later", "sleeper": true, "status": "Gold", "matchexpr": "var v = R.item('attr/otaversion').val; (v == 0 || v >= 0x23079631);", diff --git a/devices/ikea/tradfri_on_off_switch_old_fw.json b/devices/ikea/tradfri_on_off_switch_old_fw.json index 815f88cd29..f375600427 100644 --- a/devices/ikea/tradfri_on_off_switch_old_fw.json +++ b/devices/ikea/tradfri_on_off_switch_old_fw.json @@ -3,7 +3,9 @@ "uuid": "152ae8be-878d-4d55-ba19-39a34b082b59", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI on/off switch", - "product": "TRADFRI on/off switch - E1743", + "vendor": "IKEA", + "product": "Tradfri on/off switch (E1743)", + "comment": "Required firmware older than 0x23079631", "sleeper": true, "status": "Gold", "matchexpr": "var v = R.item('attr/otaversion').val; (v != 0 && v < 0x23079631);", diff --git a/devices/ikea/tradfri_open_close_remote.json b/devices/ikea/tradfri_open_close_remote.json index 806e1e4956..4e56dffae3 100644 --- a/devices/ikea/tradfri_open_close_remote.json +++ b/devices/ikea/tradfri_open_close_remote.json @@ -3,7 +3,8 @@ "uuid": "7d2b2eb7-d0f7-42a1-a792-cfa74c40d435", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI open/close remote", - "product": "TRADFRI open/close remote - E1766", + "vendor": "IKEA", + "product": "Tradfri open/close remote (E1766)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_remote_control.json b/devices/ikea/tradfri_remote_control.json index 53dbbe6e72..7b4e4114fd 100644 --- a/devices/ikea/tradfri_remote_control.json +++ b/devices/ikea/tradfri_remote_control.json @@ -3,7 +3,8 @@ "uuid": "dadf3618-a75d-4e65-9675-6c44e22c584d", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI remote control", - "product": "TRADFRI remote control - E1810", + "vendor": "IKEA", + "product": "Tradfri remote control (E1810)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_shortcut_button.json b/devices/ikea/tradfri_shortcut_button.json index c9a99f6995..7ffe6dd8b3 100644 --- a/devices/ikea/tradfri_shortcut_button.json +++ b/devices/ikea/tradfri_shortcut_button.json @@ -3,7 +3,8 @@ "uuid": "28edf641-4709-484c-b0c7-c8255154348a", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI SHORTCUT Button", - "product": "TRADFRI SHORTCUT Button - E1812", + "vendor": "IKEA", + "product": "Tradfri shortcut button (E1812)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_signal_repeater.json b/devices/ikea/tradfri_signal_repeater.json index 38b3457353..06d653d6c1 100644 --- a/devices/ikea/tradfri_signal_repeater.json +++ b/devices/ikea/tradfri_signal_repeater.json @@ -9,7 +9,8 @@ "TRADFRI Signal Repeater", "TRADFRI signal repeater" ], - "product": "TRADFRI Signal Repeater", + "vendor": "IKEA", + "product": "Tradfri signal repeater (E1746)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfri_wireless_dimmer.json b/devices/ikea/tradfri_wireless_dimmer.json index 15892557b0..b57c3906a3 100644 --- a/devices/ikea/tradfri_wireless_dimmer.json +++ b/devices/ikea/tradfri_wireless_dimmer.json @@ -3,7 +3,8 @@ "uuid": "5405897a-0084-45bc-8150-533acd5b7fb3", "manufacturername": "$MF_IKEA", "modelid": "TRADFRI wireless dimmer", - "product": "TRADFRI wireless dimmer - E1724", + "vendor": "IKEA", + "product": "Tradfri wireless dimmer (E1724)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfribulbe14wscandleopal470lm.json b/devices/ikea/tradfribulbe14wscandleopal470lm.json index 37dde0d3c8..681100b08f 100644 --- a/devices/ikea/tradfribulbe14wscandleopal470lm.json +++ b/devices/ikea/tradfribulbe14wscandleopal470lm.json @@ -3,7 +3,8 @@ "uuid": "5d4a970d-3a95-4e2b-8aa8-82a885221fe1", "manufacturername": "$MF_IKEA", "modelid": "TRADFRIbulbE14WScandleopal470lm", - "product": "TRADFRIbulbE14WScandleopal470lm", + "vendor": "IKEA", + "product": "Tradfri LED bulb E14 470 lumen, wireless dimmable white spectrum/chandelier opal white (LED1949C5)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/tradfribulbe27wsglobeopal1055lm.json b/devices/ikea/tradfribulbe27wsglobeopal1055lm.json index 9938995587..5bba24ced0 100644 --- a/devices/ikea/tradfribulbe27wsglobeopal1055lm.json +++ b/devices/ikea/tradfribulbe27wsglobeopal1055lm.json @@ -3,7 +3,8 @@ "uuid": "50f0db9d-c73d-4d65-aae1-64976334323f", "manufacturername": "$MF_IKEA", "modelid": "TRADFRIbulbE27WSglobeopal1055lm", - "product": "Tradfri LED bulb E27 1055 lumen", + "vendor": "IKEA", + "product": "Tradfri LED bulb E27 1055 lumen, dimmable, white spectrum, opal white (LED2003G10)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/vallhorn_wireless_motion_sensor.json b/devices/ikea/vallhorn_wireless_motion_sensor.json index ff495856c0..bda4fb4d61 100644 --- a/devices/ikea/vallhorn_wireless_motion_sensor.json +++ b/devices/ikea/vallhorn_wireless_motion_sensor.json @@ -3,7 +3,8 @@ "uuid": "2ad3b0f4-f70a-4775-a1b1-b5cc4f927903", "manufacturername": "$MF_IKEA", "modelid": "VALLHORN Wireless Motion Sensor", - "product": "VALLHORN Wireless Motion Sensor", + "vendor": "IKEA", + "product": "Vallhorn wireless motion sensor (E2134)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/ikea/vindstyrka_air_quality_sensor.json b/devices/ikea/vindstyrka_air_quality_sensor.json index 3c53399ed3..896e3c3430 100644 --- a/devices/ikea/vindstyrka_air_quality_sensor.json +++ b/devices/ikea/vindstyrka_air_quality_sensor.json @@ -3,7 +3,8 @@ "uuid": "ac5adf59-1be3-47a3-9de2-4657d0583331", "manufacturername": "$MF_IKEA", "modelid": "VINDSTYRKA", - "product": "Vindstyrka Air Quality Sensor", + "vendor": "IKEA", + "product": "Vindstyrka air quality sensor (E2112)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/iluminize/roller_shutter_actuator_mini.json b/devices/iluminize/roller_shutter_actuator_mini.json index 3acf9f75ae..422c928b98 100644 --- a/devices/iluminize/roller_shutter_actuator_mini.json +++ b/devices/iluminize/roller_shutter_actuator_mini.json @@ -3,8 +3,8 @@ "uuid": "243652d7-2e83-4241-a7b9-cd8ae2d9f7aa", "manufacturername": "iluminize", "modelid": "5128.10", - "vendor": "iluminize", - "product": "Zigbee 3.0 roller shutter actuator", + "vendor": "Iluminize", + "product": "Curtain controller (5128.10)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/immax/07046L_keyfob.json b/devices/immax/07046L_keyfob.json index c9f05a8501..6dfb8e9e8a 100644 --- a/devices/immax/07046L_keyfob.json +++ b/devices/immax/07046L_keyfob.json @@ -3,8 +3,8 @@ "uuid": "80a358eb-56ce-4fdd-8dfe-374693301d17", "manufacturername": "Immax", "modelid": "Keyfob-ZB3.0", - "vendor": "Immax Neo", - "product": "Keyfob 07046L", + "vendor": "Immax", + "product": "Neo smart keyfob (07046L)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/immax/07048L_smart_plug.json b/devices/immax/07048L_smart_plug.json index de909bcf10..d37c93f940 100644 --- a/devices/immax/07048L_smart_plug.json +++ b/devices/immax/07048L_smart_plug.json @@ -3,8 +3,8 @@ "uuid": "f821d929-ee1a-44e0-97d8-ef5d68dc281b", "manufacturername": "Immax", "modelid": "Plug-230V-ZB3.0", - "vendor": "Immax Neo", - "product": "Smart plug 07048L", + "vendor": "Immax", + "product": "Neo smart plug (07048L)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/innr/rc_250.json b/devices/innr/rc_250.json index 55afa6a649..9166fc3820 100644 --- a/devices/innr/rc_250.json +++ b/devices/innr/rc_250.json @@ -3,7 +3,8 @@ "uuid": "8bcc2fce-08f5-44df-a094-77c60a2c7180", "manufacturername": "innr", "modelid": "RC 250", - "product": "Battery switch", + "vendor": "Innr", + "product": "5-key wireless remote control (RC 250)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/innr/sp_120.json b/devices/innr/sp_120.json index f8f0475621..6c391d9ab9 100644 --- a/devices/innr/sp_120.json +++ b/devices/innr/sp_120.json @@ -3,8 +3,8 @@ "uuid": "5a2c2e2d-c5b6-41c6-977a-3d4aeb327499", "manufacturername": "innr", "modelid": "SP 120", - "vendor": "innr", - "product": "SP 120 smart plug", + "vendor": "Innr", + "product": "Smart plug (SP 120)", "sleeper": false, "status": "Gold", "path": "/devices/innr/sp_120.json", diff --git a/devices/innr/sp_234.json b/devices/innr/sp_234.json index 02e0c9441f..39cf5ac1f1 100644 --- a/devices/innr/sp_234.json +++ b/devices/innr/sp_234.json @@ -3,8 +3,8 @@ "uuid": "609f1078-242f-44b3-9c1b-1af687b9d819", "manufacturername": "innr", "modelid": "SP 234", - "vendor": "innr", - "product": "SP 234 smart plug", + "vendor": "Innr", + "product": "Smart plug (SP 234)", "sleeper": false, "status": "Gold", "path": "/devices/innr/sp_234.json", diff --git a/devices/innr/sp_240.json b/devices/innr/sp_240.json index 2cf7f36167..ed7e99b0cb 100644 --- a/devices/innr/sp_240.json +++ b/devices/innr/sp_240.json @@ -3,7 +3,8 @@ "uuid": "4b16f6c7-b57e-4d7a-9eff-894c5023ab9e", "manufacturername": "innr", "modelid": "SP 240", - "product": "SP 240", + "vendor": "Innr", + "product": "Smart plug (SP 240)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/innr/xx_110.json b/devices/innr/xx_110.json index e207599662..30fad3a420 100644 --- a/devices/innr/xx_110.json +++ b/devices/innr/xx_110.json @@ -9,7 +9,8 @@ "PL 110", "UC 110" ], - "product": "innr Puck Light and innr Under Cabinet light", + "vendor": "Innr", + "product": "Puck Light White Extension Pack and Under Cabinet Light (PL 110/UC 110)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/konke/3AFE280100510001_battery_switch.json b/devices/konke/3AFE280100510001_battery_switch.json index 18762dfe5f..26620f20b6 100644 --- a/devices/konke/3AFE280100510001_battery_switch.json +++ b/devices/konke/3AFE280100510001_battery_switch.json @@ -3,7 +3,8 @@ "uuid": "4fe1326d-8697-45ab-aa72-2a8a0e8d8c83", "manufacturername": "Konke", "modelid": "3AFE280100510001", - "product": "Konke Kit Pro Multi Function Button", + "vendor": "Konke", + "product": "Kit pro multi function button (KPKEY)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/lds/ZBT-DIMSwitch-D0000_remote.json b/devices/lds/ZBT-DIMSwitch-D0000_remote.json index 187852eda0..1678dcdda7 100644 --- a/devices/lds/ZBT-DIMSwitch-D0000_remote.json +++ b/devices/lds/ZBT-DIMSwitch-D0000_remote.json @@ -3,7 +3,8 @@ "uuid": "ee6cc184-94bf-48c9-80d6-ca8eb0d974d0", "manufacturername": "LDS", "modelid": "ZBT-DIMSwitch-D0000", - "product": "LDS battery switch", + "vendor": "Ynoa", + "product": "Wireless dimmer knob (LA-AAN-UIT-7A)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/legrand/Remote_switch_Wakeup_sleep.json b/devices/legrand/Remote_switch_Wakeup_sleep.json index 487b73a467..757ddb65da 100644 --- a/devices/legrand/Remote_switch_Wakeup_sleep.json +++ b/devices/legrand/Remote_switch_Wakeup_sleep.json @@ -3,7 +3,8 @@ "uuid": "3666edf3-7d38-4c80-857b-94610b5ef239", "manufacturername": "Legrand", "modelid": "Remote switch Wake up / Sleep", - "product": "Remote switch Sleep / Wake - 064884", + "vendor": "Legrand", + "product": "Valena life scene switch wakeup and sleep (752x89/064884)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/legrand/Remote_switch_home_away.json b/devices/legrand/Remote_switch_home_away.json index e26322a5c1..01f5566ed3 100644 --- a/devices/legrand/Remote_switch_home_away.json +++ b/devices/legrand/Remote_switch_home_away.json @@ -3,7 +3,8 @@ "uuid": "9b705c23-87d1-4a69-8f2f-10f452a6bdf9", "manufacturername": "Legrand", "modelid": "Master remote SW Home / Away", - "product": "Master remote SW Home / Away", + "vendor": "Legrand", + "product": "Home and Away wireless master switch celiane (064873)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/legrand/cable_outlet.json b/devices/legrand/cable_outlet.json index 69621dbe41..3d02441c9e 100644 --- a/devices/legrand/cable_outlet.json +++ b/devices/legrand/cable_outlet.json @@ -4,7 +4,8 @@ "ddfvalidate": false, "manufacturername": "Legrand", "modelid": "Cable outlet", - "product": "Cable outlet", + "vendor": "Legrand", + "product": "Cable outlet 3000W (064879)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/legrand/wireless_scenes_command.json b/devices/legrand/wireless_scenes_command.json index 22b14e2740..ec45a3490b 100644 --- a/devices/legrand/wireless_scenes_command.json +++ b/devices/legrand/wireless_scenes_command.json @@ -3,7 +3,8 @@ "uuid": "be154dd8-8225-4a88-b4a0-49c8b4dacbd6", "manufacturername": "Legrand", "modelid": "Wireless Scenes Command", - "product": "Wireless Scenes Command", + "vendor": "Legrand", + "product": "Wireless 4 scenes control switch celiane (0 677 55/56/57)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/lidl/hg06338.json b/devices/lidl/hg06338.json index cbfc9ab45e..c5ee904fc0 100644 --- a/devices/lidl/hg06338.json +++ b/devices/lidl/hg06338.json @@ -9,7 +9,8 @@ "HG06338", "TS011F" ], - "product": "LIDL Silvercrest Smart USB Extension Lead", + "vendor": "Lidl", + "product": "SilverCrest power strip 3 AC (16A) with 4 USB (HG06338)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ1800_ladpngdx_lild_doorbell.json b/devices/lidl/hg06668.json similarity index 96% rename from devices/tuya/_TZ1800_ladpngdx_lild_doorbell.json rename to devices/lidl/hg06668.json index 335e992f8d..d72f887ad8 100644 --- a/devices/tuya/_TZ1800_ladpngdx_lild_doorbell.json +++ b/devices/lidl/hg06668.json @@ -3,7 +3,8 @@ "uuid": "eb971e80-0096-4734-9d37-63a360b8c860", "manufacturername": ["_TZ1800_ladpngdx", "LIDL Silvercrest", "LIDL Silvercrest"], "modelid": ["TS0211", "TS0211", "HG06668"], - "product": "Silvercrest Doorbell", + "vendor": "Lidl", + "product": "Silvercrest doorbell (HG06668)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_htnnfasr_water_valve.json b/devices/lidl/hg06875.json similarity index 98% rename from devices/tuya/_TZE200_htnnfasr_water_valve.json rename to devices/lidl/hg06875.json index b7800ecece..2a2c1afa1b 100644 --- a/devices/tuya/_TZE200_htnnfasr_water_valve.json +++ b/devices/lidl/hg06875.json @@ -3,8 +3,8 @@ "uuid": "7b06366d-9e69-471f-b703-a3e0212e833d", "manufacturername": "_TZE200_htnnfasr", "modelid": "TS0601", - "vendor": "LIDL", - "product": "Smart watering timer", + "vendor": "Lidl", + "product": "Parkside Smart Watering Timer (HG06875)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/lidl/hg08673.json b/devices/lidl/hg08673.json index b2acf20c6d..00b7b31622 100644 --- a/devices/lidl/hg08673.json +++ b/devices/lidl/hg08673.json @@ -3,7 +3,8 @@ "uuid": "6fc0fda8-a625-46fd-97ca-e985b79c73fd", "manufacturername": ["_TZ3000_nkcobies","_TZ3000_j1v25l17","_TZ3000_ynmowqk2"], "modelid": ["TS011F","TS011F","TS011F"], - "product": "HG08673 LIDL SilverCrest smart plug with monitoring (DK, EU, FR)", + "vendor": "Lidl", + "product": "SilverCrest smart plug (HG08673)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/linkind/001082_water_leak_sensor.json b/devices/linkind/001082_water_leak_sensor.json index 1a2f1e5a10..decefaa3b1 100644 --- a/devices/linkind/001082_water_leak_sensor.json +++ b/devices/linkind/001082_water_leak_sensor.json @@ -3,8 +3,8 @@ "uuid": "50a7905a-8eee-4ed7-bc4b-7c6b19bbe68b", "manufacturername": "LK", "modelid": "A001082", - "vendor": "Linkind", - "product": "Zigbee Water Leak Sensor", + "vendor": "AiDot Linkind", + "product": "Water leak sensor (LS21001)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/linkind/ZBT-CCTLight-D0106.json b/devices/linkind/ZBT-CCTLight-D0106.json index c052ac2c35..db2a546da9 100644 --- a/devices/linkind/ZBT-CCTLight-D0106.json +++ b/devices/linkind/ZBT-CCTLight-D0106.json @@ -3,7 +3,8 @@ "uuid": "0f0290cb-4791-49c2-8b6b-a1a519163c74", "manufacturername": "lk", "modelid": "ZBT-CCTLight-D0106", - "product": "Linkind A60 LED Tunable White Bulb 800 lumen", + "vendor": "AiDot Linkind", + "product": "A60 LED Tunable White Bulb 800 lumen (D0106)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/linkind/ZBT-CCTLight-M3500107.json b/devices/linkind/ZBT-CCTLight-M3500107.json index 8063f3a75f..abf5c288bf 100644 --- a/devices/linkind/ZBT-CCTLight-M3500107.json +++ b/devices/linkind/ZBT-CCTLight-M3500107.json @@ -3,7 +3,8 @@ "uuid": "b0f2c040-b837-4b4e-baa6-4f112e3f0d68", "manufacturername": "lk", "modelid": "ZBT-CCTLight-M3500107", - "product": "Linkind 4.8W GU10 Bulb Dimmable & Tunable", + "vendor": "AiDot Linkind", + "product": "4.8W GU10 Bulb Dimmable & Tunable (M3500107)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/lixee/zlinky_tic_histo_tri_hphc.json b/devices/lixee/zlinky_tic_histo_tri_hphc.json index 56f3501e38..178e876ab9 100644 --- a/devices/lixee/zlinky_tic_histo_tri_hphc.json +++ b/devices/lixee/zlinky_tic_histo_tri_hphc.json @@ -4,7 +4,7 @@ "manufacturername": "LiXee", "modelid": "ZLinky_TIC", "vendor": "LiXee", - "product": "ZLinky_TIC historique+HPHC+triphase", + "product": "ZLinky_TIC mode historique HPHC triphase", "sleeper": false, "status": "Draft", "subdevices": [ diff --git a/devices/lixee/zlinky_tic_historique_mono_base.json b/devices/lixee/zlinky_tic_historique_mono_base.json index b11b08d741..ee0403e252 100644 --- a/devices/lixee/zlinky_tic_historique_mono_base.json +++ b/devices/lixee/zlinky_tic_historique_mono_base.json @@ -3,7 +3,8 @@ "uuid": "55133b78-5c06-4df4-94ac-2748d4f155d9", "manufacturername": "LiXee", "modelid": "ZLinky_TIC", - "product": "ZLinky_TIC historique+base", + "vendor": "LiXee", + "product": "ZLinky_TIC mode historique base", "sleeper": false, "status": "Draft", "subdevices": [ diff --git a/devices/lixee/zlinky_tic_historique_mono_hphc.json b/devices/lixee/zlinky_tic_historique_mono_hphc.json index 750df6992b..f2b954ad03 100644 --- a/devices/lixee/zlinky_tic_historique_mono_hphc.json +++ b/devices/lixee/zlinky_tic_historique_mono_hphc.json @@ -4,7 +4,7 @@ "manufacturername": "LiXee", "modelid": "ZLinky_TIC", "vendor": "LiXee", - "product": "ZLinky_TIC historique+HPHC", + "product": "ZLinky_TIC mode historique HPHC", "sleeper": false, "status": "Draft", "subdevices": [ diff --git a/devices/lixee/zlinky_tic_standard_mono_base.json b/devices/lixee/zlinky_tic_standard_mono_base.json index 0f92cf111e..de8a32298f 100644 --- a/devices/lixee/zlinky_tic_standard_mono_base.json +++ b/devices/lixee/zlinky_tic_standard_mono_base.json @@ -3,7 +3,8 @@ "uuid": "778be623-5395-4a1a-9e8a-48c3149f6828", "manufacturername": "LiXee", "modelid": "ZLinky_TIC", - "product": "ZLinky_TIC Standard+Base", + "vendor": "LiXee", + "product": "ZLinky_TIC mode standard base", "sleeper": false, "status": "Draft", "subdevices": [ diff --git a/devices/lixee/zlinky_tic_standard_tri_hphc.json b/devices/lixee/zlinky_tic_standard_tri_hphc.json index 0fe76ade74..77846666c5 100644 --- a/devices/lixee/zlinky_tic_standard_tri_hphc.json +++ b/devices/lixee/zlinky_tic_standard_tri_hphc.json @@ -4,7 +4,7 @@ "manufacturername": "LiXee", "modelid": "ZLinky_TIC", "vendor": "LiXee", - "product": "ZLinky_TIC standard+HPHC+triphase", + "product": "ZLinky_TIC mode standard HPHC triphase", "sleeper": false, "status": "Draft", "subdevices": [ diff --git a/devices/lutron/lutron_aurora_foh.json b/devices/lutron/lutron_aurora_foh.json index e865566ec6..e5ce75032f 100644 --- a/devices/lutron/lutron_aurora_foh.json +++ b/devices/lutron/lutron_aurora_foh.json @@ -3,7 +3,8 @@ "uuid": "524fadcb-a83c-4f33-acfa-81eb41e22978", "manufacturername": "$MF_LUTRON", "modelid": "Z3-1BRL", - "product": "Aurora", + "vendor": "Lutron", + "product": "Aurora smart bulb dimmer (Z3-1BRL)", "status": "Gold", "md:known_issues": [ "lutron_known_issues.md" ], "subdevices": [ diff --git a/devices/mhcozy/ts0004.json b/devices/mhcozy/ts0004.json index 2fe9761447..5be8b4afa4 100644 --- a/devices/mhcozy/ts0004.json +++ b/devices/mhcozy/ts0004.json @@ -3,7 +3,8 @@ "uuid": "bfd918c6-53f3-44b8-97fd-b5c00100cab8", "manufacturername": "_TZ3000_u3oupgdy", "modelid": "TS0004", - "product": "MHCOZY 4-Channel Dry Contact Smart Wireless Zigbee Switch Relay Module", + "vendor": "MHCozy", + "product": "4-channel dry contact smart wireless zigbee switch relay module (TS0004)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/mli/tint_gu10_spot_zbt-colortemperature.json b/devices/mli/tint_gu10_spot_zbt-colortemperature.json index 580eed0785..0287c2729c 100644 --- a/devices/mli/tint_gu10_spot_zbt-colortemperature.json +++ b/devices/mli/tint_gu10_spot_zbt-colortemperature.json @@ -4,7 +4,7 @@ "manufacturername": "MLI", "modelid": "ZBT-ColorTemperature", "vendor": "Müller Licht", - "product": "Tint GU10 Spot ZBT-ColorTemperature", + "product": "Tint GU10 spot ZBT-ColorTemperature", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/mli/zbt-extendedcolor.json b/devices/mli/zbt-extendedcolor.json index f54acfc6f2..c973c6fb5e 100644 --- a/devices/mli/zbt-extendedcolor.json +++ b/devices/mli/zbt-extendedcolor.json @@ -3,7 +3,8 @@ "uuid": "62a57ed7-8ddd-4e86-bd8f-03f7822a50cd", "manufacturername": ["MLI"], "modelid": ["ZBT-ExtendedColor"], - "product": "Tint by Mueller Light GU10 spot", + "vendor": "Müller Licht", + "product": "Tint GU10 spot", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/moes/Moes_MS-104BZ_wired_switch_2_gangs.json b/devices/moes/Moes_MS-104BZ_wired_switch_2_gangs.json index d003f6e98b..58b815bba3 100644 --- a/devices/moes/Moes_MS-104BZ_wired_switch_2_gangs.json +++ b/devices/moes/Moes_MS-104BZ_wired_switch_2_gangs.json @@ -10,7 +10,7 @@ "TS011F" ], "vendor": "Moes", - "product": "MS-104BZ Wired Switch 2 gangs", + "product": "Wired Switch 2 gangs (MS-104BZ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/moes/Moes_MS-105-M_1_gang_dimmer_module.json b/devices/moes/Moes_MS-105-M_1_gang_dimmer_module.json index 956b13fed8..7892d9ae80 100644 --- a/devices/moes/Moes_MS-105-M_1_gang_dimmer_module.json +++ b/devices/moes/Moes_MS-105-M_1_gang_dimmer_module.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZE200_la2c2uo9", "_TZE204_dcnsggvz"], "modelid": ["TS0601", "TS0601"], "vendor": "Moes", - "product": "Moes ZM-105-M 1-Gang Dimmer Module", + "product": "1-gang dimmer module (ZM-105-M)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/moes/Moes_TZ3000_TS0012_2_gang_switches.json b/devices/moes/Moes_TZ3000_TS0012_2_gang_switches.json index edae42b85d..29cff665d2 100644 --- a/devices/moes/Moes_TZ3000_TS0012_2_gang_switches.json +++ b/devices/moes/Moes_TZ3000_TS0012_2_gang_switches.json @@ -3,7 +3,8 @@ "uuid": "1c23b01a-f9c0-4131-aa84-d1539f03f2e5", "manufacturername": "_TZ3000_18ejxno0", "modelid": "TS0012", - "product": "2 gang switches", + "vendor": "Moes", + "product": "2 gang switches (TS0012)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/moes/Moes_TZ3000_TS0201_temp_hum_with_LCD.json b/devices/moes/Moes_TZ3000_TS0201_temp_hum_with_LCD.json index 51945d54ad..f608484167 100644 --- a/devices/moes/Moes_TZ3000_TS0201_temp_hum_with_LCD.json +++ b/devices/moes/Moes_TZ3000_TS0201_temp_hum_with_LCD.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZ3000_ywagc4rj","_TZ3000_itnrsufe"], "modelid": ["TS0201","TS0201"], "vendor": "Moes", - "product": "TS0201", + "product": "Temperature and humidity sensor (TS0201)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_ztvwu4nk_thermostat.json b/devices/moes/Moes_TZE200_ztvwu4nk_thermostat.json similarity index 91% rename from devices/tuya/_TZE200_ztvwu4nk_thermostat.json rename to devices/moes/Moes_TZE200_ztvwu4nk_thermostat.json index d0445aef05..c7d3cd4ff1 100644 --- a/devices/tuya/_TZE200_ztvwu4nk_thermostat.json +++ b/devices/moes/Moes_TZE200_ztvwu4nk_thermostat.json @@ -3,8 +3,8 @@ "uuid": "90e437ea-e697-4490-8944-e0d8ef0dc1d0", "manufacturername": ["_TZE200_ztvwu4nk", "_TZE204_5toc8efa", "_TZE200_5toc8efa", "_TZE200_ye5jkfsb", "_TZE204_aoclfnxz", "_TZE200_u9bfwha0"], "modelid": ["TS0601", "TS0601", "TS0601", "TS0601", "TS0601", "TS0601"], - "vendor": "Tuya", - "product": "Moes Thermostat", + "vendor": "Moes", + "product": "Thermostat for Water/Gas Boiler (BHT-002)", "sleeper": false, "status": "Gold", "subdevices": [ @@ -43,7 +43,7 @@ { "name": "attr/swversion", "refresh.interval": 86400, - "parse": {"fn": "zcl:attr", "ep": 1, "cl": "0x0000", "at": "0x0001", "script": "tuya_swversion.js"}, + "parse": {"fn": "zcl:attr", "ep": 1, "cl": "0x0000", "at": "0x0001", "script": "../tuya/tuya_swversion.js"}, "read": {"fn": "zcl:attr", "ep": 1, "cl": "0x0000", "at": "0x0001"} }, { @@ -82,8 +82,8 @@ }, { "name": "config/preset", - "parse": {"fn": "tuya", "dpid": 2, "script": "tuya_trv_preset.js"}, - "write": {"fn": "tuya", "dpid": 2, "dt": "0x30", "script": "tuya_trv_preset_set.js"}, + "parse": {"fn": "tuya", "dpid": 2, "script": "../tuya/tuya_trv_preset.js"}, + "write": {"fn": "tuya", "dpid": 2, "dt": "0x30", "script": "../tuya/tuya_trv_preset_set.js"}, "read": {"fn": "none"} }, { diff --git a/devices/moes/Moes_ZM-105-M_1_gang_dimmer.json b/devices/moes/Moes_ZM-105-M_1_gang_dimmer.json index a02e0431ee..2dcc1819fb 100644 --- a/devices/moes/Moes_ZM-105-M_1_gang_dimmer.json +++ b/devices/moes/Moes_ZM-105-M_1_gang_dimmer.json @@ -3,7 +3,8 @@ "uuid": "699b5ac1-dfad-48a3-88b7-f01ed9847ca9", "manufacturername": "_TZE204_dcnsggvz", "modelid": "TS0601", - "product": "TS0601", + "vendor": "Moes", + "product": "Switch (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/namron/4512737_thermostat.json b/devices/namron/4512737_thermostat.json index c27f3c0763..02b032934d 100644 --- a/devices/namron/4512737_thermostat.json +++ b/devices/namron/4512737_thermostat.json @@ -3,7 +3,8 @@ "uuid": "1d156ff9-89d3-4441-ad0f-f7b8fe96cfe8", "manufacturername": ["NAMRON AS", "NAMRON AS"], "modelid": ["4512737", "4512738"], - "product": "Thermostat Touch Zigbee 16A", + "vendor": "Namron", + "product": "Thermostat touch zigbee 16A (4512737/4512738)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/namron/4512762_open_close_sensor.json b/devices/namron/4512762_open_close_sensor.json index 93f6e5f771..579fbc704f 100644 --- a/devices/namron/4512762_open_close_sensor.json +++ b/devices/namron/4512762_open_close_sensor.json @@ -3,8 +3,8 @@ "uuid": "df910571-c59a-47a7-8564-b61daadd1370", "manufacturername": "Namron AS", "modelid": "4512762", - "vendor": "Namron AS", - "product": "4512762 open/close sensor", + "vendor": "Namron", + "product": "Open/close sensor (4512762)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/namron/4512765_hum_temp.json b/devices/namron/4512765_hum_temp.json index 1ca8282bfa..d20ebf6713 100644 --- a/devices/namron/4512765_hum_temp.json +++ b/devices/namron/4512765_hum_temp.json @@ -3,7 +3,8 @@ "uuid": "f95a027d-57d5-4dc5-800e-f06ee5ea0404", "manufacturername": "Namron AS", "modelid": "4512765", - "product": "S903TH-ZG", + "vendor": "Namron", + "product": "Temperature and humidity sensor (4512765/S903TH-ZG)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/namron/5401395_heater.json b/devices/namron/5401395_heater.json index 09f34cb8a9..22fad0d5ab 100644 --- a/devices/namron/5401395_heater.json +++ b/devices/namron/5401395_heater.json @@ -4,7 +4,7 @@ "manufacturername": ["NAMRON AS", "NAMRON AS"], "modelid": ["5401395", "5401399"], "vendor": "Namron", - "product": "Panel Heater 1000W White/Black", + "product": "Panel heater 1000W (5401395/5401399)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/nedis/nedis_zbrc10wt.json b/devices/nedis/nedis_zbrc10wt.json index 2c763179e8..ff80a3211d 100644 --- a/devices/nedis/nedis_zbrc10wt.json +++ b/devices/nedis/nedis_zbrc10wt.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_fsiepnrh", "modelid": "TS0215A", "vendor": "Nedis", - "product": "4 button remote", + "product": "4 button remote (ZBRC10WT)", "sleeper": true, "status": "Gold", "path": "/devices/nedis/nedis_zbrc10wt.json", diff --git a/devices/nedis/nedis_zbsm10wt_motion_sensor.json b/devices/nedis/nedis_zbsm10wt_motion_sensor.json index 493a7984d1..43177a50aa 100644 --- a/devices/nedis/nedis_zbsm10wt_motion_sensor.json +++ b/devices/nedis/nedis_zbsm10wt_motion_sensor.json @@ -3,8 +3,8 @@ "uuid":"05069614-e8f7-4ec3-b036-d321ea6713db", "manufacturername":"_TZ3000_nss8amz9", "modelid":"TS0202", - "product":"Zigbee motion sensor ZBSM10WT", - "vendor": "Nedis", + "vendor": "Nedis", + "product":"Zigbee motion sensor (ZBSM10WT)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/neo/NAS-WR01B_TS011F.json b/devices/neo/NAS-WR01B_TS011F.json index 0b33e2f2e2..ffd4d2a6d3 100644 --- a/devices/neo/NAS-WR01B_TS011F.json +++ b/devices/neo/NAS-WR01B_TS011F.json @@ -17,7 +17,8 @@ "TS011F", "TS011F" ], - "product": "NEO NAS-WR01B Smart Plug", + "vendor": "Neo", + "product": "Smart plug 16A with power monitoring EU (NAS-WR01B)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/neo/TS0012_Immax_smart_controller.json b/devices/neo/TS0012_Immax_smart_controller.json index 55cf2b105f..2079231dfc 100644 --- a/devices/neo/TS0012_Immax_smart_controller.json +++ b/devices/neo/TS0012_Immax_smart_controller.json @@ -3,8 +3,8 @@ "uuid": "076dc726-f9b8-4ffd-bb9e-1f9c48556416", "manufacturername": "_TZ3000_llfaquvp", "modelid": "TS0012", - "vendor": "NEO", - "product": "Immax NEO Smart controller", + "vendor": "Neo", + "product": "Immax Smart controller (TS0012)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/nexentro/nexentro_blinds_actuator_mini.json b/devices/nexentro/nexentro_blinds_actuator_mini.json index 38a571eb74..b1003f6760 100644 --- a/devices/nexentro/nexentro_blinds_actuator_mini.json +++ b/devices/nexentro/nexentro_blinds_actuator_mini.json @@ -3,8 +3,8 @@ "uuid": "ccefc9fd-e527-42d9-85c4-fc50756052a4", "manufacturername": "Insta GmbH", "modelid": "NEXENTRO Blinds Actuator", - "vendor": "NEXENTRO", - "product": "NEXENTRO Blinds Actuator", + "vendor": "Nexentro", + "product": "Blinds Actuator", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/niko/170-33505_170-33605_smart_socket.json b/devices/niko/170-33505_170-33605_smart_socket.json index a08a5bcda9..4a8d4b4ff3 100644 --- a/devices/niko/170-33505_170-33605_smart_socket.json +++ b/devices/niko/170-33505_170-33605_smart_socket.json @@ -4,7 +4,7 @@ "manufacturername": "NIKO NV", "modelid": "Connected socket outlet", "vendor": "Niko NV", - "product": "170-33505/170-33605 smart socket", + "product": "Smart socket (170-33505/170-33605)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/orvibo/CM10ZW.json b/devices/orvibo/CM10ZW.json index 17cc4533f8..eac151ce75 100644 --- a/devices/orvibo/CM10ZW.json +++ b/devices/orvibo/CM10ZW.json @@ -4,7 +4,7 @@ "manufacturername": "ORVIBO", "modelid": "396483ce8b3f4e0d8e9d79079a35a420", "vendor": "Orvibo", - "product": "ORVIBO Zigbee Dry Contact CM10ZW", + "product": "Dry contact (CM10ZW)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/orvibo/sf21_smoke_sensor.json b/devices/orvibo/sf21_smoke_sensor.json index 2464902fcb..75999ff5c3 100644 --- a/devices/orvibo/sf21_smoke_sensor.json +++ b/devices/orvibo/sf21_smoke_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "HEIMAN", "modelid": "98293058552c49f38ad0748541ee96ba", "vendor": "Orvibo", - "product": "Smoke detector SF21", + "product": "Smoke detector (SF21)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/osram/cla60_tw.json b/devices/osram/cla60_tw.json index f235b88577..ecaa2857d2 100644 --- a/devices/osram/cla60_tw.json +++ b/devices/osram/cla60_tw.json @@ -3,7 +3,8 @@ "uuid": "f2700e57-348a-470a-83bc-b4fccdeff4f8", "manufacturername": "OSRAM", "modelid": "CLA60 TW OSRAM", - "product": "CLA60 TW OSRAM", + "vendor": "Osram", + "product": "Smart+ classic E27 tunable white (4058075816534)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/osram/classic_a60_fil_dim_t.json b/devices/osram/classic_a60_fil_dim_t.json index b80f574116..242e41f015 100644 --- a/devices/osram/classic_a60_fil_dim_t.json +++ b/devices/osram/classic_a60_fil_dim_t.json @@ -3,7 +3,8 @@ "uuid": "c559de53-91b1-459c-890e-b8a24c006332", "manufacturername": "LEDVANCE", "modelid": "A60 FIL DIM T", - "product": "Filament Classic A 52", + "vendor": "Ledvance", + "product": "Smart+ filament classic dimmable A52D 6W E27 (4058075729209)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/osram/classic_a60_rgbw.json b/devices/osram/classic_a60_rgbw.json index 0b3943749c..522c561a27 100644 --- a/devices/osram/classic_a60_rgbw.json +++ b/devices/osram/classic_a60_rgbw.json @@ -3,7 +3,8 @@ "uuid": "5769d071-f5e7-4f13-a894-cece8f801c25", "manufacturername": "OSRAM", "modelid": "Classic A60 RGBW", - "product": "Classic A60 RGBW", + "vendor": "Osram", + "product": "Lightify classic A60 RGBW", "sleeper": false, "supportsMgmtBind": false, "status": "Gold", diff --git a/devices/osram/classic_a60_tw.json b/devices/osram/classic_a60_tw.json index 2fdd67f470..ec26546b90 100644 --- a/devices/osram/classic_a60_tw.json +++ b/devices/osram/classic_a60_tw.json @@ -3,7 +3,8 @@ "uuid": "4cb8ab04-0f78-4867-883a-204b8e8bcebc", "manufacturername": "OSRAM", "modelid": "Classic A60 TW", - "product": "Classic A60 TW", + "vendor": "Osram", + "product": "Lightify classic A 60 TW", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/osram/classic_a60_w_clear.json b/devices/osram/classic_a60_w_clear.json index f5de95ce00..1f2296d95d 100644 --- a/devices/osram/classic_a60_w_clear.json +++ b/devices/osram/classic_a60_w_clear.json @@ -3,7 +3,8 @@ "uuid": "b9d54d61-57ed-4472-bc66-fa03b21ef533", "manufacturername": "OSRAM", "modelid": "Classic A60 W clear - LIGHTIFY", - "product": "Classic A60 W clear - LIGHTIFY", + "vendor": "Osram", + "product": "Lightify LED classic A60 clear", "sleeper": false, "supportsMgmtBind": false, "status": "Gold", diff --git a/devices/osram/classic_b40_tw.json b/devices/osram/classic_b40_tw.json index a8e9698305..bac772e342 100644 --- a/devices/osram/classic_b40_tw.json +++ b/devices/osram/classic_b40_tw.json @@ -3,7 +3,8 @@ "uuid": "6d99ff61-ec81-4398-85bf-e091e7de2b1a", "manufacturername": "OSRAM", "modelid": "Classic B40 TW - LIGHTIFY", - "product": "Classic B40 TW - LIGHTIFY", + "vendor": "Osram", + "product": "Lightify Classic B40 TW", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/osram/par16_50_tw.json b/devices/osram/par16_50_tw.json index 987e8c55df..f880660e1f 100644 --- a/devices/osram/par16_50_tw.json +++ b/devices/osram/par16_50_tw.json @@ -3,7 +3,8 @@ "uuid": "a179c62e-6765-43e4-b24d-9cc849dd499e", "manufacturername": "OSRAM", "modelid": "PAR16 50 TW", - "product": "PAR16 50 TW", + "vendor": "Osram", + "product": "Lightify PAR16 50 TW", "sleeper": false, "supportsMgmtBind": false, "status": "Gold", diff --git a/devices/osram/plug_01.json b/devices/osram/plug_01.json index b2c2fee9bb..b43e2a977c 100644 --- a/devices/osram/plug_01.json +++ b/devices/osram/plug_01.json @@ -3,7 +3,8 @@ "uuid": "7d02b7c0-456a-48ee-b690-eae30c3b7c46", "manufacturername": "OSRAM", "modelid": "Plug 01", - "product": "Plug 01", + "vendor": "Osram", + "product": "Smart+ Plug (AB3257001NJ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ouellet/OTH4000-ZB.json b/devices/ouellet/OTH4000-ZB.json index 393ff1d9b5..2c561f4e12 100644 --- a/devices/ouellet/OTH4000-ZB.json +++ b/devices/ouellet/OTH4000-ZB.json @@ -4,7 +4,7 @@ "manufacturername": "Sinope Technologies", "modelid": "OTH4000-ZB", "vendor": "Ouellet", - "product": "OTH4000-ZB", + "product": "Smart thermostat (OTH4000-ZB)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/owon/PIR313-E_sensor_multi.json b/devices/owon/PIR313-E_sensor_multi.json index 8dfe5707b5..f0424c022e 100644 --- a/devices/owon/PIR313-E_sensor_multi.json +++ b/devices/owon/PIR313-E_sensor_multi.json @@ -3,8 +3,8 @@ "uuid": "01178dcc-3cae-426b-851c-ea705dd03b3a", "manufacturername": "OWON", "modelid": "PIR313", - "vendor": "OWON", - "product": "PIR313", + "vendor": "Owon", + "product": "Motion multi sensor (PIR313)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/owon/THS317-ET_temperature_sensor.json b/devices/owon/THS317-ET_temperature_sensor.json index 0f03713d80..6f4b1949ae 100644 --- a/devices/owon/THS317-ET_temperature_sensor.json +++ b/devices/owon/THS317-ET_temperature_sensor.json @@ -3,7 +3,8 @@ "uuid": "1bda6f99-1465-4bc4-bff7-8e2f9c604830", "manufacturername": "OWON", "modelid": "THS317-ET", - "product": "THS317-ET", + "vendor": "Owon", + "product": "Temperature sensor with probe (THS317-ET)", "sleeper": true, "status": "Silver", "subdevices": [ diff --git a/devices/owon/ac201.json b/devices/owon/ac201.json index cceddc5c36..9bd6db31ad 100644 --- a/devices/owon/ac201.json +++ b/devices/owon/ac201.json @@ -3,7 +3,8 @@ "uuid": "bd497bc5-c997-450d-a2db-e4c219f863f3", "manufacturername": "OWON", "modelid": "AC201", - "product": "AC201", + "vendor": "Owon", + "product": "Split A/C controller (AC201)", "sleeper": false, "status": "Gold", "path": "/devices/ac201.json", diff --git a/devices/paulmann/501_34_battery_switch.json b/devices/paulmann/501_34_battery_switch.json index 9ba3cb355f..9dd365e986 100644 --- a/devices/paulmann/501_34_battery_switch.json +++ b/devices/paulmann/501_34_battery_switch.json @@ -3,7 +3,8 @@ "uuid": "e8f0ae5b-e1c5-4a7b-bebc-2e91becb6f81", "manufacturername": "Paulmann LichtGmbH", "modelid": "501.34", - "product": "Paulmann Battery Switch", + "vendor": "Paulmann", + "product": "Wall switch on/off/dimm (501.35)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/philips/light_zb3_C.json b/devices/philips/light_zb3_C.json index f580b6309e..2fbacb1002 100644 --- a/devices/philips/light_zb3_C.json +++ b/devices/philips/light_zb3_C.json @@ -109,6 +109,7 @@ "929003053301_01", "929003053301_02" ], + "vendor": "Philips", "product": "Hue white and color ambiance light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zb3_C_festavia.json b/devices/philips/light_zb3_C_festavia.json index c1ff4a0dd3..cdd429bc39 100644 --- a/devices/philips/light_zb3_C_festavia.json +++ b/devices/philips/light_zb3_C_festavia.json @@ -9,7 +9,8 @@ "LCX012", "LCX012" ], - "product": "Hue Festavia", + "vendor": "Philips", + "product": "Hue festavia string lights", "sleeper": false, "status": "Gold", "matchexpr": "R.hasCluster(0x0b,0xfc03)", diff --git a/devices/philips/light_zb3_C_gradient.json b/devices/philips/light_zb3_C_gradient.json index c9e24eba85..9f50a3fc59 100644 --- a/devices/philips/light_zb3_C_gradient.json +++ b/devices/philips/light_zb3_C_gradient.json @@ -81,6 +81,7 @@ "915005988501", "915005988601" ], + "vendor": "Philips", "product": "Hue white and color ambiance gradient light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zb3_white.json b/devices/philips/light_zb3_white.json index 19f338caaa..8f30caa00b 100644 --- a/devices/philips/light_zb3_white.json +++ b/devices/philips/light_zb3_white.json @@ -17,6 +17,7 @@ "LWA028", "LWE002" ], + "vendor": "Philips", "product": "Hue white light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zb3_white_ambiance.json b/devices/philips/light_zb3_white_ambiance.json index 34f17df5be..283f30c44b 100644 --- a/devices/philips/light_zb3_white_ambiance.json +++ b/devices/philips/light_zb3_white_ambiance.json @@ -41,6 +41,7 @@ "915005996501", "915005997701" ], + "vendor": "Philips", "product": "Hue white ambiance light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zll_A.json b/devices/philips/light_zll_A.json index 291a41986c..bf3a8a4996 100644 --- a/devices/philips/light_zll_A.json +++ b/devices/philips/light_zll_A.json @@ -41,6 +41,7 @@ "LLC014", "LLC013" ], + "vendor": "Philips", "product": "Hue color ambiance light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zll_B.json b/devices/philips/light_zll_B.json index ddac18b1f5..842545df61 100644 --- a/devices/philips/light_zll_B.json +++ b/devices/philips/light_zll_B.json @@ -25,6 +25,7 @@ "LCT003", "LLM001" ], + "vendor": "Philips", "product": "Hue white and color ambiance light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zll_C.json b/devices/philips/light_zll_C.json index f0898e98e0..860d0c9537 100644 --- a/devices/philips/light_zll_C.json +++ b/devices/philips/light_zll_C.json @@ -37,6 +37,7 @@ "LST002", "LCT012" ], + "vendor": "Philips", "product": "Hue white and color ambiance light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/light_zll_white_ambiance.json b/devices/philips/light_zll_white_ambiance.json index f34c4e0786..5be923f594 100644 --- a/devices/philips/light_zll_white_ambiance.json +++ b/devices/philips/light_zll_white_ambiance.json @@ -17,6 +17,7 @@ "LTW010", "LTW012" ], + "vendor": "Philips", "product": "Hue white ambiance light", "sleeper": false, "status": "Gold", diff --git a/devices/philips/lom007_smart_plug.json b/devices/philips/lom007_smart_plug.json index 8858aa15ea..0792e3b628 100644 --- a/devices/philips/lom007_smart_plug.json +++ b/devices/philips/lom007_smart_plug.json @@ -9,6 +9,7 @@ "LOM007", "LOM007" ], + "vendor": "Philips", "product": "Hue smart plug", "sleeper": false, "status": "Gold", diff --git a/devices/philips/rdm001_wall_switch_module.json b/devices/philips/rdm001_wall_switch_module.json index 7282c6cc04..81968c890d 100644 --- a/devices/philips/rdm001_wall_switch_module.json +++ b/devices/philips/rdm001_wall_switch_module.json @@ -13,6 +13,7 @@ "RDM001", "RDM004" ], + "vendor": "Philips", "product": "Hue wall switch module", "status": "Gold", "sleeper": true, diff --git a/devices/philips/rdm002_tap_dial_switch.json b/devices/philips/rdm002_tap_dial_switch.json index 8c37ed79b6..2b3883e921 100644 --- a/devices/philips/rdm002_tap_dial_switch.json +++ b/devices/philips/rdm002_tap_dial_switch.json @@ -9,6 +9,7 @@ "RDM002", "RDM002" ], + "vendor": "Philips", "product": "Hue tap dial switch", "status": "Gold", "sleeper": true, diff --git a/devices/philips/rom001_smart_button.json b/devices/philips/rom001_smart_button.json index b3a81339f2..49e7ce08a5 100644 --- a/devices/philips/rom001_smart_button.json +++ b/devices/philips/rom001_smart_button.json @@ -13,6 +13,7 @@ "ROM001", "RDM003" ], + "vendor": "Philips", "product": "Hue smart button", "status": "Gold", "sleeper": true, diff --git a/devices/philips/rwl022_dimmer_switch.json b/devices/philips/rwl022_dimmer_switch.json index 1172ef9237..d884e454db 100644 --- a/devices/philips/rwl022_dimmer_switch.json +++ b/devices/philips/rwl022_dimmer_switch.json @@ -9,6 +9,7 @@ "RWL022", "RWL022" ], + "vendor": "Philips", "product": "Hue dimmer switch (2021)", "status": "Gold", "sleeper": true, diff --git a/devices/philips/rwl02_dimmer_switch.json b/devices/philips/rwl02_dimmer_switch.json index 98eb3af76d..2c3b272f4d 100644 --- a/devices/philips/rwl02_dimmer_switch.json +++ b/devices/philips/rwl02_dimmer_switch.json @@ -9,6 +9,7 @@ "RWL021", "RWL020" ], + "vendor": "Philips", "product": "Hue dimmer switch", "status": "Gold", "sleeper": true, diff --git a/devices/philips/soc001_contact_sensor.json b/devices/philips/soc001_contact_sensor.json index ce24167b36..d8247bcc31 100644 --- a/devices/philips/soc001_contact_sensor.json +++ b/devices/philips/soc001_contact_sensor.json @@ -9,6 +9,7 @@ "SOC001", "SOC001" ], + "vendor": "Philips", "product": "Hue secure contact sensor", "status": "Gold", "sleeper": false, diff --git a/devices/plaid_systems/ps-sprzms-slp3_soil_sensor.json b/devices/plaid_systems/ps-sprzms-slp3_soil_sensor.json index 409c166fb0..20e31cc3a4 100644 --- a/devices/plaid_systems/ps-sprzms-slp3_soil_sensor.json +++ b/devices/plaid_systems/ps-sprzms-slp3_soil_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "PLAID SYSTEMS", "modelid": "PS-SPRZMS-SLP3", "vendor": "Plaid Systems", - "product": "Spruce Soil sensor", + "product": "Spruce Soil sensor (PS-SPRZMS-SLP3)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/robb_smarrt/rob_200-017-0_plug.json b/devices/robb_smarrt/rob_200-017-0_plug.json index 0a46473c28..19d7372400 100644 --- a/devices/robb_smarrt/rob_200-017-0_plug.json +++ b/devices/robb_smarrt/rob_200-017-0_plug.json @@ -3,7 +3,8 @@ "uuid": "8e815937-47fb-47c8-a20b-db46f9a6c2c7", "manufacturername": "ROBB smarrt", "modelid": "ROB_200-017-0", - "product": "Smart plug 3680 Watt", + "vendor": "ROBB smarrt", + "product": "Smart plug 3680W (ROB_200-017-0)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/robb_smarrt/rob_200-029-0_covering.json b/devices/robb_smarrt/rob_200-029-0_covering.json index 691820f7e8..fac96f246f 100644 --- a/devices/robb_smarrt/rob_200-029-0_covering.json +++ b/devices/robb_smarrt/rob_200-029-0_covering.json @@ -3,7 +3,8 @@ "uuid": "c3e59819-892b-4d41-bbe1-31d7c8a72835", "manufacturername": "ROBB smarrt", "modelid": "ROB_200-029-0", - "product": "Roller Shutter Switch", + "vendor": "ROBB smarrt", + "product": "Roller Shutter Switch (ROB_200-029-0)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/samsung/samjin_button_switch.json b/devices/samsung/samjin_button_switch.json index 66febb058e..841dd2f72c 100644 --- a/devices/samsung/samjin_button_switch.json +++ b/devices/samsung/samjin_button_switch.json @@ -5,7 +5,8 @@ "doc:hdr": "Samsung Button", "manufacturername": "$MF_SAMJIN", "modelid": "button", - "product": "Samsung Button (IM6001-BTP01)", + "vendor": "Samsung", + "product": "Button (IM6001-BTP01)", "status": "Silver", "md:known_issues": [ ], "subdevices": [ diff --git a/devices/samsung/samjin_multi_sensor.json b/devices/samsung/samjin_multi_sensor.json index 140073bc61..8f63fef877 100644 --- a/devices/samsung/samjin_multi_sensor.json +++ b/devices/samsung/samjin_multi_sensor.json @@ -3,6 +3,7 @@ "uuid": "7de168f6-a43d-4692-9013-aecaa33ee7c9", "manufacturername": "$MF_SAMJIN", "modelid": "multi", + "vendor": "Samsung", "product": "Multipurpose Sensor (IM6001-OTP01)", "status": "Gold", "subdevices": [ diff --git a/devices/schwaiger/zhs20_smoke_detector.json b/devices/schwaiger/zhs20_smoke_detector.json index 5daf555ecc..75294f654d 100644 --- a/devices/schwaiger/zhs20_smoke_detector.json +++ b/devices/schwaiger/zhs20_smoke_detector.json @@ -4,7 +4,7 @@ "manufacturername": "Heiman", "modelid": "SMOK_YDLV10", "vendor": "Schwaiger", - "product": "Smoke detector ZHS20", + "product": "Smoke detector (ZHS20)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sengled/E12-N1E.json b/devices/sengled/E12-N1E.json index 4abaab361a..08749dd492 100644 --- a/devices/sengled/E12-N1E.json +++ b/devices/sengled/E12-N1E.json @@ -3,8 +3,8 @@ "uuid": "3df1f61f-b3e7-40f0-ac8c-2578bc2e235d", "manufacturername": "sengled", "modelid": "E12-N1E", - "vendor": "sengled", - "product": "E12-N1E", + "vendor": "Sengled", + "product": "Soft white BR30 bulb (E12-N1E)", "sleeper": false, "status": "Bronze", "subdevices": [ diff --git a/devices/sengled/e1c-nb7.json b/devices/sengled/e1c-nb7.json index 80d71477cc..e29c6d2d4e 100644 --- a/devices/sengled/e1c-nb7.json +++ b/devices/sengled/e1c-nb7.json @@ -3,7 +3,8 @@ "uuid": "977d449e-6cb9-4ab4-a498-09ac6e566700", "manufacturername": "sengled", "modelid": "E1C-NB7", - "product": "E1C-NB7", + "vendor": "Sengled", + "product": "Smart plug with power monitoring (E1C-NB7)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sengled/e1d-g73.json b/devices/sengled/e1d-g73.json index d7c9905fe5..92b9be5e5a 100644 --- a/devices/sengled/e1d-g73.json +++ b/devices/sengled/e1d-g73.json @@ -4,7 +4,7 @@ "manufacturername": "sengled", "modelid": "E1D-G73", "vendor": "Sengled", - "product": "Smart Window and Door Sensor", + "product": "Smart window and door sensor (E1D-G73)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/siglis/zigfred_plus_wired_switch.json b/devices/siglis/zigfred_plus_wired_switch.json index 790c811aac..22405c0d7b 100644 --- a/devices/siglis/zigfred_plus_wired_switch.json +++ b/devices/siglis/zigfred_plus_wired_switch.json @@ -3,7 +3,8 @@ "uuid": "14fd6af8-b8bd-4b11-8eee-135341040fdb", "manufacturername": "Siglis", "modelid": "zigfred plus", - "product": "zigfred plus", + "vendor": "Siglis", + "product": "4x dimmer switch (zigfred plus)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/siglis/zigfred_uno_wired_switch.json b/devices/siglis/zigfred_uno_wired_switch.json index 570e0de53a..4da81491c4 100644 --- a/devices/siglis/zigfred_uno_wired_switch.json +++ b/devices/siglis/zigfred_uno_wired_switch.json @@ -3,7 +3,8 @@ "uuid": "e42353b6-fa6c-4c47-82d1-61d5dbc13102", "manufacturername": "Siglis", "modelid": "zigfred uno", - "product": "zigfred uno", + "vendor": "Siglis", + "product": "Wall switch (zigfred uno)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sinope/sp2610zb_smart_switch.json b/devices/sinope/sp2610zb_smart_switch.json index c52cf2c1b9..0e97296707 100644 --- a/devices/sinope/sp2610zb_smart_switch.json +++ b/devices/sinope/sp2610zb_smart_switch.json @@ -3,7 +3,8 @@ "uuid": "34ba6cbd-2798-4ac2-b5d4-9918b3bd89c5", "manufacturername": "Sinope Technologies", "modelid": "SP2610ZB", - "product": "SP2610ZB", + "vendor": "Sinope", + "product": "Smart in-wall outlet US (SP2610ZB)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sinope/th1124zb.json b/devices/sinope/th1124zb.json index 668b702b44..50ee5f7b8c 100644 --- a/devices/sinope/th1124zb.json +++ b/devices/sinope/th1124zb.json @@ -3,7 +3,8 @@ "uuid": "955538c2-6cb3-4e73-8a48-248c94aab6a1", "manufacturername": "Sinope Technologies", "modelid": "TH1124ZB", - "product": "TH1124ZB", + "vendor": "Sinope", + "product": "Smart thermostat for electric heating (TH1124ZB)", "sleeper": false, "status": "Gold", "subdevices": [ @@ -58,7 +59,7 @@ "name": "config/heatsetpoint", "default": 0 }, - { + { "name": "config/resetpresence", "refresh.interval": 300, "description": "Use it to address Occupancy specific attribute.\nfalse = Unoccupied\ntrue = Occupied", @@ -125,7 +126,7 @@ "mf": "0x119c" }, "write": { - "at": "0x0014", + "at": "0x0014", "cl": "0x0201", "dt": "0x29", "ep": 1, diff --git a/devices/smabit/AV201021C_door_sensor.json b/devices/smabit/AV201021C_door_sensor.json index da682af33e..fa5efa60d5 100644 --- a/devices/smabit/AV201021C_door_sensor.json +++ b/devices/smabit/AV201021C_door_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "SMaBiT", "modelid": "AV2010/21C", "vendor": "SMaBiT", - "product": "AV2010/21C Flat Magnetic Contact", + "product": "Flat magnetic contact sensor (AV2010/21C)", "sleeper": true, "status": "Silver", "subdevices": [ diff --git a/devices/sonoff/ck-bl702-swp-01(7020)_plug.json b/devices/sonoff/ck-bl702-swp-01(7020)_plug.json index 659c79fcbf..5f718018d4 100644 --- a/devices/sonoff/ck-bl702-swp-01(7020)_plug.json +++ b/devices/sonoff/ck-bl702-swp-01(7020)_plug.json @@ -3,8 +3,8 @@ "uuid": "53f3ec54-fa3f-4479-8312-aecdf3c52ac2", "manufacturername": "eWeLink", "modelid": "CK-BL702-SWP-01(7020)", - "vendor": "WOOLLEY ", - "product": "Zigbee Smart Plug", + "vendor": "eWeLink", + "product": "Smart Plug (eWeLink)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sonoff/snzb-01p_switch_wireless.json b/devices/sonoff/snzb-01p_switch_wireless.json index 09e590f75f..cf2bc48541 100644 --- a/devices/sonoff/snzb-01p_switch_wireless.json +++ b/devices/sonoff/snzb-01p_switch_wireless.json @@ -3,7 +3,8 @@ "uuid": "b724fa99-e7d5-4738-8f68-1395bd0483e1", "manufacturername": "eWeLink", "modelid": "SNZB-01P", - "product": "SNZB-01P", + "vendor": "Sonoff", + "product": "Wireless Switch (SNZB-01P)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sonoff/snzb-02-multisensor.json b/devices/sonoff/snzb-02-multisensor.json index 4e0ad49640..799e91b194 100644 --- a/devices/sonoff/snzb-02-multisensor.json +++ b/devices/sonoff/snzb-02-multisensor.json @@ -3,8 +3,8 @@ "uuid": "52815a37-6180-4ab8-83ef-021d75496a7b", "manufacturername": ["eWeLink","SONOFF","SONOFF"], "modelid": ["TH01","SNZB-02D","SNZB-02P"], - "vendor": "SONOFF", - "product": "SNZB-02 multisensor", + "vendor": "Sonoff", + "product": "Temperature And Humidity Sensor (SNZB-02)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sonoff/snzb-04_open_close_sensor.json b/devices/sonoff/snzb-04_open_close_sensor.json index ac7e8a6c21..bdabbd5367 100644 --- a/devices/sonoff/snzb-04_open_close_sensor.json +++ b/devices/sonoff/snzb-04_open_close_sensor.json @@ -3,8 +3,8 @@ "uuid": "cd25fbd8-9b9b-4051-9c01-1c08a9d65203", "manufacturername": ["eWeLink", "zbeacon"], "modelid": ["DS01", "DS01"], - "vendor": "SONOFF", - "product": "DS01 open/close sensor", + "vendor": "eWeLink", + "product": "Open/close sensor (DS01)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sonoff/snzb-06p.json b/devices/sonoff/snzb-06p.json index 96e992cfab..9b6aa53f72 100644 --- a/devices/sonoff/snzb-06p.json +++ b/devices/sonoff/snzb-06p.json @@ -4,7 +4,7 @@ "manufacturername": "SONOFF", "modelid": "SNZB-06P", "vendor": "Sonoff", - "product": "Human Presence Sensor", + "product": "Human presence sensor (SNZB-06P)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sonoff/trvzb-thermostat.json b/devices/sonoff/trvzb-thermostat.json index fa82523f0c..b3eacc5b38 100644 --- a/devices/sonoff/trvzb-thermostat.json +++ b/devices/sonoff/trvzb-thermostat.json @@ -3,8 +3,8 @@ "uuid": "762fa019-837e-4d90-9147-1e9bd841b807", "manufacturername": "SONOFF", "modelid": "TRVZB", - "vendor": "SONOFF", - "product": "TRVZB Thermostat", + "vendor": "Sonoff", + "product": "Thermostat (TRVZB)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sonoff/zbmini-l_relay.json b/devices/sonoff/zbmini-l_relay.json index 068907c6ed..4532b05a28 100644 --- a/devices/sonoff/zbmini-l_relay.json +++ b/devices/sonoff/zbmini-l_relay.json @@ -3,7 +3,8 @@ "uuid": "beb540be-7ed3-4380-be1c-042b7898f74e", "manufacturername": ["SONOFF", "SONOFF"], "modelid": ["ZBMINI-L", "ZBMINIL2"], - "product": "ZBMINI-L or ZBMINIL2", + "vendor": "Sonoff", + "product": "Mini Relay No Neutral (ZBMINI-L/ZBMINIL2)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/stelpro/smt402ad.json b/devices/stelpro/smt402ad.json index c653f1b86c..0a66b9355a 100644 --- a/devices/stelpro/smt402ad.json +++ b/devices/stelpro/smt402ad.json @@ -3,7 +3,8 @@ "uuid": "f1c4277b-f0bc-4d08-93ae-5010230b66ec", "manufacturername": "Stelpro", "modelid": "SMT402AD", - "product": "SMT402AD Thermostat", + "vendor": "Stelpro", + "product": "Thermostat (SMT402AD)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/2button_switch.json b/devices/sunricher/2button_switch.json index 2a041967aa..37303b81d9 100644 --- a/devices/sunricher/2button_switch.json +++ b/devices/sunricher/2button_switch.json @@ -22,7 +22,8 @@ "ROB_200-009-0" ], "matchexpr": "R.endpoints.length === 1", - "product": "2 Button Wall Switch", + "vendor": "Sunricher", + "product": "2 button wall switch", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/4button_switch.json b/devices/sunricher/4button_switch.json index 6ebb1c56d4..8963aed3a8 100644 --- a/devices/sunricher/4button_switch.json +++ b/devices/sunricher/4button_switch.json @@ -20,7 +20,8 @@ "ROB_200-008-0" ], "matchexpr": "R.endpoints.length === 2", - "product": "4 Button Wall Switch", + "vendor": "Sunricher", + "product": "4 button wall switch", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/8button_switch.json b/devices/sunricher/8button_switch.json index 94a2ca4673..aafa2fbce7 100644 --- a/devices/sunricher/8button_switch.json +++ b/devices/sunricher/8button_switch.json @@ -24,7 +24,8 @@ "ROB_200-025-0" ], "matchexpr": "R.endpoints.length === 4", - "product": "8 Button Wall Switch", + "vendor": "Sunricher", + "product": "8 button wall switch", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/SR-ZG9030A-MW.json b/devices/sunricher/SR-ZG9030A-MW.json index 7e6bba9a1b..864452dd79 100644 --- a/devices/sunricher/SR-ZG9030A-MW.json +++ b/devices/sunricher/SR-ZG9030A-MW.json @@ -4,7 +4,7 @@ "manufacturername": "Sunricher", "modelid": "HK-DIM", "vendor": "Sunricher", - "product": "Ceiling Mount Microwave Occupancy Sensor SR-ZG9030A-MW", + "product": "Ceiling mount microwave occupancy sensor (SR-ZG9030A-MW)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/SR-ZG9080A.json b/devices/sunricher/SR-ZG9080A.json index 93aedf4e77..30e9316ef0 100644 --- a/devices/sunricher/SR-ZG9080A.json +++ b/devices/sunricher/SR-ZG9080A.json @@ -3,7 +3,8 @@ "uuid": "7a66015b-448c-422a-8b00-cc6eed60447b", "manufacturername": "Sunricher", "modelid": "Motor Controller", - "product": "SR-ZG9080A", + "vendor": "Sunricher", + "product": "Curtain motor controller (SR-ZG9080A)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/vivares_pbc4_01.json b/devices/sunricher/vivares_pbc4_01.json index a3fb766056..36536c11dc 100644 --- a/devices/sunricher/vivares_pbc4_01.json +++ b/devices/sunricher/vivares_pbc4_01.json @@ -4,7 +4,7 @@ "manufacturername": "Sunricher", "modelid": "VIVARES_PBC4_01", "vendor": "Sunricher", - "product": "C4 control unit", + "product": "Push button coupler C4 (SR-ZG2833PAC-C4)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/sunricher/zg2855-rgb_button.json b/devices/sunricher/zg2855-rgb_button.json index cfa79d2f70..39695cb711 100644 --- a/devices/sunricher/zg2855-rgb_button.json +++ b/devices/sunricher/zg2855-rgb_button.json @@ -3,7 +3,8 @@ "uuid":"f0903584-b715-414b-88e4-db5ee8939507", "manufacturername":"Sunricher", "modelid":"ZG2855-RGB", - "product":"3 in 1 zigbee push button remote", + "vendor": "Sunricher", + "product":"3 in 1 zigbee push button remote (ZG2855-RGB)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/terncy/terncy_dc01_contact_sensor.json b/devices/terncy/terncy_dc01_contact_sensor.json index 70c037105e..7e414f1b08 100644 --- a/devices/terncy/terncy_dc01_contact_sensor.json +++ b/devices/terncy/terncy_dc01_contact_sensor.json @@ -3,7 +3,9 @@ "uuid": "ae49b1d3-2ad4-432e-8a59-474edd3a9fb8", "manufacturername": "Sunricher", "modelid": "TERNCY-DC01", - "product": "TERNCY-DC01 contact sensor", + "vendor": "Terncy", + "product": "Door sensor (TERNCY-DC01)", + "md:info": ["terncy_dc01_contact_sensor_pairing.md"], "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/terncy/terncy_dc01_contact_sensor_pairing.md b/devices/terncy/terncy_dc01_contact_sensor_pairing.md new file mode 100644 index 0000000000..2a31f3cc21 --- /dev/null +++ b/devices/terncy/terncy_dc01_contact_sensor_pairing.md @@ -0,0 +1,3 @@ +### Pairing + +Press and hold the button for about 6 seconds till the green LED starts flashing. Wait until paired. \ No newline at end of file diff --git a/devices/terncy/terncy_sd01.json b/devices/terncy/terncy_sd01.json index e69d14c697..02301c6d49 100644 --- a/devices/terncy/terncy_sd01.json +++ b/devices/terncy/terncy_sd01.json @@ -4,7 +4,7 @@ "manufacturername": ["Xiaoyan", "TERNCY"], "modelid": ["TERNCY-SD01", "TERNCY-SD01"], "vendor": "Terncy", - "product": "Terncy Smart Dial SD01", + "product": "Smart dial (TERNCY-SD01)", "sleeper": true, "status": "Gold", "md:known_issues": [ "terncy_sd01_known_issues.md" ], diff --git a/devices/terncy/terncy_sd01_known_issues.md b/devices/terncy/terncy_sd01_known_issues.md index 674e637429..cb94c2a4d4 100644 --- a/devices/terncy/terncy_sd01_known_issues.md +++ b/devices/terncy/terncy_sd01_known_issues.md @@ -1,7 +1,5 @@ ### Compatibility - - In order for the device to work properly, the [firmware](https://github.com/Koenkk/zigbee-OTA/raw/master/images/Terncy/TERNCY-SD01_v46.OTA) must be updated, as in earlier versions, there is no manufacturer name included. Additionally, it must be ensured that deconz exposes endpoint 6E through the coordinator. Please see [this](https://github.com/dresden-elektronik/deconz-rest-plugin/issues/4728#issuecomment-860883260) diff --git a/devices/tesla/TSL-SEN-TAH_multi_sensor.json b/devices/tesla/TSL-SEN-TAH_multi_sensor.json index 8ff19a1ac5..c6c68fe0ae 100644 --- a/devices/tesla/TSL-SEN-TAH_multi_sensor.json +++ b/devices/tesla/TSL-SEN-TAH_multi_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_j5fbnjeh", "modelid": "TS0201", "vendor": "Tesla Global Limited", - "product": "TSL-SEN-TAH", + "product": "Temperature and humidity sensor (TSL-SEN-TAH)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/third_reality/3RMS16BZ_motion_sensor.json b/devices/third_reality/3RMS16BZ_motion_sensor.json index bbf2c0dc20..1846ff008d 100644 --- a/devices/third_reality/3RMS16BZ_motion_sensor.json +++ b/devices/third_reality/3RMS16BZ_motion_sensor.json @@ -3,7 +3,8 @@ "uuid": "240fb1b8-8965-4549-a7eb-df13c38678e1", "manufacturername": "Third Reality, Inc", "modelid": "3RMS16BZ", - "product": "Wireless Motion Sensor", + "vendor": "Third Reality", + "product": "Motion Sensor, Pet Friendly (3RMS16BZ)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/third_reality/3RSP02028BZ_smart_plug.json b/devices/third_reality/3RSP02028BZ_smart_plug.json index 0747954bf6..200059522f 100644 --- a/devices/third_reality/3RSP02028BZ_smart_plug.json +++ b/devices/third_reality/3RSP02028BZ_smart_plug.json @@ -4,7 +4,7 @@ "manufacturername": "Third Reality, Inc", "modelid": "3RSP02028BZ", "vendor": "Third Reality", - "product": "Smart plug", + "product": "Smart plug (3RSP02028BZ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/third_reality/3RTHS24BZ_multi_sensor.json b/devices/third_reality/3RTHS24BZ_multi_sensor.json index 46d050b767..1ec09ea6f5 100644 --- a/devices/third_reality/3RTHS24BZ_multi_sensor.json +++ b/devices/third_reality/3RTHS24BZ_multi_sensor.json @@ -3,8 +3,8 @@ "uuid":"03cafb19-0a86-4881-bfb3-ad83eb6ba28f", "manufacturername":"Third Reality, Inc", "modelid":"3RTHS24BZ", - "vendor":"ThirdReality", - "product":"Third Reality Temperature and Humidity Sensor with Digital LCD Display", + "vendor": "Third Reality", + "product":"Temperature and humidity sensor with digital LCD display (3RTHS24BZ)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/third_reality/3RWS18BZ_water_sensor.json b/devices/third_reality/3RWS18BZ_water_sensor.json index c6539a92be..4b179b5f0d 100644 --- a/devices/third_reality/3RWS18BZ_water_sensor.json +++ b/devices/third_reality/3RWS18BZ_water_sensor.json @@ -3,7 +3,8 @@ "uuid": "825c658a-7923-45d9-87a5-1fa36eb2cfa8", "manufacturername": "Third Reality, Inc", "modelid": "3RWS18BZ", - "product": "3RWS18BZ", + "vendor": "Third Reality", + "product": "Water leak sensor (3RWS18BZ)", "sleeper": true, "status": "Silver", "subdevices": [ diff --git a/devices/tuya/ZY-M100_human_breathing_presence.json b/devices/tuya/ZY-M100_human_breathing_presence.json index eea1475a43..87a590fe84 100644 --- a/devices/tuya/ZY-M100_human_breathing_presence.json +++ b/devices/tuya/ZY-M100_human_breathing_presence.json @@ -15,7 +15,8 @@ "TS0601", "TS0601" ], - "product": "Tuya MmwRadar Human Presence Detector", + "vendor": "Tuya", + "product": "MmwRadar Human Presence Detector (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TS0012_2gangs_wired_no_neutral_not_locked.json b/devices/tuya/_TS0012_2gangs_wired_no_neutral_not_locked.json index 198cae82f0..9a5af4a0c1 100644 --- a/devices/tuya/_TS0012_2gangs_wired_no_neutral_not_locked.json +++ b/devices/tuya/_TS0012_2gangs_wired_no_neutral_not_locked.json @@ -3,7 +3,8 @@ "uuid": "dae97704-62d0-42d6-8652-d8ea6020a0de", "manufacturername": "_TZ3000_lupfd8zu", "modelid": "TS0012", - "product": "Tuya 2 gangs wired without neutral", + "vendor": "Tuya", + "product": "Tuya 2 gangs wired without neutral (TS0012)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TS0601_TZE204_ijxvkhd0_mmwave_radar.json b/devices/tuya/_TS0601_TZE204_ijxvkhd0_mmwave_radar.json index 9548fb0d5d..2a77522479 100644 --- a/devices/tuya/_TS0601_TZE204_ijxvkhd0_mmwave_radar.json +++ b/devices/tuya/_TS0601_TZE204_ijxvkhd0_mmwave_radar.json @@ -3,7 +3,8 @@ "uuid": "6f0fcd39-28ba-44b1-a01f-4a00cf942192", "manufacturername": "_TZE204_ijxvkhd0", "modelid": "TS0601", - "product": "Tuya Human Presence Detector", + "vendor": "Tuya", + "product": "Human presence detector wall (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TS0601_TZE204_qasjif9e_mmwave_radar.json b/devices/tuya/_TS0601_TZE204_qasjif9e_mmwave_radar.json index 1e073f208b..b55ca4c561 100644 --- a/devices/tuya/_TS0601_TZE204_qasjif9e_mmwave_radar.json +++ b/devices/tuya/_TS0601_TZE204_qasjif9e_mmwave_radar.json @@ -3,7 +3,8 @@ "uuid": "7f423a6d-8c5d-4995-8b74-30588ae6184f", "manufacturername": "_TZE204_qasjif9e", "modelid": "TS0601", - "product": "Tuya MmwRadar Mini human breathe sensor", + "vendor": "Tuya", + "product": "Human presence detector ceiling (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TS130F_standard_covering_reversed.json b/devices/tuya/_TS130F_standard_covering_reversed.json index d88c628c1f..66af902903 100644 --- a/devices/tuya/_TS130F_standard_covering_reversed.json +++ b/devices/tuya/_TS130F_standard_covering_reversed.json @@ -3,7 +3,8 @@ "uuid": "8890ee18-d1c9-4319-9c7a-634bb1d02ecc", "manufacturername": "_TZ3000_iaxvag8w", "modelid": "TS130F", - "product": "Standard Tuya Covering", + "vendor": "Tuya", + "product": "Standard covering (TS130F)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TYZB01_SM0201_temp_hum_sensor.json b/devices/tuya/_TYZB01_SM0201_temp_hum_sensor.json index f70425efc8..4b9d3e381f 100644 --- a/devices/tuya/_TYZB01_SM0201_temp_hum_sensor.json +++ b/devices/tuya/_TYZB01_SM0201_temp_hum_sensor.json @@ -3,7 +3,8 @@ "uuid":"08dc1145-5065-4dbd-a0dc-3433984f7088", "manufacturername":["_TYZB01_cbiezpds", "_TYZB01_zqvwka4k"], "modelid":["SM0201","SM0201"], - "product":"SM0201 Temperature and Humidity Sensor with LCD Display", + "vendor": "Tuya", + "product":"Temperature and humidity sensor with LCD display (SM0201)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/tuya/_TYZB01_TS0011_1gang_wired_no_neutral.json b/devices/tuya/_TYZB01_TS0011_1gang_wired_no_neutral.json index 5edc26d9f9..887df7e4a3 100644 --- a/devices/tuya/_TYZB01_TS0011_1gang_wired_no_neutral.json +++ b/devices/tuya/_TYZB01_TS0011_1gang_wired_no_neutral.json @@ -3,7 +3,8 @@ "uuid": "fcea0ffe-581e-4ccf-ae5a-188930ab14b8", "manufacturername": "TYZB01_xfpdrwvc", "modelid": "TS0011", - "product": "TS0011", + "vendor": "Tuya", + "product": "Light switch (TS0011)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_2channel_module.json b/devices/tuya/_TZ3000_2channel_module.json index d79763df32..fba39d21bc 100644 --- a/devices/tuya/_TZ3000_2channel_module.json +++ b/devices/tuya/_TZ3000_2channel_module.json @@ -13,7 +13,8 @@ "TS0002", "TS0002" ], - "product": "Tuya 2 output module", + "vendor": "Tuya", + "product": "2 output module (TS0002)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_4fjiwweb_smart_knob.json b/devices/tuya/_TZ3000_4fjiwweb_smart_knob.json index 5e3f8a680c..3705a90227 100644 --- a/devices/tuya/_TZ3000_4fjiwweb_smart_knob.json +++ b/devices/tuya/_TZ3000_4fjiwweb_smart_knob.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_4fjiwweb", "modelid": "TS004F", "vendor": "Tuya", - "product": "Smart Knob", + "product": "Smart Knob (TS004F)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0011_1gang_switch_module.json b/devices/tuya/_TZ3000_TS0011_1gang_switch_module.json index 88d1e2ff12..59e9727d33 100644 --- a/devices/tuya/_TZ3000_TS0011_1gang_switch_module.json +++ b/devices/tuya/_TZ3000_TS0011_1gang_switch_module.json @@ -3,7 +3,8 @@ "uuid": "dff3219b-6a94-454f-a71c-00b8391b15e7", "manufacturername": ["_TZ3000_txpirhfq","_TZ3000_qmi1cfuq", "_TZ3000_ji4araar","_TZ3000_v7sopte0","_TYZB01_qeqvmvti","_TZ3000_7jsk6lxz", "_TZ3000_hhiodade"], "modelid": ["TS0011", "TS0011", "TS0011","TS0011","TS0011","TS0011", "TS0011"], - "product": "1 gang switch module", + "vendor": "Tuya", + "product": "1 gang switch module (TS0011)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0041_1gang_remote.json b/devices/tuya/_TZ3000_TS0041_1gang_remote.json index a5d49348b3..a2d1f1d1d7 100644 --- a/devices/tuya/_TZ3000_TS0041_1gang_remote.json +++ b/devices/tuya/_TZ3000_TS0041_1gang_remote.json @@ -3,7 +3,8 @@ "uuid": "eb70937d-16de-48f6-9aef-e50a6c0831f6", "manufacturername": [" _TZ3000_itb0omhv", "_TZ3000_4upl1fcj","_TZ3000_wqcbzbae", "_TZ3000_tk3s5tyg", "_TZ3000_mrpevh8p", "_TZ3000_qgwcxxws", "_TZ3000_yj6k7vfo", "_TZ3000_axpdxqgu"], "modelid": ["TS0041", "TS0041", "TS0041", "TS0041", "TS0041", "TS0041", "TS0041", "TS0041"], - "product": "Tuya 1-gang remote", + "vendor": "Tuya", + "product": "1-gang remote (TS0041)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0042_2gang_remote.json b/devices/tuya/_TZ3000_TS0042_2gang_remote.json index 3d3a14c722..61f8ce7e1c 100644 --- a/devices/tuya/_TZ3000_TS0042_2gang_remote.json +++ b/devices/tuya/_TZ3000_TS0042_2gang_remote.json @@ -3,7 +3,8 @@ "uuid": "a1e3894c-d259-4235-852e-2aea617df251", "manufacturername": ["_TZ3000_5e235jpa", "_TZ3000_t8hzpgnd", "_TZ3000_tzvbimpq", "_TZ3000_i3rjdrwu"], "modelid": ["TS0042", "TS0042", "TS0042", "TS0042"], - "product": "Tuya 2-gang remote", + "vendor": "Tuya", + "product": "2-gang remote (TS0042)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0043_3gang_remote.json b/devices/tuya/_TZ3000_TS0043_3gang_remote.json index 8e595ac6e8..979440e7d4 100644 --- a/devices/tuya/_TZ3000_TS0043_3gang_remote.json +++ b/devices/tuya/_TZ3000_TS0043_3gang_remote.json @@ -3,7 +3,8 @@ "uuid": "d333ea82-790f-42e4-ac3b-c255f67a95be", "manufacturername": ["_TZ3000_gbm10jnj", "_TZ3000_sj7jbgks", "_TZ3000_w8jwkczz", "_TZ3000_famkxci2", "_TZ3000_w3c7ouru", "_TZ3000_yw5tvzsk", "_TZ3000_pkeqinnt"], "modelid": ["TS0043", "TS0043", "TS0043", "TS0043", "TS0043", "TS0043", "TS0043"], - "product": "Tuya 3-gang remote", + "vendor": "Tuya", + "product": "3-gang remote (TS0043)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0044_4gang_remote.json b/devices/tuya/_TZ3000_TS0044_4gang_remote.json index 33f6838f99..a057eb59aa 100644 --- a/devices/tuya/_TZ3000_TS0044_4gang_remote.json +++ b/devices/tuya/_TZ3000_TS0044_4gang_remote.json @@ -25,7 +25,8 @@ "TS0044", "TS0044" ], - "product": "Tuya 4-gang remote", + "vendor": "Tuya", + "product": "Tuya 4-gang remote (TS0044)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0044_4gang_remote_locked.json b/devices/tuya/_TZ3000_TS0044_4gang_remote_locked.json index 78600b9012..4871f14985 100644 --- a/devices/tuya/_TZ3000_TS0044_4gang_remote_locked.json +++ b/devices/tuya/_TZ3000_TS0044_4gang_remote_locked.json @@ -3,7 +3,9 @@ "uuid": "1ca9db80-e00c-4d5d-84b2-7451b19d6e46", "manufacturername": ["_TZ3000_a4xycprs", "_TZ3000_u3nv1jwk"], "modelid": ["TS0044", "TS0044"], - "product": "Tuya 4-gang locked remote", + "vendor": "Tuya", + "product": "4-gang remote (TS0044)", + "comment": "Locked by Tuya", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS004F_switch.json b/devices/tuya/_TZ3000_TS004F_switch.json index 500e8152b8..4fa3e27c4d 100644 --- a/devices/tuya/_TZ3000_TS004F_switch.json +++ b/devices/tuya/_TZ3000_TS004F_switch.json @@ -3,7 +3,8 @@ "uuid": "0a13c865-4c4b-4264-9a32-ba438027c477", "manufacturername": ["_TZ3000_rco1yzb1","_TZ3000_czuyt8lz"], "modelid": ["TS004F","TS004F"], - "product": "TS004F Scene Switch", + "vendor": "Tuya", + "product": "Scene switch (TS004F)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS011F_PowerStrip.json b/devices/tuya/_TZ3000_TS011F_PowerStrip.json index 8fbd96b1b3..9b0b37d9d2 100644 --- a/devices/tuya/_TZ3000_TS011F_PowerStrip.json +++ b/devices/tuya/_TZ3000_TS011F_PowerStrip.json @@ -15,7 +15,8 @@ "TS011F", "TS011F" ], - "product":"Tuya Powerstrip w/USB", + "vendor": "Tuya", + "product":"Powerstrip with USB (TS011F)", "sleeper":false, "status":"Gold", "subdevices":[ diff --git a/devices/tuya/_TZ3000_TS011F_smart_plug.json b/devices/tuya/_TZ3000_TS011F_smart_plug.json index 055073ba43..8c3febf09f 100644 --- a/devices/tuya/_TZ3000_TS011F_smart_plug.json +++ b/devices/tuya/_TZ3000_TS011F_smart_plug.json @@ -3,7 +3,8 @@ "uuid": "0b14b62e-ba7e-4b8d-9ede-f9e92497104f", "manufacturername": ["_TZ3000_okaz9tjs", "_TZ3000_dksbtrzs", "_TZ3000_gvn91tmx"], "modelid": ["TS011F", "TS011F", "TS011F"], - "product": "Smart Plug Power Monitor", + "vendor": "Tuya", + "product": "Smart plug power monitor (TS011F)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0201_temp_hum_sensor.json b/devices/tuya/_TZ3000_TS0201_temp_hum_sensor.json index 1b37fa7c93..620058f00f 100644 --- a/devices/tuya/_TZ3000_TS0201_temp_hum_sensor.json +++ b/devices/tuya/_TZ3000_TS0201_temp_hum_sensor.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZ3000_yd2e749y", "_TZ3000_fllyghyj", "_TZ3000_fie1dpkm", "_TZ3000_lbtpiody", "_TZ3000_5nrcorgu", "_TZ3000_ena8vgqb", "_TZ3000_xr3htd96", "_TZ3000_0s1izerx", "_TZ3000_saiqcn0y"], "modelid": ["TS0201", "TS0201", "TS0201", "TS0201", "TS0201", "TS0201", "TS0201", "TS0201", "TS0201"], "vendor": "Tuya", - "product": "Temperature and humidity sensor", + "product": "Temperature and humidity sensor (TS0201)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0203_door_sensor.json b/devices/tuya/_TZ3000_TS0203_door_sensor.json index 3b5e6a5c84..d0e9167474 100644 --- a/devices/tuya/_TZ3000_TS0203_door_sensor.json +++ b/devices/tuya/_TZ3000_TS0203_door_sensor.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZ3000_n2egfsli", "_TZ3000_oxslv1c9", "_TZ3000_7tbsruql", "_TZ3000_7d8yme6f", "_TZ3000_rgchmad8", "_TZ3000_bzxlofth","_TZ3000_au1rjicn", "_TZ3000_4ugnzsli", "_TZ3000_decxrtwa", "_TZ3000_2mbfxlzr", "_TZ3000_6zvw8ham", "_TZ3000_v7chgqso", "_TZ3000_yxqnffam", "_TZ3000_zgrffiwg","_TZ3000_1bwpjvlz"], "modelid": ["TS0203", "TS0203", "TS0203", "TS0203", "TS0203", "TS0203","TS0203","TS0203","TS0203", "TS0203", "TS0203", "TS0203", "TS0203", "TS0203", "TS0203"], "vendor": "Tuya", - "product": "Smart Zigbee Door Window Contact", + "product": "Door window contact (TS0203)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0207_water_leak_sensor.json b/devices/tuya/_TZ3000_TS0207_water_leak_sensor.json index b257466935..f4195c5c4a 100644 --- a/devices/tuya/_TZ3000_TS0207_water_leak_sensor.json +++ b/devices/tuya/_TZ3000_TS0207_water_leak_sensor.json @@ -38,7 +38,7 @@ "TS0207" ], "vendor": "Tuya", - "product": "Tuya water leak sensor", + "product": "Wwater leak sensor (TS0207)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_TS0210_vibration_sensor.json b/devices/tuya/_TZ3000_TS0210_vibration_sensor.json index 652c2de0f0..63e2c5a55d 100644 --- a/devices/tuya/_TZ3000_TS0210_vibration_sensor.json +++ b/devices/tuya/_TZ3000_TS0210_vibration_sensor.json @@ -3,8 +3,8 @@ "uuid": "a4ade039-8213-47cc-8f92-09b04d7557cd", "manufacturername": ["_TZ3000_bmfw9ykl", "_TZ3000_lzdjjfss", "_TZ3000_lqpt3mvr"], "modelid": ["TS0210","TS0210","TS0210"], - "vendor": "Tuya", - "product": "Moes vibration sensor", + "vendor": "Moes", + "product": "Vibration sensor (TS0210)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000__TS0207_range_extender.json b/devices/tuya/_TZ3000__TS0207_range_extender.json index 0aee39de95..52547f15ca 100644 --- a/devices/tuya/_TZ3000__TS0207_range_extender.json +++ b/devices/tuya/_TZ3000__TS0207_range_extender.json @@ -3,7 +3,8 @@ "uuid": "9d273448-b13a-41a8-9dfe-1e1de9927214", "manufacturername": ["_TZ3000_m0vaazab","_TZ3000_ufttklsz","_TZ3000_5k5vh43t","_TZ3000_gszjt2xx"], "modelid": ["TS0207","TS0207","TS0207","TS0207"], - "product": "Range Extender", + "vendor": "Tuya", + "product": "Range Extender (TS0207)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_cehuw1lw_smartplug_EU.json b/devices/tuya/_TZ3000_cehuw1lw_smartplug_EU.json index cd2e7753b9..ce6036c99a 100644 --- a/devices/tuya/_TZ3000_cehuw1lw_smartplug_EU.json +++ b/devices/tuya/_TZ3000_cehuw1lw_smartplug_EU.json @@ -3,7 +3,8 @@ "uuid": "37f521f8-bcb4-41ca-a865-961258d96ca9", "manufacturername": "_TZ3000_cehuw1lw", "modelid": "TS011F", - "product": "Random tuya plug", + "vendor": "Tuya", + "product": "Standard plug (TS011F)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_gzvniqjb_din_rail_switch.json b/devices/tuya/_TZ3000_gzvniqjb_din_rail_switch.json index fed7022c20..9cea8b2ac6 100644 --- a/devices/tuya/_TZ3000_gzvniqjb_din_rail_switch.json +++ b/devices/tuya/_TZ3000_gzvniqjb_din_rail_switch.json @@ -3,8 +3,8 @@ "uuid": "f66ebd4f-7da9-40a0-b06b-eb6327b73abb", "manufacturername": "_TZ3000_gzvniqjb", "modelid": "TS0011", - "product": "TO-Q-SY1-ZT", - "vendor": "TONGOU", + "vendor": "Tongou", + "product": "DIN rail circuit breaker 63A (TO-Q-SY1-ZT)", "sleeper": true, "status": "Gold", "subdevices": [{ diff --git a/devices/tuya/_TZ3000_hkkkuk7k_mini_switch.json b/devices/tuya/_TZ3000_hkkkuk7k_mini_switch.json index 6f855c39e6..ab62c7865e 100644 --- a/devices/tuya/_TZ3000_hkkkuk7k_mini_switch.json +++ b/devices/tuya/_TZ3000_hkkkuk7k_mini_switch.json @@ -3,7 +3,8 @@ "uuid": "a6d2c96b-43b7-4e6b-9884-350191c770bb", "manufacturername": "_TZ3000_hkkkuk7k", "modelid": "TS0012", - "product": "Tuya 2 output module", + "vendor": "Tuya", + "product": "2 output module (TS0012)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_i8jfiezr_temp_hum_sensor.json b/devices/tuya/_TZ3000_i8jfiezr_temp_hum_sensor.json index 8751ad5ca4..770555e3b7 100644 --- a/devices/tuya/_TZ3000_i8jfiezr_temp_hum_sensor.json +++ b/devices/tuya/_TZ3000_i8jfiezr_temp_hum_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_i8jfiezr", "modelid": "TS0201", "vendor": "RTX", - "product": "TS0201", + "product": "Temperature and humidity sensor (TS0201)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_ja5osu5g_smart_button.json b/devices/tuya/_TZ3000_ja5osu5g_smart_button.json index ae17bd4f50..f0821f40cd 100644 --- a/devices/tuya/_TZ3000_ja5osu5g_smart_button.json +++ b/devices/tuya/_TZ3000_ja5osu5g_smart_button.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZ3000_ja5osu5g", "_TZ3000_fa9mlvja"], "modelid": ["TS004F", "TS0041"], "vendor": "Tuya", - "product": "Wireless Smart Button", + "product": "Wireless smart button (TS004)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_jl7qyupf_2gangs_switch_locked.json b/devices/tuya/_TZ3000_jl7qyupf_2gangs_switch_locked.json index ac4f41ae5c..1e739ccf17 100644 --- a/devices/tuya/_TZ3000_jl7qyupf_2gangs_switch_locked.json +++ b/devices/tuya/_TZ3000_jl7qyupf_2gangs_switch_locked.json @@ -3,7 +3,8 @@ "uuid":"e8976fdf-293d-4da2-8408-64b9b043c6f9", "manufacturername":"_TZ3000_jl7qyupf", "modelid":"TS0012", - "product":"Wired Switch 2 gangs, locked by tuya", + "product":"Wired switch 2 gangs (TS0012)", + "comment": "Locked by Tuya", "sleeper":false, "status":"Gold", "subdevices":[ diff --git a/devices/tuya/_TZ3000_pfc7i3kt_smart_switch_3gangs_locked.json b/devices/tuya/_TZ3000_pfc7i3kt_smart_switch_3gangs_locked.json index b87f9b9283..c74d24a9f9 100644 --- a/devices/tuya/_TZ3000_pfc7i3kt_smart_switch_3gangs_locked.json +++ b/devices/tuya/_TZ3000_pfc7i3kt_smart_switch_3gangs_locked.json @@ -3,7 +3,9 @@ "uuid": "bb9f0394-adc0-4361-bf65-2a8efe1ff741", "manufacturername": "_TZ3000_pfc7i3kt", "modelid": "TS0003", - "product": "Wired Switch 3 gangs (locked)", + "vendor": "Tuya", + "product": "Switch module 3 channel (TS0003)", + "comment": "Locked by Tuya", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_qewo8dlz_wired_switch_3gangs.json b/devices/tuya/_TZ3000_qewo8dlz_wired_switch_3gangs.json index 7a7ab639d8..55d4bd6476 100644 --- a/devices/tuya/_TZ3000_qewo8dlz_wired_switch_3gangs.json +++ b/devices/tuya/_TZ3000_qewo8dlz_wired_switch_3gangs.json @@ -3,7 +3,8 @@ "uuid":"15e1102b-831e-431b-bb8c-c1d53c4f5490", "manufacturername":"_TZ3000_qewo8dlz", "modelid":"TS0013", - "product":"Wired Switch 3 gangs", + "vendor": "Tuya", + "product":"Wired Switch 3 gangs (TS0013)", "sleeper":false, "status":"Gold", "subdevices":[ diff --git a/devices/tuya/_TZ3000_typdpbpg_smart_plug_eu.json b/devices/tuya/_TZ3000_typdpbpg_smart_plug_eu.json index e5543d3fc3..81bdeae366 100644 --- a/devices/tuya/_TZ3000_typdpbpg_smart_plug_eu.json +++ b/devices/tuya/_TZ3000_typdpbpg_smart_plug_eu.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_typdpbpg", "modelid": "TS011F", "vendor": "Tuya", - "product": "Smart plug EU", + "product": "Smart plug EU (TS011F)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3000_wkr3jqmr_4channel_module.json b/devices/tuya/_TZ3000_wkr3jqmr_4channel_module.json index e77b661122..fb2061b18e 100644 --- a/devices/tuya/_TZ3000_wkr3jqmr_4channel_module.json +++ b/devices/tuya/_TZ3000_wkr3jqmr_4channel_module.json @@ -3,7 +3,8 @@ "uuid": "3a7cad20-0c89-4f6a-b629-dd696f59eab8", "manufacturername": "_TZ3000_wkr3jqmr", "modelid": "TS0004", - "product": "Tuya 4 output module", + "vendor": "Tuya", + "product": "4 output module (TS0004)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3210_dse8ogfy_fingerbot.json b/devices/tuya/_TZ3210_dse8ogfy_fingerbot.json index 5e4e0f1428..611bbbfba7 100644 --- a/devices/tuya/_TZ3210_dse8ogfy_fingerbot.json +++ b/devices/tuya/_TZ3210_dse8ogfy_fingerbot.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZ3210_dse8ogfy", "_TZ3210_j4pdtz9v"], "modelid": ["TS0001", "TS0001"], "vendor": "Tuya", - "product": "Fingerbot", + "product": "Adaprox fingerbot (TS0001)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZ3210_up3pngle_TS0205_smoke_sensor.json b/devices/tuya/_TZ3210_up3pngle_TS0205_smoke_sensor.json index 10ca6b39e9..9421a36402 100644 --- a/devices/tuya/_TZ3210_up3pngle_TS0205_smoke_sensor.json +++ b/devices/tuya/_TZ3210_up3pngle_TS0205_smoke_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3210_up3pngle", "modelid": "TS0205", "vendor": "Tuya", - "product": "Smoke Sensor", + "product": "Smoke sensor (TS0205)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZB000_42ha4rsc_window_blinds.json b/devices/tuya/_TZB000_42ha4rsc_window_blinds.json index 16f673af0f..568f408d94 100644 --- a/devices/tuya/_TZB000_42ha4rsc_window_blinds.json +++ b/devices/tuya/_TZB000_42ha4rsc_window_blinds.json @@ -3,7 +3,8 @@ "uuid": "165aea49-d5c1-4418-a479-cdad4dfe1600", "manufacturername": "_TZB000_42ha4rsc", "modelid": "TS030F", - "product": "Livarno blinds", + "vendor": "Livarno", + "product": "Window blinds (TS030F)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_2ekuz3dz_trv.json b/devices/tuya/_TZE200_2ekuz3dz_trv.json index 2934680cdb..473f8d88e7 100644 --- a/devices/tuya/_TZE200_2ekuz3dz_trv.json +++ b/devices/tuya/_TZE200_2ekuz3dz_trv.json @@ -3,8 +3,8 @@ "uuid": "edfadfce-d2d8-481a-967d-c46972c5b642", "manufacturername": "_TZE200_2ekuz3dz", "modelid": "TS0601", - "vendor": "Tuya", - "product": "Tuya TRV", + "vendor": "Beok", + "product": "Under floor heating thermostat (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_2wg5qrjy_valve.json b/devices/tuya/_TZE200_2wg5qrjy_valve.json index 40f76ecbf6..452ac8c90a 100644 --- a/devices/tuya/_TZE200_2wg5qrjy_valve.json +++ b/devices/tuya/_TZE200_2wg5qrjy_valve.json @@ -3,8 +3,8 @@ "uuid": "1d0e1b23-c414-4ad4-bb8a-1736cb9f977e", "manufacturername": "_TZE200_2wg5qrjy", "modelid": "TS0601", - "vendor": "Mercator", - "product": "Mercator SSWM-DIMZ", + "vendor": "Royal Gardineer", + "product": "Water valve (ZX-7155-675)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_3towulqd_motion_lux_sensor.json b/devices/tuya/_TZE200_3towulqd_motion_lux_sensor.json index 982bebc1cb..1a3a84e38d 100644 --- a/devices/tuya/_TZE200_3towulqd_motion_lux_sensor.json +++ b/devices/tuya/_TZE200_3towulqd_motion_lux_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZE200_3towulqd", "modelid": "TS0601", "vendor": "Tuya", - "product": "ZG-204ZL Luminance Motion Sensor", + "product": "PIR motion detector and light sensor (ZG-204ZL)", "status": "Gold", "sleeper": true, "subdevices": [ diff --git a/devices/tuya/_TZE200_9cxuhakf_wired_dimmer.json b/devices/tuya/_TZE200_9cxuhakf_wired_dimmer.json index e4cee107b9..84bbebed9e 100644 --- a/devices/tuya/_TZE200_9cxuhakf_wired_dimmer.json +++ b/devices/tuya/_TZE200_9cxuhakf_wired_dimmer.json @@ -4,7 +4,7 @@ "manufacturername": "_TZE200_9cxuhakf", "modelid": "TS0601", "vendor": "Mercator", - "product": "Mercator SSWM-DIMZ", + "product": "Switch Mechanism (SSWM-DIMZ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_TS0601_humidity_temp.json b/devices/tuya/_TZE200_TS0601_humidity_temp.json index 9babcc4974..d632ced20a 100644 --- a/devices/tuya/_TZE200_TS0601_humidity_temp.json +++ b/devices/tuya/_TZE200_TS0601_humidity_temp.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZE200_nnrfa68v","_TZE200_znbl8dj5", "_TZE200_qoy0ekbd", "_TZE200_a8sdabtg", "_TZE200_whkgqxse","_TZE200_yjjdcqsq", "_TZE200_9yapgbuv", "_TZE200_utkemkbs", "_TZE200_locansqn"], "modelid": ["TS0601","TS0601", "TS0601", "TS0601", "TS0601", "TS0601", "TS0601", "TS0601", "TS0601"], "vendor": "Tuya", - "product": "Temperature Humidity Sensor TS0601", + "product": "Temperature humidity sensor (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_TS0601_mmWave_Radar.json b/devices/tuya/_TZE200_TS0601_mmWave_Radar.json index ede70e55de..fce5433d8e 100644 --- a/devices/tuya/_TZE200_TS0601_mmWave_Radar.json +++ b/devices/tuya/_TZE200_TS0601_mmWave_Radar.json @@ -3,7 +3,8 @@ "uuid": "eadb2b6f-aeb8-4695-923d-ba0eb42fd003", "manufacturername": ["_TZE200_v6ossqfy","_TZE200_mx6u6l4y","_TZE200_0u3bj3rc"], "modelid": ["TS0601","TS0601","TS0601"], - "product": "2.4GHz mmWave radar w/LED", + "vendor": "Tuya", + "product": "2.4GHz mmWave radar with LED (TS0601)", "sleeper": false, "status": "Silver", "subdevices": [ diff --git a/devices/tuya/_TZE200_TS0601_smoke_detector.json b/devices/tuya/_TZE200_TS0601_smoke_detector.json index d11d04e2fe..54a21ca602 100644 --- a/devices/tuya/_TZE200_TS0601_smoke_detector.json +++ b/devices/tuya/_TZE200_TS0601_smoke_detector.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZE200_m9skfctm","_TZE200_vzekyi4c"], "modelid": ["TS0601","TS0601"], "vendor": "Tuya", - "product": "Photoelectric Smoke sensor", + "product": "Photoelectric smoke sensor (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_TS0601_trv.json b/devices/tuya/_TZE200_TS0601_trv.json index 72f48cd74a..9b805b1ece 100644 --- a/devices/tuya/_TZE200_TS0601_trv.json +++ b/devices/tuya/_TZE200_TS0601_trv.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZE200_bvu2wnxz", "_TZE200_6rdj8dzm", "_TZE200_gd4rvykv", "_TZE200_rxntag7i", "_TZE200_p3dbf6qs"], "modelid": ["TS0601", "TS0601", "TS0601", "TS0601", "TS0601"], "vendor": "Tuya", - "product": "Tuya TRV", + "product": "Thermostat TRV (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_amp6tsvy_wired_switch_1gang.json b/devices/tuya/_TZE200_amp6tsvy_wired_switch_1gang.json index 8d62422116..3ad0dabc5c 100644 --- a/devices/tuya/_TZE200_amp6tsvy_wired_switch_1gang.json +++ b/devices/tuya/_TZE200_amp6tsvy_wired_switch_1gang.json @@ -3,7 +3,7 @@ "uuid": "05836394-be13-49dd-9bec-68f962076311", "manufacturername": "_TZE200_amp6tsvy", "modelid": "TS0601", - "product": "Tuya 1 gang wired switch", + "product": "Tuya 1 gang wired switch (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_bjawzodf_humidity_temp.json b/devices/tuya/_TZE200_bjawzodf_humidity_temp.json index b88e8ad8b4..21bf21bd5e 100644 --- a/devices/tuya/_TZE200_bjawzodf_humidity_temp.json +++ b/devices/tuya/_TZE200_bjawzodf_humidity_temp.json @@ -3,7 +3,8 @@ "uuid": "c7017086-082a-4c0b-baae-5a55171f3733", "manufacturername": ["_TZE200_bjawzodf", "_TZE200_zl1kmjqx"], "modelid": ["TS0601", "TS0601"], - "product": "Tuya multi sensor", + "vendor": "Tuya", + "product": "Tuya multi sensor (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_byzdayie_din_enrgy_meter.json b/devices/tuya/_TZE200_byzdayie_din_enrgy_meter.json index aeafc064bc..cd049a7d90 100644 --- a/devices/tuya/_TZE200_byzdayie_din_enrgy_meter.json +++ b/devices/tuya/_TZE200_byzdayie_din_enrgy_meter.json @@ -3,7 +3,8 @@ "uuid": "438898c5-16f6-44f4-9768-22ac33490d69", "manufacturername": ["_TZE200_byzdayie", "_TZE200_fsb6zw01", "_TZE200_ewxhg6o9"], "modelid": ["TS0601", "TS0601", "TS0601"], - "product": "Single Phase 65A Din Rail Smart Energy Meter", + "vendor": "Tuya", + "product": "Single phase 65A DIN rail smart energy meter (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_dq1mfjug_smoke_sensor.json b/devices/tuya/_TZE200_dq1mfjug_smoke_sensor.json index 02ad58c419..a81e9db5e0 100644 --- a/devices/tuya/_TZE200_dq1mfjug_smoke_sensor.json +++ b/devices/tuya/_TZE200_dq1mfjug_smoke_sensor.json @@ -1,11 +1,10 @@ - { "schema": "devcap1.schema.json", "uuid": "e8f3e015-6c02-478c-a51e-7730a86293cc", "manufacturername": "_TZE200_dq1mfjug", "modelid": "TS0601", "vendor": "Tuya", - "product": "Smoke sensor", + "product": "Smoke sensor (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_dwcarsat_air_sensor.json b/devices/tuya/_TZE200_dwcarsat_air_sensor.json index 13eb71a6f1..92f4c022d7 100644 --- a/devices/tuya/_TZE200_dwcarsat_air_sensor.json +++ b/devices/tuya/_TZE200_dwcarsat_air_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZE200_dwcarsat", "modelid": "TS0601", "vendor": "Tuya", - "product": "Smart Air House keeper", + "product": "Smart Air House keeper (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_e3oitdyu_smart_dimmer_module.json b/devices/tuya/_TZE200_e3oitdyu_smart_dimmer_module.json index f7f43e09e4..c1a0e16421 100644 --- a/devices/tuya/_TZE200_e3oitdyu_smart_dimmer_module.json +++ b/devices/tuya/_TZE200_e3oitdyu_smart_dimmer_module.json @@ -3,8 +3,8 @@ "uuid": "3c38d64a-5192-4183-882c-e4320e914bb5", "manufacturername": "_TZE200_e3oitdyu", "modelid": "TS0601", - "vendor": "$MF_TUYA", - "product": "Smart Dimmer Module", + "vendor": "Tuya", + "product": "Smart Dimmer Module (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_h4cgnbzg_trv.json b/devices/tuya/_TZE200_h4cgnbzg_trv.json index eaf5bb2c55..4558c666ef 100644 --- a/devices/tuya/_TZE200_h4cgnbzg_trv.json +++ b/devices/tuya/_TZE200_h4cgnbzg_trv.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZE200_h4cgnbzg", "_TZE200_exfrnlow", "_TZE200_9m4kmbfu", "_TZE200_3yp57tby", "_TZE200_9gvruqf5", "_TZE200_zr9c0day", "_TZE200_0dvm9mva"], "modelid": ["TS0601", "TS0601", "TS0601", "TS0601", "TS0601", "TS0601", "TS0601"], "vendor": "Tuya", - "product": "Saswell TRVs", + "product": "Saswell TRVs (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_hhrtiq0x_nedis_trv.json b/devices/tuya/_TZE200_hhrtiq0x_nedis_trv.json index 3eee7c1105..48674a5a03 100644 --- a/devices/tuya/_TZE200_hhrtiq0x_nedis_trv.json +++ b/devices/tuya/_TZE200_hhrtiq0x_nedis_trv.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZE200_hhrtiq0x", "_TZE200_ps5v5jor", "_TZE200_2cs6g9i7"], "modelid": ["TS0601", "TS0601", "TS0601"], "vendor": "Tuya", - "product": "Nedis TRV", + "product": "Nedis TRV (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_myd45weu_soil_sensor.json b/devices/tuya/_TZE200_myd45weu_soil_sensor.json index 80312477c2..5da9cf8d04 100644 --- a/devices/tuya/_TZE200_myd45weu_soil_sensor.json +++ b/devices/tuya/_TZE200_myd45weu_soil_sensor.json @@ -3,7 +3,8 @@ "uuid": "2c91cde2-7329-4c70-bf90-59af861796ff", "manufacturername": ["_TZE200_myd45weu", "_TZE200_9cqcpkgb", "_TZE200_ga1maeof", "_TZE204_myd45weu"], "modelid": ["TS0601", "TS0601", "TS0601", "TS0601"], - "product": "Tuya Soil Sensor", + "vendor": "Tuya", + "product": "Tuya Soil Sensor (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_pay2byax_openclose_sensor.json b/devices/tuya/_TZE200_pay2byax_openclose_sensor.json index 5813447287..88e34025cb 100644 --- a/devices/tuya/_TZE200_pay2byax_openclose_sensor.json +++ b/devices/tuya/_TZE200_pay2byax_openclose_sensor.json @@ -3,7 +3,8 @@ "uuid": "fc4a79fe-ccd4-4973-b167-ceba1e0d8db2", "manufacturername": ["_TZE200_pay2byax", "_TZE200_kltffuzl", "_TZE200_fwoorn8y"], "modelid": ["TS0601", "TS0601", "TS0601"], - "product": "ZG-102Z or TM001-ZA or TM081 open/close sensor", + "vendor": "Tuya", + "product": "Open/close sensor (ZG-102Z/TM001-ZA/TM081)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE200_thbr5z34_awow__trv.json b/devices/tuya/_TZE200_thbr5z34_awow__trv.json index c66ef911df..a49438b2a6 100644 --- a/devices/tuya/_TZE200_thbr5z34_awow__trv.json +++ b/devices/tuya/_TZE200_thbr5z34_awow__trv.json @@ -3,8 +3,8 @@ "uuid": "ad397c3b-9008-48d9-942c-8e41d4cbae16", "manufacturername": "_TZE200_thbr5z34", "modelid": "TS0601", - "vendor": "Tuya", - "product": "Awow TRV", + "vendor": "Awow", + "product": "Thermostat TRV (MS-C-4)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE204_ac0fhfiq_energy_meter.json b/devices/tuya/_TZE204_ac0fhfiq_energy_meter.json index c5e9a1f13e..76c0d0e431 100644 --- a/devices/tuya/_TZE204_ac0fhfiq_energy_meter.json +++ b/devices/tuya/_TZE204_ac0fhfiq_energy_meter.json @@ -3,7 +3,8 @@ "uuid": "ad471d48-8ab4-4d20-a854-56f8423f568d", "manufacturername": "_TZE204_ac0fhfiq", "modelid": "TS0601", - "product": "BiDirectional ZigBee Energy Meter", + "vendor": "Tuya", + "product": "BiDirectional zigbee energy meter (TS0601)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/_TZE204_sxm7l9xa_mmwave_radar.json b/devices/tuya/_TZE204_sxm7l9xa_mmwave_radar.json index c5f3715c53..e07729e408 100644 --- a/devices/tuya/_TZE204_sxm7l9xa_mmwave_radar.json +++ b/devices/tuya/_TZE204_sxm7l9xa_mmwave_radar.json @@ -3,7 +3,8 @@ "uuid": "63378e16-6840-4b37-9e9e-ac17c8462e08", "manufacturername": "_TZE204_sxm7l9xa", "modelid": "TS0601", - "product": "Tuya Human Presence Detector", + "vendor": "Tuya", + "product": "Tuya human presence detector (TS0601)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/ih-f001_door_sensor.json b/devices/tuya/ih-f001_door_sensor.json index 869badbe09..4b466d6695 100644 --- a/devices/tuya/ih-f001_door_sensor.json +++ b/devices/tuya/ih-f001_door_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_oxslv1c9", "modelid": "TS0203", "vendor": "Tuya", - "product": "iH-F001 Door Window Contact", + "product": "iH-F001 door window contact", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/ih-k009_temp_hum_sensor.json b/devices/tuya/ih-k009_temp_hum_sensor.json index bf89edc40d..093f3b5a31 100644 --- a/devices/tuya/ih-k009_temp_hum_sensor.json +++ b/devices/tuya/ih-k009_temp_hum_sensor.json @@ -4,7 +4,7 @@ "manufacturername": "_TZ3000_dowj6gyi", "modelid": "TS0201", "vendor": "Tuya", - "product": "IH-K009", + "product": "Temperature and Humidity Sensor (IH-K009)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/nous_a1z_smart_plug.json b/devices/tuya/nous_a1z_smart_plug.json index de9fd5f8b1..6a84c254f2 100644 --- a/devices/tuya/nous_a1z_smart_plug.json +++ b/devices/tuya/nous_a1z_smart_plug.json @@ -4,7 +4,7 @@ "manufacturername": ["_TZ3000_ksw8qtmt", "_TZ3000_2putqrmw"], "modelid": ["TS011F", "TS011F"], "vendor": "Nous", - "product": "Nous A1Z smart plug", + "product": "Smart zigbee socket (A1Z)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/tuya/rh3040_motion_sensor.json b/devices/tuya/rh3040_motion_sensor.json index ff42bdaaeb..ccdeb3a31f 100644 --- a/devices/tuya/rh3040_motion_sensor.json +++ b/devices/tuya/rh3040_motion_sensor.json @@ -5,8 +5,8 @@ "doc:hdr": "Motion sensor RH3040", "manufacturername": ["TUYATEC-zn9wyqtr", "TUYATEC-lakq7nse", "TUYATEC-53o41joc"], "modelid": ["RH3040", "RH3040", "RH3040"], - "vendor": "$MF_TUYA", - "product": "Motion Sensor RH3040", + "vendor": "Tuya", + "product": "Motion sensor (RH3040)", "status": "Gold", "supportsMgmtBind": true, "subdevices": [ diff --git a/devices/tuya/ts0202_presence_sensor.json b/devices/tuya/ts0202_presence_sensor.json index ace804883a..fbfec40bb3 100644 --- a/devices/tuya/ts0202_presence_sensor.json +++ b/devices/tuya/ts0202_presence_sensor.json @@ -1,13 +1,62 @@ { "schema":"devcap1.schema.json", "uuid":"13e89e44-1f42-4e5d-8d29-995d394451ac", - "manufacturername": ["_TYZB01_tv3wxhcz","_TYZB01_hqbdru35","TZ3000_tiwq83wk","_TZ3000_ykwcwxmz","_TZ3000_hgu1dlak","_TZ3000_hktqahrq","_TZ3000_kmh5qpmb", - "_TZ3000_jmrgyl7o","_TZ3000_msl6wxk9", "_TZ3000_otvn3lne", "_TZ3000_6ygjfyll", "_TZ3040_6ygjfyll", "_TZ3000_mcxw5ehu","_TYZB01_ef5xlc9q", - "_TYZB01_vwqnz1sn","_TYZB01_2b8f6cio","_TZE200_bq5c8xfe","_TYZB01_dl7cejts","_TYZB01_qjqgmqxr","_TZ3000_mmtwjmaq","_TYZB01_zwvaj5wy", - "_TZ3000_bsvqrxru", "_TZ3000_mg4dy6z6", "_TZ3040_bb6xaihh", "_TZ3000_lf56vpxj"], - "modelid":["TS0202", "TS0202", "TS0202", "TS0202", "TS0202","TS0202", "TS0202", "TS0202", "TS0202", "TS0202","TS0202", "TS0202", "TS0202", "TS0202", - "TS0202", "TS0202", "TS0202", "TS0202", "TS0202","TS0202", "TS0202", "TS0202", "TS0202", "TS0202", "TS0202"], - "product":"TS0202 Presence sensor", + "manufacturername": [ + "_TYZB01_tv3wxhcz", + "_TYZB01_hqbdru35", + "_TZ3000_tiwq83wk", + "_TZ3000_ykwcwxmz", + "_TZ3000_hgu1dlak", + "_TZ3000_hktqahrq", + "_TZ3000_kmh5qpmb", + "_TZ3000_jmrgyl7o", + "_TZ3000_msl6wxk9", + "_TZ3000_otvn3lne", + "_TZ3000_6ygjfyll", + "_TZ3040_6ygjfyll", + "_TZ3000_mcxw5ehu", + "_TYZB01_ef5xlc9q", + "_TYZB01_vwqnz1sn", + "_TYZB01_2b8f6cio", + "_TZE200_bq5c8xfe", + "_TYZB01_dl7cejts", + "_TYZB01_qjqgmqxr", + "_TZ3000_mmtwjmaq", + "_TYZB01_zwvaj5wy", + "_TZ3000_bsvqrxru", + "_TZ3000_mg4dy6z6", + "_TZ3040_bb6xaihh", + "_TZ3000_lf56vpxj" + ], + "modelid":[ + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202", + "TS0202" + ], + "vendor": "Tuya", + "product":"Presence sensor (TS0202)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/ubisys/c4_5504.json b/devices/ubisys/c4_5504.json index 56d66fe11f..d1dbe844e1 100644 --- a/devices/ubisys/c4_5504.json +++ b/devices/ubisys/c4_5504.json @@ -4,7 +4,7 @@ "manufacturername": "ubisys", "modelid": "C4 (5504)", "vendor": "ubisys", - "product": "C4 (5504) control unit", + "product": "Control unit (C4 (5504))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/d1_5503_d1r_5603.json b/devices/ubisys/d1_5503_d1r_5603.json index e4a07c7c28..1a00f28dd5 100644 --- a/devices/ubisys/d1_5503_d1r_5603.json +++ b/devices/ubisys/d1_5503_d1r_5603.json @@ -3,7 +3,8 @@ "uuid": "651042bb-371c-4964-abaa-f4277f4ea9d5", "manufacturername": ["ubisys", "ubisys"], "modelid": ["D1 (5503)", "D1-R (5603)"], - "product": "D1 (5503)/D1-R (5603)", + "vendor": "ubisys", + "product": "Universal dimmer (D1 (5503)/D1-R (5603))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/h1.json b/devices/ubisys/h1.json index c99e45f966..3022bb227b 100644 --- a/devices/ubisys/h1.json +++ b/devices/ubisys/h1.json @@ -4,7 +4,7 @@ "manufacturername": "ubisys", "modelid": "H1", "vendor": "ubisys", - "product": "H1", + "product": "Heating regulator (H1)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/j1_5502.json b/devices/ubisys/j1_5502.json index a7403b6000..51259a379a 100644 --- a/devices/ubisys/j1_5502.json +++ b/devices/ubisys/j1_5502.json @@ -4,7 +4,7 @@ "manufacturername": "ubisys", "modelid": "J1 (5502)", "vendor": "ubisys", - "product": "J1 (5502) cover controller", + "product": "Cover controller (J1 (5502))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/j1r_5602.json b/devices/ubisys/j1r_5602.json index a1814513ee..4dfb7dedd8 100644 --- a/devices/ubisys/j1r_5602.json +++ b/devices/ubisys/j1r_5602.json @@ -4,7 +4,7 @@ "manufacturername": "ubisys", "modelid": "J1-R (5602)", "vendor": "ubisys", - "product": "J1-R (5602) cover controller", + "product": "Cover controller (J1-R (5602))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/ld6.json b/devices/ubisys/ld6.json index ea7576c223..7e489beb0e 100644 --- a/devices/ubisys/ld6.json +++ b/devices/ubisys/ld6.json @@ -3,7 +3,8 @@ "uuid": "7f333034-1cf4-41a4-aa3f-00a600b12a92", "manufacturername": "ubisys", "modelid": "LD6", - "product": "Lighting Driver LD6", + "vendor": "ubisys", + "product": "Lighting driver (LD6)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/s1_5501_s1r_5601.json b/devices/ubisys/s1_5501_s1r_5601.json index c462c5667f..c2889ac4cc 100644 --- a/devices/ubisys/s1_5501_s1r_5601.json +++ b/devices/ubisys/s1_5501_s1r_5601.json @@ -4,7 +4,7 @@ "manufacturername": ["ubisys", "ubisys"], "modelid": ["S1 (5501)", "S1-R (5601)"], "vendor": "ubisys", - "product": "S1 (5501) / S1-R (5601) power switch", + "product": "Power switch (S1 (5501)/S1-R (5601))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/s2_5502.json b/devices/ubisys/s2_5502.json index 1ca6ed6ee1..0a9d4db181 100644 --- a/devices/ubisys/s2_5502.json +++ b/devices/ubisys/s2_5502.json @@ -4,7 +4,7 @@ "manufacturername": "ubisys", "modelid": "S2 (5502)", "vendor": "ubisys", - "product": "S2 (5502) power switch", + "product": "Power switch (S2 (5502))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/ubisys/s2r_5602.json b/devices/ubisys/s2r_5602.json index da91e2f336..c95d33f52e 100644 --- a/devices/ubisys/s2r_5602.json +++ b/devices/ubisys/s2r_5602.json @@ -4,7 +4,7 @@ "manufacturername": "ubisys", "modelid": "S2-R (5602)", "vendor": "ubisys", - "product": "S2-R (5602) power switch", + "product": "Power switch (S2-R (5602))", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wattle/hc-slm-1_doorlock.json b/devices/wattle/hc-slm-1_doorlock.json index c9f66d8a2b..c3b60b3cbd 100644 --- a/devices/wattle/hc-slm-1_doorlock.json +++ b/devices/wattle/hc-slm-1_doorlock.json @@ -3,8 +3,8 @@ "uuid": "02e93675-afbe-435c-b071-399c4d53a643", "manufacturername": "Home Control AS", "modelid": "HC-SLM-1", - "vendor": "Wattle", - "product": "Wattle Door Lock SPL Smart", + "vendor": "Heimgard", + "product": "Door lock SPL smart (HC-SLM-1)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/contact_sensor_cct591011_as.json b/devices/wiser/contact_sensor_cct591011_as.json index f6ab270554..6ac5a27da1 100644 --- a/devices/wiser/contact_sensor_cct591011_as.json +++ b/devices/wiser/contact_sensor_cct591011_as.json @@ -3,8 +3,8 @@ "uuid": "5ee1ec56-058c-409e-a0b1-21dc4254203c", "manufacturername": "Schneider Electric", "modelid": "CCT591011_AS", - "vendor": "LK Wiser", - "product": "Contact sensor CCT591011_AS", + "vendor": "Schneider Electric", + "product": "LK Wiser door and windows sensor (550B1023)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/dimmer_module.json b/devices/wiser/dimmer_module.json index c9786238ac..4a25619946 100644 --- a/devices/wiser/dimmer_module.json +++ b/devices/wiser/dimmer_module.json @@ -3,7 +3,8 @@ "uuid": "91302945-48e9-448e-94c9-4aa1286441dc", "manufacturername": "Schneider Electric", "modelid": "CH/DIMMER/1", - "product": "40/300-Series Module Dimmer", + "vendor": "Schneider Electric", + "product": "Wiser 40/300-series module dimmer (41EPBDWCLMZ/354PBDMBTZ)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/dimmer_switch_1Gang.json b/devices/wiser/dimmer_switch_1Gang.json index ea6e3ab315..08300e1c5f 100644 --- a/devices/wiser/dimmer_switch_1Gang.json +++ b/devices/wiser/dimmer_switch_1Gang.json @@ -3,7 +3,8 @@ "uuid": "fe300f6a-22ec-41fb-9658-43483f6e1e10", "manufacturername": "Schneider Electric", "modelid": "1GANG/DIMMER/1", - "product": "Merten - Schneider Dimmer 1 GANG", + "vendor": "Schneider Electric", + "product": "Merten Wiser 1 gang dimmer", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/dimmer_switch_2Gang.json b/devices/wiser/dimmer_switch_2Gang.json index 509b5101db..edbb3e5994 100644 --- a/devices/wiser/dimmer_switch_2Gang.json +++ b/devices/wiser/dimmer_switch_2Gang.json @@ -3,7 +3,8 @@ "uuid": "7d0ca1ce-a7c9-4d3c-a26f-bae789a5a4bd", "manufacturername": "Schneider Electric", "modelid": "1GANG/DIMMER/1", - "product": "Merten - Schneider Dimmer 2 GANG", + "vendor": "Schneider Electric", + "product": "Merten Wiser 2 gang dimmer", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/fuga_4button_battery_switch.json b/devices/wiser/fuga_4button_battery_switch.json index bca40765b0..096245f759 100644 --- a/devices/wiser/fuga_4button_battery_switch.json +++ b/devices/wiser/fuga_4button_battery_switch.json @@ -3,7 +3,8 @@ "uuid": "6520f051-3aca-4197-8bb1-882398107fc9", "manufacturername": ["Schneider Electric", "Schneider Electric"], "modelid": ["FLS/AIRLINK/4", "FLS/SYSTEM-M/4"], - "product": "4 or 2 Button Switch wireless", + "vendor": "Schneider Electric", + "product": "LK Fuga Wiser wireless battery 2 or 4 button switch (550D6001/WDE002906)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/fuga_dimmer_switch.json b/devices/wiser/fuga_dimmer_switch.json index 52b409705b..e0bee6f618 100644 --- a/devices/wiser/fuga_dimmer_switch.json +++ b/devices/wiser/fuga_dimmer_switch.json @@ -3,7 +3,8 @@ "uuid": "de597758-80a6-4f63-84b4-c8497821f6e1", "manufacturername": "Schneider Electric", "modelid": "LK Dimmer", - "product": "LK Fuga Dimmer Switch", + "vendor": "Schneider Electric", + "product": "LK Fuga Wiser Wireless Dimmer (545D6102)", "sleeper": false, "status": "Gold", "path": "/devices/wiser/fuga_dimmer_switch.json", diff --git a/devices/wiser/fuga_double_relay_switch.json b/devices/wiser/fuga_double_relay_switch.json index ad86a707ba..db1aa134d8 100644 --- a/devices/wiser/fuga_double_relay_switch.json +++ b/devices/wiser/fuga_double_relay_switch.json @@ -3,7 +3,8 @@ "uuid": "244aa7fa-af3d-489b-afc1-a277311338ed", "manufacturername": "Schneider Electric", "modelid": "LK Switch", - "product": "LK Fuga Double Relay Switch", + "vendor": "Schneider Electric", + "product": "LK Fuga Wiser wireless double relay (545D6514)", "sleeper": false, "status": "Gold", "path": "/devices/wiser/fuga_double_relay_switch.json", diff --git a/devices/wiser/fuga_socket_outlet.json b/devices/wiser/fuga_socket_outlet.json index 6321d8bb62..b9de48b313 100644 --- a/devices/wiser/fuga_socket_outlet.json +++ b/devices/wiser/fuga_socket_outlet.json @@ -3,7 +3,7 @@ "uuid":"223dea85-638b-4489-bec4-3eabea01dba4", "manufacturername":["Schneider Electric", "Schneider Electric"], "modelid":["LK/OUTLET/1", "SOCKET/OUTLET/1"], - "product":"Connected socket outlet 16A", + "product":"LK Fuga Wiser wireless socket outlet 16A (545D6115)", "sleeper":false, "status":"Gold", "subdevices":[ diff --git a/devices/wiser/itrv_thermostat.json b/devices/wiser/itrv_thermostat.json index cc06290074..f1f0fb81c7 100644 --- a/devices/wiser/itrv_thermostat.json +++ b/devices/wiser/itrv_thermostat.json @@ -3,7 +3,8 @@ "uuid": "64571d77-15ed-48e7-8f2b-cb74f9b3b35f", "manufacturername": "Schneider Electric", "modelid": "iTRV", - "product": "iTRV thermostat", + "vendor": "Schneider Electric", + "product": "Wiser radiator thermostat (WV704R0A0902)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/merten/meg5113-0300_cover_controller.json b/devices/wiser/meg5113-0300_cover_controller.json similarity index 95% rename from devices/merten/meg5113-0300_cover_controller.json rename to devices/wiser/meg5113-0300_cover_controller.json index 613aa924a9..1b5e179298 100644 --- a/devices/merten/meg5113-0300_cover_controller.json +++ b/devices/wiser/meg5113-0300_cover_controller.json @@ -3,8 +3,8 @@ "uuid": "cc3b7ff9-2867-4f6a-af90-fd40441a0304", "manufacturername": "Schneider Electric", "modelid": "1GANG/SHUTTER/1", - "vendor": "Merten Wiser", - "product": "MEG5113-0300 cover controller", + "vendor": "Schneider Electric", + "product": "Merten Wiser cover controller (MEG5113-0300)", "sleeper": false, "status": "Silver", "subdevices": [ diff --git a/devices/wiser/room_thermostat_cctfr6400.json b/devices/wiser/room_thermostat_cctfr6400.json index 02896bf0f7..b7e1a47ba3 100644 --- a/devices/wiser/room_thermostat_cctfr6400.json +++ b/devices/wiser/room_thermostat_cctfr6400.json @@ -3,7 +3,8 @@ "uuid": "75137123-75e5-4c15-9620-d6e360d8de27", "manufacturername": "Schneider Electric", "modelid": "Thermostat", - "product": "Room thermostat CCTFR6400", + "vendor": "Schneider Electric", + "product": "Wiser room thermostat (CCTFR6400)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/smart-plug-single-16A.json b/devices/wiser/smart-plug-single-16A.json index 561c23e37d..05207ca1a7 100644 --- a/devices/wiser/smart-plug-single-16A.json +++ b/devices/wiser/smart-plug-single-16A.json @@ -3,7 +3,8 @@ "uuid": "c8ed8ec9-cab9-4b7f-a917-a94282887a07", "manufacturername": "Schneider Electric", "modelid": "SMARTPLUG/1", - "product": "SMARTPLUG/1", + "vendor": "Schneider Electric", + "product": "Wiser smart plug 16A (CCT711119)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/socket-outlet-double-16A-connected.json b/devices/wiser/socket-outlet-double-16A-connected.json index cfadb40b95..6510b62522 100644 --- a/devices/wiser/socket-outlet-double-16A-connected.json +++ b/devices/wiser/socket-outlet-double-16A-connected.json @@ -3,7 +3,8 @@ "uuid": "93faf7ca-97e1-4d92-857b-7c311ddab4f7", "manufacturername": "Schneider Electric", "modelid": "SOCKET/OUTLET/2", - "product": "SOCKET/OUTLET/2", + "vendor": "Schneider Electric", + "product": "Elko smart socket double 16A plus PW (EKO09738)", "sleeper": false, "status": "Bronze", "subdevices": [ diff --git a/devices/wiser/switch_1Gang.json b/devices/wiser/switch_1Gang.json index 077fe5bf26..804a2c76f2 100644 --- a/devices/wiser/switch_1Gang.json +++ b/devices/wiser/switch_1Gang.json @@ -3,7 +3,8 @@ "uuid": "15c66594-8515-480a-9ba4-05ce912fe5a9", "manufacturername": "Schneider Electric", "modelid": "1GANG/SWITCH/1", - "product": "Merten / Schneider Switch 1GANG", + "vendor": "Schneider Electric", + "product": "Merten PlusLink relay insert (MEG5161-0000)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/wiser/wall_switch_shutter.json b/devices/wiser/wall_switch_shutter.json index 07bc15203d..3acfe62a1d 100644 --- a/devices/wiser/wall_switch_shutter.json +++ b/devices/wiser/wall_switch_shutter.json @@ -3,8 +3,8 @@ "uuid": "1d90bd73-6292-4387-bf0f-a4a87ad4701b", "manufacturername": "Schneider Electric", "modelid": "NHPB/SHUTTER/1", - "vendor": "Wiser Odace", - "product": "S520567W roller shutter switch", + "vendor": "Schneider Electric", + "product": "Wiser Odace roller shutter switch (S520567W)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/woox/Woox_R7049_Smart_Smoke_Alarm.json b/devices/woox/Woox_R7049_Smart_Smoke_Alarm.json index 068b0b7e06..c64b28d9a0 100644 --- a/devices/woox/Woox_R7049_Smart_Smoke_Alarm.json +++ b/devices/woox/Woox_R7049_Smart_Smoke_Alarm.json @@ -3,8 +3,8 @@ "uuid": "3e0e9169-ca6c-4a47-9d70-b35e703eb71f", "manufacturername": "_TZE200_aycxwiau", "modelid": "TS0601", - "vendor": "WOOX", - "product": "Smart Smoke Alarm R7049", + "vendor": "Woox", + "product": "Smart smoke alarm (R7049)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/woox/woox_r7048_hum_temp_sensor.json b/devices/woox/woox_r7048_hum_temp_sensor.json index d0ce75eef9..b35893080c 100644 --- a/devices/woox/woox_r7048_hum_temp_sensor.json +++ b/devices/woox/woox_r7048_hum_temp_sensor.json @@ -3,7 +3,8 @@ "uuid":"8eff3666-a36d-4a24-a0aa-82396593332a", "manufacturername":"_TZ3000_amqudjr0", "modelid":"TS0201", - "product":"R7048 Temperature & Humidity Sensor", + "vendor": "Woox", + "product":"Temperature and Humidity Sensor (R7048)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/woox/woox_r7052_ts0215a.json b/devices/woox/woox_r7052_ts0215a.json index 90794b8556..000fadccc4 100644 --- a/devices/woox/woox_r7052_ts0215a.json +++ b/devices/woox/woox_r7052_ts0215a.json @@ -4,7 +4,7 @@ "manufacturername":["_TZ3000_ssp0maqm", "_TZ3000_zsh6uat3"], "modelid":["TS0215A", "TS0215A"], "vendor":"Woox", - "product":"R7052 Smart SOS Button", + "product":"Smart SOS button (R7052)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/woox/woox_r7054_remote.json b/devices/woox/woox_r7054_remote.json index 1bfe671fc3..257fd0a661 100644 --- a/devices/woox/woox_r7054_remote.json +++ b/devices/woox/woox_r7054_remote.json @@ -4,7 +4,7 @@ "manufacturername":["_TZ3000_0zrccfgx", "_TZ3000_p6ju8myv"], "modelid":["TS0215A", "TS0215A"], "vendor":"Woox", - "product":"R7054 4 gang", + "product":"4 gang switch (R7054)", "sleeper":true, "status":"Gold", "subdevices":[ diff --git a/devices/woox/woox_r7060_ts0101.json b/devices/woox/woox_r7060_ts0101.json index 4aad53ffeb..25bddcac61 100644 --- a/devices/woox/woox_r7060_ts0101.json +++ b/devices/woox/woox_r7060_ts0101.json @@ -3,8 +3,8 @@ "uuid": "13a63ec0-34c7-43b7-96e2-e9d33348642e", "manufacturername": "_TZ3210_eymunffl", "modelid": "TS0101", - "vendor": "WOOX", - "product": "TS0101", + "vendor": "Woox", + "product": "Smart garden irrigation control (R7060)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xfinity/THK1_keypad.json b/devices/xfinity/THK1_keypad.json index 225c213d8b..e05f2e201c 100644 --- a/devices/xfinity/THK1_keypad.json +++ b/devices/xfinity/THK1_keypad.json @@ -3,7 +3,8 @@ "uuid": "6aa5a6c3-8bd0-4cf8-8f02-279cb0bf4ee2", "manufacturername": ["Technicolor","Universal Electronics Inc","Universal Electronics Inc"], "modelid": ["TKA105","URC4450BC0-X-R","H34450BA00-00007"], - "product": "Xfinity security keypad", + "vendor": "Xfinity", + "product": "Security keypad", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_airmonitor_acn01.json b/devices/xiaomi/lumi_airmonitor_acn01.json index 5efd717a57..e939a80f1b 100644 --- a/devices/xiaomi/lumi_airmonitor_acn01.json +++ b/devices/xiaomi/lumi_airmonitor_acn01.json @@ -3,8 +3,8 @@ "uuid": "f2680399-a74e-4099-9b7e-922805e14023", "manufacturername": "$MF_LUMI", "modelid": "lumi.airmonitor.acn01", - "vendor": "Xiaomi", - "product": "Aqara TVOC Air Quality Monitor VOCKQJK11LM", + "vendor": "Xiaomi Aqara", + "product": "TVOC Air Quality Monitor (VOCKQJK11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_curtain.json b/devices/xiaomi/lumi_curtain.json index d4be161449..5b18233af4 100644 --- a/devices/xiaomi/lumi_curtain.json +++ b/devices/xiaomi/lumi_curtain.json @@ -3,7 +3,8 @@ "uuid": "5c04457c-fde5-45e7-8342-07d15ffaae44", "manufacturername": "$MF_LUMI", "modelid": "lumi.curtain", - "product": "Xiaomi Aqara Smart Curtain Controller", + "vendor": "Xiaomi Aqara", + "product": "Smart Curtain Controller (ZNCLDJ11LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_curtain_acn002.json b/devices/xiaomi/lumi_curtain_acn002.json index b5ecb79c49..d73d9e9570 100644 --- a/devices/xiaomi/lumi_curtain_acn002.json +++ b/devices/xiaomi/lumi_curtain_acn002.json @@ -3,8 +3,8 @@ "uuid": "35795459-326d-4e16-a202-05195107ca61", "manufacturername": "$MF_LUMI", "modelid": "lumi.curtain.acn002", - "vendor": "Xiaomi", - "product": "Aqara Roller Shade Driver E1 RSD-M01", + "vendor": "Xiaomi Aqara", + "product": "Roller shade driver E1 (ZNJLBL01LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_light_acn132.json b/devices/xiaomi/lumi_light_acn132.json index c900528b91..0be1cbdc2c 100644 --- a/devices/xiaomi/lumi_light_acn132.json +++ b/devices/xiaomi/lumi_light_acn132.json @@ -9,7 +9,8 @@ "lumi.light.acn132", "lumi.light.acn132" ], - "product": "Aqara LED Strip T1", + "vendor": "Xiaomi Aqara", + "product": "LED strip T1 (LGYCDD01LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_motion_ac01.json b/devices/xiaomi/lumi_motion_ac01.json index b096a1f9cb..b67924bff4 100644 --- a/devices/xiaomi/lumi_motion_ac01.json +++ b/devices/xiaomi/lumi_motion_ac01.json @@ -3,8 +3,8 @@ "uuid": "72b706a6-2bc0-4a52-ac56-619f7c20ce71", "manufacturername": "aqara", "modelid": "lumi.motion.ac01", - "vendor": "Xiaomi", - "product": "Aqara FP1 Human Presence Sensor RTCZCGQ11LM", + "vendor": "Xiaomi Aqara", + "product": "FP1 human presence sensor (RTCZCGQ11LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_sensor_wleak_aq1.json b/devices/xiaomi/lumi_sensor_wleak_aq1.json index 2713b7f017..49d9c69bb0 100644 --- a/devices/xiaomi/lumi_sensor_wleak_aq1.json +++ b/devices/xiaomi/lumi_sensor_wleak_aq1.json @@ -3,8 +3,8 @@ "uuid": "1bb80228-e651-4a46-990b-f738ddd28d4a", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_wleak.aq1", - "vendor": "Xiaomi", - "product": "Aqara Water Leak Sensor SJCGQ11LM", + "vendor": "Xiaomi Aqara", + "product": "Water leak sensor (SJCGQ11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/lumi_vibration_aq1.json b/devices/xiaomi/lumi_vibration_aq1.json index ae762051bd..6206b38991 100644 --- a/devices/xiaomi/lumi_vibration_aq1.json +++ b/devices/xiaomi/lumi_vibration_aq1.json @@ -3,8 +3,8 @@ "uuid": "8dd6bec7-40c0-4da3-bf26-e875f4d35b17", "manufacturername": "$MF_LUMI", "modelid": "lumi.vibration.aq1", - "vendor": "Xiaomi", - "product": "Aqara Vibration Sensor DJT11LM", + "vendor": "Xiaomi Aqara", + "product": "Vibration sensor (DJT11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_dw-s03d_t1_openclose_sensor.json b/devices/xiaomi/xiaomi_dw-s03d_t1_openclose_sensor.json index bd30c834a5..da58be1c80 100644 --- a/devices/xiaomi/xiaomi_dw-s03d_t1_openclose_sensor.json +++ b/devices/xiaomi/xiaomi_dw-s03d_t1_openclose_sensor.json @@ -3,8 +3,8 @@ "uuid": "8fd50f36-98c3-4e75-8e51-4644f90dd043", "manufacturername": "$MF_LUMI", "modelid": "lumi.magnet.agl02", - "vendor": "Xiaomi", - "product": "Aqara T1 open/close sensor DW-S03D", + "vendor": "Xiaomi Aqara", + "product": "T1 open/close sensor (DW-S03D)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_gzcgq01lm_light_sensor.json b/devices/xiaomi/xiaomi_gzcgq01lm_light_sensor.json index bf8a789b59..bd47811411 100644 --- a/devices/xiaomi/xiaomi_gzcgq01lm_light_sensor.json +++ b/devices/xiaomi/xiaomi_gzcgq01lm_light_sensor.json @@ -5,8 +5,8 @@ "doc:hdr": "Light sensor GZCGQ01LM", "manufacturername": ["$MF_XIAOMI", "$MF_LUMI"], "modelid": ["lumi.sen_ill.mgl01", "lumi.sen_ill.mgl01"], - "vendor": "Xiaomi", - "product": "Mijia Light Sensor GZCGQ01LM", + "vendor": "Xiaomi Mi", + "product": "Light detection sensor (GZCGQ01LM)", "status": "Gold", "md:known_issues": [ ], "sleeper": true, diff --git a/devices/xiaomi/xiaomi_gzcgq11lm_light_sensor.json b/devices/xiaomi/xiaomi_gzcgq11lm_light_sensor.json index 5cdfd3bc09..b7fa1b1076 100644 --- a/devices/xiaomi/xiaomi_gzcgq11lm_light_sensor.json +++ b/devices/xiaomi/xiaomi_gzcgq11lm_light_sensor.json @@ -3,8 +3,8 @@ "uuid": "21d1b07f-3780-4cc6-9151-968f7bb0646d", "manufacturername": ["$MF_LUMI"], "modelid": ["lumi.sen_ill.agl01"], - "vendor": "Xiaomi", - "product": "Aqara T1 Light Sensor GZCGQ11LM", + "vendor": "Xiaomi Aqara", + "product": "T1 light sensor (GZCGQ11LM)", "status": "Gold", "sleeper": true, "subdevices": [ diff --git a/devices/xiaomi/xiaomi_jtqj-bf-01lm_gas_leak_detector.json b/devices/xiaomi/xiaomi_jtqj-bf-01lm_gas_leak_detector.json index ed02cb034d..3def8814d7 100644 --- a/devices/xiaomi/xiaomi_jtqj-bf-01lm_gas_leak_detector.json +++ b/devices/xiaomi/xiaomi_jtqj-bf-01lm_gas_leak_detector.json @@ -3,8 +3,8 @@ "uuid": "5d354301-8bb8-4c5f-9741-edcccc367510", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_natgas", - "vendor": "Xiaomi", - "product": "Mijia Honeywell gas leak detector JTQJ-BF-01LM/BW", + "vendor": "Xiaomi Mi", + "product": "Honeywell gas leak detector (JTQJ-BF-01LM/BW)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_jtyj-gd-01lm_smoke_detector.json b/devices/xiaomi/xiaomi_jtyj-gd-01lm_smoke_detector.json index 0a3492ce0d..f116c5cd1c 100644 --- a/devices/xiaomi/xiaomi_jtyj-gd-01lm_smoke_detector.json +++ b/devices/xiaomi/xiaomi_jtyj-gd-01lm_smoke_detector.json @@ -3,8 +3,8 @@ "uuid": "c6d2cc27-f9d1-4c93-8c6e-0beb6c97e682", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_smoke", - "vendor": "Xiaomi", - "product": "Mijia Honeywell smoke detector JTYJ-GD-01LM/BW", + "vendor": "Xiaomi Mi", + "product": "Honeywell fire alarm smoke detector (JTYJ-GD-01LM/BW)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_known_issues_mccqg01lm.md b/devices/xiaomi/xiaomi_known_issues_difficult_pairing.md similarity index 100% rename from devices/xiaomi/xiaomi_known_issues_mccqg01lm.md rename to devices/xiaomi/xiaomi_known_issues_difficult_pairing.md diff --git a/devices/xiaomi/xiaomi_known_issues_plugfw.md b/devices/xiaomi/xiaomi_known_issues_firmware_update.md similarity index 100% rename from devices/xiaomi/xiaomi_known_issues_plugfw.md rename to devices/xiaomi/xiaomi_known_issues_firmware_update.md diff --git a/devices/xiaomi/xiaomi_known_issues1.md b/devices/xiaomi/xiaomi_known_issues_sticky_parents.md similarity index 100% rename from devices/xiaomi/xiaomi_known_issues1.md rename to devices/xiaomi/xiaomi_known_issues_sticky_parents.md diff --git a/devices/xiaomi/xiaomi_lumi.airrtc.agl001.json b/devices/xiaomi/xiaomi_lumi.airrtc.agl001.json index 532e856eb8..ed43e5325b 100644 --- a/devices/xiaomi/xiaomi_lumi.airrtc.agl001.json +++ b/devices/xiaomi/xiaomi_lumi.airrtc.agl001.json @@ -3,8 +3,8 @@ "uuid": "7e3db69a-d38c-4f71-b9c3-fdbd807333fa", "manufacturername": "$MF_LUMI", "modelid": "lumi.airrtc.agl001", - "vendor": "Aqara", - "product": "E1 Thermostat", + "vendor": "Xiaomi Aqara", + "product": "Smart radiator thermostat E1 (SRTS-A01)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_lumi.light.aqcn02_TunableWhite_Bulb.json b/devices/xiaomi/xiaomi_lumi.light.aqcn02_TunableWhite_Bulb.json index e5b947b702..d89f050bde 100644 --- a/devices/xiaomi/xiaomi_lumi.light.aqcn02_TunableWhite_Bulb.json +++ b/devices/xiaomi/xiaomi_lumi.light.aqcn02_TunableWhite_Bulb.json @@ -3,7 +3,8 @@ "uuid": "ebd6369b-7956-4d64-b0d3-57c70d2002ad", "manufacturername": "$MF_LUMI", "modelid": "lumi.light.aqcn02", - "product": "Aqara Tunable White LED Bulb (ZNLDP12LM)", + "vendor": "Xiaomi Aqara", + "product": "LED bulb tunable white (ZNLDP12LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_lumi.relay.c2acn01.json b/devices/xiaomi/xiaomi_lumi.relay.c2acn01.json index 962b476726..e771cb27a8 100644 --- a/devices/xiaomi/xiaomi_lumi.relay.c2acn01.json +++ b/devices/xiaomi/xiaomi_lumi.relay.c2acn01.json @@ -3,7 +3,8 @@ "uuid": "4fc4be68-d226-4fca-b249-885f3c52b8b4", "manufacturername": "$MF_LUMI", "modelid": "lumi.relay.c2acn01", - "product": "wireless relay with neutral", + "vendor": "Xiaomi Aqara", + "product": "2 way control module wireless relay", "sleeper": false, "status": "Silver", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_lywsd03mmc.json b/devices/xiaomi/xiaomi_lywsd03mmc.json index 20cac112da..f000686253 100644 --- a/devices/xiaomi/xiaomi_lywsd03mmc.json +++ b/devices/xiaomi/xiaomi_lywsd03mmc.json @@ -3,8 +3,8 @@ "uuid": "ab855acd-56bb-45df-a127-b796c4b3e547", "manufacturername": "Xiaomi", "modelid": "LYWSD03MMC", - "vendor": "Xiaomi", - "product": "LYWSD03MMC", + "vendor": "Xiaomi Mi", + "product": "Temperature and humidity sensor with LCD (LYWSD03MMC)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_mccgq01lm_openclose_sensor.json b/devices/xiaomi/xiaomi_mccgq01lm_openclose_sensor.json index 8cc1219ed8..948168bc80 100644 --- a/devices/xiaomi/xiaomi_mccgq01lm_openclose_sensor.json +++ b/devices/xiaomi/xiaomi_mccgq01lm_openclose_sensor.json @@ -3,11 +3,14 @@ "uuid": "17905b83-4763-44bd-bed5-a7c898601c6d", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_magnet", - "vendor": "Xiaomi", - "product": "Mijia open/close sensor MCCGQ01LM", + "vendor": "Xiaomi Mi", + "product": "Open/close sensor (MCCGQ01LM)", "sleeper": true, "status": "Gold", - "md:known_issues": [ "xiaomi_known_issues1.md", "xiaomi_known_issues_mccqg01lm.md" ], + "md:known_issues": [ + "xiaomi_known_issues_sticky_parents.md", + "xiaomi_known_issues_difficult_pairing.md" + ], "subdevices": [ { "type": "$TYPE_OPEN_CLOSE_SENSOR", diff --git a/devices/xiaomi/xiaomi_mccgq11lm_openclose_sensor.json b/devices/xiaomi/xiaomi_mccgq11lm_openclose_sensor.json index 18168f3b6d..a10f6dbe2f 100644 --- a/devices/xiaomi/xiaomi_mccgq11lm_openclose_sensor.json +++ b/devices/xiaomi/xiaomi_mccgq11lm_openclose_sensor.json @@ -3,13 +3,13 @@ "uuid": "1ace8d48-1cd9-42bb-92a1-1ae158715bb5", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_magnet.aq2", - "vendor": "Xiaomi", - "product": "Aqara open/close sensor MCCGQ11LM", + "vendor": "Xiaomi Aqara", + "product": "Open/close sensor (MCCGQ11LM)", "sleeper": true, "status": "Gold", "md:known_issues": [ - "xiaomi_known_issues1.md", - "xiaomi_known_issues_mccqg01lm.md" + "xiaomi_known_issues_sticky_parents.md", + "xiaomi_known_issues_difficult_pairing.md" ], "subdevices": [ { diff --git a/devices/xiaomi/xiaomi_mccgq14lm_e1_openclose_sensor.json b/devices/xiaomi/xiaomi_mccgq14lm_e1_openclose_sensor.json index b94a9099ea..86c55c66d9 100644 --- a/devices/xiaomi/xiaomi_mccgq14lm_e1_openclose_sensor.json +++ b/devices/xiaomi/xiaomi_mccgq14lm_e1_openclose_sensor.json @@ -3,8 +3,8 @@ "uuid": "790755f4-7320-42ee-8334-f9fa8c80cdc3", "manufacturername": "$MF_LUMI", "modelid": "lumi.magnet.acn001", - "vendor": "Xiaomi", - "product": "Aqara E1 open/close sensor MCCGQ14LM", + "vendor": "Xiaomi Aqara", + "product": "E1 open/close sensor (MCCGQ14LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_mfkzq01lm_cube.json b/devices/xiaomi/xiaomi_mfkzq01lm_cube.json index 2f030170cc..2d43461157 100644 --- a/devices/xiaomi/xiaomi_mfkzq01lm_cube.json +++ b/devices/xiaomi/xiaomi_mfkzq01lm_cube.json @@ -3,8 +3,8 @@ "uuid": "637ed291-d6e1-4a32-880f-0893516fb425", "manufacturername": ["$MF_LUMI", "$MF_LUMI"], "modelid": ["lumi.sensor_cube", "lumi.sensor_cube.aqgl01"], - "vendor": "Xiaomi", - "product": "Aqara Cube MFKZQ01LM", + "vendor": "Xiaomi Aqara", + "product": "Cube (MFKZQ01LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_mfkzq11lm_t1_cube.json b/devices/xiaomi/xiaomi_mfkzq11lm_t1_cube.json index e67482d844..7bd1de69b2 100644 --- a/devices/xiaomi/xiaomi_mfkzq11lm_t1_cube.json +++ b/devices/xiaomi/xiaomi_mfkzq11lm_t1_cube.json @@ -3,8 +3,8 @@ "uuid": "77ce001f-0fa9-4da8-973f-9d5d8e7c7fdc", "manufacturername": ["$MF_LUMI"], "modelid": ["lumi.remote.cagl01"], - "vendor": "Xiaomi", - "product": "Aqara T1 Cube MFKZQ11LM", + "vendor": "Xiaomi Aqara", + "product": "T1 cube (MFKZQ11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_mfkzq12lm_t1_pro_cube.json b/devices/xiaomi/xiaomi_mfkzq12lm_t1_pro_cube.json index bd507578ca..0a446c5fd2 100644 --- a/devices/xiaomi/xiaomi_mfkzq12lm_t1_pro_cube.json +++ b/devices/xiaomi/xiaomi_mfkzq12lm_t1_pro_cube.json @@ -3,8 +3,8 @@ "uuid": "f601e062-83a5-4ad1-b2e3-e15af0c6fc70", "manufacturername": ["$MF_LUMI"], "modelid": ["lumi.remote.cagl02"], - "vendor": "Xiaomi", - "product": "Aqara T1 Pro Cube MFKZQ12LM", + "vendor": "Xiaomi Aqara", + "product": "T1 pro cube (MFKZQ12LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_mho-c401n_temp_hum_sensor.json b/devices/xiaomi/xiaomi_mho-c401n_temp_hum_sensor.json index 30eeff3f5c..aa620c8867 100644 --- a/devices/xiaomi/xiaomi_mho-c401n_temp_hum_sensor.json +++ b/devices/xiaomi/xiaomi_mho-c401n_temp_hum_sensor.json @@ -3,8 +3,8 @@ "uuid": "63fe16a6-dfe3-4872-8428-5070ff618c30", "manufacturername": "MiaMiaoCe", "modelid": "MHO-C401N", - "vendor": "Xiaomi", - "product": "Temperature/humidity sensor with display MHO-C401N", + "vendor": "Xiaomi Mi", + "product": "Temperature and humidity sensor with display (MHO-C401N)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_qbkg03lm_switch.json b/devices/xiaomi/xiaomi_qbkg03lm_switch.json index 5ea6b9188d..0bc3ca3a90 100644 --- a/devices/xiaomi/xiaomi_qbkg03lm_switch.json +++ b/devices/xiaomi/xiaomi_qbkg03lm_switch.json @@ -3,8 +3,8 @@ "uuid": "16208f88-8b30-49f5-9e2b-eda0cd3901a7", "manufacturername": "$MF_LUMI", "modelid": "lumi.ctrl_neutral2", - "vendor": "Xiaomi", - "product": "Aqara double rocker switch QBKG03LM", + "vendor": "Xiaomi Aqara", + "product": "Double rocker switch (QBKG03LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_qbkg04lm_switch.json b/devices/xiaomi/xiaomi_qbkg04lm_switch.json index 1407fd7a78..7ff1fc4da0 100644 --- a/devices/xiaomi/xiaomi_qbkg04lm_switch.json +++ b/devices/xiaomi/xiaomi_qbkg04lm_switch.json @@ -3,8 +3,8 @@ "uuid": "7c6d3f22-6a85-4955-bfbf-91b98d1a4237", "manufacturername": "$MF_LUMI", "modelid": "lumi.ctrl_neutral1", - "vendor": "Xiaomi", - "product": "Aqara single rocker switch QBKG04LM", + "vendor": "Xiaomi Aqara", + "product": "Single rocker switch (QBKG04LM)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_rtcgq13lm_presence_sensor.json b/devices/xiaomi/xiaomi_rtcgq13lm_presence_sensor.json index fbd603b8f5..b55fc021bb 100644 --- a/devices/xiaomi/xiaomi_rtcgq13lm_presence_sensor.json +++ b/devices/xiaomi/xiaomi_rtcgq13lm_presence_sensor.json @@ -3,8 +3,8 @@ "uuid": "55fea19c-d877-45da-b7e1-13ebaafc8050", "manufacturername": "$MF_LUMI", "modelid": "lumi.motion.agl04", - "vendor": "Xiaomi", - "product": "Aqara high precision motion sensor RTCGQ13LM", + "vendor": "Xiaomi Aqara", + "product": "High precision motion sensor (RTCGQ13LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_rtcgq14lm_p1_presence_sensor.json b/devices/xiaomi/xiaomi_rtcgq14lm_p1_presence_sensor.json index 81a2c5cd84..e19f1b267d 100644 --- a/devices/xiaomi/xiaomi_rtcgq14lm_p1_presence_sensor.json +++ b/devices/xiaomi/xiaomi_rtcgq14lm_p1_presence_sensor.json @@ -3,8 +3,8 @@ "uuid": "c6f3115f-9219-41d0-b318-b3ec1a18b586", "manufacturername": "$MF_LUMI", "modelid": "lumi.motion.ac02", - "vendor": "Xiaomi", - "product": "Aqara P1 presence sensor RTCGQ14LM", + "vendor": "Xiaomi Aqara", + "product": "P1 presence sensor (RTCGQ14LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_rtcgqq11lm_presence_sensor.json b/devices/xiaomi/xiaomi_rtcgqq11lm_presence_sensor.json index d628b324a3..c80a33f160 100644 --- a/devices/xiaomi/xiaomi_rtcgqq11lm_presence_sensor.json +++ b/devices/xiaomi/xiaomi_rtcgqq11lm_presence_sensor.json @@ -3,8 +3,8 @@ "uuid": "85676803-9d00-47fe-838f-ce76dfafc276", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_motion.aq2", - "vendor": "Xiaomi", - "product": "Aqara motion sensor RTCGQ11LM", + "vendor": "Xiaomi Aqara", + "product": "Motion sensor (RTCGQ11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_sjcgq13lm_e1_wleak_sensor.json b/devices/xiaomi/xiaomi_sjcgq13lm_e1_wleak_sensor.json index b6a61f9e0b..50a957ca19 100644 --- a/devices/xiaomi/xiaomi_sjcgq13lm_e1_wleak_sensor.json +++ b/devices/xiaomi/xiaomi_sjcgq13lm_e1_wleak_sensor.json @@ -3,8 +3,8 @@ "uuid": "e16fcda9-dd0e-46e2-aaee-938e8eb69a2b", "manufacturername": "$MF_LUMI", "modelid": "lumi.flood.acn001", - "vendor": "Xiaomi", - "product": "Aqara E1 Water Leak Sensor SJCGQ13LM", + "vendor": "Xiaomi Aqara", + "product": "E1 water leak sensor (SJCGQ13LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_sp-euc01_smart_plug.json b/devices/xiaomi/xiaomi_sp-euc01_smart_plug.json index 13ba98ca7b..c59c60c425 100644 --- a/devices/xiaomi/xiaomi_sp-euc01_smart_plug.json +++ b/devices/xiaomi/xiaomi_sp-euc01_smart_plug.json @@ -3,13 +3,13 @@ "uuid": "711cfee9-6235-4db7-be0e-52b5a976a231", "manufacturername": "$MF_LUMI", "modelid": "lumi.plug.maeu01", - "vendor": "Xiaomi", - "product": "Aqara smart plug SP-EUC01", + "vendor": "Xiaomi Aqara", + "product": "Smart plug (SP-EUC01)", "sleeper": false, "status": "Gold", "comment": "DDF for device firmwares at least above 0.0.0_0022, paired with xBee I fw 0x26400500 / xBee II fw 0x266f0700 and above", "matchexpr": "(R.endpoints.indexOf(0x15) !== -1) && (R.endpoints.indexOf(0x1F) !== -1);", - "md:known_issues": [ "xiaomi_known_issues_plugfw.md" ], + "md:known_issues": [ "xiaomi_known_issues_firmware_update.md" ], "subdevices": [ { "type": "$TYPE_SMART_PLUG", diff --git a/devices/xiaomi/xiaomi_ssm-u01_t1_switch.json b/devices/xiaomi/xiaomi_ssm-u01_t1_switch.json index 26f53f880a..b150e7f8ab 100644 --- a/devices/xiaomi/xiaomi_ssm-u01_t1_switch.json +++ b/devices/xiaomi/xiaomi_ssm-u01_t1_switch.json @@ -3,8 +3,8 @@ "uuid": "d9e2a290-e2b4-42de-bd95-4b46b4f0a142", "manufacturername": "$MF_LUMI", "modelid": "lumi.switch.n0agl1", - "vendor": "Xiaomi", - "product": "Aqara T1 single rocker switch (with neutral wire) SSM-U01", + "vendor": "Xiaomi Aqara", + "product": "T1 single rocker switch with neutral wire (SSM-U01)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_ssm-u02_t1_switch.json b/devices/xiaomi/xiaomi_ssm-u02_t1_switch.json index 2f019dd04f..6a2c33b14e 100644 --- a/devices/xiaomi/xiaomi_ssm-u02_t1_switch.json +++ b/devices/xiaomi/xiaomi_ssm-u02_t1_switch.json @@ -3,8 +3,8 @@ "uuid": "a13006cd-e75e-4693-aaa4-dfae5aabba52", "manufacturername": "$MF_LUMI", "modelid": "lumi.switch.l0agl1", - "vendor": "Xiaomi", - "product": "Aqara T1 single rocker switch (no neutral wire) SSM-U02", + "vendor": "Xiaomi Aqara", + "product": "T1 single rocker switch no neutral wire (SSM-U02)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wb-r02d_t1_wireless_mini_switch.json b/devices/xiaomi/xiaomi_wb-r02d_t1_wireless_mini_switch.json index f931251f89..b15e7631d9 100644 --- a/devices/xiaomi/xiaomi_wb-r02d_t1_wireless_mini_switch.json +++ b/devices/xiaomi/xiaomi_wb-r02d_t1_wireless_mini_switch.json @@ -3,8 +3,8 @@ "uuid": "ec850765-323e-4837-8bc6-9695a2d2fa46", "manufacturername": "$MF_LUMI", "modelid": "lumi.remote.b1acn02", - "vendor": "Xiaomi", - "product": "Aqara T1 wireless mini switch WB-R02D", + "vendor": "Xiaomi Aqara", + "product": "T1 wireless mini switch (WB-R02D)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wrs-r02_h1_switch.json b/devices/xiaomi/xiaomi_wrs-r02_h1_switch.json index 920b3e97c2..d7343045a6 100644 --- a/devices/xiaomi/xiaomi_wrs-r02_h1_switch.json +++ b/devices/xiaomi/xiaomi_wrs-r02_h1_switch.json @@ -3,8 +3,8 @@ "uuid": "7608923f-e09a-46ba-86e5-f22498b668bf", "manufacturername": "$MF_LUMI", "modelid": "lumi.remote.b28ac1", - "vendor": "Xiaomi", - "product": "Aqara H1 dual rocker wireless remote switch WRS-R02", + "vendor": "Xiaomi Aqara", + "product": "H1 dual rocker wireless remote switch (WRS-R02)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_ws-euk01_h1_switch.json b/devices/xiaomi/xiaomi_ws-euk01_h1_switch.json index 649da402d5..983ca3bc28 100644 --- a/devices/xiaomi/xiaomi_ws-euk01_h1_switch.json +++ b/devices/xiaomi/xiaomi_ws-euk01_h1_switch.json @@ -3,8 +3,8 @@ "uuid": "73afe387-7620-4f8e-8515-a3a961882965", "manufacturername": "$MF_LUMI", "modelid": "lumi.switch.l1aeu1", - "vendor": "Xiaomi", - "product": "Aqara H1 single rocker switch (no neutral wire) WS-EUK01", + "vendor": "Xiaomi Aqara", + "product": "H1 single rocker switch no neutral wire (WS-EUK01)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_ws-euk02_h1_switch.json b/devices/xiaomi/xiaomi_ws-euk02_h1_switch.json index e140c329bb..1c0853a7a5 100644 --- a/devices/xiaomi/xiaomi_ws-euk02_h1_switch.json +++ b/devices/xiaomi/xiaomi_ws-euk02_h1_switch.json @@ -3,8 +3,8 @@ "uuid": "ec6892b3-359f-4e7d-9665-da3435259b07", "manufacturername": "$MF_LUMI", "modelid": "lumi.switch.l2aeu1", - "vendor": "Xiaomi", - "product": "Aqara H1 dual rocker switch (no neutral wire) WS-EUK02", + "vendor": "Xiaomi Aqara", + "product": "H1 dual rocker switch no neutral wire (WS-EUK02)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_ws-euk03_h1_switch.json b/devices/xiaomi/xiaomi_ws-euk03_h1_switch.json index 30b571901e..f8675663f0 100644 --- a/devices/xiaomi/xiaomi_ws-euk03_h1_switch.json +++ b/devices/xiaomi/xiaomi_ws-euk03_h1_switch.json @@ -3,8 +3,8 @@ "uuid": "4013c222-9aaf-4c19-9bb3-d3a2c57a8d31", "manufacturername": "$MF_LUMI", "modelid": "lumi.switch.n1aeu1", - "vendor": "Xiaomi", - "product": "Aqara H1 single rocker switch (neutral wire) WS-EUK03", + "vendor": "Xiaomi Aqara", + "product": "H1 single rocker switch neutral wire (WS-EUK03)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_ws-euk04_h1_switch.json b/devices/xiaomi/xiaomi_ws-euk04_h1_switch.json index 283fb61286..041f17472d 100644 --- a/devices/xiaomi/xiaomi_ws-euk04_h1_switch.json +++ b/devices/xiaomi/xiaomi_ws-euk04_h1_switch.json @@ -3,8 +3,8 @@ "uuid": "2cd32483-30a8-4692-8f75-d9e6c0bb1ff7", "manufacturername": "$MF_LUMI", "modelid": "lumi.switch.n2aeu1", - "vendor": "Xiaomi", - "product": "Aqara H1 dual rocker switch (neutral wire) WS-EUK04", + "vendor": "Xiaomi Aqara", + "product": "H1 dual rocker switch neutral wire (WS-EUK04)", "sleeper": false, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wsdcgq01lm_temp_hum_sensor.json b/devices/xiaomi/xiaomi_wsdcgq01lm_temp_hum_sensor.json index 4f3d96e653..e4cf3abce8 100644 --- a/devices/xiaomi/xiaomi_wsdcgq01lm_temp_hum_sensor.json +++ b/devices/xiaomi/xiaomi_wsdcgq01lm_temp_hum_sensor.json @@ -3,8 +3,8 @@ "uuid": "e17bc41f-1554-4498-a758-843c922ee449", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_ht", - "vendor": "Xiaomi", - "product": "Aqara Temperature and Humidity Sensor WSDCGQ01LM", + "vendor": "Xiaomi Aqara", + "product": "Temperature and humidity sensor (WSDCGQ01LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wsdcgq11lm_temp_hum_sensor.json b/devices/xiaomi/xiaomi_wsdcgq11lm_temp_hum_sensor.json index 9328fc05d4..ec09c0767e 100644 --- a/devices/xiaomi/xiaomi_wsdcgq11lm_temp_hum_sensor.json +++ b/devices/xiaomi/xiaomi_wsdcgq11lm_temp_hum_sensor.json @@ -3,8 +3,8 @@ "uuid": "2ef565de-2b5d-4550-9d6a-e1f99899244a", "manufacturername": "$MF_LUMI", "modelid": "lumi.weather", - "vendor": "Xiaomi", - "product": "Aqara Temperature and Humidity Sensor WSDCGQ11LM", + "vendor": "Xiaomi Aqara", + "product": "Temperature and humidity sensor (WSDCGQ11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wsdcgq12lm_t1_temp_hum_sensor.json b/devices/xiaomi/xiaomi_wsdcgq12lm_t1_temp_hum_sensor.json index 553b2a1312..3074d9e6b1 100644 --- a/devices/xiaomi/xiaomi_wsdcgq12lm_t1_temp_hum_sensor.json +++ b/devices/xiaomi/xiaomi_wsdcgq12lm_t1_temp_hum_sensor.json @@ -3,8 +3,8 @@ "uuid": "89456203-1e4a-49e4-860c-5b34fa54b4a7", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_ht.agl02", - "vendor": "Xiaomi", - "product": "Aqara T1 Temperature and Humidity Sensor WSDCGQ12LM", + "vendor": "Xiaomi Aqara", + "product": "T1 temperature and humidity sensor (WSDCGQ12LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wxkg01lm_mini_switch.json b/devices/xiaomi/xiaomi_wxkg01lm_mini_switch.json index e5bec27507..557e76fcc5 100644 --- a/devices/xiaomi/xiaomi_wxkg01lm_mini_switch.json +++ b/devices/xiaomi/xiaomi_wxkg01lm_mini_switch.json @@ -3,8 +3,8 @@ "uuid": "3e294f3c-e684-4620-9c05-508b545cb523", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_switch", - "vendor": "Xiaomi", - "product": "MiJia wireless mini switch (WXKG01LM)", + "vendor": "Xiaomi Mi", + "product": "Wireless mini switch (WXKG01LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wxkg11lm_mini_switch.json b/devices/xiaomi/xiaomi_wxkg11lm_mini_switch.json index 08cdac66b2..3f2ee56111 100644 --- a/devices/xiaomi/xiaomi_wxkg11lm_mini_switch.json +++ b/devices/xiaomi/xiaomi_wxkg11lm_mini_switch.json @@ -3,8 +3,8 @@ "uuid": "e7dfca99-3df4-4c7f-abf3-5381a6782874", "manufacturername": "$MF_LUMI", "modelid": "lumi.sensor_switch.aq2", - "vendor": "Xiaomi", - "product": "Aqara wireless mini switch (WXKG11LM)", + "vendor": "Xiaomi Aqara", + "product": "Wireless mini switch (WXKG11LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wxkg17lm_e1_switch.json b/devices/xiaomi/xiaomi_wxkg17lm_e1_switch.json index 472e6a40f0..328e953966 100644 --- a/devices/xiaomi/xiaomi_wxkg17lm_e1_switch.json +++ b/devices/xiaomi/xiaomi_wxkg17lm_e1_switch.json @@ -4,8 +4,8 @@ "manufacturername": "$MF_LUMI", "modelid": "lumi.remote.acn004", "matchexpr": "R.endpoints.length === 3", - "vendor": "Xiaomi", - "product": "Aqara E1 dual rocker wireless switch WXKG17LM", + "vendor": "Xiaomi Aqara", + "product": "E1 dual rocker wireless switch (WXKG17LM)", "sleeper": true, "status": "Gold", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_wxkg20lm_mini_switch.json b/devices/xiaomi/xiaomi_wxkg20lm_mini_switch.json index 8dbcbd0b4a..148a0490e3 100644 --- a/devices/xiaomi/xiaomi_wxkg20lm_mini_switch.json +++ b/devices/xiaomi/xiaomi_wxkg20lm_mini_switch.json @@ -3,8 +3,8 @@ "uuid": "8095c9c6-3a3d-42c4-81bb-ef3b11660d35", "manufacturername": "$MF_LUMI", "modelid": "lumi.remote.acn007", - "vendor": "Xiaomi", - "product": "Aqara wireless mini switch WXKG20LM", + "vendor": "Xiaomi Aqara", + "product": "Wireless mini switch (WXKG20LM)", "sleeper": true, "status": "Silver", "subdevices": [ diff --git a/devices/xiaomi/xiaomi_zncz04lm_smart_plug.json b/devices/xiaomi/xiaomi_zncz04lm_smart_plug.json index 4369f8b993..de30c2c310 100644 --- a/devices/xiaomi/xiaomi_zncz04lm_smart_plug.json +++ b/devices/xiaomi/xiaomi_zncz04lm_smart_plug.json @@ -3,13 +3,13 @@ "uuid": "d699395b-4e78-4649-b9db-1c537041b70d", "manufacturername": "$MF_LUMI", "modelid": "lumi.plug.mmeu01", - "vendor": "Xiaomi", - "product": "Mijia smart plug ZNCZ04LM", + "vendor": "Xiaomi Mi", + "product": "Smart plug (ZNCZ04LM)", "sleeper": false, "status": "Gold", "comment": "DDF for device firmwares equal or below 0.0.0_0022", "matchexpr": "(R.endpoints.indexOf(0x15) !== -1) && (R.endpoints.indexOf(0x16) !== -1);", - "md:known_issues": [ "xiaomi_known_issues_plugfw.md" ], + "md:known_issues": [ "xiaomi_known_issues_firmware_update.md" ], "subdevices": [ { "type": "$TYPE_SMART_PLUG", diff --git a/devices/xiaomi/xiaomi_zncz04lm_smart_plug_v24.json b/devices/xiaomi/xiaomi_zncz04lm_smart_plug_v24.json index 218f460dae..d667da1e55 100644 --- a/devices/xiaomi/xiaomi_zncz04lm_smart_plug_v24.json +++ b/devices/xiaomi/xiaomi_zncz04lm_smart_plug_v24.json @@ -3,13 +3,13 @@ "uuid": "f140dad4-5c36-4001-84f9-4a9f7e524baa", "manufacturername": "$MF_LUMI", "modelid": "lumi.plug.mmeu01", - "vendor": "Xiaomi", - "product": "Mijia smart plug ZNCZ04LM", + "vendor": "Xiaomi Mi", + "product": "Smart plug (ZNCZ04LM)", "sleeper": false, "status": "Gold", "comment": "DDF for device firmwares equal or above 0.0.0_0024", "matchexpr": "(R.endpoints.indexOf(0x15) !== -1) && (R.endpoints.indexOf(0x1F) !== -1);", - "md:known_issues": [ "xiaomi_known_issues_plugfw.md" ], + "md:known_issues": [ "xiaomi_known_issues_firmware_update.md" ], "subdevices": [ { "type": "$TYPE_SMART_PLUG", diff --git a/devices/xiaomi/xiaomi_zncz12lm_smart_plug.json b/devices/xiaomi/xiaomi_zncz12lm_smart_plug.json index c9d7106852..963c75eceb 100644 --- a/devices/xiaomi/xiaomi_zncz12lm_smart_plug.json +++ b/devices/xiaomi/xiaomi_zncz12lm_smart_plug.json @@ -3,8 +3,8 @@ "uuid": "006efd51-4464-45b8-836b-97e846db5106", "manufacturername": "$MF_LUMI", "modelid": "lumi.plug.maus01", - "vendor": "Xiaomi", - "product": "Aqara smart plug ZNCZ12LM", + "vendor": "Xiaomi Aqara", + "product": "Smart plug (ZNCZ12LM)", "sleeper": false, "status": "Gold", "subdevices": [