In process of adding parsers for other MQTT formats
This commit is contained in:
NucBox_EVO-X2\robert
parent
e22c41e20a
commit
375096e303
@ -12,7 +12,7 @@ functions:
|
|||||||
read_timeout: "1h"
|
read_timeout: "1h"
|
||||||
write_timeout: "1h"
|
write_timeout: "1h"
|
||||||
exec_timeout: "1h"
|
exec_timeout: "1h"
|
||||||
|
max_inflight: 16
|
||||||
# RabbitMQ configuration
|
# RabbitMQ configuration
|
||||||
RABBITMQ_URL: "amqp://well_pipe:wellnuo_2024@192.168.68.70:5672//"
|
RABBITMQ_URL: "amqp://well_pipe:wellnuo_2024@192.168.68.70:5672//"
|
||||||
RABBITMQ_QUEUE: "evgrid-dev-demo"
|
RABBITMQ_QUEUE: "evgrid-dev-demo"
|
||||||
|
|||||||
477
src/app.py
477
src/app.py
@ -78,6 +78,9 @@ PROCESSING_PERIOD = int(os.getenv('PROCESSING_PERIOD', '300')) # 5 minutes
|
|||||||
QUEUE_LENGTH_THRESHOLD = int(os.getenv('QUEUE_LENGTH_THRESHOLD', '1000'))
|
QUEUE_LENGTH_THRESHOLD = int(os.getenv('QUEUE_LENGTH_THRESHOLD', '1000'))
|
||||||
redis_host = os.getenv('REDIS_HOST', '192.168.68.70')
|
redis_host = os.getenv('REDIS_HOST', '192.168.68.70')
|
||||||
redis_host = '192.168.68.70'
|
redis_host = '192.168.68.70'
|
||||||
|
#in debugger:
|
||||||
|
#redis_host = '127.0.0.1'
|
||||||
|
|
||||||
cache_dir = "cache"
|
cache_dir = "cache"
|
||||||
MQTTSERVER = os.getenv('MQTTSERVER', "mqtt.eluxnetworks.net") #"mqtt.eluxnetworks.net"
|
MQTTSERVER = os.getenv('MQTTSERVER', "mqtt.eluxnetworks.net") #"mqtt.eluxnetworks.net"
|
||||||
mqtt_port = int(os.getenv('MQTT_PORT', "8883")) # TLS port
|
mqtt_port = int(os.getenv('MQTT_PORT', "8883")) # TLS port
|
||||||
@ -98,12 +101,10 @@ logger.info(f"DB_HOST= {DB_HOST}")
|
|||||||
logger.info(f"DB_PORT= {DB_PORT}")
|
logger.info(f"DB_PORT= {DB_PORT}")
|
||||||
logger.info(f"PROCESSING_PERIOD= {PROCESSING_PERIOD}")
|
logger.info(f"PROCESSING_PERIOD= {PROCESSING_PERIOD}")
|
||||||
logger.info(f"QUEUE_LENGTH_THRESHOLD= {QUEUE_LENGTH_THRESHOLD}")
|
logger.info(f"QUEUE_LENGTH_THRESHOLD= {QUEUE_LENGTH_THRESHOLD}")
|
||||||
logger.info(f"QUEUE_LENGTH_THRESHOLD= {QUEUE_LENGTH_THRESHOLD}")
|
|
||||||
logger.info(f"BATCH_SIZE= {BATCH_SIZE}")
|
logger.info(f"BATCH_SIZE= {BATCH_SIZE}")
|
||||||
|
|
||||||
logger.info(f"mqtt_port= {mqtt_port}")
|
logger.info(f"mqtt_port= {mqtt_port}")
|
||||||
logger.info(f"MQTT_CLIENT_ID= {mqtt_client_id}")
|
logger.info(f"MQTT_CLIENT_ID= {mqtt_client_id}")
|
||||||
logger.info(f"MQTT_CLIENT_ID= {mqtt_client_id}")
|
|
||||||
logger.info(f"QUEUE_NAME= {QUEUE_NAME}")
|
logger.info(f"QUEUE_NAME= {QUEUE_NAME}")
|
||||||
logger.info(f"RABBITMQ_URL= {RABBITMQ_URL}")
|
logger.info(f"RABBITMQ_URL= {RABBITMQ_URL}")
|
||||||
|
|
||||||
@ -260,7 +261,7 @@ def connect_mqtt(client_id):
|
|||||||
if rc == 0:
|
if rc == 0:
|
||||||
connected = True
|
connected = True
|
||||||
print(f"Connected to {MQTTSERVER} with {unique_client_id}")
|
print(f"Connected to {MQTTSERVER} with {unique_client_id}")
|
||||||
subbedTo = [("/w",1),("wellnuotopics/topic1",1),("/faws",1)]
|
subbedTo = [("/w",1),("wellnuotopics/topic1",1),("/faws",1),("mesh/#",1)]
|
||||||
print("subscribing to ", subbedTo)
|
print("subscribing to ", subbedTo)
|
||||||
client.subscribe(subbedTo)
|
client.subscribe(subbedTo)
|
||||||
else:
|
else:
|
||||||
@ -462,7 +463,7 @@ def process_messages(connection, db_conn):
|
|||||||
# Basic QoS with all required parameters
|
# Basic QoS with all required parameters
|
||||||
channel.basic_qos(
|
channel.basic_qos(
|
||||||
prefetch_size=0,
|
prefetch_size=0,
|
||||||
prefetch_count=1,
|
prefetch_count=100,
|
||||||
a_global=False
|
a_global=False
|
||||||
)
|
)
|
||||||
logger.info("Basic QoS set")
|
logger.info("Basic QoS set")
|
||||||
@ -500,6 +501,11 @@ def process_messages(connection, db_conn):
|
|||||||
#logger.info(f"Properties: {msg.properties}")
|
#logger.info(f"Properties: {msg.properties}")
|
||||||
#logger.info(f"Body type: {type(msg.body)}")
|
#logger.info(f"Body type: {type(msg.body)}")
|
||||||
#logger.info(f"Body length: {len(msg.body) if msg.body else 0}")
|
#logger.info(f"Body length: {len(msg.body) if msg.body else 0}")
|
||||||
|
is_mesh = False
|
||||||
|
topic = ""
|
||||||
|
if "mesh" in msg.body:
|
||||||
|
topic = json.loads(msg.body)["subject"]
|
||||||
|
is_mesh = True
|
||||||
|
|
||||||
if isinstance(msg.body, (bytes, bytearray)):
|
if isinstance(msg.body, (bytes, bytearray)):
|
||||||
hex_dump = ' '.join(f'{b:02x}' for b in msg.body[:32])
|
hex_dump = ' '.join(f'{b:02x}' for b in msg.body[:32])
|
||||||
@ -517,7 +523,7 @@ def process_messages(connection, db_conn):
|
|||||||
|
|
||||||
with PROCESSING_TIME.time():
|
with PROCESSING_TIME.time():
|
||||||
with db_conn.cursor() as cursor:
|
with db_conn.cursor() as cursor:
|
||||||
data_type, parsed_data = process_message_data(cursor, data)
|
data_type, parsed_data = process_message_data(cursor, data, is_mesh, topic)
|
||||||
if data_type and parsed_data:
|
if data_type and parsed_data:
|
||||||
#logger.info(f"Successfully processed as {data_type}")
|
#logger.info(f"Successfully processed as {data_type}")
|
||||||
|
|
||||||
@ -527,6 +533,8 @@ def process_messages(connection, db_conn):
|
|||||||
parsed_data_mqtt["temperature"] = parsed_data["temperature"] + temperature_offset
|
parsed_data_mqtt["temperature"] = parsed_data["temperature"] + temperature_offset
|
||||||
parsed_data_mqtt["humidity"] = parsed_data["humidity"] + humidity_offset
|
parsed_data_mqtt["humidity"] = parsed_data["humidity"] + humidity_offset
|
||||||
|
|
||||||
|
if parsed_data["device_id"] == 679:
|
||||||
|
print("stop")
|
||||||
MQSend("/"+ids2MAC[parsed_data["device_id"]], json.dumps(parsed_data_mqtt))
|
MQSend("/"+ids2MAC[parsed_data["device_id"]], json.dumps(parsed_data_mqtt))
|
||||||
if data_type in data_batches:
|
if data_type in data_batches:
|
||||||
data_batches[data_type].append(parsed_data)
|
data_batches[data_type].append(parsed_data)
|
||||||
@ -903,7 +911,8 @@ def GetLastDetected(device_id, field_name, threshold_value):
|
|||||||
cur.execute(query)
|
cur.execute(query)
|
||||||
record = cur.fetchone()
|
record = cur.fetchone()
|
||||||
if record != None:
|
if record != None:
|
||||||
last_detected = cur.fetchone()[0].timestamp()
|
last_detected = record[0].timestamp()
|
||||||
|
#last_detected = cur.fetchone()[0].timestamp()
|
||||||
|
|
||||||
|
|
||||||
return last_detected
|
return last_detected
|
||||||
@ -982,10 +991,16 @@ def UpdateLastSeen(new_message_dict):
|
|||||||
radar_val = sum(new_message_dict['radar'][1][3:9]) / new_message_dict['radar'][1][0]
|
radar_val = sum(new_message_dict['radar'][1][3:9]) / new_message_dict['radar'][1][0]
|
||||||
elif component[0] == "s":
|
elif component[0] == "s":
|
||||||
component_index = ast.literal_eval(component[1])
|
component_index = ast.literal_eval(component[1])
|
||||||
radar_val = new_message_dict['radar'][1][1 + component_index] / new_message_dict['radar'][1][0]
|
if new_message_dict['radar'][1][0] > 0:
|
||||||
|
radar_val = new_message_dict['radar'][1][1 + component_index] / new_message_dict['radar'][1][0]
|
||||||
|
else:
|
||||||
|
radar_val = 0
|
||||||
elif component[0] == "m":
|
elif component[0] == "m":
|
||||||
component_index = ast.literal_eval(component[1])
|
component_index = ast.literal_eval(component[1])
|
||||||
radar_val = new_message_dict['radar'][0][5 + component_index] / new_message_dict['radar'][0][0]
|
if new_message_dict['radar'][0][0] > 0:
|
||||||
|
radar_val = new_message_dict['radar'][0][5 + component_index] / new_message_dict['radar'][0][0]
|
||||||
|
else:
|
||||||
|
radar_val = 0
|
||||||
|
|
||||||
if radar_val > radar_threshold_value: #seen now
|
if radar_val > radar_threshold_value: #seen now
|
||||||
r.set('lastseen_'+device_id_s, new_message_dict['time'])
|
r.set('lastseen_'+device_id_s, new_message_dict['time'])
|
||||||
@ -1002,7 +1017,97 @@ def UpdateLastSeen(new_message_dict):
|
|||||||
logger.error(f"Error: {traceback.format_exc()}")
|
logger.error(f"Error: {traceback.format_exc()}")
|
||||||
logger.error(f"UpdateLastSeen failed: {e}")
|
logger.error(f"UpdateLastSeen failed: {e}")
|
||||||
|
|
||||||
def process_message_data(cursor, body):
|
def get_or_create_device(mac: str) -> int:
|
||||||
|
"""Get ble_id, creating device if needed"""
|
||||||
|
sql = """
|
||||||
|
INSERT INTO ble_devices (mac_address)
|
||||||
|
VALUES (%s)
|
||||||
|
ON CONFLICT (mac_address) DO UPDATE SET mac_address = EXCLUDED.mac_address
|
||||||
|
RETURNING ble_id
|
||||||
|
"""
|
||||||
|
with conn.cursor() as cursor: # or your db connection variable
|
||||||
|
cursor.execute(sql, (mac,))
|
||||||
|
conn.commit() # needed for INSERT
|
||||||
|
return cursor.fetchone()[0]
|
||||||
|
|
||||||
|
def ingest_ble_report(topic: str, payload: dict):
|
||||||
|
"""Process both full and delta reports identically"""
|
||||||
|
reporter_id = payload['id']
|
||||||
|
report_time = datetime.fromtimestamp(payload['time'] / 1000, tz=timezone.utc)
|
||||||
|
|
||||||
|
devices = payload.get('devices', []) if payload['type'] == 'full' else payload.get('changes', [])
|
||||||
|
|
||||||
|
|
||||||
|
for dev in devices:
|
||||||
|
mac = dev['mac']
|
||||||
|
rssi = dev['rssi']
|
||||||
|
alarm_state = dev.get('a_state', 0)
|
||||||
|
|
||||||
|
sighting_time = datetime.fromtimestamp(dev['time'] / 1000, tz=timezone.utc) \
|
||||||
|
if 'time' in dev else report_time
|
||||||
|
|
||||||
|
if is_random_mac(mac):
|
||||||
|
# Option A: Store in separate short-lived table
|
||||||
|
execute("""
|
||||||
|
INSERT INTO ble_random_sightings (mac_address, rssi, alarm_state, sighting_time, reporter_id)
|
||||||
|
VALUES (%s, %s, %s, %s, %s)
|
||||||
|
""", (mac, rssi, alarm_state, sighting_time, reporter_id))
|
||||||
|
continue # Skip main device table
|
||||||
|
|
||||||
|
# Option B: Just skip entirely
|
||||||
|
# continue
|
||||||
|
device_name = dev.get('name') # Only in full reports
|
||||||
|
ble_id = get_or_create_device(mac)
|
||||||
|
# Full reports have per-device timestamp, deltas use report time
|
||||||
|
sighting_time = datetime.fromtimestamp(dev['time'] / 1000, tz=timezone.utc) \
|
||||||
|
if 'time' in dev else report_time
|
||||||
|
|
||||||
|
# 1. Insert to history (always)
|
||||||
|
insert_sighting(mac, rssi, alarm_state, device_name, sighting_time, reporter_id)
|
||||||
|
|
||||||
|
# 2. Upsert current state
|
||||||
|
upsert_device_state(mac, rssi, alarm_state, device_name, sighting_time, reporter_id)
|
||||||
|
|
||||||
|
def upsert_sighting(ble_id: int, rssi: int, alarm_state: int, sighting_time: datetime, reporter_id: int):
|
||||||
|
"""Single query: update if no change, insert if changed"""
|
||||||
|
|
||||||
|
RSSI_THRESHOLD = 5
|
||||||
|
|
||||||
|
execute("""
|
||||||
|
WITH latest AS (
|
||||||
|
SELECT id, rssi, alarm_state
|
||||||
|
FROM ble_sightings
|
||||||
|
WHERE ble_id = %(ble_id)s
|
||||||
|
ORDER BY last_seen DESC
|
||||||
|
LIMIT 1
|
||||||
|
),
|
||||||
|
updated AS (
|
||||||
|
UPDATE ble_sightings s
|
||||||
|
SET last_seen = %(time)s, reporter_id = %(reporter)s
|
||||||
|
FROM latest l
|
||||||
|
WHERE s.id = l.id
|
||||||
|
AND abs(l.rssi - %(rssi)s) < %(threshold)s
|
||||||
|
AND l.alarm_state = %(alarm)s
|
||||||
|
RETURNING s.id
|
||||||
|
)
|
||||||
|
INSERT INTO ble_sightings (ble_id, rssi, alarm_state, first_seen, last_seen, reporter_id)
|
||||||
|
SELECT %(ble_id)s, %(rssi)s, %(alarm)s, %(time)s, %(time)s, %(reporter)s
|
||||||
|
WHERE NOT EXISTS (SELECT 1 FROM updated)
|
||||||
|
AND NOT EXISTS (
|
||||||
|
SELECT 1 FROM latest l
|
||||||
|
WHERE abs(l.rssi - %(rssi)s) < %(threshold)s
|
||||||
|
AND l.alarm_state = %(alarm)s
|
||||||
|
)
|
||||||
|
""", {
|
||||||
|
'ble_id': ble_id,
|
||||||
|
'rssi': rssi,
|
||||||
|
'alarm': alarm_state,
|
||||||
|
'time': sighting_time,
|
||||||
|
'reporter': reporter_id,
|
||||||
|
'threshold': RSSI_THRESHOLD
|
||||||
|
})
|
||||||
|
|
||||||
|
def process_message_data(cursor, body, is_mesh, topic):
|
||||||
|
|
||||||
global MACS2id, ids2MAC
|
global MACS2id, ids2MAC
|
||||||
"""Process a single message from the queue."""
|
"""Process a single message from the queue."""
|
||||||
@ -1012,6 +1117,8 @@ def process_message_data(cursor, body):
|
|||||||
else:
|
else:
|
||||||
data = json.loads(body)
|
data = json.loads(body)
|
||||||
|
|
||||||
|
#print(decrypt_data)
|
||||||
|
|
||||||
if "data_base64" in data:
|
if "data_base64" in data:
|
||||||
|
|
||||||
decrypt_data = data["data_base64"]
|
decrypt_data = data["data_base64"]
|
||||||
@ -1022,179 +1129,225 @@ def process_message_data(cursor, body):
|
|||||||
decrypt_data = decrypt_data.decode('utf-8')
|
decrypt_data = decrypt_data.decode('utf-8')
|
||||||
m_type = 0
|
m_type = 0
|
||||||
new_message_dict = {}
|
new_message_dict = {}
|
||||||
#print(decrypt_data)
|
|
||||||
if len(decrypt_data) > 14:
|
if len(decrypt_data) > 14:
|
||||||
|
|
||||||
if "data_base64" in decrypt_data:
|
if "data_base64" in decrypt_data:
|
||||||
data = json.loads(decrypt_data)
|
data = json.loads(decrypt_data)
|
||||||
payload = data["data_base64"]
|
payload = data["data_base64"]
|
||||||
decrypt_data = base64.b64decode(payload)
|
decrypt_data = base64.b64decode(payload)
|
||||||
|
#if data["subject"] != "wellnuotopics/topic1":
|
||||||
|
# print(decrypt_data)
|
||||||
|
if is_mesh:
|
||||||
|
decrypt_dict = json.loads(decrypt_data)
|
||||||
|
if "/full" in topic:
|
||||||
|
#{'id': 704, 'time': 1768070305983, 'seq': 8662, 'type': 'full', 'packet': 2, 'packets': 2, 'dev_count': 14,
|
||||||
|
# 'devices': [
|
||||||
|
# {'mac': '44:AC:AE:BD:95:22', 'rssi': -89, 'a_state': 255, 'time': 1768070302720},
|
||||||
|
# {'mac': '6D:B9:B5:A5:0D:C6', 'rssi': -62, 'a_state': 255, 'time': 1768070303820},
|
||||||
|
# {'mac': '38:CB:8F:DC:A8:13', 'rssi': -81, 'a_state': 255, 'time': 1768070252414},
|
||||||
|
# {'mac': 'A4:C1:38:BE:3D:94', 'rssi': -77, 'a_state': 255, 'time': 1768070300456, 'name': 'NVIDIA SHIELD Remote'},
|
||||||
|
# {'mac': '1C:67:76:B7:B5:5D', 'rssi': -83, 'a_state': 255, 'time': 1768070304506},
|
||||||
|
# {'mac': 'E2:25:91:41:CB:4C', 'rssi': -71, 'a_state': 255, 'time': 1768070303194},
|
||||||
|
# {'mac': 'EF:A5:A3:05:81:B4', 'rssi': -83, 'a_state': 255, 'time': 1768070206193, 'name': '20123099999'},
|
||||||
|
# {'mac': '15:E9:FB:C0:75:04', 'rssi': -63, 'a_state': 255, 'time': 1768070304705},
|
||||||
|
# {'mac': '50:21:8C:20:35:27', 'rssi': -96, 'a_state': 255, 'time': 1768070257700},
|
||||||
|
# {'mac': '64:B7:08:89:08:9A', 'rssi': -97, 'a_state': 255, 'time': 1768070236446, 'name': 'WP_238_890898'},
|
||||||
|
# {'mac': '33:C1:E9:DC:28:03', 'rssi': -85, 'a_state': 255, 'time': 1768070303919},
|
||||||
|
# {'mac': 'BC:57:29:05:EF:CF', 'rssi': -79, 'a_state': 255, 'time': 1768070300787, 'name': 'KBPro_472435'},
|
||||||
|
# {'mac': 'E0:92:95:25:C2:90', 'rssi': -89, 'a_state': 255, 'time': 1768070304907},
|
||||||
|
# {'mac': '78:03:D9:36:82:4A', 'rssi': -96, 'a_state': 255, 'time': 1768070304915}]}
|
||||||
|
devices = decrypt_dict["devices"]
|
||||||
|
for device in devices:
|
||||||
|
print(device)
|
||||||
|
#upsert_sighting(ble_id: int, rssi: int, alarm_state: int, sighting_time: datetime, reporter_id: int)
|
||||||
|
ble_id = get_or_create_device(device['mac'])
|
||||||
|
sighting_time = datetime.fromtimestamp(device['time'] / 1000, tz=timezone.utc)
|
||||||
|
upsert_sighting(
|
||||||
|
ble_id=ble_id,
|
||||||
|
rssi=device['rssi'],
|
||||||
|
alarm_state=device.get('a_state', 0),
|
||||||
|
sighting_time=sighting_time,
|
||||||
|
reporter_id=decrypt_dict['id']
|
||||||
|
)
|
||||||
|
|
||||||
if len(decrypt_data) > 14:
|
print(decrypt_dict)
|
||||||
pointer = 0
|
elif "/delta" in topic:
|
||||||
lenn = 4
|
print(decrypt_dict)
|
||||||
#print ("")
|
elif "mesh/topology/summary" in topic:
|
||||||
seconds = struct.unpack('<L', decrypt_data[pointer:pointer+lenn])[0]
|
print(decrypt_dict)
|
||||||
pointer = pointer + lenn
|
elif "mesh/topology/node/" in topic:
|
||||||
useconds = struct.unpack('<L', decrypt_data[pointer:pointer+lenn])[0]
|
print(decrypt_dict)
|
||||||
pointer = pointer + lenn
|
elif "mesh/topology/links/" in topic:
|
||||||
lenn = 6
|
print(decrypt_dict)
|
||||||
MAC = decrypt_data[pointer:pointer+lenn].hex().upper()
|
|
||||||
#logging.info(MAC)
|
|
||||||
|
|
||||||
pointer = pointer + lenn
|
|
||||||
lenn = 4
|
|
||||||
GROUP = struct.unpack('<L', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
|
|
||||||
pointer = pointer + lenn
|
|
||||||
|
|
||||||
packet_time = float(seconds+useconds/1000000)
|
|
||||||
this_time = time.localtime(packet_time)
|
|
||||||
year = this_time[0]
|
|
||||||
month = this_time[1]
|
|
||||||
day = this_time[2]
|
|
||||||
hour = this_time[3]
|
|
||||||
minute = this_time[4]
|
|
||||||
|
|
||||||
#YMDHm_str = time.strftime('%Y-%m-%d_%H-%M', this_time)
|
|
||||||
#minute_in_day = 60*hour + minute
|
|
||||||
#lets populate report structure
|
|
||||||
#new_message_dict = {"time":packet_time, "temperature":0, "humidity":0, "light":0, "pressure":0, "smell":[], "radar":[]}
|
|
||||||
if MAC in MACS2id:
|
|
||||||
device_id = MACS2id[MAC]
|
|
||||||
else:
|
|
||||||
device_id = GetIdFromMAC(cursor, MAC)
|
|
||||||
MACS2id[MAC] = device_id
|
|
||||||
ids2MAC[device_id] = MAC
|
|
||||||
|
|
||||||
if device_id > 0:
|
|
||||||
|
|
||||||
|
|
||||||
new_message_dict = {"time":packet_time, "device_id":device_id}
|
else:
|
||||||
|
if len(decrypt_data) > 14:
|
||||||
|
pointer = 0
|
||||||
|
lenn = 4
|
||||||
|
#print ("")
|
||||||
|
seconds = struct.unpack('<L', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
pointer = pointer + lenn
|
||||||
|
useconds = struct.unpack('<L', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
pointer = pointer + lenn
|
||||||
|
lenn = 6
|
||||||
|
MAC = decrypt_data[pointer:pointer+lenn].hex().upper()
|
||||||
|
#logging.info(MAC)
|
||||||
|
|
||||||
line_entry = str(packet_time)
|
pointer = pointer + lenn
|
||||||
dcr_l = len(decrypt_data)
|
lenn = 4
|
||||||
lenn_1 = 1
|
GROUP = struct.unpack('<L', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
|
||||||
message_type = struct.unpack('<b', decrypt_data[pointer:pointer+lenn_1])[0]
|
pointer = pointer + lenn
|
||||||
|
|
||||||
#print(message_type, pointer, dcr_l)
|
packet_time = float(seconds+useconds/1000000)
|
||||||
if message_type > 0:
|
this_time = time.localtime(packet_time)
|
||||||
st = time.time()
|
year = this_time[0]
|
||||||
if message_type == 16: #Radar message
|
month = this_time[1]
|
||||||
|
day = this_time[2]
|
||||||
|
hour = this_time[3]
|
||||||
|
minute = this_time[4]
|
||||||
|
|
||||||
if MAC == "10061C15C330":
|
#YMDHm_str = time.strftime('%Y-%m-%d_%H-%M', this_time)
|
||||||
print("Stop")
|
#minute_in_day = 60*hour + minute
|
||||||
|
#lets populate report structure
|
||||||
|
#new_message_dict = {"time":packet_time, "temperature":0, "humidity":0, "light":0, "pressure":0, "smell":[], "radar":[]}
|
||||||
|
if MAC in MACS2id:
|
||||||
|
device_id = MACS2id[MAC]
|
||||||
|
else:
|
||||||
|
device_id = GetIdFromMAC(cursor, MAC)
|
||||||
|
MACS2id[MAC] = device_id
|
||||||
|
ids2MAC[device_id] = MAC
|
||||||
|
|
||||||
m_type = "radar"
|
if device_id > 0:
|
||||||
#counter, no targets, moving targets, stationary targets, both, 9 moving gates energy
|
|
||||||
#counter, 9 stationary gates energy
|
|
||||||
pointer = pointer + lenn_1
|
|
||||||
motion_energy = [0] * 14
|
|
||||||
stationary_energy = [0] * 10
|
|
||||||
#print("@1",time.time()-st)
|
|
||||||
lenn = 2
|
|
||||||
for i in range(14):
|
|
||||||
V = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
motion_energy[i] = V
|
|
||||||
pointer = pointer + lenn
|
|
||||||
for i in range(10):
|
|
||||||
V = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
stationary_energy[i] = V
|
|
||||||
pointer = pointer + lenn
|
|
||||||
|
|
||||||
new_message_dict["radar"] = [motion_energy, stationary_energy]
|
|
||||||
UpdateLastSeen(new_message_dict)
|
|
||||||
lenn = 1
|
|
||||||
pointer = pointer + lenn
|
|
||||||
|
|
||||||
elif message_type == 17 or (message_type >= 0x20 and message_type <= 0x2F): #Sensors message
|
|
||||||
#work_dict = dict(common_dict)
|
|
||||||
#print("@4",time.time()-st)
|
|
||||||
m_type = "sensors"
|
|
||||||
pointer = pointer + lenn_1
|
|
||||||
|
|
||||||
lenn = 4
|
|
||||||
P = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
pointer = pointer + lenn
|
|
||||||
T = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
pointer = pointer + lenn
|
|
||||||
lenn = 2
|
|
||||||
L = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
pointer = pointer + lenn
|
|
||||||
lenn = 4
|
|
||||||
H = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
pointer = pointer + lenn
|
|
||||||
|
|
||||||
lenn = 1
|
|
||||||
dp = struct.unpack('<b', decrypt_data[pointer:pointer+lenn])[0]
|
|
||||||
pointer = pointer + lenn
|
|
||||||
|
|
||||||
new_message_dict["temperature"] = T
|
|
||||||
new_message_dict["humidity"] = H
|
|
||||||
new_message_dict["light"] = L
|
|
||||||
new_message_dict["pressure"] = P
|
|
||||||
|
|
||||||
|
|
||||||
#logging.info(str(packet_time))
|
new_message_dict = {"time":packet_time, "device_id":device_id}
|
||||||
#logging.info("P:"+str(P))
|
|
||||||
#logging.info("T:"+str(T))
|
line_entry = str(packet_time)
|
||||||
#logging.info("L:"+str(L))
|
dcr_l = len(decrypt_data)
|
||||||
#logging.info("H:"+str(H))
|
lenn_1 = 1
|
||||||
S=[0,0,0,0,0,0,0,0,0,0]
|
|
||||||
for index in range(dp):
|
message_type = struct.unpack('<b', decrypt_data[pointer:pointer+lenn_1])[0]
|
||||||
|
|
||||||
|
#print(message_type, pointer, dcr_l)
|
||||||
|
if message_type > 0:
|
||||||
|
st = time.time()
|
||||||
|
if message_type == 16: #Radar message
|
||||||
|
|
||||||
|
if MAC == "10061C15C330":
|
||||||
|
print("Stop")
|
||||||
|
|
||||||
|
m_type = "radar"
|
||||||
|
#counter, no targets, moving targets, stationary targets, both, 9 moving gates energy
|
||||||
|
#counter, 9 stationary gates energy
|
||||||
|
pointer = pointer + lenn_1
|
||||||
|
motion_energy = [0] * 14
|
||||||
|
stationary_energy = [0] * 10
|
||||||
|
#print("@1",time.time()-st)
|
||||||
|
lenn = 2
|
||||||
|
for i in range(14):
|
||||||
|
V = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
motion_energy[i] = V
|
||||||
|
pointer = pointer + lenn
|
||||||
|
for i in range(10):
|
||||||
|
V = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
stationary_energy[i] = V
|
||||||
|
pointer = pointer + lenn
|
||||||
|
|
||||||
|
new_message_dict["radar"] = [motion_energy, stationary_energy]
|
||||||
|
UpdateLastSeen(new_message_dict)
|
||||||
lenn = 1
|
lenn = 1
|
||||||
smell_index = struct.unpack('<B', decrypt_data[pointer:pointer+lenn])[0]
|
pointer = pointer + lenn
|
||||||
if index == 0:
|
|
||||||
message_type = smell_index
|
elif message_type == 17 or (message_type >= 0x20 and message_type <= 0x2F): #Sensors message
|
||||||
|
#work_dict = dict(common_dict)
|
||||||
|
#print("@4",time.time()-st)
|
||||||
|
m_type = "sensors"
|
||||||
|
pointer = pointer + lenn_1
|
||||||
|
|
||||||
|
lenn = 4
|
||||||
|
P = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
pointer = pointer + lenn
|
||||||
|
T = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
pointer = pointer + lenn
|
||||||
|
lenn = 2
|
||||||
|
L = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
pointer = pointer + lenn
|
pointer = pointer + lenn
|
||||||
lenn = 4
|
lenn = 4
|
||||||
smell_value = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
H = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
pointer = pointer + lenn
|
pointer = pointer + lenn
|
||||||
#logging.info("I:"+str(smell_index))
|
|
||||||
#logging.info("S:"+str(smell_value))
|
lenn = 1
|
||||||
S[smell_index - message_type] = smell_value
|
dp = struct.unpack('<b', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
#work_dict['pressure_r'] = reason
|
pointer = pointer + lenn
|
||||||
new_message_dict["smell"] = S
|
|
||||||
elif message_type == 1: #pressure event
|
new_message_dict["temperature"] = T
|
||||||
m_type = "pressure"
|
new_message_dict["humidity"] = H
|
||||||
print(f"{m_type} event detected")
|
new_message_dict["light"] = L
|
||||||
#print("@7",time.time()-st)
|
new_message_dict["pressure"] = P
|
||||||
pointer = pointer + lenn_1
|
|
||||||
lenn = 4
|
|
||||||
P = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
#logging.info(str(packet_time))
|
||||||
#we are not interested at changes larger than 100!
|
#logging.info("P:"+str(P))
|
||||||
if P > 100:
|
#logging.info("T:"+str(T))
|
||||||
P = 100
|
#logging.info("L:"+str(L))
|
||||||
new_message_dict["pressure"] = P
|
#logging.info("H:"+str(H))
|
||||||
pointer = pointer + lenn
|
S=[0,0,0,0,0,0,0,0,0,0]
|
||||||
elif message_type == 2: #temperature event
|
for index in range(dp):
|
||||||
m_type = "temperature"
|
lenn = 1
|
||||||
print(f"{m_type} event detected")
|
smell_index = struct.unpack('<B', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
pointer = pointer + lenn_1
|
if index == 0:
|
||||||
lenn = 4
|
message_type = smell_index
|
||||||
T = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
pointer = pointer + lenn
|
||||||
new_message_dict["temperature"] = T
|
lenn = 4
|
||||||
pointer = pointer + lenn
|
smell_value = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
elif message_type == 3: #humidity event
|
pointer = pointer + lenn
|
||||||
m_type = "humidity"
|
#logging.info("I:"+str(smell_index))
|
||||||
print(f"{m_type} event detected")
|
#logging.info("S:"+str(smell_value))
|
||||||
#print("@12",time.time()-st)
|
S[smell_index - message_type] = smell_value
|
||||||
pointer = pointer + lenn_1
|
#work_dict['pressure_r'] = reason
|
||||||
lenn = 4
|
new_message_dict["smell"] = S
|
||||||
H = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
elif message_type == 1: #pressure event
|
||||||
new_message_dict["humidity"] = H
|
m_type = "pressure"
|
||||||
pointer = pointer + lenn
|
print(f"{m_type} event detected")
|
||||||
elif message_type == 4: #light event
|
#print("@7",time.time()-st)
|
||||||
m_type = "light"
|
pointer = pointer + lenn_1
|
||||||
print(f"{m_type} event detected")
|
lenn = 4
|
||||||
pointer = pointer + lenn_1
|
P = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
lenn = 2
|
#we are not interested at changes larger than 100!
|
||||||
L = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
if P > 100:
|
||||||
new_message_dict["light"] = L
|
P = 100
|
||||||
pointer = pointer + lenn
|
new_message_dict["pressure"] = P
|
||||||
else:
|
pointer = pointer + lenn
|
||||||
pass
|
elif message_type == 2: #temperature event
|
||||||
|
m_type = "temperature"
|
||||||
|
print(f"{m_type} event detected")
|
||||||
|
pointer = pointer + lenn_1
|
||||||
|
lenn = 4
|
||||||
|
T = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
new_message_dict["temperature"] = T
|
||||||
|
pointer = pointer + lenn
|
||||||
|
elif message_type == 3: #humidity event
|
||||||
|
m_type = "humidity"
|
||||||
|
print(f"{m_type} event detected")
|
||||||
|
#print("@12",time.time()-st)
|
||||||
|
pointer = pointer + lenn_1
|
||||||
|
lenn = 4
|
||||||
|
H = struct.unpack('<f', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
new_message_dict["humidity"] = H
|
||||||
|
pointer = pointer + lenn
|
||||||
|
elif message_type == 4: #light event
|
||||||
|
m_type = "light"
|
||||||
|
print(f"{m_type} event detected")
|
||||||
|
pointer = pointer + lenn_1
|
||||||
|
lenn = 2
|
||||||
|
L = struct.unpack('<H', decrypt_data[pointer:pointer+lenn])[0]
|
||||||
|
new_message_dict["light"] = L
|
||||||
|
pointer = pointer + lenn
|
||||||
|
else:
|
||||||
|
pass
|
||||||
else:
|
else:
|
||||||
m_type = 0
|
m_type = 0
|
||||||
new_message_dict = {}
|
new_message_dict = {}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user