diff --git a/FHEM/lib/SD_ProtocolData.pm b/FHEM/lib/SD_ProtocolData.pm index bf3e6fa79..fa761bf2b 100644 --- a/FHEM/lib/SD_ProtocolData.pm +++ b/FHEM/lib/SD_ProtocolData.pm @@ -1,5 +1,5 @@ ########################################################################################################################################### -# $Id: SD_ProtocolData.pm 3.4.4 2021-08-29 21:54:48Z elektron-bbs $ +# $Id: SD_ProtocolData.pm 3.4.4 2021-09-16 18:27:10Z HomeAutoUser $ # The file is part of the SIGNALduino project. # All protocol definitions are contained in this file. # @@ -2709,7 +2709,7 @@ package lib::SD_ProtocolData; sync => '2DD4', modulation => '2-FSK', regexMatch => qr/^9/, # ToDo, check! fuer eine regexp Pruefung am Anfang vor dem method Aufruf - register => ['0001','0246','0301','042D','05D4','06FF','0700','0802','0D21','0E65','0F6A','1089','115C','1206','1322','14F8','1556','1700','1818','1916','1B43','1C68','1D91','23EC','2517','2611','2B3E'], + register => ['0001','0246','0301','042D','05D4','06FF','0700','0802','0D21','0E65','0F6A','1089','115C','1206','1322','14F8','1556','1700','1818','1916','1B43','1C68','1D91','23EC','2517','2611'], rfmode => 'Lacrosse_mode1', clientmodule => 'LaCrosse', method => \&lib::SD_Protocols::ConvLaCrosse, @@ -2726,7 +2726,7 @@ package lib::SD_ProtocolData; datarate => '6620.41', sync => '2DD4', modulation => '2-FSK', - register => ['0001','0246','0307','042D','05D4','06FF','0700','0802','0D21','0E6B','0FD0','1088','110B','1206','1322','14F8','1553','1700','1818','1916','1B43','1C68','1D91','23ED','2517','2611','2B3E'], + register => ['0001','0246','0307','042D','05D4','06FF','0700','0802','0D21','0E6B','0FD0','1088','110B','1206','1322','14F8','1553','1700','1818','1916','1B43','1C68','1D91','23ED','2517','2611'], rfmode => 'PCA301', clientmodule => 'PCA301', dispatchequals => 'true', @@ -2765,7 +2765,7 @@ package lib::SD_ProtocolData; sync => '2DD4', modulation => '2-FSK', regexMatch => qr/^9/, # ToDo, check! fuer eine regexp Pruefung am Anfang vor dem method Aufruf - register => ['0001','0246','0301','042D','05D4','06FF','0700','0802','0D21','0E65','0F6A','1088','1182','1206','1322','14F8','1556','1700','1818','1916','1B43','1C68','1D91','23EC','2516','2611','2B3E'], + register => ['0001','0246','0301','042D','05D4','06FF','0700','0802','0D21','0E65','0F6A','1088','1182','1206','1322','14F8','1556','1700','1818','1916','1B43','1C68','1D91','23EC','2516','2611'], rfmode => 'Lacrosse_mode2', clientmodule => 'LaCrosse', method => \&lib::SD_Protocols::ConvLaCrosse, diff --git a/controls_signalduino.txt b/controls_signalduino.txt index 9fe43e541..4473e5865 100644 --- a/controls_signalduino.txt +++ b/controls_signalduino.txt @@ -14,5 +14,5 @@ UPD 2021-08-11_21:38:30 35313 FHEM/14_SD_WS09.pm UPD 2020-04-13_23:15:56 14325 FHEM/14_SD_WS_Maverick.pm UPD 2021-08-11_21:38:30 37904 FHEM/41_OREGON.pm UPD 2020-12-17_23:16:30 15582 FHEM/90_SIGNALduino_un.pm -UPD 2021-08-30_16:54:51 218835 FHEM/lib/SD_ProtocolData.pm +UPD 2021-09-16_17:38:28 218814 FHEM/lib/SD_ProtocolData.pm UPD 2021-08-30_16:54:51 72899 FHEM/lib/SD_Protocols.pm diff --git a/t/FHEM/00_SIGNALduino/01_SIGNALduino_Attr_rfmode.t b/t/FHEM/00_SIGNALduino/01_SIGNALduino_Attr_rfmode.t index ab51ee810..175be7bf9 100644 --- a/t/FHEM/00_SIGNALduino/01_SIGNALduino_Attr_rfmode.t +++ b/t/FHEM/00_SIGNALduino/01_SIGNALduino_Attr_rfmode.t @@ -83,7 +83,7 @@ InternalTimer(time()+1, sub() { is($ret,U(),q[verify return undef ]); is(FhemTestUtils_gotLog(".*rfmode found on.*"), 1, 'Verify rfmode is found'); is(FhemTestUtils_gotLog(".*register settings exist.*"), 1, 'Verify registers settinx exist'); - is(FhemTestUtils_gotLog(".*write value.*"), 27, 'Verify write value'); + is(FhemTestUtils_gotLog(".*write value.*"), 26, 'Verify write value'); }; subtest 'rfmode set to Lacrosse_mode1 without protocol id enabled' => sub { diff --git a/t/SD_ProtocolData/01_verifyFSK.t b/t/SD_ProtocolData/01_verifyFSK.t index fef832af2..1b68a0aee 100644 --- a/t/SD_ProtocolData/01_verifyFSK.t +++ b/t/SD_ProtocolData/01_verifyFSK.t @@ -54,7 +54,6 @@ my $check_hash = hash item '23EC'; item '2517'; item '2611'; - item '2B3E'; end(); }; etc(); @@ -88,7 +87,6 @@ my $check_hash = hash item '23ED'; item '2517'; item '2611'; - item '2B3E'; end(); }; etc(); @@ -169,8 +167,6 @@ my $check_hash = hash item '23EC'; item '2516'; item '2611'; - item '2B3E'; - end(); }; etc();