From 224fae39f751fca3bd80f9ea48f53c8056ee2202 Mon Sep 17 00:00:00 2001
From: YuruC3 <yuru.c3@gmail.com>
Date: Sat, 9 Aug 2025 10:53:17 +0200
Subject: [PATCH] checked PC_CONTROL_CODES with mypy

---
 PC_CONTROL_CODE/docker/.gitignore          |  1 +
 PC_CONTROL_CODE/docker/mainDocker.py       | 12 ++++---
 PC_CONTROL_CODE/dockerInflux/.gitignore    |  1 +
 PC_CONTROL_CODE/dockerInflux/mainDocker.py | 38 ++++++++++++----------
 4 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 PC_CONTROL_CODE/docker/.gitignore
 create mode 100644 PC_CONTROL_CODE/dockerInflux/.gitignore

diff --git a/PC_CONTROL_CODE/docker/.gitignore b/PC_CONTROL_CODE/docker/.gitignore
new file mode 100644
index 0000000..6fdd640
--- /dev/null
+++ b/PC_CONTROL_CODE/docker/.gitignore
@@ -0,0 +1 @@
+.mypy_cache
\ No newline at end of file
diff --git a/PC_CONTROL_CODE/docker/mainDocker.py b/PC_CONTROL_CODE/docker/mainDocker.py
index 34dfec1..8d8c619 100644
--- a/PC_CONTROL_CODE/docker/mainDocker.py
+++ b/PC_CONTROL_CODE/docker/mainDocker.py
@@ -95,9 +95,11 @@ def getTemp() -> dict:
                             continue                    
                     # continue
         return MDict
+    else:
+        return {"error": "unidentified"}
 
 
-def setSpeed(inSpeeDict: dict) -> None:
+def setSpeed(inSpeeDict: dict) -> int:
 
     bpavrg = 0
     # default
@@ -109,18 +111,20 @@ def setSpeed(inSpeeDict: dict) -> None:
         outfanprcntg = int((bpavrg / (HIGH_FAN_TRSHD - LOW_FAN_TRSHD)) * TEMP_FACTOR)
         # os.system(f"echo setting {outfanprcntg}%")
 
+        return outfanprcntg
+
     # Set fan speed
     if outfanprcntg >= 20:
         MDserial.write((f"{SETFANCMND} {str(outfanprcntg)} \n\r").encode())  
         print(f"setting {outfanprcntg}%", flush=True)
-        return 0
+        return outfanprcntg
     else:
         # Set default value
         MDserial.write((f"{SETFANCMND} {str(DEFOUTPRCNTG)} \n\r").encode())  
-        return 1
+        return DEFOUTPRCNTG
     
     # If something goes super wrong
-    return -1
+    return 1
 
 
 
diff --git a/PC_CONTROL_CODE/dockerInflux/.gitignore b/PC_CONTROL_CODE/dockerInflux/.gitignore
new file mode 100644
index 0000000..6fdd640
--- /dev/null
+++ b/PC_CONTROL_CODE/dockerInflux/.gitignore
@@ -0,0 +1 @@
+.mypy_cache
\ No newline at end of file
diff --git a/PC_CONTROL_CODE/dockerInflux/mainDocker.py b/PC_CONTROL_CODE/dockerInflux/mainDocker.py
index b0ba3ae..93dddc0 100644
--- a/PC_CONTROL_CODE/dockerInflux/mainDocker.py
+++ b/PC_CONTROL_CODE/dockerInflux/mainDocker.py
@@ -35,19 +35,19 @@ BACKOFFTIME: Final[float] = float(os.getenv("BACKOFFTIME", 5))
 
 # INFLUXDB config
 # token = "apg1gysUeCcxdcRTMmosJTenbEppmUNi9rXlANDB2oNadBdWAu2GVTDc_q_dyo0iyYsckKaOvPRm6ba2NK0y_A=="
-INFLUXTOKEN: Final[str] = os.getenv("INFLUX_TOKEN")
+INFLUXTOKEN: Final[str] = str(os.getenv("INFLUX_TOKEN", "0"))
 # bucket = "JBOD"
-INFLUXBUCKET: Final[str] = os.getenv("INFLUX_BUCKET")
+INFLUXBUCKET: Final[str] = str(os.getenv("INFLUX_BUCKET", "0"))
 # org = "staging"
-INFLUXORG: Final[str] = os.getenv("INFLUX_ORG")
+INFLUXORG: Final[str] = str(os.getenv("INFLUX_ORG", "0"))
 # url = "http://localhost:8086"
-INFLUXURL: Final[str] = os.getenv("INFLUX_URL")
+INFLUXURL: Final[str] = str(os.getenv("INFLUX_URL", "0"))
 # measurement = "MD1200"
-INFLUXMEASUREMENT: Final[str] = os.getenv("INFLUX_MEASUREMENT")
+INFLUXMEASUREMENT: Final[str] = str(os.getenv("INFLUX_MEASUREMENT", "0"))
 # MACHINE_TAG = "CHONGUS1200"
-MACHINE_TAG: Final[str] = os.getenv("INFLUX_MACHINE_TAG")
+MACHINE_TAG: Final[str] = str(os.getenv("INFLUX_MACHINE_TAG", "0"))
 # LOCATION = "HQ"
-LOCATION: Final[str] = os.getenv("INFLUX_LOCATION")
+LOCATION: Final[str] = str(os.getenv("INFLUX_LOCATION", "0"))
 # INFLX_SEPARATE_POINTS = 0.1
 # INFLUX_SEPARATE_POINTS = float(os.getenv("INFLUX_SEPARATE_POINTS"), 0.1)
 
@@ -60,14 +60,14 @@ MDserial = serial.Serial(
     bytesize=serial.EIGHTBITS,\
     timeout=MDSERIALTIMEOUT)
 
-lastTempReading = time.time() 
-MDtempDict = {}
-MDict = {}
+# lastTempReading: float = time.time() 
+MDtempDict: dict = {}
+MDict: dict = {}
 currentSerialUsage = threading.Lock()
-fluxSending = False
-currentTime = 0
-lastTempReading = 0
-inflxdb_LeData = []
+fluxSending: bool = False
+currentTime: float = 0
+lastTempReading: float = 0
+inflxdb_LeData: list = []
 # Initialize InfluxDB client and influxdb API
 # ---------------------UNCOMMENT-----------------------
 inflxdb_client = influxdb_client.InfluxDBClient(url=INFLUXURL, token=INFLUXTOKEN, org=INFLUXORG)
@@ -142,9 +142,11 @@ def getTemp() -> dict:
         fluxSending = True
 
         return MDict
+    else:
+        return {"error": "unidentified"}
 
 
-def setSpeed(inSpeeDict: dict) -> None:
+def setSpeed(inSpeeDict: dict) -> int:
 
     bpavrg = 0
     # default
@@ -163,16 +165,16 @@ def setSpeed(inSpeeDict: dict) -> None:
             MDserial.write((f"{SETFANCMND} {str(outfanprcntg)} \n\r").encode())  
             print(f"setting {outfanprcntg}%", flush=True)
 
-            return 0
+            return outfanprcntg
         else:
             # Set default value
             MDserial.write((f"{SETFANCMND} {str(DEFOUTPRCNTG)} \n\r").encode())  
 
-            return 1
+            return outfanprcntg
     
     
     # If something goes super wrong
-    return -1
+    return 1