Products cleanup: A

- split products details into manufacturer, model, name as appropriate.

This commit covers configs beginning with numbers, capitals, and the letter `a`

custom_components/tuya_local/devices/9in1_airquality_monitor.yaml

@@ -1,8 +1,7 @@
 name: Air Quality
 products:
   - id: rqhuxgkizawedhxj
-    name: ZN-2C09
-  - id: rqhuxgkizawedhxj
+    model: ZN-2C09
 entities:
   - entity: sensor
     name: Air Quality

custom_components/tuya_local/devices/CT20W_pir_motion_detector.yaml

@@ -1,7 +1,8 @@
 name: Motion detector
 products:
   - id: ejptirvg36uwwdwu
-    name: CT20W PIR Motion Detector
+    model: CT20W
+    name: PIR motion detector
 entities:
   - entity: alarm_control_panel
     dps:

custom_components/tuya_local/devices/EM3390TF_weather_station.yaml

@@ -1,7 +1,8 @@
 name: Weather station
 products:
   - id: cvurn5ynloebrpwy
-    name: Viflykoo EM3390TF
+    manufacturer: Viflykoo
+    model: EM3390TF
 entities:
   - entity: sensor
     name: Indoor temperature

custom_components/tuya_local/devices/HCT-626_dual_water_timer.yaml

@@ -1,7 +1,7 @@
 name: Dual water timer
 products:
   - id: smd9kj1n
-    name: HCT-626
+    model: HCT-626
 entities:
   - entity: valve
     name: Valve 1

custom_components/tuya_local/devices/README.md

@@ -18,20 +18,17 @@ generic name for the type of device should go in the top level name.
 
 ### `products`
 
-*Optional, for future use.*
+*Optional.*
 
 A list of products that this config applies to. Each product in the list must
-have an `id` specified, which corresponds to the productId or productKey
-(depending on where you are getting it from) in Tuya info. This is available
-from the Tuya developer web portal listing for your device, or when using
-UDP discovery (via tinytuya). In future it is intended that UDP discovery
-will be used to more precisely match devices to configs, so it is recommended
-to report these if you can find them when requesting a new device. Each
-listing can also have an optional `name`, which is intended to specify the
-specific brand and model name or number of the matching device.  In future
-when local discovery is implemented to discover products by id, this name will
-be displayed on discovery, and be available as manufacturer and model info
-in device settings.
+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.
 
 ### `entities`
 

custom_components/tuya_local/devices/ZC34T-03-3A_swing_arm_opener.yaml

@@ -1,7 +1,8 @@
 name: Window opener
 products:
   - id: ozttm5n6okadq7tq
-    name: ZC34T-03-3A swing arm opener
+    model: ZC34T-03-3A
+    name: Swing arm opener
 entities:
   - entity: cover
     class: window

custom_components/tuya_local/devices/abalon_bcm700d_curtain.yaml

@@ -1,7 +1,8 @@
 name: Curtain rail motor
 products:
   - id: XS76BY5Q1uKO6gjC
-    name: Abalon BCM700D
+    manufacturer: Abalon
+    model: BCM700D
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/abir_x8_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 products:
   - id: hslyk0g1sim9ojqu
-    name: Abir X8
+    manufacturer: Abir
+    model: X8
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/advancedfires_1500_fireplace.yaml

@@ -1,7 +1,8 @@
-name: Fireplace
+name: Electric fireplace
 products:
   - id: bf773f569661709b88gzbb
-    name: Advanced Fires 1500 electric fireplace
+    manufacturer: Advanced Fires
+    model: 1500
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/aeratron_ae3plus_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 products:
   - id: iarwcyttkv1kvent
-    name: Aeratron AE3+
+    manufacturer: Aeratron
+    model: AE3+
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/af3w_petfeeder.yaml

@@ -1,7 +1,7 @@
 name: Pet feeder
 # products:
 #   - id: UNKNOWN
-#     name: TY-AF3W
+#     model: TY-AF3W
 entities:
   - entity: number
     name: Servings

custom_components/tuya_local/devices/afyeev_16a_evcharger.yaml

@@ -1,7 +1,8 @@
 name: EV charger
 products:
   - id: dsmsam7xpb3ht7rl
