From 0bc68354c5713f5801c6cdf5fb8f4539c485cfe9 Mon Sep 17 00:00:00 2001 From: wvhn <17801971+wvhn@users.noreply.github.com> Date: Thu, 8 Sep 2022 18:59:28 +0200 Subject: [PATCH 01/19] changes from raman for SV2.9 https://forum.fhem.de/index.php/topic,86584.msg790077.html#msg790077 --- FHEM/01_fronthem.pm | 139 +++++++- FHEM/31_fronthemDevice.pm | 324 ++++++++++++++--- FHEM/99_fronthemUtils.pm | 703 +++++++++++++++++++++++++++++++++++-- www/pgm2/fronthemEditor.js | 17 +- 4 files changed, 1098 insertions(+), 85 deletions(-) diff --git a/FHEM/01_fronthem.pm b/FHEM/01_fronthem.pm index 7b35258..2e31e4b 100644 --- a/FHEM/01_fronthem.pm +++ b/FHEM/01_fronthem.pm @@ -1,6 +1,6 @@ ############################################## # $Id: 01_fronthem.pm 21 2015-02-13 20:25:09Z. herrmannj $ - +# modified: 2018-04-03 00:00:00Z raman #TODO alot ;) #organize loading order #attr cfg file @@ -33,6 +33,8 @@ use utf8; use Data::Dumper; +sub fronthem_Notify($$); + sub fronthem_Initialize(@) { @@ -43,6 +45,7 @@ fronthem_Initialize(@) $hash->{SetFn} = "fronthem_Set"; $hash->{ReadFn} = "fronthem_Read"; $hash->{UndefFn} = "fronthem_Undef"; + $hash->{NotifyFn} = "fronthem_Notify"; $hash->{ShutdownFn} = "fronthem_Shutdown"; $hash->{AttrList} = "configFile ".$readingFnAttributes; } @@ -143,6 +146,7 @@ fronthem_Notify($$) { my ($hash, $ntfyDev) = @_; my $ntfyDevName = $ntfyDev->{NAME}; + my $name = $hash->{NAME}; # responde to fhem system events # INITIALIZED|REREADCFG|DEFINED|RENAMED|SHUTDOWN @@ -151,6 +155,7 @@ fronthem_Notify($$) foreach my $event (@{$ntfyDev->{CHANGED}}) { my @e = split(' ', $event); + #Log3 ($hash, 1, "in $e[0]"); #TODO remove if ($e[0] eq 'INITIALIZED') { # @@ -165,6 +170,21 @@ fronthem_Notify($$) } } } + elsif ( $ntfyDevName ne $name ) { + return undef + } + + foreach my $change (@{$ntfyDev->{CHANGED}}) { + readingsBeginUpdate($hash); + #Log3 $name, 1, "fronthem $name: change: $change."; + + if ($change =~ /^(.+): (.+)/) { + if($1 eq "ws") { + readingsBulkUpdate($hash, "state", $2); + } + } + } + readingsEndUpdate($hash, 1); return undef; } @@ -238,11 +258,32 @@ fronthem_ipcRead($) $ipcHash->{PARENT}->{helper}->{config}->{$item}->{type} = 'item' unless defined($ipcHash->{PARENT}->{helper}->{config}->{$item}->{type}); } } - if (exists($up->{message}) && (($up->{message}->{cmd} || '') eq 'series')) + if (exists($up->{message}) && (($up->{message}->{cmd} || '') eq 'plot')) { - my $item = $up->{message}->{item}; - $ipcHash->{PARENT}->{helper}->{config}->{$item}->{type} = 'plot'; + foreach my $item (@{$up->{message}->{items}}) + { + my $gad = $item->{item}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{type} = 'plot'; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{mode} = $item->{mode}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{start} = $item->{start}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{end} = $item->{end}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{count} = $item->{count}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{interval} = $item->{interval}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{updatemode} = $item->{updatemode}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{datamode} = $item->{datamode}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{gad} = $item->{item} if (defined($item->{item})); + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{gads} = $item->{items} if (defined($item->{items})); + } } + if (exists($up->{message}) && (($up->{message}->{cmd} || '') eq 'log')) + { + foreach my $item (@{$up->{message}->{items}}) + { + my $gad = $item->{item}; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{type} = 'log'; + $ipcHash->{PARENT}->{helper}->{config}->{$gad}->{size} = $item->{size}; + } + } fronthem_ProcessDeviceMsg($ipcHash, $up) if (exists($up->{message})); }; Log3 ($ipcHash->{PARENT}, 2, "ipc $ipcHash->{NAME} ($id): error $@ decoding ipc msg $msg") if ($@); @@ -386,6 +427,21 @@ fronthem_ReadCfg(@) $filtered->{config}->{$key}->{reading} = $data->{config}->{$key}->{reading}; $filtered->{config}->{$key}->{converter} = $data->{config}->{$key}->{converter}; $filtered->{config}->{$key}->{set} = $data->{config}->{$key}->{set}; + + if ($data->{config}->{$key}->{type} eq 'plot') + { + $filtered->{config}->{$key}->{start} = $data->{config}->{$key}->{start}; + $filtered->{config}->{$key}->{end} = $data->{config}->{$key}->{end}; + $filtered->{config}->{$key}->{mode} = $data->{config}->{$key}->{mode}; + $filtered->{config}->{$key}->{interval} = $data->{config}->{$key}->{interval}; + $filtered->{config}->{$key}->{updatemode} = $data->{config}->{$key}->{updatemode}; + $filtered->{config}->{$key}->{datamode} = $data->{config}->{$key}->{datamode}; + } + + if ($data->{config}->{$key}->{type} eq 'log') + { + $filtered->{config}->{$key}->{size} = $data->{config}->{$key}->{size}; + } } } @@ -413,6 +469,30 @@ fronthem_WriteCfg(@) $cfgContent->{config}->{$key}->{reading} = $hash->{helper}->{config}->{$key}->{reading}; $cfgContent->{config}->{$key}->{converter} = $hash->{helper}->{config}->{$key}->{converter}; $cfgContent->{config}->{$key}->{set} = $hash->{helper}->{config}->{$key}->{set}; + } + elsif ($hash->{helper}->{config}->{$key}->{type} eq 'log') + { + $cfgContent->{config}->{$key}->{type} = $hash->{helper}->{config}->{$key}->{type}; + $cfgContent->{config}->{$key}->{size} = $hash->{helper}->{config}->{$key}->{size}; + $cfgContent->{config}->{$key}->{device} = $hash->{helper}->{config}->{$key}->{device}; + $cfgContent->{config}->{$key}->{reading} = $hash->{helper}->{config}->{$key}->{reading}; + $cfgContent->{config}->{$key}->{converter} = $hash->{helper}->{config}->{$key}->{converter}; + $cfgContent->{config}->{$key}->{set} = $hash->{helper}->{config}->{$key}->{set}; + } + elsif ($hash->{helper}->{config}->{$key}->{type} eq 'plot') + { + $cfgContent->{config}->{$key}->{type} = $hash->{helper}->{config}->{$key}->{type}; + $cfgContent->{config}->{$key}->{device} = $hash->{helper}->{config}->{$key}->{device}; + $cfgContent->{config}->{$key}->{reading} = $hash->{helper}->{config}->{$key}->{reading}; + $cfgContent->{config}->{$key}->{converter} = $hash->{helper}->{config}->{$key}->{converter}; + $cfgContent->{config}->{$key}->{set} = $hash->{helper}->{config}->{$key}->{set}; + + $cfgContent->{config}->{$key}->{start} = $hash->{helper}->{config}->{$key}->{start}; + $cfgContent->{config}->{$key}->{end} = $hash->{helper}->{config}->{$key}->{end}; + $cfgContent->{config}->{$key}->{mode} = $hash->{helper}->{config}->{$key}->{mode}; + $cfgContent->{config}->{$key}->{interval} = $hash->{helper}->{config}->{$key}->{interval}; + $cfgContent->{config}->{$key}->{updatemode} = $hash->{helper}->{config}->{$key}->{updatemode}; + $cfgContent->{config}->{$key}->{datamode} = $hash->{helper}->{config}->{$key}->{datamode}; } } @@ -436,13 +516,19 @@ fronthem_CreateListen(@) { my ($hash) = @_; my $listen; + my $plotlisten; + my $loglisten; foreach my $key (keys %{$hash->{helper}->{config}}) { my $gad = $hash->{helper}->{config}->{$key}; $listen->{$gad->{device}}->{$gad->{reading}}->{$key} = $hash->{helper}->{config}->{$key} if ((defined($gad->{device})) && (defined($gad->{reading}))); + $plotlisten->{$gad->{device}}->{$gad->{reading}}->{$key} = $hash->{helper}->{config}->{$key} if ((defined($gad->{device})) && (defined($gad->{reading})) && $gad->{type} eq 'plot'); + $loglisten->{$gad->{device}}->{$gad->{reading}}->{$key} = $hash->{helper}->{config}->{$key} if ((defined($gad->{device})) && (defined($gad->{reading})) && $gad->{type} eq 'log'); } $hash->{helper}->{listen} = $listen; + $hash->{helper}->{plot} = $plotlisten; + $hash->{helper}->{log} = $loglisten; return undef; } @@ -566,7 +652,7 @@ fronthem_FromDevice(@) my ($hash, $device, $msg) = @_; unless (exists($hash->{helper}->{sender}->{$device})) { - Log3 ($hash, 1, "$hash->{NAME} $device want send but isnt a sender"); + Log3 ($hash, 4, "$hash->{NAME} $device want send but isnt a sender"); # TODO device must be disconnected !! fronthem_DisconnectClient($hash, $device); return undef; } @@ -753,4 +839,45 @@ fronthem_wsProcessInboundCmd(@) return undef; } -1; \ No newline at end of file +1; + +=pod +=item device +=item summary fronthem websocket for FHEM +=item summary_DE fronthem websocket Schnittstelle für FHEM +=begin html + +

