From 9ae9e3c4ad34b25bb6950e6262ab29d08a9f0b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C3=B6rsty?= Date: Sat, 3 Mar 2018 12:40:58 +0100 Subject: [PATCH] Tags werden nicht korrekt an MS gesendet / Lugbuttontexte fehlen -Tags werden nicht korrekt an MS gesendet (Fixes #26) -Log Statusbuttontexte fehlen (Fixes #27) --- plugin.cfg | 2 +- prerelease.cfg | 6 +++--- webfrontend/htmlauth/bin/blescan.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin.cfg b/plugin.cfg index 10cbfff..3a01d93 100644 --- a/plugin.cfg +++ b/plugin.cfg @@ -10,7 +10,7 @@ NAME=Christian Woerstenfeld EMAIL=git@loxberry.woerstenfeld.de [PLUGIN] -VERSION=v2018.2.28 +VERSION=v2018.3.3 NAME=BLE-Scanner FOLDER=ble_scanner TITLE=BLE-Scanner diff --git a/prerelease.cfg b/prerelease.cfg index 7a557fb..6267ff4 100644 --- a/prerelease.cfg +++ b/prerelease.cfg @@ -6,10 +6,10 @@ # If your plugin offers automatic updates, please enable the following option. # Version of the new release -VERSION=v2018.2.28 +VERSION=v2018.3.3 # Download URL of the ZIP Archive -ARCHIVEURL=https://github.com/Woersty/LoxBerry-Plugin-BLE-Scanner/archive/v2018.2.28.zip +ARCHIVEURL=https://github.com/Woersty/LoxBerry-Plugin-BLE-Scanner/archive/v2018.3.3.zip # URL for further information about this release -INFOURL=https://github.com/Woersty/LoxBerry-Plugin-BLE-Scanner/releases/tag/v2018.2.28 +INFOURL=https://github.com/Woersty/LoxBerry-Plugin-BLE-Scanner/releases/tag/v2018.3.3 diff --git a/webfrontend/htmlauth/bin/blescan.py b/webfrontend/htmlauth/bin/blescan.py index 4ccb1bb..ad732fc 100644 --- a/webfrontend/htmlauth/bin/blescan.py +++ b/webfrontend/htmlauth/bin/blescan.py @@ -197,7 +197,7 @@ def parse_events(sock, loop_count=10): rssi, = struct.unpack("b", pkt[report_pkt_offset -1]) conn = sqlite3.connect('/tmp/ble_scanner.dat') c = conn.cursor() - sql = "REPLACE INTO `ble_scanner` (MAC,rssi,Timestamp) VALUES ('" + packed_bdaddr_to_string(pkt[report_pkt_offset + 3:report_pkt_offset + 9]) + "','" + str(rssi) + "',CURRENT_TIMESTAMP);" + sql = "REPLACE INTO `ble_scanner` (MAC,rssi,Timestamp) VALUES ('" + packed_bdaddr_to_string(pkt[report_pkt_offset + 3:report_pkt_offset + 9]) + "','" + "-" + str(abs(rssi)) + "',CURRENT_TIMESTAMP);" if (LOGLEVEL >= 6): sys.stdout = open(logfile, "a") print str(datetime.datetime.now()) + " [Python] SQLite:", sql