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 Issues Packages Projects Releases Wiki Activity

bugfix: 10_MQTT_DEVICE.pm: publishSet patch from hexenmeister (Forum #msg648963)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14529 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
eisler 2017-06-17 14:46:58 +00:00
parent 9e9affc5aa
commit b9609113d8
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- bugfix: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648963)
- feature: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648596) - feature: 10_MQTT_DEVICE.pm: publishSet patch (Forum #msg648596)
- feature: 01_FHEMWEB.pm: selectnumbers widget modifier (Forum #73188) - feature: 01_FHEMWEB.pm: selectnumbers widget modifier (Forum #73188)
- feature: 98_structure.pm: add evaluateSetResult attribute (Forum #73113) - feature: 98_structure.pm: add evaluateSetResult attribute (Forum #73113)

25
fhem/FHEM/10_MQTT_DEVICE.pm
View File

@ -82,16 +82,22 @@ sub Define() {
sub Set($$$@) { sub Set($$$@) {
my ($hash,$name,$command,@values) = @_; my ($hash,$name,$command,@values) = @_;
return "Need at least one parameters" unless defined $command; 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}) && @values);
my $msgid; my $msgid;
if (@values) { my $mark=0;
if($command ne '?') {
if(defined($hash->{publishSets}->{$command})) {
my $value = join " ",@values; my $value = join " ",@values;
$msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{$command}->{topic}, message => $value, qos => $hash->{qos}, retain => $hash->{retain}); $msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{$command}->{topic}, message => $value, qos => $hash->{qos}, retain => $hash->{retain});
readingsSingleUpdate($hash,$command,$value,1); readingsSingleUpdate($hash,$command,$value,1);
} else { $mark=1;
} elsif(defined($hash->{publishSets}->{""})) {
$msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{""}->{topic}, message => $command, qos => $hash->{qos}, retain => $hash->{retain}); $msgid = send_publish($hash->{IODev}, topic => $hash->{publishSets}->{""}->{topic}, message => $command, qos => $hash->{qos}, retain => $hash->{retain});
readingsSingleUpdate($hash,"state",$command,1); readingsSingleUpdate($hash,"state",$command,1);
$mark=1;
}
}
if(!$mark) {
return "Unknown argument $command, choose one of " . join(" ", map {$hash->{sets}->{$_} eq "" ? $_ : "$_:".$hash->{sets}->{$_}} sort keys %{$hash->{sets}})
} }
$hash->{message_ids}->{$msgid}++ if defined $msgid; $hash->{message_ids}->{$msgid}++ if defined $msgid;
readingsSingleUpdate($hash,"transmission-state","outgoing publish sent",1); readingsSingleUpdate($hash,"transmission-state","outgoing publish sent",1);
@ -151,8 +157,19 @@ sub Attr($$$$) {
topic => $topic, topic => $topic,
}; };
if ($2 eq "") { if ($2 eq "") {
if(@values) {
foreach my $set (@values) { foreach my $set (@values) {
$hash->{sets}->{$set}=""; $hash->{sets}->{$set}="";
my($setname,@restvalues) = split(":",$set);
if(@restvalues) {
$hash->{publishSets}->{$setname} = {
'values' => \@restvalues,
topic => $topic,
};
}
}
} else {
$hash->{sets}->{""}="";
} }
} else { } else {
$hash->{sets}->{$2}=join(",",@values); $hash->{sets}->{$2}=join(",",@values);