Skip to content

added converter: UserCode #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
verybadsoldier wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added converter: UserCode #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2438928
added converter: UserCode
Apr 4, 2015
0de01b1
UserCodeConverter: escape incoming SV code
Apr 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions FHEM/fhconverter.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
package fronthem;
use strict;
use warnings;
use String::Escape;

###############################################################################
#
Expand Down Expand Up @@ -376,5 +377,71 @@ sub RGBCombined(@)
return undef;
}

###############################################################################
#
# converts readings using user perl code
# first argument converts outgoing data (e.g. {$VALUE / 1000.0}
# second argument converts incoming data (e.g. {$VALUE * 1000.0}
#
###############################################################################
sub UserCode(@)
{
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};

# we join the arguments to one string because they might have
# been split in an inproper way for us
my $argsStr = join(",", @{$param->{args}});

# now we split the args correctly
# (we obey commas within perl code)
my $regexi= '\s*({.*?})\s*';
my $regexo= '^(' . $regexi . ')(,\s*(.*))*$';
my @args;
while($argsStr =~ /$regexo/) {
push(@args, $2);

$argsStr = defined($4) ? $4 : "";
}

return "error:$gad: converter syntax: wrong paramter count" unless (@args == 1 or @args == 2);

if ($param->{cmd} eq 'get')
{
$event = ($reading eq 'state') ? main::Value($device) : main::ReadingsVal($device, $reading, '0');
$param->{cmd} = 'send';
}

if ($param->{cmd} eq 'send')
{
my $VALUE = $event;
$param->{gadval} = eval $args[0];
$param->{gad} = $gad;
$param->{gads} = [];
return undef;
}
elsif ($param->{cmd} eq 'rcv')
{
return "done" if (@args < 2); # we are read-only if we havent a second arg

# make sure to properly escape untrusted code
my $VALUE = String::Escape::quote(String::Escape::backslash($gadval));
$param->{result} = eval $args[1];
$param->{results} = [];
return undef;
}
elsif ($param->{cmd} eq '?')
{
return 'usage: TBD!!!';
}
return undef;
}


1;