From 8eabb5af4ead8d472431746487f6f7c9f1bd634d Mon Sep 17 00:00:00 2001
From: Jason Rumney <jasonrumney@gmail.com>
Date: Sun, 22 Dec 2024 22:09:07 +0900
Subject: [PATCH] Moes RFIR remote: merge into identical S11 RFIR remote

S11 was previously able to be added when set to scene 1.
Moes was added after product id matching was available to match the no
dps case.

By making all dps optional, both these remotes can match the same
config without the setting to scene 1 workaround.
---
 .../tuya_local/devices/moes_rfir_remote.yaml  | 33 -------------------
 .../tuya_local/devices/s11_rfir_remote.yaml   |  6 ++++
 2 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 custom_components/tuya_local/devices/moes_rfir_remote.yaml

diff --git a/custom_components/tuya_local/devices/moes_rfir_remote.yaml b/custom_components/tuya_local/devices/moes_rfir_remote.yaml
deleted file mode 100644
index 61217c48fb..0000000000
--- a/custom_components/tuya_local/devices/moes_rfir_remote.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Remote controller
-products:
-  - id: wbaloeb3kiwwhads
-    name: Moes RF/IR remote
-  - id: 0gawnyfgyneswent
-    name: IR Controller Pro
-primary_entity:
-  entity: remote
-  dps:
-    - id: 201
-      name: send
-      type: string
-      optional: true
-    - id: 202
-      name: receive
-      type: string
-      optional: true
-      persist: false
-    - id: 1
-      type: string
-      name: scene_1
-    - id: 2
-      type: string
-      optional: true
-      name: scene_2
-    - id: 3
-      type: string
-      optional: true
-      name: scene_3
-    - id: 4
-      type: string
-      optional: true
-      name: scene_4
diff --git a/custom_components/tuya_local/devices/s11_rfir_remote.yaml b/custom_components/tuya_local/devices/s11_rfir_remote.yaml
index d3c86d80ef..94930a1e0f 100644
--- a/custom_components/tuya_local/devices/s11_rfir_remote.yaml
+++ b/custom_components/tuya_local/devices/s11_rfir_remote.yaml
@@ -1,7 +1,12 @@
 name: Remote control
+legacy_type: moes_rfir_remote
 products:
   - id: nwpvjlq7qacvnqf3
     name: S11+ (IR+RF Pro)
+  - id: wbaloeb3kiwwhads
+    name: Moes RF/IR remote
+  - id: 0gawnyfgyneswent
+    name: IR Controller Pro
 primary_entity:
   entity: remote
   dps:
@@ -17,6 +22,7 @@ primary_entity:
     - id: 1
       type: string
       name: scene_1
+      optional: true
     - id: 2
       type: string
       optional: true