aniketSaha/NorthStar-HMI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added other tpdo variables

Browse Source
This commit is contained in:
aniketSaha 2025-08-06 10:44:35 +02:00
parent 7984e11514
commit 7d2e11a4ce
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classCAN.py
View File

@ -210,11 +210,11 @@ class CANBackend:
"Conductivity_Product" : int.from_bytes(data[5:7], 'little') / 100.0, "Conductivity_Product" : int.from_bytes(data[5:7], 'little') / 100.0,
}) })
print("Conductivity_Product",int.from_bytes(data[5:7], 'little') / 100.0)
# ========== Docking Parameters ========== # ========== Docking Parameters ==========
elif cob_id == 0x2AC and len(data) >= 8: elif cob_id == 0x2AC and len(data) >= 2:
self.latest_data[0].update({ self.latest_data[0].update({
"Ploop_sp": int.from_bytes(data[0:2], 'little'),
"Pdilute_sp": int.from_bytes(data[2:4], 'little'),
"Qdrain_sp": int.from_bytes(data[4:6], 'little'), "Qdrain_sp": int.from_bytes(data[4:6], 'little'),
"TankLevel": int.from_bytes(data[6:8], 'little'), "TankLevel": int.from_bytes(data[6:8], 'little'),
}) })

10
main.py
View File

@ -106,7 +106,7 @@ def format_DS_data(data):
return { return {
"timestamp": datetime.datetime.now().isoformat(), "timestamp": datetime.datetime.now().isoformat(),
"Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1), "Q_conso_filt": np.round(data.get("Qdrain_sp", 0.0), 1),
"TankLevel": np.round(data.get("TankLevel", 0.0), 1), "TankLevel": np.round(data.get("TankLevel", 0.0), 2),
"Qinlet": np.round(data.get("Inlet_flow", 0.0), 1), "Qinlet": np.round(data.get("Inlet_flow", 0.0), 1),
"Qoutlet": np.round(data.get("Outlet_flow", 0.0), 1), "Qoutlet": np.round(data.get("Outlet_flow", 0.0), 1),
@ -253,13 +253,15 @@ def get_pu_status():
async def update_latest_data(): async def update_latest_data():
global active_PUs global active_PUs
while True: while True:
#DS
data = can_backend.get_latest_data(pu_number=0)
latest_data[f"DS"] = format_DS_data(data)
# PUs # PUs
for pu in active_PUs: for pu in active_PUs:
data = can_backend.get_latest_data(pu_number=pu) data = can_backend.get_latest_data(pu_number=pu)
latest_data[f"PU_{pu}"] = format_PU_data(data) latest_data[f"PU_{pu}"] = format_PU_data(data)
#DS
data = can_backend.get_latest_data(pu_number=0)
latest_data[f"DS"] = format_DS_data(data)
logging.debug(f"[MONITOR DS BUFFER] latest_data: {latest_data}") logging.debug(f"[MONITOR DS BUFFER] latest_data: {latest_data}")
await asyncio.sleep(0.05) await asyncio.sleep(0.05)