-    name: "Afyeev 16A EV Charger"
+    manufacturer: Afyeev
+    name: "16A EV Charger"
 entities:
   - entity: sensor
     translation_key: status

custom_components/tuya_local/devices/afyeev_evcharger.yaml

@@ -1,9 +1,11 @@
 name: EV charger
 products:
   - id: aaaealnecwgwerjl
-    name: AFYEEV 32A 22kW
+    manufacturer: Afyeev
+    name: "32A 22kW EV charger"
   - id: 65zlpwd6lhgpbwtd
-    name: AFYEEV 32A wall mounted
+    manufacturer: Afyeev
+    name: "32A wall mounted EV charger"
 entities:
   - entity: sensor
     class: enum

custom_components/tuya_local/devices/agl_ultramagic_lock.yaml

@@ -1,7 +1,8 @@
 name: Gate lock
 products:
   - id: xrqkoapmq1rwjvms
-    name: AGL Ultra Magic
+    manufacturer: AGL
+    name: Ultra Magic gate lock
 entities:
   - entity: cover
     class: gate

custom_components/tuya_local/devices/ailrinni_fingerprint_lock.yaml

@@ -2,9 +2,12 @@ name: Door lock
 legacy_type: ironzon_fingerprint_lock
 products:
   - id: ludzroix
-    name: Ironzon PLD 190
+    manufacturer: Ironzon
+    model: PLD 190
+    name: Fingerprint lock
   - id: okkyfgfs
-    name: Ailrinni BLE fingerprint lock
+    manufacturer: Ailrinni
+    name: BLE fingerprint lock
 entities:
   - entity: lock
     dps:

custom_components/tuya_local/devices/airrobo_p20_vacuum.yaml

@@ -1,7 +1,8 @@
 name: Robot vacuum
 # products:
 #  - id: UNKNOWN
-#    name: Airrobo P20
+#    manufacturer: Airrobo
+#    model: P20
 entities:
   - entity: vacuum
     dps:

custom_components/tuya_local/devices/akai_dryer.yaml

@@ -1,7 +1,8 @@
 name: Dryer
 products:
   - id: do3cbzmmdqfdpqxw
-    name: Akai heat pump dryer
+    manufacturer: Akai
+    name: Heat pump dryer
 entities:
   - entity: sensor
     class: enum

custom_components/tuya_local/devices/aktobis_wdh_310ek_dehumidifier.yaml

@@ -1,7 +1,8 @@
 name: Dehumidifier
 products:
   - id: ifasqsxbghku3bwk
-    name: Aktobis WDH-310EKW dehumidifier
+    manufacturer: Aktobis
+    model: WDH-310EKW
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/alecoair_d12_dehumidifier.yaml

@@ -1,7 +1,8 @@
-name: AlecoAir D12 ECO dehumidifier
+name: Dehumidifier
 products:
   - id: gcthce4ejb8nzgow
-    name: D12 ECO 2.0
+    manufacturer: AlecoAir
+    model: D12 ECO 2.0
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/alecoair_d16_dehumidifier.yaml

@@ -2,7 +2,8 @@ name: Dehumidifier
 legacy_type: alecoair_d14_dehumidifier
 products:
   - id: pzq25786mlkxmtbb
-    name: AlecoAir D16 Purify
+    manufacturer: AlecoAir
+    model: D16 Purify
 entities:
   - entity: humidifier
     class: dehumidifier

custom_components/tuya_local/devices/amico_smart_ceiling_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 products:
   - id: eb208a14315d7cb2bd6txt
-    name: Amico 52 inch ceiling fan
+    manufacturer: Amico
+    name: "52 inch ceiling fan"
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/andersson_gsh_heater.yaml

@@ -4,7 +4,8 @@ products:
   # - id: UNKNOWN
   #   name: Andersson GSH
   - id: qAmsenZuNF74vRvj
-    name: Devola Intelligent
+    manufacturer: Devola
+    model: Intelligent
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/anko_kettle.yaml

@@ -1,7 +1,8 @@
-name: Anko kettle
+name: Kettle
 products:
   - id: dft4ebatvon3ha5s
-    name: Anko LD-K3068
+    manufacturer: Anko
+    model: LD-K3068
 entities:
   - entity: water_heater
     icon: "mdi:kettle"

custom_components/tuya_local/devices/aquaforte_vsp_poolpump.yaml

