FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-06 06:08:44 +00:00
Code Issues Releases Wiki Activity

ble2mqttd: Version 0.16, fixed watchdog, changed exit code

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29040 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
PatrickR 2024-07-24 19:44:31 +00:00
parent 2a548f84f2
commit a7df476124
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/contrib/ble2mqttd
View File

@ -78,7 +78,7 @@ Readonly my $DEFAULT_RSSI_THRESHOLD => 10;
Readonly my $DEFAULT_ABSENT_INTERVAL => 60; Readonly my $DEFAULT_ABSENT_INTERVAL => 60;
Readonly my $ME => 'ble2mqttd'; Readonly my $ME => 'ble2mqttd';
Readonly my $VERSION => '0.15'; Readonly my $VERSION => '0.16';
Readonly my $PIDFILE => "/var/run/$ME.pid"; Readonly my $PIDFILE => "/var/run/$ME.pid";
my ($mqtt, $bluetoothctl, $loglevel, $logtarget, $debug); my ($mqtt, $bluetoothctl, $loglevel, $logtarget, $debug);
@ -151,7 +151,7 @@ sub usage_exit {
printf("\t%s --mqttserver mqtt.domain:8883 --mqttfingerprint 'sha256\$11e20bbb668da517a0ae8536f3c79887d06ddec945fab60401deab92dc7e7c1f' --mqttuser user --mqttpass pass\n", $ME); printf("\t%s --mqttserver mqtt.domain:8883 --mqttfingerprint 'sha256\$11e20bbb668da517a0ae8536f3c79887d06ddec945fab60401deab92dc7e7c1f' --mqttuser user --mqttpass pass\n", $ME);
printf("\t%s --mqttserver mqtt.domain:8883 --mqttfingerprint 'sha256\$11e20bbb668da517a0ae8536f3c79887d06ddec945fab60401deab92dc7e7c1f' --mqttuser user --mqttpass pass --mac 'AB:CD:EF:.*'\n", $ME); printf("\t%s --mqttserver mqtt.domain:8883 --mqttfingerprint 'sha256\$11e20bbb668da517a0ae8536f3c79887d06ddec945fab60401deab92dc7e7c1f' --mqttuser user --mqttpass pass --mac 'AB:CD:EF:.*'\n", $ME);
closelog(); closelog();
exit(1); exit(2);
} }
sub parse_loglevel { sub parse_loglevel {
@ -420,12 +420,13 @@ sub handle_match {
$info =~ s/\s+$//; $info =~ s/\s+$//;
$mac = uc($mac); $mac = uc($mac);
$lastevent = time();
if($macregex && $mac!~/$macregex/i) { if($macregex && $mac!~/$macregex/i) {
printf("%s### Match (filtered): [%s] %s (%s)\n", tsprefix(), $type, $mac, $info) if ($debug >= 2); printf("%s### Match (filtered): [%s] %s (%s)\n", tsprefix(), $type, $mac, $info) if ($debug >= 2);
return(); return();
} }
$lastevent = time();
if (my ($rssi) = ($info =~ m/^RSSI: (-?[0-9]+)$/)) { if (my ($rssi) = ($info =~ m/^RSSI: (-?[0-9]+)$/)) {
printf("%s### Match RSSI: [%s] %s -> %s\n", tsprefix(), $type, $mac, $rssi) if ($debug >= 2); printf("%s### Match RSSI: [%s] %s -> %s\n", tsprefix(), $type, $mac, $rssi) if ($debug >= 2);
$devices{$mac}{'rssi'}=$rssi; $devices{$mac}{'rssi'}=$rssi;