From b7f5a515d243901857d19d177ed6ce3955e8d0f9 Mon Sep 17 00:00:00 2001 From: rr2000 <> Date: Mon, 9 Mar 2015 19:03:15 +0000 Subject: [PATCH] 37_SHC: now add all files for the previous commit (rr2000) git-svn-id: https://svn.fhem.de/fhem/trunk@8182 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/37_SHC.pm | 33 +++- fhem/FHEM/37_SHCdev.pm | 272 ++++++++++++++++++---------- fhem/FHEM/SHC_datafields.pm | 17 +- fhem/FHEM/SHC_parser.pm | 30 +-- fhem/FHEM/lib/SHC_packet_layout.xml | 182 ++++++++++++++++++- 6 files changed, 405 insertions(+), 130 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 4145fd8b1..05e56b936 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # 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. + - changed: 37_SHC: now add all files for the previous commit (rr2000) - feature: 37_SHC: add new support for SoilMoistureMeter and add support for DigPort and DigPin in Powerswitch (rr2000) - feature: 02_HTTPSRV: query string sets readings (Stefan Strobel) diff --git a/fhem/FHEM/37_SHC.pm b/fhem/FHEM/37_SHC.pm index 7d6678a29..55fb95c1f 100644 --- a/fhem/FHEM/37_SHC.pm +++ b/fhem/FHEM/37_SHC.pm @@ -2,6 +2,7 @@ # This file is part of the smarthomatic module for FHEM. # # Copyright (c) 2014 Stefan Baumann +# 2015 Uwe Freese # # You can find smarthomatic at www.smarthomatic.org. # You can find FHEM at www.fhem.de. @@ -26,6 +27,7 @@ package main; use strict; use warnings; use Time::HiRes qw(gettimeofday); +use Digest::CRC qw(crc32); # linux packet libdigest-crc-perl sub SHC_Parse($$$$); sub SHC_Read($); @@ -37,7 +39,7 @@ sub SHC_SimpleWrite(@); my $clientsSHC = ":SHCdev:BASE:xxx:"; my %matchListSHC = ( - "1:SHCdev" => "^Packet Data: SenderID=[1-9]|0[1-9]|[1-9][0-9]|[0-9][0-9][0-9]|[0-3][0-9][0-9][0-9]|40[0-8][0-9]|409[0-6]", #1-4096 with leading zeros + "1:SHCdev" => "^PKT:SID=([1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-3][0-9][0-9][0-9]|40[0-8][0-9]|409[0-6]);", #1-4096 "2:xxx" => "^\\S+\\s+22", "3:xxx" => "^\\S+\\s+11", "4:xxx" => "^\\S+\\s+9 ", @@ -269,11 +271,15 @@ sub SHC_Parse($$$$) next if (!$dmsg || length($dmsg) < 1); # Bogus messages - if ($dmsg !~ m/^Packet Data: SenderID=/) { + if ($dmsg =~ m/^PKT:SID=0;/) { # "echo" from message sent by FHEM itself + return; + } + + if ($dmsg !~ m/^PKT:SID=/) { # Messages just to dipose - if ( $dmsg =~ m/^\*\*\* Enter AES key nr/ - || $dmsg =~ m/^\*\*\* Received character/) + if ( $dmsg =~ m/^\*\*\* Enter data/ + || $dmsg =~ m/^\*\*\* 0x/) { return; } @@ -294,17 +300,34 @@ sub SHC_Parse($$$$) # -Verbosity level 4 if ( $dmsg =~ m/^Request added to queue/ || $dmsg =~ m/^Request Buffer/ - || $dmsg =~ m/^Request (q|Q)ueue/) + || $dmsg =~ m/^Request Queue/) { Log3 $name, 4, "$name: $dmsg"; return; } + + # -Verbosity level 1 + if ( $dmsg =~ m/^CRC Error/ ) + { + Log3 $name, 1, "$name: $dmsg"; + return; + } # Anything else in verbosity level 3 Log3 $name, 3, "$name: $dmsg"; return; } + # check CRC of "PKT:..." message and ignore message if necessary + my $crc = crc32(substr($dmsg, 4, length($dmsg) - 12)); + $crc = sprintf("%08x", $crc); + + if ($crc ne substr($dmsg, length($dmsg) - 8)) + { + Log3 $name, 1, "$name: CRC Error (" . $crc . ") $dmsg"; + return; + } + $hash->{"${name}_MSGCNT"}++; $hash->{"${name}_TIME"} = TimeNow(); $hash->{RAWMSG} = $rmsg; diff --git a/fhem/FHEM/37_SHCdev.pm b/fhem/FHEM/37_SHCdev.pm index 4905ab894..d4f6d4e00 100644 --- a/fhem/FHEM/37_SHCdev.pm +++ b/fhem/FHEM/37_SHCdev.pm @@ -1,7 +1,8 @@ ########################################################################## # This file is part of the smarthomatic module for FHEM. # -# Copyright (c) 2014 Stefan Baumann, Uwe Freese +# Copyright (c) 2014 Stefan Baumann +# 2014..2015 Uwe Freese # # You can find smarthomatic at www.smarthomatic.org. # You can find FHEM at www.fhem.de. @@ -33,37 +34,41 @@ use SHC_parser; my $parser = new SHC_parser(); my %dev_state_icons = ( - "PowerSwitch" => "on:on:toggle off:off:toggle set.*:light_question:off", - "Dimmer" => "on:on off:off set.*:light_question:off", - "EnvSensor" => undef, - "RGB_Dimmer" => undef + "PowerSwitch" => ".*1\\d{7}:on:off .*0\\d{7}:off:on set.*:light_question:off", + "Dimmer" => "on:on off:off set.*:light_question:off", + "EnvSensor" => undef, + "RGBDimmer" => undef, + "SoilMoistureMeter" => ".*H:\\s\\d\\..*:ampel_rot" ); my %web_cmds = ( - "PowerSwitch" => "on:off:toggle:statusRequest", - "Dimmer" => "on:off:statusRequest", - "EnvSensor" => undef, - "RGB_Dimmer" => undef + "PowerSwitch" => "on:off:toggle:statusRequest", + "Dimmer" => "on:off:statusRequest", + "EnvSensor" => undef, + "RGBDimmer" => undef, + "SoilMoistureMeter" => undef ); # Array format: [ reading1, str_format1, reading2, str_format2 ... ] # "on" reading translates 0 -> "off" # 1 -> "on" my %dev_state_format = ( - "PowerSwitch" => ["on", ""], - "Dimmer" => ["on", "", "brightness", "B: "], - "EnvSensor" => [ # Results in "T: 23.4 H: 27.3 Baro: 978.34 B: 45" + "PowerSwitch" => ["port", "Port: "], + "Dimmer" => ["on", "", "brightness", "B: "], + "EnvSensor" => [ # Results in "T: 23.4 H: 27.3 Baro: 978.34 B: 45" "temperature", "T: ", "humidity", "H: ", "barometric_pressure", "Baro: ", "brightness", "B: ", "distance", "D: ", - "dins", "Din: ", + "port", "Port: ", "ains", "Ain: " ], - "RGB_Dimmer" => [ - "color", "Color: " - ] + "RGBDimmer" => [ + "color", "Color: ", + "brightness", "Brightness: " + ], + "SoilMoistureMeter" => ["humidity", "H: "] ); # Supported set commands @@ -71,19 +76,23 @@ my %dev_state_format = ( # use "cmd_name:cmd_additional_info" # cmd_additional_info: Description available at http://www.fhemwiki.de/wiki/DevelopmentModuleIntro#X_Set my %sets = ( - "PowerSwitch" => "on:noArg off:noArg toggle:noArg statusRequest:noArg " . - # Used from SetExtensions.pm - "blink on-for-timer on-till off-for-timer off-till intervals", - "Dimmer" => "on:noArg off:noArg toggle:noArg statusRequest:noArg pct:slider,0,1,100 ani " . - # Used from SetExtensions.pm - "blink on-for-timer on-till off-for-timer off-till intervals", - "EnvSensor" => "", - "RGB_Dimmer" => "Color " . - "ColorAnimation", - "Custom" => "PowerSwitch.SwitchState " . - "PowerSwitch.SwitchStateExt " . - "Dimmer.Brightness " . - "Dimmer.Animation" + "PowerSwitch" => "on:noArg off:noArg toggle:noArg statusRequest:noArg " . + # Used from SetExtensions.pm + "blink on-for-timer on-till off-for-timer off-till intervals " . + "DigitalPort " . + "DigitalPortTimeout " . + "DigitalPin " . + "DigitalPinTimeout", + "Dimmer" => "on:noArg off:noArg toggle:noArg statusRequest:noArg pct:slider,0,1,100 ani " . + # Used from SetExtensions.pm + "blink on-for-timer on-till off-for-timer off-till intervals", + "EnvSensor" => "", + "RGBDimmer" => "Color " . + "ColorAnimation " . + "Dimmer.Brightness:slider,0,1,100", + "SoilMoistureMeter" => "", + "Custom" => "Dimmer.Brightness " . + "Dimmer.Animation" ); # Supported get commands @@ -92,27 +101,10 @@ my %gets = ( "PowerSwitch" => "", "Dimmer" => "", "EnvSensor" => "din:all,1,2,3,4,5,6,7,8 ain:all,1,2,3,4,5 ain_volt:1,2,3,4,5", - "RGB_Dimmer" => "", + "RGBDimmer" => "", "Custom" => "" ); -# Hashtable for automatic device type assignment -# Format: -# "MessageGroupName:MessageName" => "Auto Device Type" -my %auto_devtype = ( - "Weather.Temperature" => "EnvSensor", - "Weather.HumidityTemperature" => "EnvSensor", - "Weather.BarometricPressureTemperature" => "EnvSensor", - "Environment.Brightness" => "EnvSensor", - "Environment.Distance" => "EnvSensor", - "GPIO.DigitalPin" => "EnvSensor", - "GPIO.AnalogPin" => "EnvSensor", - "PowerSwitch.SwitchState" => "PowerSwitch", - "Dimmer.Brightness" => "Dimmer", - "Dimmer.Color" => "RGB_Dimmer", - "Dimmer.ColorAnimation" => "RGB_Dimmer" -); - sub SHCdev_Parse($$); ##################################### @@ -120,7 +112,7 @@ sub SHCdev_Initialize($) { my ($hash) = @_; - $hash->{Match} = "^Packet Data: SenderID=[1-9]|0[1-9]|[1-9][0-9]|[0-9][0-9][0-9]|[0-3][0-9][0-9][0-9]|40[0-8][0-9]|409[0-6]"; + $hash->{Match} = "^PKT:SID=([1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-3][0-9][0-9][0-9]|40[0-8][0-9]|409[0-6]);"; $hash->{SetFn} = "SHCdev_Set"; $hash->{GetFn} = "SHCdev_Get"; $hash->{DefFn} = "SHCdev_Define"; @@ -130,7 +122,7 @@ sub SHCdev_Initialize($) ." readonly:1" ." forceOn:1" ." $readingFnAttributes" - ." devtype:EnvSensor,Dimmer,PowerSwitch,RGB_Dimmer"; + ." devtype:EnvSensor,Dimmer,PowerSwitch,RGBDimmer,SoilMoistureMeter"; } ##################################### @@ -198,7 +190,7 @@ sub SHCdev_Parse($$) my $name = $hash->{NAME}; if (!$parser->parse($msg)) { - Log3 $hash, 4, "SHC_TEMP: parser error: $msg"; + Log3 $name, 1, "$name: Parser error: $msg"; return ""; } @@ -210,7 +202,7 @@ sub SHCdev_Parse($$) my $rname = $rhash ? $rhash->{NAME} : $raddr; if (!$modules{SHCdev}{defptr}{$raddr}) { - Log3 $name, 3, "SHC_TEMP: Unknown device $rname, please define it"; + Log3 $name, 3, "$name: Unknown device $rname, please define it"; return "UNDEFINED SHCdev_$rname SHCdev $raddr"; } @@ -234,9 +226,6 @@ sub SHCdev_Parse($$) given ($msggroupname) { when ('Generic') { given ($msgname) { - when ('BatteryStatus') { - readingsBulkUpdate($rhash, "battery", $parser->getField("Percentage")); - } when ('Version') { my $major = $parser->getField("Major"); my $minor = $parser->getField("Minor"); @@ -244,22 +233,61 @@ sub SHCdev_Parse($$) my $vhash = $parser->getField("Hash"); readingsBulkUpdate($rhash, "version", "$major.$minor.$patch-$vhash"); + } + when ('DeviceInfo') { + my $devtype = $parser->getField("DeviceType"); + my $major = $parser->getField("VersionMajor"); + my $minor = $parser->getField("VersionMinor"); + my $patch = $parser->getField("VersionPatch"); + my $vhash = $parser->getField("VersionHash"); + + # Assign device type + my $devtypeOld = AttrVal( $rname, "devtype", undef ); + if (!defined($devtypeOld)) { + $attr{$rname}{devtype} = $devtype; + Log3 $name, 3, "$rname: Assign device type = " . $attr{$rname}{devtype}; + } + + readingsBulkUpdate($rhash, "version", "$major.$minor.$patch-$vhash"); + } + when ('BatteryStatus') { + readingsBulkUpdate($rhash, "battery", $parser->getField("Percentage")); } } } when ('GPIO') { given ($msgname) { - when ('DigitalPin') { + when ('DigitalPortTimeout') { + my $pins = ""; + for (my $i = 0 ; $i < 8 ; $i++) { + my $pinx = $parser->getField("On", $i); + my $timeoutx = $parser->getField("TimeoutSec", $i); + my $channel = $i + 1; + if ($channel == 1) + { + readingsBulkUpdate($rhash, "on", $pinx); + } + readingsBulkUpdate($rhash, "pin" . $channel, $pinx); + readingsBulkUpdate($rhash, "timeout" . $channel, $timeoutx); + $pins .= $pinx; + } + readingsBulkUpdate($rhash, "port", $pins); + } + when ('DigitalPort') { my $pins = ""; for (my $i = 0 ; $i < 8 ; $i++) { my $pinx = $parser->getField("On", $i); my $channel = $i + 1; - readingsBulkUpdate($rhash, "din" . $channel, $pinx); + if ($channel == 1) + { + readingsBulkUpdate($rhash, "on", $pinx); + } + readingsBulkUpdate($rhash, "pin" . $channel, $pinx); $pins .= $pinx; } - readingsBulkUpdate($rhash, "dins", $pins); + readingsBulkUpdate($rhash, "port", $pins); } - when ('AnalogPin') { + when ('AnalogPort') { my $pins = ""; for (my $i = 0 ; $i < 5 ; $i++) { my $pinx_on = $parser->getField("On", $i); @@ -294,6 +322,11 @@ sub SHCdev_Parse($$) readingsBulkUpdate($rhash, "barometric_pressure", $bar); readingsBulkUpdate($rhash, "temperature", $tmp); } + when ('Humidity') { + my $hum = $parser->getField("Humidity") / 10; # parser returns 1/10 percent + + readingsBulkUpdate($rhash, "humidity", $hum); + } } } when ('Environment') { @@ -308,17 +341,6 @@ sub SHCdev_Parse($$) } } } - when ('PowerSwitch') { - given ($msgname) { - when ('SwitchState') { - my $on = $parser->getField("On"); - my $timeout = $parser->getField("TimeoutSec"); - - readingsBulkUpdate($rhash, "on", $on); - readingsBulkUpdate($rhash, "timeout", $timeout); - } - } - } when ('Dimmer') { given ($msgname) { when ('Brightness') { @@ -348,13 +370,6 @@ sub SHCdev_Parse($$) } } - # Autoassign device type - my $devtype = AttrVal( $rname, "devtype", undef ); - if (!defined($devtype) && (defined($auto_devtype{"$msggroupname.$msgname"}))) { - $attr{$rname}{devtype} = $auto_devtype{"$msggroupname.$msgname"}; - Log3 $name, 3, "$rname: Autoassign device type = " . $attr{$rname}{devtype}; - } - # If the devtype is defined add, if not already done, the according webCmds and devStateIcons my $devtype2 = AttrVal( $rname, "devtype", undef ); if (defined($devtype2)) { @@ -446,23 +461,56 @@ sub SHCdev_Set($@) # is able to do this as well. Even more it supports intervals, off-for-timer, off-till ... if ($cmd eq 'toggle') { - $cmd = ReadingsVal($name, "state", "on") eq "off" ? "on" : "off"; + $cmd = ReadingsVal($name, "on", "0") eq "0" ? "on" : "off"; } if (!$readonly && $cmd eq 'off') { readingsSingleUpdate($hash, "state", "set-$cmd", 1); - $parser->initPacket("PowerSwitch", "SwitchState", "SetGet"); - $parser->setField("PowerSwitch", "SwitchState", "TimeoutSec", 0); - $parser->setField("PowerSwitch", "SwitchState", "On", 0); + $parser->initPacket("GPIO", "DigitalPin", "SetGet"); + $parser->setField("GPIO", "DigitalPin", "Pos", 0); + $parser->setField("GPIO", "DigitalPin", "On", 0); SHCdev_Send($hash); } elsif (!$readonly && $cmd eq 'on') { readingsSingleUpdate($hash, "state", "set-$cmd", 1); - $parser->initPacket("PowerSwitch", "SwitchState", "SetGet"); - $parser->setField("PowerSwitch", "SwitchState", "TimeoutSec", 0); - $parser->setField("PowerSwitch", "SwitchState", "On", 1); + $parser->initPacket("GPIO", "DigitalPin", "SetGet"); + $parser->setField("GPIO", "DigitalPin", "Pos", 0); + $parser->setField("GPIO", "DigitalPin", "On", 1); SHCdev_Send($hash); } elsif ($cmd eq 'statusRequest') { - $parser->initPacket("PowerSwitch", "SwitchState", "Get"); + $parser->initPacket("GPIO", "DigitalPin", "Get"); + SHCdev_Send($hash); + } elsif ($cmd eq 'DigitalPort') { + $parser->initPacket("GPIO", "DigitalPort", "SetGet"); + # if not enough (less than 8) pinbits are available use zero as default + my $pinbits = $arg . "00000000"; + for (my $i = 0 ; $i < 8 ; $i = $i + 1) { + $parser->setField("GPIO", "DigitalPort", "On", substr($pinbits, $i , 1), $i); + } + SHCdev_Send($hash); + } elsif ($cmd eq 'DigitalPortTimeout') { # TODO implement correctly + $parser->initPacket("GPIO", "DigitalPortTimeout", "SetGet"); + # if not enough (less than 8) pinbits are available use zero as default + my $pinbits = $arg . "00000000"; + for (my $i = 0 ; $i < 8 ; $i = $i + 1) { + my $pintimeout = "0"; # default value for timeout + if (exists $aa[$i + 2]) { + $pintimeout = $aa[$i + 2]; + } + Log3 $name, 3, "$name: $i: Pin: " . substr($pinbits, $i , 1) . " Timeout: $pintimeout"; + $parser->setField("GPIO", "DigitalPortTimeout", "On", substr($pinbits, $i , 1), $i); + $parser->setField("GPIO", "DigitalPortTimeout", "TimeoutSec", $pintimeout, $i); + } + SHCdev_Send($hash); + } elsif ($cmd eq 'DigitalPin') { + $parser->initPacket("GPIO", "DigitalPin", "SetGet"); + $parser->setField("GPIO", "DigitalPin", "Pos", $arg); + $parser->setField("GPIO", "DigitalPin", "On", $arg2); + SHCdev_Send($hash); + } elsif ($cmd eq 'DigitalPinTimeout') { + $parser->initPacket("GPIO", "DigitalPinTimeout", "SetGet"); + $parser->setField("GPIO", "DigitalPinTimeout", "Pos", $arg); + $parser->setField("GPIO", "DigitalPinTimeout", "On", $arg2); + $parser->setField("GPIO", "DigitalPinTimeout", "TimeoutSec", $arg3); SHCdev_Send($hash); } else { return SetExtensions($hash, "", $name, @aa); @@ -519,7 +567,7 @@ sub SHCdev_Set($@) return SetExtensions($hash, "", $name, @aa); } } - when ('RGB_Dimmer') { + when ('RGBDimmer') { if ($cmd eq 'Color') { #TODO Verify argument values my $color = $arg; @@ -562,6 +610,16 @@ sub SHCdev_Set($@) } readingsSingleUpdate($hash, "state", "set-coloranimation", 1); SHCdev_Send($hash); + } elsif ($cmd eq 'Dimmer.Brightness') { + my $brightness = $arg; + + # DEBUG + # Log3 $name, 3, "$name: Args: $arg, $arg2, $arg3, $brightness"; + + readingsSingleUpdate($hash, "state", "set-brightness:$brightness", 1); + $parser->initPacket("Dimmer", "Brightness", "SetGet"); + $parser->setField("Dimmer", "Brightness", "Brightness", $brightness); + SHCdev_Send($hash); } else { return SetExtensions($hash, "", $name, @aa); } @@ -605,10 +663,10 @@ sub SHCdev_Get($@) } elsif ($arg eq "all") { - if ( defined($hash->{READINGS}{dins}) - && defined($hash->{READINGS}{dins}{VAL})) + if ( defined($hash->{READINGS}{port}) + && defined($hash->{READINGS}{port}{VAL})) { - return "$name.dins => " . $hash->{READINGS}{dins}{VAL}; + return "$name.port => " . $hash->{READINGS}{port}{VAL}; } return "Error: \"input all\" readings not yet available or not supported by device"; } @@ -676,7 +734,7 @@ sub SHCdev_Send($)

SHCdev


@@ -707,10 +767,10 @@ sub SHCdev_Send($) Set