Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prmac implementation #187

Merged
merged 2 commits into from
Dec 18, 2023
Merged

prmac implementation #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0faf830
prmac implementation
DigiH Dec 17, 2023
178cd10
process_prmacs in separate method
DigiH Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions TheengsGateway/ble_gateway.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,11 @@ def decode_advertisement(

if decoded_json:
decoded_json = json.loads(decoded_json)

decoded_json = self.process_prmacs(
decoded_json,
)

# Only process if the device is not a random mac address
if decoded_json["type"] != "RMAC":
# Only add manufacturer if device is compliant and no beacon
Expand Down Expand Up @@ -493,6 +498,20 @@ def decode_advertisement(
add_manufacturer(data_json, company_id)
self.publish_json(data_json, decoded=False)

def process_prmacs(
self,
decoded_json: DataJSONType,
) -> DataJSONType:
"""Process potential RMACs."""
if "prmac" in decoded_json:
address = decoded_json.get("id")
if address in self.configuration["identities"]:
decoded_json.pop("prmac", None)
else:
decoded_json["type"] = "RMAC"

return decoded_json

def publish_json(
self,
data_json: DataJSONType,
Expand Down