@@ -1,7 +1,8 @@
 name: Pool pump
 products:
   - id: i0elff0w1pehctax
-    name: AquaForte Inverter VSP
+    manufacturer: AquaForte
+    model: Inverter VSP
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/ard100_valve.yaml

@@ -1,7 +1,7 @@
 name: Valve controller
 products:
   - id: nguto5atyd2xxnap
-    name: ARD-100+ smart valve controller
+    model: ARD-100+
 entities:
   - entity: valve
     dps:

custom_components/tuya_local/devices/arlec_12speed_tower_fan.yaml

@@ -1,6 +1,8 @@
-name: Arlec tower fan
+name: Fan
 products:
   - id: rklgm99ldz4unh5s
+    manufacturer: Arlec
+    name: Tower fan
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/arlec_19speed_fan.yaml

@@ -1,7 +1,8 @@
-name: Arlec industrial fan
+name: Fan
 products:
   - id: 0waab4clioc3qaks
-    name: Arlec 19-speed industrial wall fan
+    manufacturer: Arlec
+    name: "19-speed industrial wall fan"
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/arlec_6speed_fan.yaml

@@ -1,7 +1,8 @@
-name: Arlec floor fan
+name: Fan
 products:
   - id: tsgf7ywzeit2d90b
-    name: Arlec 45cm black floor fan
+    manufacturer: Arlec
+    name: "45cm black floor fan"
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/arlec_apr005ha_air_purifier.yaml

@@ -1,7 +1,8 @@
 name: Air Purifier
 products:
   - id: dfgsetrdnabqeimr
-    name: Arlec Air Purifier APR005HA
+    manufacturer: Arlec
+    model: APR005HA
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/arlec_ceiling_fan_remote.yaml

@@ -2,9 +2,13 @@ name: Ceiling fan remote
 legacy_type: sulion_ceiling_fan_remote
 products:
   - id: 0000008sff
-    name: Sulion Cadillac Fan Controller
+    manufacturer: Sulion
+    model: Cadillac
+    name: Fan controller
   - id: b8bofb3ruee9zwxc
-    name: Arlec AC Fan Controller CFR225HA
+    manufacturer: Arlec
+    model: CFR225HA
+    name: AC fan controller
 entities:
   - entity: fan
     dps:

custom_components/tuya_local/devices/arlec_pa1123bkha_portable_air_conditioner.yaml

@@ -1,7 +1,9 @@
-name: Portable air conditioner
+name: Air conditioner
 products:
   - id: fxy4qkdh62geizbw
-    name: Arlec PA1123BKHA portable air conditioner
+    manufacturer: Arlec
+    model: PA1123BKHA
+    name: Portable air conditioner
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/arlec_panel_heater.yaml

@@ -1,7 +1,8 @@
-name: Arlec 2400W Panel Heater
+name: Heater
 products:
   - id: 70kki9an9nr0oqbj
-    name: Arlec Panel Heater (2400W)
+    manufacturer: Arlec
+    name: "2400W panel heater"
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/arlec_panel_heater_v2.yaml

@@ -1,7 +1,9 @@
-name: Arlec 2200W Panel Heater
+name: Heater
 products:
   - id: zf4japp0z9hihzsz
-    name: Arlec Panel Heater PEH225HA
+    manufacturer: Arlec
+    model: PEH225HA
+    name: "2200W panel heater"
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/arlec_pb88uha_s2_switch.yaml

@@ -1,7 +1,8 @@
 name: Quad powerboard
 products:
   - id: vcbjjhz6pwwwkyek
-    name: Arlec PB88UHA Series 2
+    manufacturer: Arlec
+    model: PB88UHA Series 2
 entities:
   - entity: switch
     translation_key: outlet_x

custom_components/tuya_local/devices/arlec_rf_transmitter.yaml

@@ -1,7 +1,9 @@
 name: RF transmitter
 products:
   - id: lclekupkvteemsym
-    name: Arlec HUBRF06HA 8x8 function 433MHz
+    manufacturer: Arlec
+    model: HUBRF06HA
+    name: "8x8 function 433MHz RF transmitter"
 entities:
   - entity: select
     name: Remote 1

custom_components/tuya_local/devices/arlec_rgb_ledstrip.yaml

