Products cleanup: B

- split products details into manufacturer, model, name as appropriate.
- add model_id to above

This commit covers configs beginning with the letter `b`

custom_components/tuya_local/devices/README.md

@@ -25,10 +25,12 @@ have an `id` specified, which corresponds to the product_id from cloud device
 info, or productKey from the local discovery. If these are different, it is
 recommended that listings are created for both.
 
-In addition to the id, the `manufacturer` and `model` can be listed here.
-In future the intention is to display these in the Device info panel for the
-device. The `name` can also be overridden here with a more specific name to
-be used in future in place of the generic name at the top of the config.
+In addition to the id, the `manufacturer`, `model` and `model_id` (if
+the model has both a name and a more code like id) can be listed here.
+In future the intention is to display these in the Device info panel
+for the device. The `name` can also be overridden here with a more
+specific name to be used in future in place of the generic name at the
+top of the config.
 
 ### `entities`
 

custom_components/tuya_local/devices/ballu_aura.yaml

@@ -1,7 +1,8 @@
 name: Air conditioner
 products:
   - id: r9lwbruavixdspeb
-    name: "Ballu Aura  9/12"
+    manufacturer: Ballu
+    model: Aura 9/12
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/basic_ir_remote.yaml

@@ -1,9 +1,11 @@
 name: Remote controller
 products:
   - id: mjffeakbzlnfxpzt
-    name: UanTii S06/S18 IR
+    manufacturer: UanTii
+    model: S06/S18 IR
   - id: ejv37o6yz9vtxcuo
-    name: RightSitu S18 IR
+    manufacturer: RightSitu
+    model: S18 IR
 entities:
   - entity: remote
     dps:

custom_components/tuya_local/devices/bauhn_ap5w0624_powerstrip.yaml

@@ -1,7 +1,8 @@
 name: 5-way powerstrip
 products:
   - id: bf152cecbcf4180771k2lq
-    name: BAUHN AP5W-0624
+    manufacturer: Bauhn
+    model: AP5W-0624
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/bcom_intercom_camera.yaml

@@ -1,7 +1,8 @@
-name: BCom doorbell
+name: Doorbell
 products:
   - id: bf71b225dc6dd70835wlbt
-    name: Bcom Majic IPBox
+    manufacturer: Bcom
+    model: Majic IPBox
 entities:
   - entity: camera
     dps:

custom_components/tuya_local/devices/beca_bac002_thermostat_c.yaml

@@ -3,7 +3,8 @@ name: Thermostat
 # if you have a different setup, file a new device report
 products:
   - id: N8bUqOZ8HBQjU0K0
-    name: Becasmart BAC005
+    manufacturer: Beca
+    model: BAC005
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/beca_bhp6000_thermostat_c.yaml

@@ -1,6 +1,8 @@
-name: Beca BHP-6000 thermostat C
+name: Thermostat
 products:
   - id: drwezxukumr9ohuh
+    manufacturer: Beca
+    model: BHP-6000 (⁰C)
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/beca_bhp6000_thermostat_f.yaml

@@ -1,6 +1,8 @@
-name: Beca BHP-6000 thermostat F
+name: Thermostat
 products:
   - id: drwezxukumr9ohuh
+    manufacturer: Beca
+    model: BHP-6000 (⁰F)
 legacy_type: beca_bhp6000_thermostat
 entities:
   - entity: climate

custom_components/tuya_local/devices/beca_bhp6000_thermostat_mapped.yaml

@@ -1,6 +1,8 @@
-name: Beca BHP-6000 thermostat mapped
+name: Thermostat
 products:
   - id: drwezxukumr9ohuh
+    manufacturer: Beca
+    model: BHP-6000 (mapped ⁰C)
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/beca_bht006_thermostat_c.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: 7jzdtn4pwujmtskd
-    name: Beca BAC-006 fancoil
+    manufacturer: Beca
+    model: BAC-006 fancoil
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/beca_zht002_thermostat_c.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: aoclfnxz
-    name: MOES Zigbee Thermostat
+    manufacturer: Moes
+    name: Zigbee Thermostat
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/beok_tgm50_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: m3j5wouhgsvjlma9
-    name: Beok TGM50-WIFI-WP
+    manufacturer: Beok
+    model: TGM50-WIFI-WP
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/beok_tgr81_thermostat_c.yaml

