Implemented co2 sensor and silent climate endpoint

src/actions.py

@@ -5,30 +5,34 @@ from config import climate_log_file, dht22_pin
 
 from handler.dht22_climate import Dht22Climate
 from handler.matrix_display import MatrixDisplay
+from handler.mhz19_co2 import Mhz19Co2
 
 
 climate_sensor = Dht22Climate(dht22_pin)
+co2_sensor = Mhz19Co2()
 matrix_display = MatrixDisplay()
 
 
-async def log_temperature():
+async def log_climate(delay_sec: int = 60):
     # If file does not exist, create it and write header
     if not os.path.isfile(climate_log_file):
         with open(climate_log_file, "w") as f:
-            f.write("timestamp,temperature,humidity\n")
+            f.write("timestamp,temperature,humidity,co2\n")
 
     while True:
         measurements = climate_sensor.read()
+        co2_density = co2_sensor.read()
         if measurements is not None:
             with open(climate_log_file, "a") as f:
                 f.write(
-                    "{},{},{}\n".format(
+                    "{},{},{},{}\n".format(
                         datetime.now().isoformat(),
                         measurements["temperature"],
                         measurements["humidity"],
+                        co2_density,
                     )
                 )
-        await asyncio.sleep(60)
+        await asyncio.sleep(delay_sec)
 
 
 async def display_time():
@@ -41,11 +45,11 @@ async def display_time():
 
 async def display_pattern(*args, **kwargs):
     old_contrast = matrix_display.contrast
-    if "contrast" in kwargs.keys():
+    if "contrast" in kwargs:
         matrix_display.set_contrast(int(kwargs["contrast"]))
     try:
         while True:
             await matrix_display.pattern(*args, **kwargs)
     except:
-        if "contrast" in kwargs.keys():
+        if "contrast" in kwargs:
             matrix_display.set_contrast(old_contrast)

src/handler/dht22_climate.py

@@ -8,12 +8,12 @@ class Dht22Climate:
         self.pin = pin
         self.last_read = None
 
-    def get_last_read(self):
+    def get_last_read(self) -> dict | None:
         if self.last_read is None:
             return self.read()
         return self.last_read
 
-    def read(self):
+    def read(self) -> dict | None:
         humidity, temperature = Adafruit_DHT.read_retry(self.sensor, self.pin)
         if humidity is not None and temperature is not None:
             self.last_read = {"temperature": temperature, "humidity": humidity}

src/handler/mhz19_co2.py

@@ -12,12 +12,12 @@ class Mhz19Co2:
         self.stop_bits = 1
         self.timeout = None
 
-    def get_last_read(self):
+    def get_last_read(self) -> int | None:
         if self.last_read is None:
             return self.read()
         return self.last_read
 
-    def read(self):
+    def read(self) -> int | None:
         ser = None
         try:
             ser = serial.Serial(
@@ -45,15 +45,15 @@ class Mhz19Co2:
 
             # show CO2 concentration
             concentration = data[2] * 256 + data[3]
-            print(f"=== send data ===")
+            # print(f"=== send data ===")
-            print(f"send: {command_data}")
+            # print(f"send: {command_data}")
-            print(f"=== read data ===")
+            # print(f"=== read data ===")
-            print(f"data: {data}")
+            # print(f"data: {data}")
-            print(f"data[2] {data[2]}")
+            # print(f"data[2] {data[2]}")
-            print(f"data[3] {data[3]}")
+            # print(f"data[3] {data[3]}")
-            print(f"CO2 Concentration {concentration} ppm")
+            # print(f"CO2 Concentration {concentration} ppm")
-            print(f"=== === ===")
+            # print(f"=== === ===")
-            print(f"")
+            # print(f"")
 
         except Exception as e:
             print(f"Error reading data: {e}")

src/main.py

@@ -8,9 +8,10 @@ from fastapi.middleware.cors import CORSMiddleware
 from actions import (
     climate_sensor,
     display_time,
-    log_temperature,
+    log_climate,
     matrix_display,
     display_pattern,
+    co2_sensor,
 )
 from config import climate_log_file
 from handler.action_queue import ActionQueue
@@ -20,7 +21,7 @@ logging.getLogger().setLevel(logging.INFO)
 
 
 # Start services
-asyncio.create_task(log_temperature())
+# asyncio.create_task(log_climate())
 queue = ActionQueue(matrix_display.show_current_time)
 app = FastAPI()
 
@@ -62,7 +63,7 @@ async def turn_off():
 
 @app.post("/temperature")
 async def temperature():
-    measurements = climate_sensor.get_last_read()
+    measurements = climate_sensor.read()
     if measurements is None:
         return {"message": "Failed to read temperature"}
 
@@ -75,7 +76,7 @@ async def temperature():
 
 @app.post("/humidity")
 async def humidity():
-    measurements = climate_sensor.get_last_read()
+    measurements = climate_sensor.read()
     if measurements is None:
         return {"message": "Failed to read humidity"}
 
@@ -86,6 +87,30 @@ async def humidity():
     return measurements
 
 
+@app.post("/co2")
+async def co2():
+    co2 = co2_sensor.read()
+    if co2 is None:
+        return {"message": "Failed to read co2"}
+
+    await queue.add_action_to_queue(matrix_display.show_text, f"{co2}ppm")
+
+    return {"co2": co2}
+
+
+@app.post("/climate")
+async def climate():
+    measurements = climate_sensor.read()
+    if measurements is None:
+        return {"message": "Failed to read humidy and temperature"}
+
+    co2 = co2_sensor.read()
+    if co2 is None:
+        return {"message": "Failed to read co2"}
+
+    return {"co2": co2, **measurements}
+
+
 @app.post("/history")
 async def history():
     day_entry_count = 24 * 60