@@ -1,7 +1,9 @@
 name: RGB light
 products:
   - id: jawcej1v
-    name: Arlec ALD261HA USB strip light
+    manufacturer: Arlec
+    model: ALD261HA
+    name: USB strip light
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/arlec_smart_button.yaml

@@ -1,7 +1,8 @@
-name: Smart Button
+name: Smart button
 products:
   - id: kpzc6pm8
-    name: Arlec SG022HA
+    manufacturer: Arlec
+    model: SG022HA
 entities:
   - entity: event
     class: button

custom_components/tuya_local/devices/arlec_thermostat_smartplug.yaml

@@ -1,7 +1,8 @@
-name: Arlec thermostat smartplug
+name: Thermostat smartplug
 products:
   - id: 1z2w76xtiawhxleg
-    name: Arlec PCTH01HA
+    manufacturer: Arlec
+    model: PCTH01HA
 entities:
   - entity: climate
     dps:

custom_components/tuya_local/devices/asahom_outdoor_rgbcw_lights.yaml

@@ -1,7 +1,8 @@
 name: Decorative lights
 products:
   - id: wcx02kgo8o1qwaf8
-    name: Asahom S105A C
+    manufacturer: Asahom
+    model: S105A C
 entities:
   - entity: light
     dps:

custom_components/tuya_local/devices/asakuki_diffuser.yaml

@@ -1,7 +1,8 @@
 name: Aroma diffuser
 products:
   - id: 6ASdNwe9IdaewQEl
-    name: Asakuki cube light
+    manufacturer: Asakuki
+    name: Cube light aroma diffuser
 entities:
   - entity: fan
     translation_key: aroma_diffuser

custom_components/tuya_local/devices/asc_wifi_circuit_breaker.yaml

@@ -1,8 +1,10 @@
-name: ASC (Wi-Fi)
+name: Circuit breaker
 products:
   - id: yrzel5nutomegk6z
+    manufacturer: ASC
 entities:
   - entity: switch
+    icon: "mdi:fuse"
     dps:
       - id: 1
         name: switch

custom_components/tuya_local/devices/asip_0622_planter.yaml

@@ -1,7 +1,8 @@
 name: Planter
 # products:
 #   - id:
-#     name: ASIP-0622 indoor planter
+#     model: ASIP-0622
+#     name: Indoor planter
 entities:
   - entity: switch
     icon: "mdi:sprout"

custom_components/tuya_local/devices/atomi_ceiling_fan.yaml

@@ -1,7 +1,8 @@
 name: Ceiling fan
 products:
   - id: keyxcgdguks9shua
-    name: Atomi 52 inch ceiling fan
+    manufacturer: Atomi
+    name: "52 inch ceiling fan"
 entities:
   - entity: fan
     translation_only_key: fan_with_presets

custom_components/tuya_local/devices/atomi_ceramic_heater.yaml

@@ -1,9 +1,11 @@
 name: Heater
 products:
   - id: ojvja3vyqchxrfhk
-    name: Atomi AT1632
+    manufacturer: Atomi
+    model: AT1632
   - id: tos0dbspyikjzcxe
-    name: Atomi AT1635
+    manufacturer: Atomi
+    model: AT1635
 entities:
   - entity: climate
     translation_only_key: heater

custom_components/tuya_local/devices/atorch_at2pl_breaker.yaml

@@ -1,9 +1,11 @@
 name: Energy meter
 products:
   - id: seqzqh45b0ggn9so
-    name: Atorch AT2PL
+    manufacturer: Atorch
+    model: AT2PL
   - id: sq1ahfxhgove4kgo
-    name: Atorch GR2PWS
+    manufacturer: Atorch
+    model: GR2PWS
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/atorch_at4pw_energymeter.yaml

@@ -1,7 +1,8 @@
 name: Energy meter
 products:
   - id: tjtigg991kvoiiqi
-    name: ATorch AT4PBWP
+    manufacturer: Atorch
+    model: AT4PBWP
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/atorch_s1wp.yaml

@@ -1,7 +1,8 @@
 name: Energy monitoring plug with display
 products:
   - id: sqrf2g1amfutn4co
-    name: Atorch S1WP
+    manufacturer: Atorch
+    model: S1WP
 entities:
   - entity: switch
     class: outlet