@@ -1,10 +1,12 @@
-name: Beok TGR81 thermostat
+name: Thermostat
 legacy_type: avatto_me81_thermostat
 products:
   - id: gw173aldekvpzalg
-    name: Avatto WT200W-EH
+    manufacturer: Avatto
+    model: WT200W-EH
   - id: gogb05wrtredz3bs
-    name: Avatto ME81
+    manufacturer: Avatto
+    model: ME81
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/betterlife_bl1500_heater.yaml

@@ -1,6 +1,8 @@
-name: Betterlife BL1500 heater
+name: Heater
 products:
   - id: ptiFKEk2bgAslxOA
+    manufacturer: Betterlife
+    model: BL1500
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/bht002_gblw_thermostat.yaml

@@ -1,7 +1,7 @@
 name: Thermostat
 products:
   - id: v5214objiaepcaer
-    name: BHT-002 GBLW
+    model: BHT-002 GBLW
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/ble_adaprox_fingerbot.yaml

@@ -1,6 +1,8 @@
-name: BLE ADAPROX Fingerbot
+name: Fingerbot
 products:
   - id: yiihr7zh
+    manufacturer: Adaprox
+    name: BLE fingerbot
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/ble_hct611_watertimer.yaml

@@ -1,7 +1,7 @@
 name: Water timer
 products:
   - id: tqzkwarw
-    name: HCT-611
+    model: HCT-611
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/ble_hu06_lock.yaml

@@ -1,9 +1,10 @@
 name: Smart lock
 products:
   - id: stugc8dl
-    name: HU06
+    model: HU06
   - id: xicdxood
-    name: Impression ImSmart C502
+    manufacturer: Impression
+    model: ImSmart C502
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/ble_orion_lock.yaml

@@ -1,7 +1,8 @@
-name: Orion BLE lock
+name: Door lock
 products:
   - id: a6nttc41
-    name: Orion DL021HA
+    manufacturer: Orion
+    model: DL021HA
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/ble_pt216_temp_humidity.yaml

@@ -1,7 +1,7 @@
 name: Temperature and humidity sensor
 products:
   - id: 04nb6kdt
-    name: PT216 / PT19DB-2
+    model: PT216 / PT19DB-2
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/ble_pulido_p13_lock.yaml

@@ -1,7 +1,8 @@
 name: Smart Lock
 products:
   - id: kdq0tdbz
-    name: Pulido ‎P13
+    manufacturer: Pulido
+    model: ‎P13
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/ble_smart_plant_moisture.yaml

@@ -1,7 +1,7 @@
 name: Moisture sensor
 products:
   - id: gvygg3m8
-    name: SGS01
+    model: SGS01
 entities:
   - entity: sensor
     name: Soil Moisture

custom_components/tuya_local/devices/ble_solar_light.yaml

@@ -1,7 +1,8 @@
-name: Solar garden light
+name: Motion light
 products:
   - id: bt1raf68
-    name: Smart Ape solar garden light
+    manufacturer: Smart Ape
+    name: Solar garden light
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/ble_tcs024b_smart_plant_moisture.yaml

@@ -1,7 +1,7 @@
 name: Soil moisture sensor
 products:
   - id: j5mynqs3
-    name: TCS024B
+    model: TCS024B
 entities:
   - entity: sensor
     class: moisture

custom_components/tuya_local/devices/ble_water_valve.yaml

@@ -2,13 +2,15 @@ name: Water Timer Valve
 legacy_type: ble_johgee_water_valve
 products:
   - id: c8800fd30884068f
-    name: Johgee Water Timer Valve
+    manufacturer: Johgee
   - id: bfc513e1f9d4d259a10wzu
-    name: Diivoo Water Timer Valve WT-03
+    manufacturer: Diivoo
+    model: WT-03
   - id: nxquc5lb
-    name: SOP10
+    model: SOP10
   - id: so5ybnw9
-    name: BWC-495.bt Royal Gardineer
+    manufacturer: Royal Gardineer
+    model: BWC-495.bt
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/ble_yl01_watertester.yaml

@@ -1,7 +1,7 @@
 name: Water quality monitor
 products:
   - id: v1jqz5cy
-    name: BLE-YL01 Waterquality tester
+    model: BLE-YL01
 entities:
   - entity: sensor
     icon: "mdi:pool-thermometer"

custom_components/tuya_local/devices/ble_ysgbs01_lock.yaml

@@ -1,7 +1,8 @@
 name: Door lock
 products:
   - id: isk2p555
