Избегаем "залипания" последнего сообщения в MQTT.

[openhab-process.git] / mqtt-bt / scan-beacons

diff --git a/mqtt-bt/scan-beacons b/mqtt-bt/scan-beacons
index 210bcfbbf1c714cf37e8e4e69a10d1571d685696..5512aa9a009aa3c03531ba19c217c41687e0e5a3 100644 (file)
--- a/mqtt-bt/scan-beacons
+++ b/mqtt-bt/scan-beacons
@@ -113,12 +113,10 @@ end
 
 function open_dump()
 
 
 function open_dump()
 

-  run_command("/usr/bin/pkill btmon")
-  run_command("/usr/bin/pkill hcitool")
-  f = assert(io.popen ("/usr/bin/stdbuf -o0 /usr/bin/btmon"))
+  f = assert(io.popen ("/usr/bin/btmon"))

   run_command("hciconfig hci0 down")
   run_command("hciconfig hci0 up")
   run_command("hciconfig hci0 down")
   run_command("hciconfig hci0 up")

-  f_null = assert(io.popen ("hcitool lescan --duplicates --passive"))
+  f_null = assert(io.popen ("hcitool lescan --duplicates"))

 
   return f
 
 
   return f
 


@@ -137,7 +135,7 @@ local function starts_with(str, start)
 end
 
 function mqtt_pub(path,value)
 end
 
 function mqtt_pub(path,value)

-  res=mqtt_client:publish(path,value)
+  res=mqtt_client:publish(path,value,0,false)

   printLog("Pub "..path.." returned "..res);
   return res
 end
   printLog("Pub "..path.." returned "..res);
   return res
 end


@@ -185,7 +183,7 @@ function process_packet(packet)
         
     if not pcall(mqtt_pub,mqtt_path,dump(packet)) then
       printLog('Reconnecting MQTT...')
         
     if not pcall(mqtt_pub,mqtt_path,dump(packet)) then
       printLog('Reconnecting MQTT...')

-      mqtt_client:connect(mqtt_id)
+      mqtt_client:connect(mqtt_host,mqtt_port)

     end
 
   end
     end
 
   end