Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code

MQTT_DEVICE: fix per instance dynamic sets

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6764 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2014-10-13 19:39:54 +00:00
parent 81e96c2d81
commit 62b6091a32
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/10_MQTT_DEVICE.pm
View File

@ -26,9 +26,6 @@
use strict;
use warnings;
my %sets = (
);
my %gets = (
"version" => "",
);
@ -38,7 +35,7 @@ sub MQTT_DEVICE_Initialize($) {
my $hash = shift @_;
# Consumer
$hash->{DefFn} = "MQTT::Client_Define";
$hash->{DefFn} = "MQTT::DEVICE::Define";
$hash->{UndefFn} = "MQTT::Client_Undefine";
$hash->{SetFn} = "MQTT::DEVICE::Set";
$hash->{AttrFn} = "MQTT::DEVICE::Attr";
@ -75,13 +72,18 @@ BEGIN {
))
};
sub Set($@) {
my ($hash, @a) = @_;
return "Need at least one parameters" if(@a < 2);
return "Unknown argument $a[1], choose one of " . join(" ", map {$sets{$_} eq "" ? $_ : "$_:$sets{$_}"} sort keys %sets)
if(!defined($sets{$a[1]}));
my $command = $a[1];
my $value = $a[2];
sub Define() {
my ( $hash, $def ) = @_;
$hash->{sets} = {};
return MQTT::Client_Define($hash,$def);
};
sub Set($$$@) {
my ($hash,$name,$command,@values) = @_;
return "Need at least one parameters" unless defined $command;
return "Unknown argument $command, choose one of " . join(" ", map {$hash->{sets}->{$_} eq "" ? $_ : "$_:".$hash->{sets}->{$_}} sort keys %{$hash->{sets}})
if(!defined($hash->{sets}->{$command}));
my $value = join " ",@values;
my $msgid;
if (defined $value) {
$msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{$command}->{topic}, message => $value, qos => $hash->{qos}, retain => $hash->{retain});
@ -149,19 +151,19 @@ sub Attr($$$$) {
};
if ($2 eq "") {
foreach my $set (@values) {
$sets{$set}="";
$hash->{sets}->{$set}="";
}
} else {
$sets{$2}=join(",",@values);
$hash->{sets}->{$2}=join(",",@values);
}
} else {
if ($2 eq "") {
foreach my $set (@{$hash->{publishSets}->{$2}->{'values'}}) {
delete $sets{$set};
delete $hash->{sets}->{$set};
}
} else {
CommandDeleteReading(undef,"$hash->{NAME} $2");
delete $sets{$2};
delete $hash->{sets}->{$2};
}
delete $hash->{publishSets}->{$2};
}