From 96bce799ce1b8beb7474d01f7b68dfbfa75f4c0e Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Sun, 27 Nov 2016 09:12:29 +0000 Subject: [PATCH] 00_CUL.pm/STACKABLE_CC: allow more report caharacters (Forum #60028) git-svn-id: https://svn.fhem.de/fhem/trunk@12667 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_CUL.pm | 2 +- fhem/FHEM/16_STACKABLE_CC.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index bfb68d027..0ce787d53 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -25,7 +25,7 @@ my %gets = ( # Name, Data to send to the CUL, Regexp for the answer "raw" => ["", '.*'], "uptime" => ["t", '^[0-9A-F]{8}[\r\n]*$' ], "fhtbuf" => ["T03", '^[0-9A-F]+[\r\n]*$' ], - "cmds" => ["?", '.*Use one of[ \*0-9A-Za-z]+[\r\n]*$' ], + "cmds" => ["?", '.*Use one of( .)*[\r\n]*$' ], "credit10ms" => [ "X", '^.. *\d*[\r\n]*$' ], ); diff --git a/fhem/FHEM/16_STACKABLE_CC.pm b/fhem/FHEM/16_STACKABLE_CC.pm index e014e4b36..1f5385a1f 100644 --- a/fhem/FHEM/16_STACKABLE_CC.pm +++ b/fhem/FHEM/16_STACKABLE_CC.pm @@ -150,7 +150,7 @@ sub STACKABLE_CC_DelPrefix($$) { my ($hash, $msg) = @_; - $msg =~ s/^.//; + $msg =~ s/^[^A-Z0-9]//i; return $msg; }