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

00_MQTT2_CLIENT.pm: add connect/disconnect (Forum #114166)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22830 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-09-23 14:35:44 +00:00
parent 964b12117f
commit d76c8538e7
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/00_MQTT2_CLIENT.pm
View File

@ -220,10 +220,11 @@ MQTT2_CLIENT_Disco($;$$)
delete($hash->{BUF}); delete($hash->{BUF});
if($hash->{disconnectTimerHash}) { if($hash->{disconnectTimerHash}) {
readingsSingleUpdate($hash, "state", "disconnected", 1);
RemoveInternalTimer($hash->{disconnectTimerHash}); RemoveInternalTimer($hash->{disconnectTimerHash});
delete($hash->{disconnectTimerHash}); delete($hash->{disconnectTimerHash});
} }
readingsSingleUpdate($hash, "state", "disconnected", 1);
} }
sub sub
@ -318,12 +319,12 @@ sub
MQTT2_CLIENT_Set($@) MQTT2_CLIENT_Set($@)
{ {
my ($hash, @a) = @_; my ($hash, @a) = @_;
my %sets = ( password=>2, publish=>2 ); my %sets = ( password=>2, publish=>2, connect=>0, disconnect=>0 );
my $name = $hash->{NAME}; my $name = $hash->{NAME};
shift(@a); shift(@a);
return "Unknown argument ?, choose one of ".join(" ", keys %sets) return "Unknown argument ?, choose one of ".join(" ", keys %sets)
if(!$a[0] || !$sets{$a[0]}); if(!$a[0] || !defined($sets{$a[0]}));
if($a[0] eq "publish") { if($a[0] eq "publish") {
shift(@a); shift(@a);
@ -344,6 +345,12 @@ MQTT2_CLIENT_Set($@)
setKeyValue($name, $a[1]); # will delete, if argument is empty setKeyValue($name, $a[1]); # will delete, if argument is empty
MQTT2_CLIENT_Disco($hash) if($init_done); MQTT2_CLIENT_Disco($hash) if($init_done);
} elsif($a[0] eq "connect") {
MQTT2_CLIENT_connect($hash) if(!$hash->{FD});
} elsif($a[0] eq "disconnect") {
MQTT2_CLIENT_Disco($hash, 1) if($hash->{FD});
} }
return undef; return undef;
} }
@ -493,6 +500,11 @@ MQTT2_CLIENT_doPublish($@)
} }
MQTT2_CLIENT_updateDisconnectTimer($hash); MQTT2_CLIENT_updateDisconnectTimer($hash);
if(!$hash->{FD}) {
Log3 $name, 4, "$name: publish to $topic while not connected";
return;
}
my $hdr = 0x30; my $hdr = 0x30;
my $pi = ""; my $pi = "";
$hdr += 1 if($retain); $hdr += 1 if($retain);
@ -639,6 +651,11 @@ MQTT2_CLIENT_getStr($$)
<li>password &lt;password&gt; value<br> <li>password &lt;password&gt; value<br>
set the password, which is stored in the FHEM/FhemUtils/uniqueID file. set the password, which is stored in the FHEM/FhemUtils/uniqueID file.
If the argument is empty, the password will be deleted. If the argument is empty, the password will be deleted.
</li><br>
<li>connect<br>
disconnect<br>
manually connect or disconnect to the MQTT server. Needed for some
strange embedded server.
</li> </li>
</ul> </ul>
<br> <br>