Merge branch 'dev-r34' into dev-r34

RFD-FHEM · May 13, 2019 · 27e1ec8 · 27e1ec8
2 parents 1380a9d + 445a5dc
commit 27e1ec8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/CHANGED b/CHANGED
@@ -1,5 +1,8 @@
-12.05.2019
+13.05.2019
  14_SD_WS.pm: New protocol for Atech wireless weather station (protocol #94)
+11.05.2019
+  00_SIGNALduino.pm: Fixed protocols with float. Float is optional and must 
+                     not be included in transmission
 05.05.2019
  14_SD_Keeloq.pm: fix use channels 10-16 #issuecomment-488055600
 21.04.2019

diff --git a/FHEM/00_SIGNALduino.pm b/FHEM/00_SIGNALduino.pm
@@ -1,4 +1,4 @@
-# $Id: 00_SIGNALduino.pm 10488 2019-03-08 12:00:00Z v3.4.0-dev $
+# $Id: 00_SIGNALduino.pm 10488 2019-05-11 12:00:00Z v3.4.0-dev $
 #
 # v3.4.0 (Development release 3.4)
 # The module is inspired by the FHEMduino project and modified in serval ways for processing the incoming messages
@@ -30,7 +30,7 @@ use lib::SD_Protocols;
 
 
 use constant {
-	SDUINO_VERSION            => "v3.4.0_dev_16.03",
+	SDUINO_VERSION            => "v3.4.0_dev_11.05",
 	SDUINO_INIT_WAIT_XQ       => 1.5,       # wait disable device
 	SDUINO_INIT_WAIT          => 2,
 	SDUINO_INIT_MAXRETRY      => 3,
@@ -2090,7 +2090,7 @@ SIGNALduino_Parse_MS($$$$%)
 				if (!SIGNALduino_FillPatternLookupTable($hash,\@{$ProtocolListSIGNALduino{$id}{$key}},\$symbol_map{$key},\%patternList,\$rawData,\%patternLookupHash,\%endPatternLookupHash,\$return_text))
 				{
 					Debug sprintf("%s pattern not found",$key) if ($debug);
-					next IDLOOP;
+					next IDLOOP if ($key ne "float") ;
 				}
 
 				if ($key eq "sync")
@@ -2341,7 +2341,7 @@ sub SIGNALduino_Parse_MU($$$$@)
 				if (!SIGNALduino_FillPatternLookupTable($hash,\@{$ProtocolListSIGNALduino{$id}{$key}},\$symbol_map{$key},\%patternList,\$rawData,\%patternLookupHash,\%endPatternLookupHash,\$return_text))
 				{
 						Debug sprintf("%s pattern not found",$key) if ($debug);
-						next IDLOOP;
+						next IDLOOP if ($key ne "float");
 				}
 				Debug sprintf("Found matched %s with indexes: (%s)",$key,$return_text) if ($debug);
 				if ($key eq "one")

diff --git a/controls_signalduino.txt b/controls_signalduino.txt
@@ -1,4 +1,4 @@
-UPD 2019-05-04_22:31:14 199719  FHEM/00_SIGNALduino.pm
+UPD 2019-05-12_22:39:24 199762  FHEM/00_SIGNALduino.pm
 UPD 2017-06-23_17:43:38 14541   FHEM/10_FS10.pm
 UPD 2016-09-18_21:22:06 10111   FHEM/14_BresserTemeo.pm
 UPD 2018-11-11_22:35:33 13616   FHEM/14_FLAMINGO.pm