From e2fa06d94eb231fd10e94c447405840e48424641 Mon Sep 17 00:00:00 2001 From: Maximilian Giller Date: Sat, 10 Aug 2024 01:51:00 +0200 Subject: [PATCH] Some small improvements --- src/actions.py | 4 ++-- src/config.py | 1 + src/handler/mhz19_co2.py | 9 ++++++--- src/main.py | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/actions.py b/src/actions.py index ab082ce..daaf0fb 100644 --- a/src/actions.py +++ b/src/actions.py @@ -1,7 +1,7 @@ import asyncio from datetime import datetime import os -from config import climate_log_file, dht22_pin +from config import climate_log_file, dht22_pin, mhz19co2_serial_port from handler.dht22_climate import Dht22Climate from handler.matrix_display import MatrixDisplay @@ -9,7 +9,7 @@ from handler.mhz19_co2 import Mhz19Co2 climate_sensor = Dht22Climate(dht22_pin) -co2_sensor = Mhz19Co2() +co2_sensor = Mhz19Co2(mhz19co2_serial_port) matrix_display = MatrixDisplay() diff --git a/src/config.py b/src/config.py index b52c857..205d229 100644 --- a/src/config.py +++ b/src/config.py @@ -1,2 +1,3 @@ dht22_pin = 17 +mhz19co2_serial_port = "/dev/serial0" climate_log_file = "./climate.csv" diff --git a/src/handler/mhz19_co2.py b/src/handler/mhz19_co2.py index 460ba5c..6e038f0 100644 --- a/src/handler/mhz19_co2.py +++ b/src/handler/mhz19_co2.py @@ -1,11 +1,13 @@ import serial +import logging class Mhz19Co2: - def __init__(self): + + def __init__(self, serial_port: str): self.last_read = None - self.serial_port = "/dev/serial0" + self.serial_port = serial_port self.baud_rate = 9600 self.byte_size = 8 self.parity = "N" @@ -56,7 +58,8 @@ class Mhz19Co2: # print(f"") except Exception as e: - print(f"Error reading data: {e}") + logging.exception(f"Error reading data: {e}", exc_info=e) + return None finally: if ser: ser.close() diff --git a/src/main.py b/src/main.py index c36536d..22c69d3 100644 --- a/src/main.py +++ b/src/main.py @@ -8,7 +8,6 @@ from fastapi.middleware.cors import CORSMiddleware from actions import ( climate_sensor, display_time, - log_climate, matrix_display, display_pattern, co2_sensor,