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

Some refactoring

Browse Source
This commit is contained in:
Etienne Chassaing 2025-08-28 11:51:31 +02:00
parent c8d892ced3
commit fcab8ac473
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
classCAN.py → hardware/classCAN.py
View File

0
patient_skid_functions.py → hardware/patient_skid.py
View File

12
main.py
View File

@ -1,4 +1,4 @@
from fastapi import FastAPI, HTTPException, Query, Form, Depends from fastapi import FastAPI, HTTPException, Form
from fastapi.staticfiles import StaticFiles from fastapi.staticfiles import StaticFiles
from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse from fastapi.responses import HTMLResponse, RedirectResponse, JSONResponse
import logging import logging
@ -11,7 +11,7 @@ from starlette.exceptions import HTTPException as StarletteHTTPException
from starlette.status import HTTP_302_FOUND from starlette.status import HTTP_302_FOUND
import json import json
from pathlib import Path from pathlib import Path
from typing import Optional, Dict, Any from typing import Dict, Any
from fastapi import Query from fastapi import Query
import asyncio import asyncio
import datetime import datetime
@ -19,9 +19,7 @@ import csv
from collections import deque from collections import deque
import numpy as np import numpy as np
import aiohttp import aiohttp
import httpx from hardware.patient_skid import handle_patient_skid_for_idle, set_patient_skid_users
import time
from patient_skid_functions import handle_patient_skid_for_idle, set_patient_skid_users
from serial_manager import SerialConfig, SerialStore, SerialReader from serial_manager import SerialConfig, SerialStore, SerialReader
from protocol_decoder import decode_frames from protocol_decoder import decode_frames
@ -31,7 +29,7 @@ if platform.system() in ["Darwin"]: # macOS or Windows
from MockCAN import CANBackend from MockCAN import CANBackend
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
else: else:
from classCAN import CANBackend # Your real backend from hardware.classCAN import CANBackend # Your real backend
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
logging.getLogger("uvicorn.access").setLevel(logging.WARNING) logging.getLogger("uvicorn.access").setLevel(logging.WARNING)
@ -289,7 +287,6 @@ def expand_pu_number(pu_number: int) -> list[int]:
return [pu_number] if pu_number != 3 else [1, 2] return [pu_number] if pu_number != 3 else [1, 2]
def send_command_to_pu( def send_command_to_pu(
pu: int, state: str, ploop_setpoint: float, qperm_setpoint: float pu: int, state: str, ploop_setpoint: float, qperm_setpoint: float
) -> dict: ) -> dict:
@ -493,7 +490,6 @@ async def set_patients_with_delay(count: int, delay_s: int):
logging.info(f"[AUTO TEST] Sending {count} patients to patient skid after {delay_s}s") logging.info(f"[AUTO TEST] Sending {count} patients to patient skid after {delay_s}s")
set_patient_skid_users(count) set_patient_skid_users(count)
from fastapi import Query, Path
@router.post("/test/auto/{pu_number}") @router.post("/test/auto/{pu_number}")
async def auto_test(pu_number: int ): async def auto_test(pu_number: int ):