custom_components/tuya_local/devices/aubess_1gang_switch.yaml

@@ -1,9 +1,9 @@
 name: Energy monitor switch
 products:
   # - id: UNKNOWN
-  #   name: Aubess 1-gang
+  #   manufacturer: Aubess
   - id: m4jtkjc43ltrilru
-    name: T34 Smart Plug+
+    model: T34 Smart Plug+
 entities:
   - entity: switch
     dps:

custom_components/tuya_local/devices/aubess_2gang_switch.yaml

@@ -1,7 +1,9 @@
 name: Double switch
 products:
   - id: zexdotwigwiobadr
-    name: SciMagic RX Double Garage door receiver
+    manufacturer: SciMagic
+    model: RX
+    name: Double garage door receiver
 entities:
   - entity: switch
     translation_key: switch_x

custom_components/tuya_local/devices/aubess_rainpoint_irrigation_system.yaml

@@ -1,7 +1,8 @@
 name: Irrigation system
 products:
   - id: 2ak7r2culspkc7hx
-    name: Aubess RainPoint TTP106W
+    manufacturer: Aubess
+    model: RainPoint TTP106W
 entities:
   - entity: valve
     class: water

custom_components/tuya_local/devices/aulifants_energymonitor_breaker.yaml

@@ -1,7 +1,8 @@
 name: Circuit breaker
 products:
   - id: qndxewijhpsz3ixr
-    name: Aulifants SMES200
+    manufacturer: Aulifants
+    model: SMES200
 entities:
   - entity: sensor
     name: Total energy

custom_components/tuya_local/devices/avatto_curtain_duallights.yaml

@@ -1,7 +1,8 @@
 name: Curtain and lights
 products:
   - id: n76sxga6lyfujuac
-    name: Avatto SYS-CL02
+    manufacturer: Avatto
+    model: SYS-CL02
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/avatto_curtain_light.yaml

@@ -1,7 +1,8 @@
 name: Avatto Curtain and Light
 products:
   - id: v59tpvs4ubvjalhq
-    name: Avatto CB3S
+    manufacturer: Avatto
+    model: CB3S
 entities:
   - entity: cover
     class: curtain

custom_components/tuya_local/devices/avatto_roller_blinds.yaml

@@ -1,7 +1,9 @@
 name: Roller blinds
 products:
   - id: 3r8gc33pnqsxfe1g
-    name: Quoya MC08 blinds motor
+    manufacturer: Quoya
+    model: MC08
+    name: Blinds motor
 entities:
   - entity: cover
     class: blind

custom_components/tuya_local/devices/avatto_trv06_radiatorvalve.yaml

@@ -1,7 +1,8 @@
 name: Radiator
 products:
   - id: ow09xlxm
-    name: Avatto/Thaleos TRV06
+    manufacturer: Avatto / Thaleos
+    model: TRV06
 entities:
   - entity: climate
     translation_key: heater

custom_components/tuya_local/devices/avatto_wt100_thermostat.yaml

@@ -1,7 +1,8 @@
 name: Thermostat
 products:
   - id: gw173aldekvpzalg
-    name: Avatto WT200W-EH
+    manufacturer: Avatto
+    model: WT200W-EH
 entities:
   - entity: climate
     translation_only_key: thermostat

custom_components/tuya_local/devices/avidsen_soria_solarinverter.yaml

@@ -1,7 +1,8 @@
 name: Solar inverter
 products:
   - id: 0kllybtbzftaee7y
-    name: Avidsen Soria Karst-400
+    manufacturer: Avidsen
+    model: Soria Karst-400
 entities:
   - entity: sensor
     class: energy

custom_components/tuya_local/devices/axen_ks100w_heatpump.yaml

@@ -3,7 +3,8 @@
 name: Combo heat pump
 products:
   - id: l01fseshej0xmz8x
-    name: Axen KS-100W/EN8BP
+    manufacturer: Axen
+    model: KS-100W/EN8BP
 entities:
   - entity: switch
     category: config

custom_components/tuya_local/devices/aygrochy_inline_wifi_air_vent.yaml

@@ -1,7 +1,7 @@
 name: Fan
 # products:
 #   - id: UNKNOWN
-#     name: Aygrochy fan
+#     manufacturer: Aygrochy
 entities:
   - entity: climate
     dps: