From cdc0caa8d7e694be51d7fc89a90cc5af7bee6a24 Mon Sep 17 00:00:00 2001 From: HomeAutoUser Date: Thu, 16 Dec 2021 19:23:37 +0100 Subject: [PATCH 1/3] Update 00_SIGNALduino.pm --- FHEM/00_SIGNALduino.pm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/FHEM/00_SIGNALduino.pm b/FHEM/00_SIGNALduino.pm index 79eb2a184..ea2b241db 100644 --- a/FHEM/00_SIGNALduino.pm +++ b/FHEM/00_SIGNALduino.pm @@ -2332,14 +2332,13 @@ sub SIGNALduino_Parse_MS { my %msg_parts = SIGNALduino_Split_Message($rmsg, $hash->{NAME}); # Verify if extracted hash has the correct values: - - my $clockidx = _limit_to_number($msg_parts{clockidx}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty clock: $msg_parts{clockidx}]) && return ; - my $syncidx = _limit_to_number($msg_parts{syncidx}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty sync: $msg_parts{syncidx}]) && return ; - my $rawData = _limit_to_number($msg_parts{rawData}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty rawData D=: $msg_parts{rawData}]) && return ; + my $clockidx = _limit_to_number($msg_parts{clockidx}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty clock: $msg_parts{clockidx}]) // return ; + my $syncidx = _limit_to_number($msg_parts{syncidx}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty sync: $msg_parts{syncidx}]) // return ; + my $rawData = _limit_to_number($msg_parts{rawData}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty rawData D=: $msg_parts{rawData}]) // return ; my $rssi; my $rssiStr= ''; if ( defined $msg_parts{rssi} ){ - $rssi = _limit_to_hex($msg_parts{rssi}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty rssi R=: $msg_parts{rssi}]) && return ; + $rssi = _limit_to_number($msg_parts{rssi}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MS, faulty rssi R=: $msg_parts{rssi}]) // return ; ($rssi,$rssiStr) = SIGNALduino_calcRSSI($rssi); }; my $messagetype=$msg_parts{messagetype}; @@ -2770,13 +2769,13 @@ sub SIGNALduino_Parse_MC { my %msg_parts = SIGNALduino_Split_Message($rmsg, $hash->{NAME}); # Verify if extracted hash has the correct values: - my $clock = _limit_to_number($msg_parts{clockabs}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty clock: $msg_parts{clockabs}]) && return ; - my $mcbitnum = _limit_to_number($msg_parts{mcbitnum}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty mcbitnum: $msg_parts{mcbitnum}]) && return ; - my $rawData = _limit_to_hex($msg_parts{rawData}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty rawData D=: $msg_parts{rawData}]) && return ; + my $clock = _limit_to_number($msg_parts{clockabs}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty clock: $msg_parts{clockabs}]) // return ; + my $mcbitnum = _limit_to_number($msg_parts{mcbitnum}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty mcbitnum: $msg_parts{mcbitnum}]) // return ; + my $rawData = _limit_to_hex($msg_parts{rawData}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty rawData D=: $msg_parts{rawData}]) // return ; my $rssi; my $rssiStr= ''; if ( defined $msg_parts{rssi} ){ - $rssi = _limit_to_hex($msg_parts{rssi}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty rssi R=: $msg_parts{rssi}]) && return ; + $rssi = _limit_to_number($msg_parts{rssi}) // $hash->{logMethod}->($hash->{NAME}, 3, qq[$hash->{NAME}: Parse_MC, faulty rssi R=: $msg_parts{rssi}]) // return ; ($rssi,$rssiStr) = SIGNALduino_calcRSSI($rssi); }; my $messagetype=$msg_parts{messagetype}; From e260d7d5b0cc54b1df0f56b2fbf28047e9a7e42f Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 16 Dec 2021 18:24:17 +0000 Subject: [PATCH 2/3] Automatic updated controls and CHANGED --- controls_signalduino.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controls_signalduino.txt b/controls_signalduino.txt index ce6bd71f0..2766a8d4a 100644 --- a/controls_signalduino.txt +++ b/controls_signalduino.txt @@ -1,4 +1,4 @@ -UPD 2021-12-16_08:21:39 231062 FHEM/00_SIGNALduino.pm +UPD 2021-12-16_19:23:37 231014 FHEM/00_SIGNALduino.pm UPD 2021-11-21_21:18:05 17872 FHEM/10_FS10.pm UPD 2020-05-26_11:51:12 20465 FHEM/10_SD_GT.pm UPD 2021-11-28_11:34:02 23375 FHEM/10_SD_Rojaflex.pm From 60cedce20bef88c293c74a980be1a062f4bd9a62 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 16 Dec 2021 18:40:40 +0000 Subject: [PATCH 3/3] Update Versiondate --- FHEM/00_SIGNALduino.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FHEM/00_SIGNALduino.pm b/FHEM/00_SIGNALduino.pm index ea2b241db..fe5f32148 100644 --- a/FHEM/00_SIGNALduino.pm +++ b/FHEM/00_SIGNALduino.pm @@ -1,4 +1,4 @@ -# $Id: 00_SIGNALduino.pm v3.5.2 2021-12-13 21:08:58Z HomeAutoUser $ +# $Id: 00_SIGNALduino.pm v3.5.2 2021-12-16 18:40:07Z HomeAutoUser $ # v3.5.2 - https://github.com/RFD-FHEM/RFFHEM/tree/master # The module is inspired by the FHEMduino project and modified in serval ways for processing the incoming messages # see http://www.fhemwiki.de/wiki/SIGNALDuino @@ -38,7 +38,7 @@ use List::Util qw(first); use constant { - SDUINO_VERSION => '3.5.2+20211213', # Datum wird automatisch bei jedem pull request aktualisiert + SDUINO_VERSION => '3.5.2+20211216', # Datum wird automatisch bei jedem pull request aktualisiert SDUINO_INIT_WAIT_XQ => 1.5, # wait disable device SDUINO_INIT_WAIT => 2, SDUINO_INIT_MAXRETRY => 3,