Merge branch 'master_SD_UT_DC-1961-TG' of https://github.com/RFD-FHEM…

…/RFFHEM into master_SD_UT_DC-1961-TG
RFD-FHEM · Jan 3, 2023 · 2c10645 · 2c10645
2 parents 46d8d2c + 26c101d
commit 2c10645
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 5 deletions.
diff --git a/FHEM/14_SD_UT.pm b/FHEM/14_SD_UT.pm
@@ -1,5 +1,5 @@
 #########################################################################################
-# $Id: 14_SD_UT.pm 0 2022-12-14 19:27:19Z elektron-bbs $
+# $Id: 14_SD_UT.pm 0 2023-01-02 23:42:10Z elektron-bbs $
 #
 # The file is part of the SIGNALduino project.
 # The purpose of this module is universal support for devices.

diff --git a/FHEM/lib/SD_ProtocolData.pm b/FHEM/lib/SD_ProtocolData.pm
@@ -1,4 +1,4 @@
-# $Id: SD_ProtocolData.pm 3.5.4 2022-12-14 19:27:19Z elektron-bbs $
+# $Id: SD_ProtocolData.pm 3.5.4 2023-01-02 23:42:10Z elektron-bbs $
 # The file is part of the SIGNALduino project.
 # All protocol definitions are contained in this file.
 #

diff --git a/controls_signalduino.txt b/controls_signalduino.txt
@@ -7,12 +7,12 @@ UPD 2023-01-01_18:10:40 16260  FHEM/14_FLAMINGO.pm
 UPD 2023-01-01_18:10:40 23141  FHEM/14_Hideki.pm
 UPD 2023-01-01_18:10:40 13225  FHEM/14_SD_AS.pm
 UPD 2023-01-01_18:10:40 29419  FHEM/14_SD_BELL.pm
-UPD 2023-01-01_18:10:40 185055 FHEM/14_SD_UT.pm
+UPD 2023-01-02_22:16:44 187601 FHEM/14_SD_UT.pm
 UPD 2023-01-01_18:10:40 138342 FHEM/14_SD_WS.pm
 UPD 2023-01-01_18:10:40 21042  FHEM/14_SD_WS07.pm
 UPD 2023-01-01_18:10:40 37841  FHEM/14_SD_WS09.pm
 UPD 2023-01-01_18:10:40 16476  FHEM/14_SD_WS_Maverick.pm
 UPD 2023-01-01_18:10:40 40385  FHEM/41_OREGON.pm
 UPD 2020-12-17_23:16:30 15582  FHEM/90_SIGNALduino_un.pm
-UPD 2022-12-13_22:57:22 236328 FHEM/lib/SD_ProtocolData.pm
+UPD 2023-01-02_22:16:44 236328 FHEM/lib/SD_ProtocolData.pm
 UPD 2022-05-31_17:12:21 79342  FHEM/lib/SD_Protocols.pm
diff --git a/t/FHEM/14_SD_UT/testData.json b/t/FHEM/14_SD_UT/testData.json
@@ -2533,5 +2533,66 @@
          }
       ],
       "module" : "SD_UT"
-   }
+  },
+  {
+    "data" : [
+      {
+         "comment" : "Remote control DC-1961-TG with 12 buttons for ceiling fan with lighting",
+         "dmsg" : "P20#1846A865",
+         "internals" : {
+            "DEF" : "DC_1961_TG 1846",
+            "NAME" : "DC_1961_TG_1846"
+         },
+         "minProtocolVersion" : "1.48",
+         "readings" : {
+            "LastAction" : "receive",
+            "deviceCode" : "1846",
+            "rollingCode" : "6",
+            "state" : "light_on_off"
+         },
+         "tests" : [
+            {
+               "comment" : "#0",
+               "attributes" : {
+                  "model" : "DC_1961_TG"
+               }
+            }
+         ],
+         "revision_entry" : "2022-12-10 11:35:35",
+         "revision_modul" : "14_SD_UT.pm     0 2022-10-27 17:06:50Z elektron-bbs",
+         "rmsg" : "MS;P1=291;P2=-753;P3=762;P4=-249;P5=-8312;D=151212123434121212123412121234341234123412341212121234341212341234;CP=1;SP=5;R=224;O;m2;",
+         "user" : "Skusi"
+      },
+      {
+         "comment" : "Remote control DC-1961-TG with 12 buttons for ceiling fan with lighting",
+         "dmsg" : "P20#1846A77B",
+         "internals" : {
+            "DEF" : "DC_1961_TG 1846",
+            "NAME" : "DC_1961_TG_1846"
+         },
+         "minProtocolVersion" : "1.48",
+         "readings" : {
+            "LastAction" : "receive",
+            "deviceCode" : "1846",
+            "rollingCode" : "7",
+            "state" : "fan_off"
+         },
+         "tests" : [
+            {
+               "comment" : "#1",
+               "attributes" : {
+                  "model" : "DC_1961_TG"
+               }
+            }
+         ],
+         "revision_entry" : "2022-12-10 11:37:49",
+         "revision_modul" : "14_SD_UT.pm     0 2022-10-27 17:06:50Z elektron-bbs",
+         "rmsg" : "MS;P1=-760;P2=747;P3=-282;P4=253;P5=-8335;D=454141412323414141412341414123234123412341412323234123232323412323;CP=4;SP=5;R=27;O;m2;",
+         "user" : "Skusi"
+      }
+     ],
+    "id" : "20",
+    "module" : "SD_UT",
+    "name" : "DC_1961_TG_1846"
+  }
 ]