Progress on Basic ID type 1

drip-general-master/bluetooth/beacon_2.py

@@ -181,8 +181,6 @@ def manifest_broadcast(HostID: HostIdentity, flight_id, exp_date, prev_loc = ""
 def broadcast_basic_id_1(hhit):
     print("basic_id_1")
 
-    hhit_suite_id
-
     """
     Serial Number = MFR Code | Length Code | MFR SN
     MFR Code = ICAO MFR Code
@@ -190,8 +188,12 @@ def broadcast_basic_id_1(hhit):
     MFR SN = HHIT Suite ID | ORCHID hash left-padded with 3 bits of zeros and encoded into 15 characters
     """
     MFR_code = "8653"
-    MFR_SN = encode(hhit_suite_id, ORCHID_hash)
-    serial_number = f"{MFR_code} 0xF "
+
+    hhit_suite_id = '0' * 3 + unhexlify(hhit)[-72:-65]
+    ORCHID_hash = unhexlify(hhit)[-64:]
+    MFR_SN = encode(hhit_suite_id + ORCHID_hash)
+
+    serial_number = f"{MFR_code} 0xF {MFR_SN}"
 
     # Set (Extended) Advertising Command
     if is_wifi: