Merge branch 'master' of rvb.name:openhab-process

diff --git a/mqtt-bt/scan-beacons b/mqtt-bt/scan-beacons
index fd50f9d06acdbd83d3d93f78059b8bb5ca66f630..192539edc60095436776bb9024d504ed2a3db310 100644 (file)
--- a/mqtt-bt/scan-beacons
+++ b/mqtt-bt/scan-beacons
@@ -99,6 +99,10 @@ function trim(s)
   return (s:gsub("^%s*(.-)%s*$", "%1"))
 end
 
+local function starts_with(str, start)
+   return str:sub(1, #start) == start
+end
+
 function mqtt_pub(path,value)
   res=mqtt_client:publish(path,value)
   printLog("Pub "..path.." returned "..res);
@@ -114,11 +118,13 @@ function process_packet(packet)
   local name
 
   mac = packet['Address']
-  uuid = packet['uuid']
+  uuid = packet['UUID']
   type = packet['Type']
   name = packet['Name (complete)']
 
-  if type=='iBeacon' then
+  print(dump(packet))
+
+  if type and starts_with(type,'iBeacon') then
     details=uuid
   elseif name then
     if not(type) then