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

LaCrosse mode 1 optimization register settings #1022

Merged
merged 4 commits into from
Oct 4, 2021
Merged

LaCrosse mode 1 optimization register settings #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d058314
LaCrosse mode 1 optimization register settings
elektron-bbs Oct 4, 2021
427a417
Automatic updated controls and CHANGED
actions-user Oct 4, 2021
4a5955d
Update Tests
elektron-bbs Oct 4, 2021
4a4f00c
Update Versiondate
actions-user Oct 4, 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
13 changes: 7 additions & 6 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-09-30 19:21:59Z elektron-bbs $
# $Id: SD_ProtocolData.pm 3.4.4 2021-10-04 19:20:09Z elektron-bbs $
# The file is part of the SIGNALduino project.
# All protocol definitions are contained in this file.
#
Expand Down Expand Up @@ -50,7 +50,7 @@
# # SIGNALduino_filterMC --> SIGNALduino internal filter function, it will decode MU data via Manchester encoding
# dispatchBin => 1 # If set to 1, data will be dispatched in binary representation to other logcial modules.
# If not set (default) or set to 0, data will be dispatched in hex mode to other logical modules.
# dispatchequals => 'true' # ???
# dispatchequals => 'true' # Dispatch if dispatchequals is provided in protocol definition or only if $dmsg is different from last $dmsg, or if 2 seconds are between transmits
# postDemodulation => \& # only MU - SIGNALduino internal sub for processing before dispatching to a logical module
# method => \& # call to process this message
# system method: lib::SD_Protocols::MCRAW -> returns bits without editing and length check included
Expand All @@ -74,7 +74,7 @@
# ID´s are currently unused: 116 -
# ID´s need to be revised (preamble u): 5|19|21|22|23|25|28|31|36|40|52|59|63
###########################################################################################################################################
# Please provide at least three messages for each new MU/MC/MS protocol and a URL of issue in GitHub or discussion in FHEM Forum
# Please provide at least three messages for each new MU/MC/MS/MN protocol and a URL of issue in GitHub or discussion in FHEM Forum
# https://forum.fhem.de/index.php/topic,58396.975.html | https://github.com/RFD-FHEM/RFFHEM
###########################################################################################################################################

Expand All @@ -86,7 +86,7 @@ package lib::SD_ProtocolData;
use strict;
use warnings;

our $VERSION = '1.36';
our $VERSION = '1.37';

our %protocols = (
"0" => ## various weather sensors (500 | 9100)
Expand Down Expand Up @@ -2708,10 +2708,11 @@ package lib::SD_ProtocolData;
datarate => '17257.69',
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'],
regexMatch => qr/^9/,
register => ['0001','022E','0341','042D','05D4','0605','0780','0800','0D21','0E65','0F6A','1089','115C','1202','1322','14F8','1556','1916','1B43','1C68','2611'],
rfmode => 'Lacrosse_mode1',
clientmodule => 'LaCrosse',
length_min => '5',
method => \&lib::SD_Protocols::ConvLaCrosse,
},
"101" => # ELV PCA 301
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-10-04_18:41:53 218814 FHEM/lib/SD_ProtocolData.pm
UPD 2021-10-04_20:45:37 218882 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.*"), 26, 'Verify write value');
is(FhemTestUtils_gotLog(".*write value.*"), 21, 'Verify write value');
};

subtest 'rfmode set to Lacrosse_mode1 without protocol id enabled' => sub {
Expand Down
17 changes: 6 additions & 11 deletions t/SD_ProtocolData/01_verifyFSK.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,25 @@ my $check_hash = hash
field modulation => '2-FSK';
field register => array {
item '0001';
item '0246';
item '0301';
item '022E';
item '0341';
item '042D';
item '05D4';
item '06FF';
item '0700';
item '0802';
item '0605';
item '0780';
item '0800';
item '0D21';
item '0E65';
item '0F6A';
item '1089';
item '115C';
item '1206';
item '1202';
item '1322';
item '14F8';
item '1556';
item '1700';
item '1818';
item '1916';
item '1B43';
item '1C68';
item '1D91';
item '23EC';
item '2517';
item '2611';
end();
};
Expand Down