From 26284f6be98f9798afadf906244503be1a7e33c7 Mon Sep 17 00:00:00 2001
From: younus <yousa991@student.liu.se>
Date: Mon, 28 Nov 2022 14:16:49 +0100
Subject: [PATCH] fixing wifi messages
---
iroha-drip-general-master/bluetooth/beacon.py | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/iroha-drip-general-master/bluetooth/beacon.py b/iroha-drip-general-master/bluetooth/beacon.py
index d124436..e46ea02 100644
--- a/iroha-drip-general-master/bluetooth/beacon.py
+++ b/iroha-drip-general-master/bluetooth/beacon.py
@@ -109,7 +109,7 @@ def location_update(gpsd: GpsPoller, iroha: DripIrohaAccount, flight_id):
)
if is_wifi:
- beacon_wifi(mac_arr, "0x08 0x0037 0x00 0x03 0x01 0x1f 0x1e 0x16 0xfa 0xff 0x0d 0x00 0x10 {payload}".format(payload=payload))
+ beacon_wifi(mac_arr, payload=payload)
else:
# Set (Extended) Advertising command
if is_bt5:
@@ -140,7 +140,7 @@ def basic_id_update(hhit):
print("basic_id_update")
# Set (Extended) Advertising Command
if is_wifi:
- beacon_wifi(mac_arr, "0x08 0x0037 0x00 0x03 0x01 0x1f 0x1e 0x16 0xfa 0xff 0x0d 0x00 0x00 0x42 {} 0x00 0x00 0x00 0x00 0x00 0x00 0x00".format(hhit))
+ beacon_wifi(mac_arr, hhit)
else:
if is_bt5:
"""
@@ -172,9 +172,9 @@ def auth_update(auth_pages, msg_number):
msg = separate_bytes(hexlify(page).decode("utf-8"))
if is_wifi:
if msg_number == 1:
- beacon_wifi(mac_arr, "0x08 0x0037 0x00 0x01 0x01 0x1f 0x1e 0x16 0xfa 0xff 0x0d {} 0x20 {}".format("00", msg))
+ beacon_wifi(mac_arr, msg)
elif msg_number == 2:
- beacon_wifi(mac_arr, "0x08 0x0037 0x00 0x02 0x01 0x1f 0x1e 0x16 0xfa 0xff 0x0d {} 0x20 {}".format("00", msg))
+ beacon_wifi(mac_arr, msg)
else:
# Set (Extended) Advertising Command
if is_bt5:
@@ -326,11 +326,7 @@ def main():
mac = hex(get_mac()) # fetches device mac address
mac_arr = list(bytearray.fromhex(mac[2:])) # converts it into int
- if is_wifi:
- beacon_wifi(mac_arr, "0x03 0x0003")
- beacon_wifi(mac_arr, "0x08 0x0036 0x00 0x00 0x00 0xa0 0x00 0x00 0xa0 0x00 0x00 0x07 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x02 0x7f 0x03 0x00 0x03 0x00 0x00")
- beacon_wifi(mac_arr, "0x08 0x0039 0x01 0x01 0x00 0x00 0x00 0x00")
- else:
+ if not is_wifi:
# Reset bt
subprocess.run("hcitool -i hci0 cmd 0x03 0x0003", shell=True)
--
GitLab