Merge branch 'main' of https://git.miaig.dev/mia/abschlussarbeit

.gitignore

@@ -1,2 +1,3 @@
 /webserver/static/plots/
+*_data.json
 /.direnv

sensors/json/ky015_data.json

@@ -1,30 +0,0 @@
-{
-    "id": "sensor_002/3",
-    "type": "environment",
-    "unit": {
-        "temperature": "°C",
-        "humidity": "%"
-    },
-    "reading": [
-        {
-            "ts": 1748436535,
-            "temperature": 24.7,
-            "humidity": 58
-        },
-        {
-            "ts": 1748436538,
-            "temperature": 24.6,
-            "humidity": 58
-        },
-        {
-            "ts": 1748436541,
-            "temperature": 24.7,
-            "humidity": 58
-        },
-        {
-            "ts": 1748436544,
-            "temperature": 24.7,
-            "humidity": 59
-        }
-    ]
-}

sensors/lichtwiderstandsSensor.py

@@ -3,6 +3,7 @@ import json
 import os
 import board
 import digitalio
+from sender import send_data as s
 
 json_file = "json/ky018_data.json"
 MAX_ENTRIES = 3000
@@ -12,11 +13,24 @@ light_pin.direction = digitalio.Direction.INPUT
 
 dataldr = {
     "location": "Hausstrasse - 1",
+    "sensors": [
+        {
         "id": "sensor_004",
         "type": "light",
         "unit": "bool", 
         "readings": []
         }
+    ]
+}
+datalive = {
+    "location": "Hausstrasse - 1",
+    "sensors": [
+        {
+            "id": "sensor_004",
+            "readings": [{}]
+        }
+    ]
+}
 
 def load_data():
     if os.path.exists(json_file):
@@ -32,14 +46,23 @@ def save_data(data):
 def capture_and_store(state):
     timestamp = int(time.time())
     data = load_data()
+    livetemp = datalive.copy()
 
-    data["readings"].append({"ts": timestamp,"value": state})
+    entry = { "ts": timestamp, "value": state}
 
-    if len(data["readings"]) > MAX_ENTRIES:
+    data["sensors"][0]["readings"].append(entry)
-        data["readings"] = data["readings"][-MAX_ENTRIES:]
+    livetemp["sensors"][0]["readings"][0] = {entry}
 
+    if len(data["sensors"][0]["readings"]) > MAX_ENTRIES:
+        data["sensors"][0]["readings"] = data["sensors"][0]["readings"][-MAX_ENTRIES:]
+    
+    s(livetemp)
+    livetemp.clear()
     save_data(data)
 
+print(load_data())
+s(load_data())
+
 try:
     while True:
         if light_pin.value:

sensors/mikrofonSensor.py

@@ -3,9 +3,11 @@ import time
 import json
 from datetime import datetime
 import os
+from sender import send_data as s
 
 SENSOR_PIN = 17
 JSON_FILE = "json/ky037_data.json"
+MAX_ENTRIES = 3000
 INTERVAL = 1
 
 GPIO.setmode(GPIO.BCM)
@@ -14,11 +16,24 @@ GPIO.setup(SENSOR_PIN, GPIO.IN)
 
 datamikro = {
     "location": "Hausstrasse - 2",
+    "sensors": [
+        {
         "id": "sensor_001",
         "type": "noise",
         "unit": "bool",
         "readings": []
         }
+    ]
+}
+datalive = {
+    "location": "Hausstrasse - 2",
+    "sensors": [
+        {
+            "id": "sensor_001",
+            "readings": [{}]
+        }
+    ]
+}
 
 def load_data():
     if os.path.exists(JSON_FILE):
@@ -34,17 +49,28 @@ def save_data(data):
 def capture_and_store():
     state = GPIO.input(SENSOR_PIN)
     timestamp = int(time.time())
+    data = load_data()
     noise = True if state == 0 else False
+    livetemp = datalive.copy()
 
     entry = { "ts": timestamp, "value": noise}
 
-    data = load_data()
+    data["sensors"][0]["readings"].append(entry)
-    data["readings"].append(entry)
+    livetemp["sensors"][0]["readings"][0] = (entry)
+
+    if len(data["sensors"][0]["readings"]) > MAX_ENTRIES:
+        data["sensors"][0]["readings"] = data["sensors"][0]["readings"][-MAX_ENTRIES:]
+        
+
+    s(livetemp)
+    livetemp.clear()
     save_data(data)
 
     dt_str = datetime.fromtimestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')
     print(f"[{dt_str}] Noise detected: {'YES' if noise else 'NO'}")
 
+s(load_data())
+
 if __name__ == "__main__":
     print("Starting noise detection with KY-037")
     try:

sensors/sender.py

@@ -2,7 +2,7 @@ import socket
 import json
 import time
 
-SERVER_HOST = "127.0.0.1"
+SERVER_HOST = "172.20.10.5"
 SERVER_PORT = 9999
 
 def send_data(data):

sensors/temperaturSensor.py

@@ -4,6 +4,7 @@ import adafruit_dht
 import json
 from datetime import datetime
 import os
+from sender import send_data as s
 
 dhtDevice = adafruit_dht.DHT11(board.D23)
 
@@ -26,6 +27,19 @@ datatemp = {
         }
     ]
 }
+datalive = {
+    "location": "Hausstrasse - 3",
+     "sensors": [
+        {
+            "id": "sensor_002",
+            "readings": [{}]
+        },
+        {
+            "id": "sensor_003",
+            "readings": [{}]
+        }
+     ]
+}
 
 def load_data():
             if os.path.exists(json_file):
@@ -43,18 +57,32 @@ max_entries=3000
 def capture_and_store(temperature_c,humidity):
     timestamp = int(time.time())
     data=load_data()
+    livetemp = datalive.copy()
 
     temp_sensor = next(s for s in data["sensors"] if s["type"] == "temperature")
     hum_sensor = next(s for s in data["sensors"] if s["type"] == "humidity")
+    livetemp_sensor = datalive["sensors"][0]
+    livehum_sensor = datalive["sensors"][1]
 
-    temp_sensor["readings"].append({"ts": timestamp, "value": temperature_c})
+    humentry = { "ts": timestamp, "value": humidity}
-    hum_sensor["readings"].append({"ts": timestamp, "value": humidity})
+    tempentry = { "ts": timestamp, "value": temperature_c}
+    
+
+    temp_sensor["readings"].append(tempentry)
+    hum_sensor["readings"].append(humentry)
+    livetemp_sensor["readings"][0] = tempentry
+    livehum_sensor["readings"][0] = humentry
 
     if len(temp_sensor["readings"]) > max_entries:
         temp_sensor["readings"] = temp_sensor["readings"][-max_entries:]
     if len(hum_sensor["readings"]) > max_entries:
         hum_sensor["readings"] = hum_sensor["readings"][-max_entries:]
 
+    s(livetemp_sensor)
+    s(livehum_sensor)
+    livetemp.clear()
+    livetemp_sensor.clear()
+    livehum_sensor.clear()
     save_data(data)