-    name: YSG BS01 BLE lock
+    manufacturer: YSG
+    model: BS01
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/blitzwolf_bw_lt31.yaml

@@ -1,7 +1,8 @@
 name: LED strip
 products:
   - id: khu3zzkkjemj6oat
-    name: Blitzwolf BW-LT31
+    manufacturer: Blitzwolf
+    model: BW-LT31
 entities:
   - entity: light
     icon: "mdi:led-strip-variant"

custom_components/tuya_local/devices/blitzwolf_bwis6_alarm.yaml

@@ -1,7 +1,8 @@
 name: Alarm system
 products:
   - id: gcymopbbssihh6h2
-    name: BlitzWolf BW-IS6
+    manufacturer: BlitzWolf
+    model: BW-IS6
 entities:
   - entity: alarm_control_panel
     dps:

custom_components/tuya_local/devices/blitzwolf_bwsh2_humidifier.yaml

@@ -2,7 +2,8 @@
 name: Humidifier
 products:
   - id: 20268362d8bfc0080ec9
-    name: BlitzWolf BWSH2
+    manufacturer: BlitzWolf
+    model: BWSH2
 entities:
   - entity: fan
     icon: "mdi:humidifier"

custom_components/tuya_local/devices/blitzwolf_bwsh5_humidifier.yaml

@@ -1,7 +1,8 @@
 name: Humidifier
 products:
   - id: lqzme7o0kzhumdxr
-    name: BlitzWolf BWSH5
+    manufacturer: BlitzWolf
+    model: BWSH5
 entities:
   - entity: humidifier
     class: humidifier

custom_components/tuya_local/devices/blitzwolf_bwshp9_powerstrip.yaml

@@ -1,7 +1,8 @@
 name: 3 outlet + USB powerstrip
 products:
   - id: 4es44udrj48pqtlb
-    name: BlitzWolf SHP-9
+    manufacturer: BlitzWolf
+    model: SHP-9
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/blumfeldt_cosmicbeam_heater.yaml

@@ -1,7 +1,9 @@
 name: Heater
 products:
   - id: maxyau6xjalwq5id
-    name: Blumfeltd Cosmic Beam Smart 24 IR radiant heater
+    manufacturer: Blumfeltd
+    model: Cosmic Beam Smart 24
+    name: IR radiant heater
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/bneta_f1d_petfeeder.yaml

@@ -1,7 +1,8 @@
 name: Pet feeder
 products:
   - id: aehfntztbgk0nf8e
-    name: BNETA F1-D
+    manufacturer: BNETA
+    model: F1-D
 entities:
   - entity: light
     translation_key: indicator

custom_components/tuya_local/devices/bonaire_heater.yaml

@@ -1,7 +1,8 @@
 name: Electric Heater
 products:
   - id: xto0qf9xem5bi7sj
-    name: Bonaire HPC5200020
+    manufacturer: Bonaire
+    model: HPC5200020
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/brade_mc6_thermostat.yaml

@@ -1,7 +1,8 @@
 name: HVAC thermostat
 products:
   - id: jnchsgfzhp5wytun
-    name: Brade MC6
+    manufacturer: Brade
+    model: MC6
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/bresser_smart_thermo_hygrometer.yaml

@@ -1,7 +1,8 @@
 name: Thermo hygrometer
 products:
   - id: xpxdr5q6vc8aztq0
-    name: Bresser 7-channel
+    manufacturer: Bresser
+    name: "7-channel thermo-hygrometer"
 entities:
   - entity: sensor
     class: temperature

custom_components/tuya_local/devices/bresser_weather_station.yaml

@@ -3,7 +3,8 @@
 name: Weather station
 products:
   - id: 8qk6p78udvbjwlof
-    name: Bresser C6085A
+    manufacturer: Bresser
+    model: ClimateConnect C6085A
 entities:
   - entity: sensor
     name: Indoor temperature

custom_components/tuya_local/devices/breville_airdynamic3d_fan.yaml

@@ -1,7 +1,8 @@
 name: Air circulator
 products:
   - id: wpkdomrtayuzuqvc
-    name: Breville AirDynamic 3D
+    manufacturer: Breville
+    model: AirDynamic 3D
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/breville_easyair_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: k2mlahbu9v4xxdlb
-    name: Breville Easy Air
+    manufacturer: Breville
+    model: Easy Air
 entities:
   - entity: fan
     icon: "mdi:air-purifier"