+ +

+

+ fronthem +

+ + +=end html + +=begin html_DE + +

+ +

+

+ fronthem +

+ + +=end html_DE + +=cut + diff --git a/FHEM/31_fronthemDevice.pm b/FHEM/31_fronthemDevice.pm index 407ad31..de67da8 100644 --- a/FHEM/31_fronthemDevice.pm +++ b/FHEM/31_fronthemDevice.pm @@ -1,6 +1,6 @@ ############################################## -# $Id: 31_fronthemDevice.pm 21 2015-02-13 20:25:09Z. herrmannj $ - +# $Id: 31_fronthemDevice.pm 21 2015-02-13 20:25:09Z herrmannj $ +# modified: 2018-04-14 00:0:00Z raman # open: # getAllSets(devName) # num converter with negative values @@ -10,6 +10,7 @@ package main; use strict; use warnings; +use Time::HiRes qw(gettimeofday); use JSON; use utf8; @@ -32,8 +33,8 @@ fronthemDevice_Initialize(@) $hash->{UndefFn} = "fronthemDevice_Undef"; $hash->{ShutdownFn} = "fronthemDevice_Shutdown"; $hash->{FW_detailFn} = "fronthemDevice_fwDetail"; - $hash->{AttrList} = "configFile ". - "whitelist:true,false ".$readingFnAttributes; + $hash->{AttrList} = "configFile " . + "whitelist:true,false ".$readingFnAttributes; $data{FWEXT}{fronthemDevice}{SCRIPT} = "fronthemEditor.js"; } @@ -144,7 +145,7 @@ fronthemDevice_Get(@) 1; } or do { my $e = $@; - Log3 ($hash->{NAME}, 1, "Error decoding webif-data $e: ".join(' ',@args)); + log3 ($hash->{NAME}, 1, "Error decoding webif-data $e: ".join(' ',@args)); return undef; }; @@ -253,9 +254,10 @@ sub fronthemDevice_ValidateGAD(@) my $result = ''; my $gadItem = $transfer->{item}; + if (!defined($defs{$hash->{helper}->{gateway}}->{helper}->{config}->{$transfer->{item}})) { - Log3 ($hash, 2, "gadModeSelect with unknown GAD $gadItem"); + Log3 ($hash, 2, "gadModeSelect with unknown ITEM $gadItem"); } my $gadAtGateway = $defs{$hash->{helper}->{gateway}}->{helper}->{config}->{$transfer->{item}}; @@ -263,9 +265,9 @@ sub fronthemDevice_ValidateGAD(@) $hash->{helper}->{config}->{$gadItem}->{read} = ($transfer->{config}->{read} eq '1')?1:0; $hash->{helper}->{config}->{$gadItem}->{write} = ($transfer->{config}->{write} eq '1')?1:0; - if ($transfer->{editor} eq 'item') + if ($transfer->{editor} eq 'item' || $transfer->{editor} eq 'log' || $transfer->{editor} eq 'plot') { - $gadAtGateway->{type} = 'item'; + $gadAtGateway->{type} = $transfer->{editor}; #device if ((defined($transfer->{config}->{device})) && length($transfer->{config}->{device})) { @@ -313,45 +315,166 @@ sub fronthemDevice_Notify($$) { my ($hash, $ntfyDev) = @_; + + my $name = $hash->{NAME}; my $ntfyDevName = $ntfyDev->{NAME}; - + # responde to fhem system events # INITIALIZED|REREADCFG|DEFINED|RENAMED|SHUTDOWN if ($ntfyDevName eq "global") { - foreach my $event (@{$ntfyDev->{CHANGED}}) + my @events = deviceEvents($ntfyDev, 1); + foreach my $a (@events) { - my @e = split(' ', $event); - if ($e[0] eq 'INITIALIZED') - { - fronthemDevice_Start($hash); - } - elsif ($e[0] eq 'RENAMED') - { - # TODO see if it is my gateway - my $gateway = fronthemDevice_GetGateway($hash); - if ($gateway && ($gateway->{NAME} eq $e[1])) - { - Log3 ($hash, 4, "$hash->{NAME}:gatway $e[1] renamed to $e[2] - update settings"); - } - } + foreach my $e (@{$a}) { + my @event = split(/\s/, $e); + + if ($event[0] eq 'INITIALIZED') + { + fronthemDevice_Start($hash); + } + elsif ($event[0] eq 'RENAMED') + { + # TODO see if it is my gateway + my $gateway = fronthemDevice_GetGateway($hash); + if ($gateway && ($gateway->{NAME} eq $event[1])) + { + Log3 ($hash, 4, "$hash->{NAME}:gatway $event[1] renamed to $event[2] - update settings"); + } + } + } } } - - return undef if(AttrVal($hash->{NAME}, "disable", 0) == 1); - return undef unless (ReadingsVal($hash->{NAME}, 'state', 'disconnected') eq 'connected'); + + return undef if (AttrVal($name, "disable", 0) == 1); + return undef unless (ReadingsVal($name, 'state', 'disconnected') eq 'connected'); # TODO exit here if gateway is absend - - my $result; + + if (defined($hash->{helper}->{gateway}) && exists($defs{$hash->{helper}->{gateway}}->{helper}->{plot}->{$ntfyDevName}) && InternalVal($name, "TYPE", "") eq "fronthemDevice") + { + my @events = deviceEvents($ntfyDev, 1); + my $listenDevice = $defs{$hash->{helper}->{gateway}}->{helper}->{plot}->{$ntfyDevName}; + + if (@events) { + foreach my $a (@events) + { + foreach my $reading (@{$a}) { + my @actualreading = split(/:\s|\s/, $reading); + my $reading = shift @actualreading; + my $listenDevice = $defs{$hash->{helper}->{gateway}}->{helper}->{plot}->{$ntfyDevName}; + + if (defined($listenDevice->{$reading})) + { + foreach my $gad (keys %{$listenDevice->{$reading}}) + { + my $gadCfg = $defs{$hash->{helper}->{gateway}}->{helper}->{config}->{$gad}; + if($gadCfg->{type} eq 'plot' && $gadCfg->{reading} eq $reading) + { + my $event = $actualreading[0]; + my @converterArgs = split(/\s/, $gadCfg->{converter}); + if (@converterArgs) { + my $converter = shift @converterArgs; + + if(@converterArgs >= 3) { + my $arg = $converterArgs[2]; + if ("@actualreading" =~ /$arg\s([0-9.]+)/) { + $event = $1; + } + } + + my $counter = 1; + my @modes; + if($gadCfg->{datamode} && $gadCfg->{datamode} ne $gadCfg->{mode}) { + if($gadCfg->{datamode} eq "minmaxavg") { + $counter = 3; + @modes = ('min','max','avg'); + } elsif($gadCfg->{datamode} eq "minmax") { + $counter = 2; + @modes = ('min','max'); + } + } else { + @modes = ($gadCfg->{mode}); + } + + for (my $i = 0; $i < $counter; $i++) { + my $param; + $param->{cmd} = 'plot'; + $param->{gad} = $gad; + $param->{device} = $ntfyDevName; + $param->{reading} = $reading; + $param->{mode} = $modes[$i]; + $param->{start} = $gadCfg->{start}; + $param->{end} = $gadCfg->{end}; + $param->{count} = $gadCfg->{count}; + $param->{interval} = $gadCfg->{interval}; + $param->{updatemode} = 'point'; + $param->{datamode} = $gadCfg->{datamode}; + $param->{event} = $event; + @{$param->{events}} = @actualreading; + @{$param->{args}} = @converterArgs; + fronthemDevice_DoConverter($hash, $converter, $param); + if(@converterArgs == 1 && @modes == 1) { + last; + } + } + } + + } + } + } + } + } + } + } + + if (defined($hash->{helper}->{gateway}) && exists($defs{$hash->{helper}->{gateway}}->{helper}->{log}->{$ntfyDevName}) && InternalVal($name, "TYPE", "") eq "fronthemDevice") + { + my @events = deviceEvents($ntfyDev, 1); + my $listenDevice = $defs{$hash->{helper}->{gateway}}->{helper}->{log}->{$ntfyDevName}; + + if (@events) { + foreach my $a (@events) + { + foreach my $reading (@{$a}) { + my @actualreading = split(/:\s|\s/, $reading); + my $reading = shift @actualreading; + my $listenDevice = $defs{$hash->{helper}->{gateway}}->{helper}->{log}->{$ntfyDevName}; + + if (defined($listenDevice->{$reading}) && $reading eq "state") + { + foreach my $gad (keys %{$listenDevice->{$reading}}) + { + my $gadCfg = $defs{$hash->{helper}->{gateway}}->{helper}->{config}->{$gad}; + + if($gadCfg->{type} eq 'log' && $gadCfg->{reading} eq $reading) + { + my ($converter, $p) = split(/\s+/, $gadCfg->{converter}, 2); + my $param; + $param->{cmd} = 'log'; + $param->{gad} = $gad; + $param->{device} = $ntfyDevName; + $param->{reading} = $reading; + $param->{size} = $gadCfg->{size}; + $param->{event} = $ntfyDev->{STATE}; + @{$param->{args}} = split(/\s*,\s*/, $p || ''); + fronthemDevice_DoConverter($hash, $converter, $param); + last; + } + } + } + } + } + } + } #of interest, device is in global (context fronthem parent device) list of known device->reading->gad ? - if (defined($hash->{helper}->{gateway}) && exists($defs{$hash->{helper}->{gateway}}->{helper}->{listen}->{$ntfyDevName})) + if (defined($hash->{helper}->{gateway}) && (exists($defs{$hash->{helper}->{gateway}}->{helper}->{listen}->{$ntfyDevName}) )) { my $max = int(@{$ntfyDev->{CHANGED}}); my $gateway = $hash->{helper}->{gateway}; # TODO getGateway my $listenDevice = $defs{$gateway}->{helper}->{listen}->{$ntfyDevName}; - + for (my $i = 0; $i < $max; $i++) { my $s = $ntfyDev->{CHANGED}[$i]; $s = "state: $s" if (($ntfyDevName ne 'global') && ($s !~ m/.+?:\s.*/)); @@ -360,8 +483,9 @@ fronthemDevice_Notify($$) # step back and see if there is a device-reading equal to $reading[0] # to prevent false interpreting of events like (state) T: 21 H: 50 @reading = ('state', $s) unless ( ($reading[0] eq 'state') || exists($ntfyDev->{READINGS}->{$reading[0]}) ); + if (defined($listenDevice->{$reading[0]})) - { + { #global list of all gad using it foreach my $gad (keys %{$listenDevice->{$reading[0]}}) { @@ -407,6 +531,7 @@ fronthemDevice_DoConverter(@) #check local permissions my $gad = $param->{gad}; my $cmd = $param->{cmd}; + #cmd == get||send: device is allowed to read the via that gad ? if ($cmd =~ /get|send/) { @@ -435,11 +560,37 @@ fronthemDevice_DoConverter(@) # return undef if pad_pin_special_cache_entry != extracted pin from key #} } + if ($cmd eq 'log') + { + if (!$hash->{helper}->{config}->{$gad}->{read} && (AttrVal($hash->{NAME}, 'whitelist', 'true') eq 'true')) + { + Log3 ($hash, 3, "$hash->{NAME} no read permission for $gad"); + return undef; + } + #TODO check pin assignment + #if (defined($hash->{helper}->{config}->{$gad}->{NAME_OF_GAD_THAT_IS_USED_TO_TEST})) + #{ + # return undef if pad_pin_special_cache_entry != extracted pin from key + #} + } + if ($cmd eq 'plot' || $cmd eq 'point') + { + if (!$hash->{helper}->{config}->{$gad}->{read} && (AttrVal($hash->{NAME}, 'whitelist', 'true') eq 'true')) + { + Log3 ($hash, 3, "$hash->{NAME} no read permission for $gad"); + return undef; + } + #TODO check pin assignment + #if (defined($hash->{helper}->{config}->{$gad}->{NAME_OF_GAD_THAT_IS_USED_TO_TEST})) + #{ + # return undef if pad_pin_special_cache_entry != extracted pin from key + #} + } if (eval $convStr) { #if there is a return value from converter, the converter may have chosen thats nothing to do, done by itself or a error is risen return undef if ($result eq 'done'); - return Log3 ($hash, 3, "$hash->{NAME}: $result"); + return Log3 ($hash, 1, "$hash->{NAME}: $result !!!"); } if ($@) { @@ -455,13 +606,14 @@ fronthemDevice_DoConverter(@) fronthemDevice_toDriver($hash, $msg); return undef; } - elsif ($cmd = 'rcv') + elsif ($cmd eq 'rcv') { my $device = $param->{device}; my $set = fronthemDevice_ConfigVal($hash, $gad, 'set'); # exit here if no set is given return undef unless $set; - $set =~ s/^state// if ($set eq 'state'); + #$set =~ s/^state// if ($param->{reading} eq 'state'); + $set =~ s/^state// if ($set eq 'state'); if ($set !~ /.*\$.*/) { fhem "set $device $set $param->{result}"; @@ -472,6 +624,15 @@ fronthemDevice_DoConverter(@) #TODO eval with vars } } + elsif ($cmd eq 'plot' || $cmd eq 'log' || $cmd eq 'url') + { + my $msg; + $msg->{receiver} = $hash->{NAME}; + $msg->{message}->{cmd} = $cmd; + @{$msg->{message}->{items}} = @{$param->{gads}}?@{$param->{gads}}:($param->{gad}, $param->{gadval}); + fronthemDevice_toDriver($hash, $msg); + return undef; + } } sub @@ -497,7 +658,7 @@ fronthemDevice_fwDetail(@) my $result = ''; $result = "
\n"; - $result .= "\n"; + $result .= "
\n"; $result .= "\n"; $result .= "
\n"; $result .= "
\n"; @@ -510,7 +671,7 @@ fronthemDevice_fwDetail(@) $result .= "\n"; $result .= "
\n"; $result .= "
"; - $result .= "GAD Edit\n"; + $result .= "Edit Item\n"; $result .= "\n"; $result .= "\n"; $result .= "\n"; $result .= "
\n"; @@ -519,7 +680,7 @@ fronthemDevice_fwDetail(@) $result .= "
\n"; $result .= "
\n"; - + return $result; } @@ -534,7 +695,6 @@ fronthemDevice_ReadCfg(@) my $json_fh; open($json_fh, "<:encoding(UTF-8)", $cfgFile) and do { - #Log3 ($hash, 1, "$hash->{NAME}: Error loading cfg file $!"); local $/; $json_text = <$json_fh>; close $json_fh; @@ -661,7 +821,7 @@ fronthemDevice_fromDriver(@) return undef; } if ($msg->{message}->{cmd} eq 'item') - { + { $hash->{helper}->{cache}->{$msg->{message}->{id}}->{val} = $msg->{message}->{val}; $hash->{helper}->{cache}->{$msg->{message}->{id}}->{time} = gettimeofday(); $hash->{helper}->{cache}->{$msg->{message}->{id}}->{count} += 1; @@ -684,6 +844,48 @@ fronthemDevice_fromDriver(@) } return undef; } + if ($msg->{message}->{cmd} eq 'log') + { + $hash->{helper}->{log} = $msg->{message}->{items}; + foreach my $gad (@{$hash->{helper}->{log}}) + { + if (fronthemDevice_ConfigVal($hash, $gad->{item}, 'converter')) + { + my $param; + $param->{cmd} = 'log'; + $param->{gad} = $gad->{item}; + $param->{device} = fronthemDevice_ConfigVal($hash, $gad->{item}, 'device'); + $param->{reading} = fronthemDevice_ConfigVal($hash, $gad->{item}, 'reading'); + my ($converter, $p) = split(/\s+/, fronthemDevice_ConfigVal($hash, $gad->{item}, 'converter'), 2); + @{$param->{args}} = split(/\s*,\s*/, $p || ''); + fronthemDevice_DoConverter($hash, $converter, $param); + } + } + } + if ($msg->{message}->{cmd} eq 'plot') + { + $hash->{helper}->{plot} = $msg->{message}->{items}; + foreach my $gad (@{$hash->{helper}->{plot}}) + { + if (fronthemDevice_ConfigVal($hash, $gad->{item}, 'converter')) + { + my $param; + $param->{cmd} = 'plot'; + $param->{gad} = $gad->{item}; + $param->{device} = fronthemDevice_ConfigVal($hash, $gad->{item}, 'device'); + $param->{reading} = fronthemDevice_ConfigVal($hash, $gad->{item}, 'reading'); + $param->{mode} = $gad->{mode}; + $param->{start} = $gad->{start}; + $param->{end} = $gad->{end}; + $param->{count} = $gad->{count}; + $param->{interval} = $gad->{interval}; + $param->{updatemode} = $gad->{updatemode}; + my ($converter, $p) = split(/\s+/, fronthemDevice_ConfigVal($hash, $gad->{item}, 'converter'), 2); + @{$param->{args}} = split(/\s/, $p); + fronthemDevice_DoConverter($hash, $converter, $param); + } + } + } return undef; } @@ -697,3 +899,45 @@ fronthemDevice_toDriver(@) 1; + + +=pod +=item device +=item summary The fronthem Device-Connector +=item summary_DE fronthem Device-Connector +=begin html + +

