Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SD_ProtocolData.pm - remove register entry #1017

Merged
merged 7 commits into from
Sep 17, 2021
Merged

Update SD_ProtocolData.pm - remove register entry #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c01189b
Update SD_ProtocolData.pm
HomeAutoUser Sep 16, 2021
2e94439
Automatic updated controls and CHANGED
actions-user Sep 16, 2021
b07a16d
Update Versiondate
actions-user Sep 16, 2021
b67a4f3
Update 01_verifyFSK.t
HomeAutoUser Sep 16, 2021
9411f99
Update Versiondate
actions-user Sep 16, 2021
e850617
Update 01_SIGNALduino_Attr_rfmode.t
HomeAutoUser Sep 16, 2021
0489284
Update Versiondate
actions-user Sep 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions FHEM/lib/SD_ProtocolData.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down Expand Up @@ -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,
Expand All @@ -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',
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion controls_signalduino.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion t/FHEM/00_SIGNALduino/01_SIGNALduino_Attr_rfmode.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions t/SD_ProtocolData/01_verifyFSK.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ my $check_hash = hash
item '23EC';
item '2517';
item '2611';
item '2B3E';
end();
};
etc();
Expand Down Expand Up @@ -88,7 +87,6 @@ my $check_hash = hash
item '23ED';
item '2517';
item '2611';
item '2B3E';
end();
};
etc();
Expand Down Expand Up @@ -169,8 +167,6 @@ my $check_hash = hash
item '23EC';
item '2516';
item '2611';
item '2B3E';

end();
};
etc();
Expand Down