From 0a7966b2ce8a8b3a5b5242a1876d25c521c28e05 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Tue, 8 Dec 2020 10:27:50 +0000 Subject: [PATCH] 57_SSCal: handle multiline code in description field if automatic creation of at-devices is used git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@23315 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- CHANGED | 2 ++ FHEM/57_SSCal.pm | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGED b/CHANGED index 378f51419..f8bf86667 100644 --- a/CHANGED +++ b/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - feature: 57_SSCal: handle multiline code in description field if automatic + creation of at-devices is used - feature: 70_BOTVAC: add oauth2 workflow, support MyKobold app - bugfix: 76_SMAPortal: fix problem that after call consumerMasterdata diff --git a/FHEM/57_SSCal.pm b/FHEM/57_SSCal.pm index bcaf53e3c..c005a9d13 100644 --- a/FHEM/57_SSCal.pm +++ b/FHEM/57_SSCal.pm @@ -139,6 +139,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( + "2.4.7" => "08.12.2020 fix handle code recognition in createAtDevices as single line ", "2.4.6" => "06.11.2020 bugfix weekly byDay ", "2.4.5" => "03.11.2020 fix commandref wiki link ", "2.4.4" => "06.10.2020 use addSendqueue from SMUtils, delete local addSendqueue ", @@ -2628,7 +2629,7 @@ sub createAtDevices { $location = ReadingsVal($name, $bnr."_35_Location", $room); # Location wird als room gesetzt $id = ReadingsVal($name, $bnr."_98_EventId", ""); - if($begin && $status =~ /upcoming|alarmed/x && $desc =~ /^\s*\{(.*)\}\s*$/x) { # ein at-Device erstellen wenn Voraussetzungen erfüllt + if($begin && $status =~ /upcoming|alarmed/x && $desc =~ /^\s*\{(.*)\}\s*$/xs) { # ein at-Device erstellen wenn Voraussetzungen erfüllt my $cmd = $1; $begin =~ s/\s/T/x; # Formatierung nach ISO8601 (YYYY-MM-DDTHH:MM:SS) für at-Devices my $ao = $begin;