+ +

+

+ fronthemDevice +

+
    + Define +
      + define <name> fronthemDevice <ip-address>
      +

    +
+ +=end html + +=begin html_DE + +

+ +

+

+ fronthemDevice +

+
    + Define +
      + define <name> fronthemDevice <ip-address>
      +

    +
+ +=end html_DE + +=cut + diff --git a/FHEM/99_fronthemUtils.pm b/FHEM/99_fronthemUtils.pm index 9371e4e..bd520f3 100644 --- a/FHEM/99_fronthemUtils.pm +++ b/FHEM/99_fronthemUtils.pm @@ -1,10 +1,12 @@ ############################################## # $Id: 99_fronthemUtils.pm 0 2015-11-10 08:00:00Z herrmannj $ +# modified: 2018-04-14 00:00:00Z raman package main; use strict; use warnings; use JSON; +use Time::HiRes qw(gettimeofday); sub fronthemUtils_Initialize($$) @@ -18,50 +20,370 @@ sub fronthem_decodejson($) { sub fronthem_encodejson($) { return encode_json($_[0]); -} +} + +sub +fronthem_ActualTimeStamp($) +{ + my ( $time ) = @_; + $time = $time * 1000; + return sprintf("%.0f", $time) * 1; +} + +sub +fronthem_TimeStamp($) +{ + my ($date) = @_; + my ($year,$mon,$mday,$hour,$min,$sec) = split(/[\s_:-]+/, $date); + my $time = timelocal($sec,$min,$hour,$mday,$mon-1,$year); + return $time * 1000; +} + +sub +fronthem_Time($$) +{ + my ($time, $period) = @_; + if ($period =~ /^(\d{1,2})(s|i|h|d|w|m|y)/) + { + my $newTime = 0; + if ($2 eq "s") + { + $newTime = $1; + } + elsif ($2 eq "i") + { + $newTime = $1 * 60; + } + elsif ($2 eq "h") + { + $newTime = $1 * 3600; + } + elsif ($2 eq "d") + { + $newTime = $1 * 3600 * 24; + } + elsif ($2 eq "w") + { + $newTime = $1 * 3600 * 24 * 7; + } + elsif ($2 eq "m") + { + $newTime = $1 * 3600 * 24 * 30; + } + elsif ($2 eq "y") + { + $newTime = $1 * 3600 * 24 * 365; + } + $time = $time - $newTime; + } + return $time; +} +sub +fronthem_Duration($) # hourstats daystats weekstats monthstats yearstats +{ + my ($duration) = @_; + if ($duration =~ /^(\d{1,2})(s|i|h|d|w|m|y)/) + { + if ($2 eq "s" || $2 eq "i") + { + return "timerange"; + } + elsif ($2 eq "h") + { + if ($1 eq "1") { + return "timerange"; + } + return "hourstats"; + } + elsif ($2 eq "d") + { + if ($1 eq "1") { + return "hourstats"; + } + return "daystats"; + } + elsif ($2 eq "w") + { + if ($1 eq "1") { + return "daystats"; + } + return "weekstats"; + } + elsif ($2 eq "m") + { + if ($1 eq "1") { + return "weekstats"; + } + return "monthstats"; + } + elsif ($2 eq "y") + { + if ($1 eq "1") { + return "monthstats"; + } + return "yearstats"; + } + } + return "timerange"; +} ############################################################################### # # Umsetzen der UZSU-Settings für ein device # ############################################################################### -sub UZSU_execute($$) -{ - my ($device, $uzsu) = @_; - - $uzsu = decode_json($uzsu); - - my $weekdays_part = " "; - for(my $i=0; $i < @{$uzsu->{list}}; $i++) { - my $weekdays = $uzsu->{list}[$i]->{rrule}; - $weekdays = substr($weekdays,18,50); - if (($uzsu->{list}[$i]->{active})) { - if ($uzsu->{list}[$i]->{event} eq 'time'){ - $weekdays_part = $weekdays_part.' '.$weekdays.'|'.$uzsu->{list}[$i]->{time}.'|'.$uzsu->{list}[$i]->{value}; - } - else { - # Bugfix below: because sunset_abs from 99_sunrise_el does not work if max-time = "" - if ($uzsu->{list}[$i]->{timeMin} ne '' and $uzsu->{list}[$i]->{timeMax} ne '') { - $weekdays_part = $weekdays_part.' '.$weekdays.'|{'.$uzsu->{list}[$i]->{event}.'_abs("REAL",'.$uzsu->{list}[$i]->{timeOffset} * 60 .',"'.$uzsu->{list}[$i]->{timeMin}.'","'.$uzsu->{list}[$i]->{timeMax}.'")}|'.$uzsu->{list}[$i]->{value}; - } - else { - $weekdays_part = $weekdays_part.' '.$weekdays.'|{'.$uzsu->{list}[$i]->{event}.'_abs("REAL",'.$uzsu->{list}[$i]->{timeOffset} * 60 .',,)}|'.$uzsu->{list}[$i]->{value}; - } - } - } - } - fhem('defmod wdt_uzsu_'.$device.' WeekdayTimer '.$device.' en '.$weekdays_part); - if ($uzsu->{active}){ - fhem('attr wdt_uzsu_'.$device.' disable 0'); -} else { - fhem('attr wdt_uzsu_'.$device.' disable 1'); -} - fhem('attr wdt_uzsu_'.$device.' room UZSU'); - #fhem('save'); # use only if you want to save WDT settings immediately. - +# +# Nicht vergessen! In FHEM notify definieren! +# +# define UZSU notify .*:uzsu:.* { UZSU_execute($NAME, $EVTPART1) } +# +# oder wenn Einstellungen gespeichert werden sollen: +# +# define UZSU notify .*:uzsu:.* { UZSU_execute($NAME, $EVTPART1, 'save') } +# +# und folgendes Attribut setzen: +# +# attr global autosave 1 +# +sub UZSU_execute($$;$) +{ + my ($device, $uzsu, $save) = @_; + $uzsu = decode_json($uzsu); + + fhem('delete wdt_uzsu_'.$device.'.*'); + + for (my $i = 0; $i < @{$uzsu->{list}}; $i++) { + if ($uzsu->{list}[$i]->{active}) { + my %rrule = UZSU_getRrules($uzsu->{list}[$i]{rrule}); + my $holiday = $uzsu->{list}[$i]{holiday}{weekend} && $uzsu->{list}[$i]{holiday}{workday} ? '' : $uzsu->{list}[$i]{holiday}{weekend} ? $rrule{'BYDAY'} ne '' ? ',$we' : '$we' : $uzsu->{list}[$i]{holiday}{workday} ? $rrule{'BYDAY'} ne '' ? ',!$we' : '!$we' : ''; + my $time = $uzsu->{list}[$i]{event} eq "time" ? $uzsu->{list}[$i]{time} : '{'.$uzsu->{list}[$i]->{event} .'_abs("REAL",' . $uzsu->{list}[$i]->{timeOffset} * 60 . ',' . ($uzsu->{list}[$i]->{timeMin} ne '' ? '"' . $uzsu->{list}[$i]->{timeMin} . '"' : '') . ',' . ($uzsu->{list}[$i]->{timeMax} ne '' ? '"' . $uzsu->{list}[$i]->{timeMax} . '"' : '') . ')}'; + my $condition = UZSU_getCommand($uzsu->{list}[$i]{condition}); + + my $weekdayTimer = $rrule{'BYDAY'} . $holiday . ($rrule{'BYDAY'} ne '' || $holiday ne '' ? "|" : '') . $time . "|" . $uzsu->{list}[$i]{value}; + my $delayedExec = UZSU_getCommand($uzsu->{list}[$i]{delayedExec}); + + fhem('defmod wdt_uzsu_' . $device . '_' . $i . ' WeekdayTimer ' . $device . ' en ' . $weekdayTimer . $condition); + fhem('attr wdt_uzsu_' . $device . '_' . $i . ' room UZSU'); + fhem('attr wdt_uzsu_' . $device . '_' . $i . ' group ' . $device); + fhem('setreading wdt_uzsu_' . $device . '_' . $i . ' weekdays ' . $weekdayTimer); + fhem('defmod rg_uzsu_' . $device . ' readingsgroup wdt_uzsu_' . $device . '.*'); + fhem('attr rg_uzsu_' . $device . ' room UZSU'); + if ($delayedExec) { + fhem('attr wdt_uzsu_' . $device . '_' . $i . ' delayedExecutionCond ' . $delayedExec); + } + } + } + if ($uzsu->{active}) { + fhem('attr NAME=wdt_uzsu_' . $device . '_.*' . ' disable 0'); + } + else { + fhem('attr NAME=wdt_uzsu_' . $device . '_.*' . ' disable 1'); + } + fhem('save', 1) if ($save eq 'save'); +} + +############################################################################### +# +# UZSU-Hilfsfunktionen +# +############################################################################### +sub UZSU_getRrules($) +{ + my ($split) = @_; + my @a = split(/;/, $split); + my %hash; + foreach (@a){ + my ($key,$val) = split(/=/, $_); + $hash{$key} = $val; + } + return %hash; } +sub UZSU_getCommand($) +{ + my ($command) = @_; + if($command->{active} && $command->{type} ne "String") + { + if($command->{deviceString} =~ /^AttrVal|InternalVal|ReadingsVal\("\S+"\s?,\s?"\S+"\s?,\s?"\S*"\)$/) + { + return ' (' . $command->{deviceString} . ' ' . $command->{type} . ' "' . $command->{value} . '")'; + } + elsif($command->{deviceString} =~ /^Value\("\S+"\)$/) + { + return ' (' . $command->{deviceString} . ' ' . $command->{type} . ' "' . $command->{value} . '")'; + } + } + elsif($command->{active} && $command->{type} eq "String" && $command->{deviceString} ne '') + { + if($command->{deviceString} =~ /^fhem ".+"( if\(.+\))?$/) + { + return ' {' . $command->{deviceString} . '}'; + } + else + { + return ' (' . $command->{deviceString} . ')'; + } + } + else + { + return ''; + } +} + + +############################################################################### +# +# Sammeln der Log-Daten in einem Dummy-Device +# (Dummy-Device wir automatisch erstellt, wenn für zu überwachende Devices +# svReadins gesetzt wird - Erklärung siehe unten!) +# +# +############################################################################### +# +# Nicht vergessen! In FHEM notify definieren! +# +# define Log notify .* { Log_SetList($NAME,$EVENT) } +# +# und folgende Attribute in "attr global userattr" hinzufügen: +# +# svEvents svReadins svRegex +# +# svReadins: Für das Device das Reading setzen, das überwacht werden soll. +# z.B. wenn state überwacht werden soll: +# +# attr svReadins state battery:Batterie +# +# z.B. wenn state und battery überwacht und +# battery in Batterie geändert werden soll: +# +# attr svReadins state battery:Batterie +# +# Zur Übersicht der überwachten Devices kann eine readingsGroup +# angelegt werden: +# +# define rg_svLog readingsGroup , .*:?svReadins,? +# attr rg_svLog nameStyle style="color:red;;font-weight:bold" +# +# svEvents: Wird automatisch für das Dummy-Device (Log-Liste) angelegt, kann aber +# an die jeweiligen Bedürdnisse angepasst werden. +# +# svRegex: Hier kann für das Dummy-Device (Log-Liste) eine Liste mit Events, +# die ersetzt werden sollen, angegeben werden. +# +# z.B. attr svRegex low:schwach opened:geöffnet closed:geschlossen connected:verbunden disconnected:getrennt +# +sub +Log_SetList($$) +{ + my ($device, $event) = @_; + my $reading = ""; + my $message = ""; + + if ($event =~ qr/(.*?):\s+(.*)/p) { + $reading = $1; + $message = $2; + } else { + $reading = "state"; + $message = $event; + } + + my @info = split(" ", AttrVal($device, "svReadins", "")); + my $list = ""; + my $newReading = ""; + foreach (@info) { + if ($_ =~ qr/(.*):(.+)/p) { + $list = $1; + $newReading = $2; + } else { + $list = $_; + } + + if ($list eq $reading) + { + fhem ("set" . " svLog_" . $list . " block"); + + if ($newReading ne "") { + $reading = $newReading; + } + + if(!$defs{"svLog_" . $list}) { + fhem ("define" . " svLog_" . $list . " dummy"); + fhem("attr" . " svLog_" . $list . " svEvents info:alive,ok,online,[O|o]pened,[C|c]onnected,[C|c]losed,[G|g]eschlossen warning:low,[O|o]pen,[O|o]ffen,offline,overload,unreachable error:dead,[D|d]isconnected,unknown,IOerr"); + } + + my @state = split(" ", AttrVal("svLog_" . $list, "svEvents", "")); + foreach (@state) { + if ($_ =~ qr/(.*):(.+)/p) { + my $z = $2; + $z =~ s/,/|/g; + + if($reading eq "state") { + fhem ("setreading" . " svLog_" . $list . " " . $device . " " . $message); + } elsif ($message =~ /.*:?\s?($z)/) { + fhem ("setreading" . " svLog_" . $list . " " . $device . " " . $reading . " " . $1); + } else { + fhem ("setreading" . " svLog_" . $list . " " . $device . " " . $reading . " " . $message); + } + } + } + fhem ("set" . " svLog_" . $list . " send"); + } + } +} + +############################################################################### +# +# Log-Hilfsfunktionen +# +############################################################################### +sub +Log_GetList($) +{ + my ($name) = @_; + my $list = ""; + my $level = "info"; # info = green, error = red, warning = yellow (levels for smartvisu status.log) + + my @info = split(" ", AttrVal($name, "svRegex", "")); + my @state = split(" ", AttrVal($name, "svEvents", "")); + + my $i = 1; + foreach my $key (sort { $b cmp $a } keys %{$defs{$name}{READINGS}}) + { + my $reading = $defs{$name}{READINGS}{$key}{VAL}; + + foreach (@state) { + if ($_ =~ qr/(.*):(.+)/p) { + my $newLevel = $1; + my $states = $2; + $states =~ s/,/|/g; + + if($reading =~ /.*:?\s?($states)/) + { + $level = $newLevel; + + foreach (@info) { + if ($_ =~ qr/(.*):(.+)/p) { + my $a = $1; + my $b = $2; + $reading =~ s/$a/$b/g; + } + } + } + } + } + + my $device = AttrVal( $key, "alias", $key ); + my $timestring = $defs{$name}{READINGS}{$key}{TIME}; + $timestring =~ s/\s/T/g; # Compatibility for older Browser "2018-03-10T18:34:53" + $list .= '{"message":"'. $device . " - " . $reading . '","time":"' . $timestring . '","level":"' . $level . '"}' . ($i == keys(%{$defs{$name}{READINGS}}) ? "" : ",") if ($key ne "state"); + + $i++; + } + return $list; +} + + package fronthem; use strict; use warnings; @@ -94,7 +416,7 @@ sub UZSU(@) if ($param->{cmd} eq 'send') { $param->{gad} = $gad; - $param->{gadval} = main::fronthem_decodejson(main::ReadingsVal($device, $reading, '')); + $param->{gadval} = main::fronthem_decodejson(main::ReadingsVal($device, $reading, '{}')); $param->{gads} = []; return undef; } @@ -157,7 +479,316 @@ sub AnAus(@) return undef; } +############################################################################### +# +# direct invert numerical values +# @param max +# +############################################################################### +sub NumInvert(@) +{ + my ($param) = @_; + my $cmd = $param->{cmd}; + my $gad = $param->{gad}; + my $gadval = $param->{gadval}; + + my $device = $param->{device}; + my $reading = $param->{reading}; + my $event = $param->{event}; + + my @args = @{$param->{args}}; + my $cache = $param->{cache}; + my $max = 100; + if (defined($args[0])) + { + $max = $args[0]; + } + + if ($param->{cmd} eq 'get') + { + $event = ($reading eq 'state')?main::Value($device):main::ReadingsVal($device, $reading, ''); + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'send') + { + return "NumInvert converter got [$event] from $device, $reading but cant interpret it as a number" unless $event =~ /\D*([+-]{0,1}\d+[.]{0,1}\d*).*?/; + $event = $max - $1; + $param->{gad} = $gad; + $param->{gadval} = $event; + $param->{gads} = []; + return undef; + } + elsif ($param->{cmd} eq 'rcv') + { + return "NumInvert converter received [$gadval] but cant interpret it as a number" unless $gadval =~ /\D*([+-]{0,1}\d+[.]{0,1}\d*).*?/; + $gadval = $max - $1; + $param->{result} = $gadval; + $param->{results} = []; + return undef; + } + elsif ($param->{cmd} eq '?') + { + return 'usage: NumInvert'; + } + return undef; +} + +############################################################################### +# +# Send readings collected in dummy device as status.log +# +############################################################################### +sub Log(@) +{ + my ($param) = @_; + my $cmd = $param->{cmd}; + my $gad = $param->{gad}; + my $gadval = $param->{gadval}; + + my $device = $param->{device}; + my $reading = $param->{reading}; + my $event = $param->{event}; + + my @args = @{$param->{args}}; + my $cache = $param->{cache}; + + if ($param->{cmd} eq 'get') + { + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'log') + { + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'send') + { + use Encode qw(decode encode); + my $list = main::Log_GetList($device); + $list = encode("utf8", '[' . $list . ']'); + $param->{gad} = $gad; + $param->{gadval} = main::fronthem_decodejson($list); + $param->{gads} = []; + + return undef; + } + elsif ($param->{cmd} eq 'rcv') + { + $param->{result} = $gadval; + $param->{results} = []; + return undef; + } + elsif ($param->{cmd} eq '?') + { + return 'usage: log'; + } + return undef; +} +############################################################################### +# +# Plot data from fhem database +# @param +# +############################################################################### +sub Plot(@) +{ + my ($param) = @_; + my $cmd = $param->{cmd}; + my $gad = $param->{gad}; + my $gadval = $param->{gadval}; + + my $device = $param->{device}; + my $reading = $param->{reading}; + my $event = $param->{event}; + + my $mode = $param->{mode}; + my $start = $param->{start}; + my $end = $param->{end}; + my $count = $param->{count}; + my $interval = $param->{interval}; + my $updatemode = $param->{updatemode}; + + my @args = @{$param->{args}}; + my $cache = $param->{cache}; + + return "error $gad: converter syntax: missing paramter: name of database" if (@args != 1); + + if ($param->{cmd} eq 'get') { + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'plot') { + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'send') { + my @data = { + "item" => $gad . '.' . $mode . '.' . $start . '.' . $end . '.' . $count, + "updatemode" => $updatemode, + "plotdata" => [], + }; + + if ($updatemode eq 'point') { + if ($mode eq "raw") { + push(@{$data[0]->{plotdata}[0]}, main::fronthem_ActualTimeStamp(main::gettimeofday())); + push(@{$data[0]->{plotdata}[0]}, sprintf("%#.4f", $event) * 1); + } + elsif ($mode eq "avg") { + + } + elsif ($mode eq "sum") { + + } + elsif ($mode eq "min") { + + } + elsif ($mode eq "max") { + + } + } + else { + my $from = main::FmtDateTime(main::fronthem_Time(time(), $start)); + $from =~ s/ /_/ig; + my $to = main::FmtDateTime(main::fronthem_Time(time(), $end)); + $to =~ s/ /_/ig; + + my $duration = "timerange"; + if ($mode ne "raw") { + $duration = main::fronthem_Duration($start); + } + + my $string = main::fhem('get ' . $args[0] . ' - webchart ' . $from . ' ' . $to . ' ' . $device . ' ' . $duration . ' TIMESTAMP ' . $reading); + my @resonse = main::fronthem_decodejson($string); + + foreach my $data (@resonse) { + my $i = 0; + foreach my $row (@{$data->{data}}) { + if ($mode eq "raw") { # [TIMESTAMP,VALUE] + push(@{$data[0]->{plotdata}[$i]}, main::fronthem_TimeStamp($row->{TIMESTAMP})); + push(@{$data[0]->{plotdata}[$i]}, sprintf("%#.4f", $row->{VALUE}) * 1); + } + elsif ($mode eq "avg") { # [TIMESTAMP,AVG] + push(@{$data[0]->{plotdata}[$i]}, main::fronthem_TimeStamp($row->{TIMESTAMP})); + push(@{$data[0]->{plotdata}[$i]}, $duration eq "timerange" ? sprintf("%#.4f", $row->{VALUE}) * 1 : sprintf("%#.4f", $row->{AVG}) * 1); + } + elsif ($mode eq "sum") { # [TIMESTAMP,SUM] + push(@{$data[0]->{plotdata}[$i]}, main::fronthem_TimeStamp($row->{TIMESTAMP})); + push(@{$data[0]->{plotdata}[$i]}, $duration eq "timerange" ? sprintf("%#.4f", $row->{VALUE}) * 1 : sprintf("%#.4f", $row->{SUM}) * 1); + } + elsif ($mode eq "min") { # [TIMESTAMP,MIN] + push(@{$data[0]->{plotdata}[$i]}, main::fronthem_TimeStamp($row->{TIMESTAMP})); + push(@{$data[0]->{plotdata}[$i]}, $duration eq "timerange" ? sprintf("%#.4f", $row->{VALUE}) * 1 : sprintf("%#.4f", $row->{MIN}) * 1); + } + elsif ($mode eq "max") { # [TIMESTAMP,MAX] + push(@{$data[0]->{plotdata}[$i]}, main::fronthem_TimeStamp($row->{TIMESTAMP})); + push(@{$data[0]->{plotdata}[$i]}, $duration eq "timerange" ? sprintf("%#.4f", $row->{VALUE}) * 1 : sprintf("%#.4f", $row->{MAX}) * 1); + } + $i++; + } + } + } + $param->{gads} = [@data]; + return undef; + } + elsif ($param->{cmd} eq 'rcv') { + $param->{result} = $gadval; + $param->{results} = []; + return undef; + } + elsif ($param->{cmd} eq '?') { + return 'usage: plot'; + } + return undef; +} + +############################################################################### +# +# Plot data from fhem filelog +# @param +# +############################################################################### +sub Plotfile(@) +{ + my ($param) = @_; + my $cmd = $param->{cmd}; + my $gad = $param->{gad}; + my $gadval = $param->{gadval}; + + my $device = $param->{device}; + my $reading = $param->{reading}; + my $event = $param->{event}; + + my $mode = $param->{mode}; + my $start = $param->{start}; + my $end = $param->{end}; + my $count = $param->{count}; + my $interval = $param->{interval}; + my $updatemode = $param->{updatemode}; + + my @args = @{$param->{args}}; + my $cache = $param->{cache}; + + return "error $gad: converter syntax: missing paramter: name of database" if (@args < 1 || @args > 4); + + if ($param->{cmd} eq 'get') { + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'plot') { + $param->{cmd} = 'send'; + } + if ($param->{cmd} eq 'send') { + my @data = { + "item" => $gad . '.' . $mode . '.' . $start . '.' . $end . '.' . $count, + "updatemode" => $updatemode, + "plotdata" => [], + }; + + my $column = 3; + if ($reading eq "state") { + $reading = ""; + } elsif($reading ne "state" && @args == 1) { + $column = 4; + } elsif(@args > 1) { + $column = $args[1] * 1; + if ($args[2]) { + $reading = $args[2]; + } + } + my $regex = $args[3] ? $args[3] : ""; + + if ($updatemode eq 'point') { + if (!$args[3]) { + push(@{$data[0]->{plotdata}[0]}, main::fronthem_ActualTimeStamp(main::gettimeofday())); + push(@{$data[0]->{plotdata}[0]}, sprintf("%#.4f", $event) * 1); + } + } + else { + my $from = main::FmtDateTime(main::fronthem_Time(time(), $start)); + $from =~ s/ /_/ig; + my $to = main::FmtDateTime(main::fronthem_Time(time(), $end)); + $to =~ s/ /_/ig; + + my $string = main::fhem("get " . $args[0] . " - - " . $from . " " . $to ." " . $column .":" . $reading . ":0:" . $regex, 1); + my @resonse = split("\n", $string); + pop @resonse; + + for (my $i = 0; $i < @resonse; $i++) { + $resonse[$i] =~ /([0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}:[0-9]{2}:[0-9]{2})\s+([0-9\.]+)/; + push(@{$data[0]->{plotdata}[$i]}, main::fronthem_TimeStamp($1)); + push(@{$data[0]->{plotdata}[$i]}, sprintf("%#.4f", $2) * 1); + } + } + $param->{gads} = [@data]; + return undef; + } + elsif ($param->{cmd} eq 'rcv') { + $param->{result} = $gadval; + $param->{results} = []; + return undef; + } + elsif ($param->{cmd} eq '?') { + return 'usage: plotfile'; + } + return undef; +} 1; diff --git a/www/pgm2/fronthemEditor.js b/www/pgm2/fronthemEditor.js index 1581cc1..1afac2e 100644 --- a/www/pgm2/fronthemEditor.js +++ b/www/pgm2/fronthemEditor.js @@ -64,7 +64,7 @@ function sveRefreshGADList(device, gadList) { keys.sort(); insert.push(''); insert.push(''); - insert.push(''); + insert.push(''); //$.each(gad, function(i, item) { // insert.push(''); //}); @@ -149,6 +149,16 @@ function sveShowGADEditor(device, gadName, gadItem) { $('#gadeditcontainer').finish(); sveGADEditorItem(device, gadName, gad); break; + case 'log': + console.log('log'); + $('#gadeditcontainer').finish(); + sveGADEditorItem(device, gadName, gad); + break; + case 'plot': + console.log('plot'); + $('#gadeditcontainer').finish(); + sveGADEditorItem(device, gadName, gad); + break; default: sveGADEditorTypeSelect(device, gadName, gad); break; @@ -179,8 +189,8 @@ function sveGADEditorItem(device, gadName, gad) { $('#gadeditor').append(''); $('#gadeditor').append(''); $('#gadeditor').append(''); - $('#gadeditor').append(''); - $('#gadeditor').append(''); + $('#gadeditor').append(''); + $('#gadeditor').append(''); if (gad.whitelist === 'false') $('.permission').hide(); @@ -316,6 +326,7 @@ function sveGADEdtorAddTypeSelect(device, gadName, gad) { $('#gadeditor').append(''); $('
gaddevicerw
itemdevicerw
' + i + 'nnn
' + 'cmd set' + '
  
permission for ' + device + '
read PIN GAD:
write PIN GAD:
read PIN Item:
write PIN Item:
' + 'mode' + '