custom_components/tuya_local/devices/breville_lad208_dehumidifier.yaml

@@ -1,7 +1,9 @@
 name: Dehumidifier
 products:
   - id: 6cad6hhp5kbwbtyq
-    name: Breville Smart Dry Connect Dehumidifier (LAD208)
+    manufacturer: Breville
+    model: Smart Dry Connect
+    model_id: LAD208
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/breville_smart_air_viral_protect_plus.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: "emh1sylyfw7n2b50"
-    name: Breville Smart Air Plus
+    manufacturer: Breville
+    model: Smart Air Plus
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/breville_smartairconnect_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air purifier
 products:
   - id: tltdxtehttjbkjni
-    name: Breville Smart Air Connect
+    manufacturer: Breville
+    model: Smart Air Connect
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/briliant_fan_light.yaml

@@ -1,7 +1,7 @@
 name: Ceiling Fan
 products:
   - id: q0czoqfxdjynmkgj
-    name: Brilliant Smart Ceiling Fan
+    manufacturer: Brilliant Smart
 entities:
   - entity: fan
     translation_key: fan_with_presets

custom_components/tuya_local/devices/brilliant_double_switch.yaml

@@ -1,7 +1,8 @@
 name: Double wall switch
 products:
   - id: 5pyb1usxij5kzs47
-    name: Briliiant Smart glass wall switch 2-gang
+    manufacturer: Briliiant Smart
+    name: Glass wall switch 2-gang
 entities:
   - entity: switch
     class: switch

custom_components/tuya_local/devices/brilliant_quad_powerstrip_usb.yaml

@@ -1,7 +1,7 @@
 name: Quad powerstrip with USB
 products:
   - id: keyphg5es7xsedyr
-    name: Brilliant Smart Quad Powerstrip with USB
+    manufacturer: Brilliant Smart
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/brilliant_quad_switch.yaml

@@ -1,7 +1,8 @@
 name: Quad wall switch
 products:
   - id: kopqi7ax9pwi7nr2
-    name: Brilliant Smart glass wall switch 4-gang
+    manufacturer: Brilliant Smart
+    name: Glass wall switch 4-gang
 entities:
   - entity: switch
     class: switch

custom_components/tuya_local/devices/brilliant_single_switch.yaml

@@ -1,7 +1,8 @@
 name: Wall switch
 products:
   - id: me0f991hyvz5uaew
-    name: Briliiant Smart glass wall switch 1-gang
+    manufacturer: Briliiant Smart
+    name: Glass wall switch 1-gang
 entities:
   - entity: switch
     class: switch

custom_components/tuya_local/devices/brilliant_triple_switch.yaml

@@ -1,7 +1,8 @@
 name: Triple wall switch
 products:
   - id: o2epqysxigahd7mn
-    name: Briliiant Smart glass wall switch 3-gang
+    manufacturer: Briliiant Smart
+    name: Glass wall switch 3-gang
 entities:
   - entity: switch
     class: switch

custom_components/tuya_local/devices/brizlabs_string_lights.yaml

@@ -1,7 +1,7 @@
 name: String lights
 # products:
 #   - id: UNKNOWN
-#     name: Brizlabs string lights
+#     manufacturer: Brizlabs
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/bstuokey_access_keypad.yaml

@@ -1,7 +1,7 @@
 name: Access control keypad
 products:
   - id: 5k8h97qska6pf5cm
-    name: BSTUOKEY keypad
+    manufacturer: BSTUOKEY
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/bstuokey_invisible_lock.yaml

@@ -1,7 +1,9 @@
 name: Door lock
 products:
   - id: kpn4zaf7
-    name: BSTUOKEY RX2052 invisible induction lock
+    manufacturer: BSTUOKEY
+    model: RX2052
+    name: Invisible induction lock
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/bvf_cp1_heater.yaml

@@ -1,7 +1,8 @@
 name: Heater
 products:
   - id: t2htqaryl4gymeuv
-    name: BVP CP-1
+    manufacturer: BVP
+    model: CP-1
 entities:
   - entity: climate
     translation_only_key: heater

tests/test_device_config.py

@@ -27,6 +27,7 @@ PRODUCT_SCHEMA = vol.Schema(
         vol.Optional("name"): str,
         vol.Optional("manufacturer"): str,
         vol.Optional("model"): str,
+        vol.Optional("model_id"): str,
     }
 )
 CONDMAP_SCHEMA = vol.Schema(