From 400fe40bcd0b0aaa13830c7e85952b7b0f3c567d Mon Sep 17 00:00:00 2001 From: aniketSaha Date: Wed, 6 Aug 2025 11:03:15 +0200 Subject: [PATCH] Changes for integrating the docking parameters --- classCAN.py | 10 +++++----- main.py | 8 ++------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/classCAN.py b/classCAN.py index a1b4ed6..550efc2 100644 --- a/classCAN.py +++ b/classCAN.py @@ -211,12 +211,12 @@ class CANBackend: }) # ========== Docking Parameters ========== - elif cob_id == 0x2AC and len(data) >= 2: + elif cob_id == 0x2AC and len(data) >= 8: 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'), - "TankLevel": int.from_bytes(data[6:8], 'little'), + "Ploop_sp": int.from_bytes(data[0:2], 'little') / 1.0, + "Pdilute_sp": int.from_bytes(data[2:4], 'little') / 1.0, + "Qdrain_sp": int.from_bytes(data[4:6], 'little') / 1.0, + "TankLevel": int.from_bytes(data[6:8], 'little') / 1.0, }) elif cob_id == 0x2B3 and len(data) >= 8: diff --git a/main.py b/main.py index a27282a..f5772f6 100644 --- a/main.py +++ b/main.py @@ -277,12 +277,8 @@ async def update_latest_data(): @app.get("/monitor") -async def get_monitor_data(pu_number: Optional[float] = Query(None)): - if pu_number is not None: - return latest_data.get(f"PU_{pu_number}", {}) - else: - # print(latest_data) - return latest_data +async def get_monitor_data(): + return JSONResponse(content=latest_data) @app.on_event("startup")