diff --git a/_trash/KY015_data.json b/_trash/KY015_data.json deleted file mode 100644 index 0637a08..0000000 --- a/_trash/KY015_data.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/_trash/ky018_data.json b/_trash/ky018_data.json deleted file mode 100644 index a465be8..0000000 --- a/_trash/ky018_data.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "id": "sensor_004", - "type": "light", - "unit": "state", - "reading": [ - { - "ts": 1748452265, - "state": "dunkel" - }, - { - "ts": 1748452267, - "state": "dunkel" - } - ] -} \ No newline at end of file diff --git a/_trash/ky037_data.json b/_trash/ky037_data.json deleted file mode 100644 index f4b55a4..0000000 --- a/_trash/ky037_data.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "id": "sensor_001", - "type": "noise", - "unit": "bool", - "readings": [ - { - "ts": 1748452253, - "value": 1 - }, - { - "ts": 1748452254, - "value": 1 - }, - { - "ts": 1748452255, - "value": 1 - }, - { - "ts": 1748452256, - "value": 1 - }, - { - "ts": 1748452257, - "value": 1 - }, - { - "ts": 1748452258, - "value": 1 - }, - { - "ts": 1748452259, - "value": 1 - } - ] -} \ No newline at end of file diff --git a/_trash/lib/python3.11/site-packages/RPi/GPIO/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/RPi/GPIO/__pycache__/__init__.cpython-311.pyc index e6a3ec7..74b1281 100644 Binary files a/_trash/lib/python3.11/site-packages/RPi/GPIO/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/RPi/GPIO/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/RPi/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/RPi/__pycache__/__init__.cpython-311.pyc index 0b334ec..b787690 100644 Binary files a/_trash/lib/python3.11/site-packages/RPi/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/RPi/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/__pycache__/adafruit_dht.cpython-311.pyc b/_trash/lib/python3.11/site-packages/__pycache__/adafruit_dht.cpython-311.pyc index 4625704..509e0d6 100644 Binary files a/_trash/lib/python3.11/site-packages/__pycache__/adafruit_dht.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/__pycache__/adafruit_dht.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/__pycache__/board.cpython-311.pyc b/_trash/lib/python3.11/site-packages/__pycache__/board.cpython-311.pyc index 44134f4..481e5d8 100644 Binary files a/_trash/lib/python3.11/site-packages/__pycache__/board.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/__pycache__/board.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/__pycache__/digitalio.cpython-311.pyc b/_trash/lib/python3.11/site-packages/__pycache__/digitalio.cpython-311.pyc index 9b6ce93..85c320c 100644 Binary files a/_trash/lib/python3.11/site-packages/__pycache__/digitalio.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/__pycache__/digitalio.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/__pycache__/pulseio.cpython-311.pyc b/_trash/lib/python3.11/site-packages/__pycache__/pulseio.cpython-311.pyc index 1bc0537..ac7a259 100644 Binary files a/_trash/lib/python3.11/site-packages/__pycache__/pulseio.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/__pycache__/pulseio.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc index a4a2302..9749a13 100644 Binary files a/_trash/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/_distutils_hack/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/__pycache__/__init__.cpython-311.pyc index e76165a..780967d 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/agnostic/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/agnostic/__pycache__/__init__.cpython-311.pyc index cbc8e06..c3eff86 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/agnostic/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/agnostic/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/board/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/board/__pycache__/__init__.cpython-311.pyc index f5e4d95..b85da18 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/board/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/board/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/__init__.cpython-311.pyc index 5e0ac94..888453c 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/raspi_4b.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/raspi_4b.cpython-311.pyc index 5fb5d44..8ef82e5 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/raspi_4b.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/board/raspberrypi/__pycache__/raspi_4b.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/__pycache__/__init__.cpython-311.pyc index ae77fbd..0b0eabe 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/__init__.cpython-311.pyc index bd7d611..54f0ff6 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/pin.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/pin.cpython-311.pyc index 1d5d6f4..f749d09 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/pin.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm2711/__pycache__/pin.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/__pycache__/__init__.cpython-311.pyc index 5f6042d..ae5b472 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/PulseIn.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/PulseIn.cpython-311.pyc index f5ebeca..2565f4a 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/PulseIn.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/PulseIn.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/__init__.cpython-311.pyc index 6e4eea4..f60143e 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/bcm283x/pulseio/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/__init__.cpython-311.pyc index 757be5c..c6755c6 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/rpi_gpio_pin.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/rpi_gpio_pin.cpython-311.pyc index 545e49f..5bcbdd4 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/rpi_gpio_pin.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_blinka/microcontroller/generic_linux/__pycache__/rpi_gpio_pin.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/__init__.cpython-311.pyc index c3f5775..d6cb654 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/board.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/board.cpython-311.pyc index 00d4c3f..34b2ff8 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/board.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/board.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/chip.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/chip.cpython-311.pyc index 5c76961..8432937 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/chip.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/chip.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/revcodes.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/revcodes.cpython-311.pyc index 2c3706f..8a84239 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/revcodes.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/__pycache__/revcodes.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/__init__.cpython-311.pyc index 4f81912..86d108e 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/boards.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/boards.cpython-311.pyc index 263e27c..de26435 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/boards.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/boards.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/chips.cpython-311.pyc b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/chips.cpython-311.pyc index e8ebcf9..3c9abe9 100644 Binary files a/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/chips.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/adafruit_platformdetect/constants/__pycache__/chips.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/__init__.cpython-311.pyc b/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/__init__.cpython-311.pyc index 51a93c0..2696eee 100644 Binary files a/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/__init__.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/__init__.cpython-311.pyc differ diff --git a/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/pin.cpython-311.pyc b/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/pin.cpython-311.pyc index 6a53280..7b86cc1 100644 Binary files a/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/pin.cpython-311.pyc and b/_trash/lib/python3.11/site-packages/microcontroller/__pycache__/pin.cpython-311.pyc differ diff --git a/sensors/lichtwiderstandsSensor.py b/sensors/lichtwiderstandsSensor.py index bcaea6a..509cfd1 100644 --- a/sensors/lichtwiderstandsSensor.py +++ b/sensors/lichtwiderstandsSensor.py @@ -4,17 +4,18 @@ import os import board import digitalio -json_file = "ky018_data.json" +json_file = "json/ky018_data.json" MAX_ENTRIES = 3000 light_pin = digitalio.DigitalInOut(board.D17) light_pin.direction = digitalio.Direction.INPUT -data_template = { +dataldr = { + "location": "Hausstrasse - 1", "id": "sensor_004", "type": "light", "unit": "bool", - "reading": [] + "readings": [] } def load_data(): @@ -22,7 +23,7 @@ def load_data(): with open(json_file, 'r', encoding='utf-8') as f: return json.load(f) else: - return data_template.copy() + return dataldr.copy() def save_data(data): with open(json_file, 'w', encoding='utf-8') as f: @@ -32,10 +33,10 @@ def capture_and_store(state): timestamp = int(time.time()) data = load_data() - data["reading"].append({"ts": timestamp,"value": state}) + data["readings"].append({"ts": timestamp,"value": state}) - if len(data["reading"]) > MAX_ENTRIES: - data["reading"] = data["reading"][-MAX_ENTRIES:] + if len(data["readings"]) > MAX_ENTRIES: + data["readings"] = data["readings"][-MAX_ENTRIES:] save_data(data) diff --git a/sensors/mikrofonSensor.py b/sensors/mikrofonSensor.py index bddda80..f6e5958 100644 --- a/sensors/mikrofonSensor.py +++ b/sensors/mikrofonSensor.py @@ -5,17 +5,18 @@ from datetime import datetime import os SENSOR_PIN = 17 -JSON_FILE = "ky037_data.json" +JSON_FILE = "json/ky037_data.json" INTERVAL = 1 GPIO.setmode(GPIO.BCM) GPIO.setup(SENSOR_PIN, GPIO.IN) -SENSOR_INFO = { +datamikro = { + "location": "Hausstrasse - 2", "id": "sensor_001", - "type": "noise", # Geräuschsensor - "unit": "bool", # 1 oder 0 (geräusch ja/nein) + "type": "noise", + "unit": "bool", "readings": [] } @@ -24,7 +25,7 @@ def load_data(): with open(JSON_FILE, 'r', encoding='utf-8') as f: return json.load(f) else: - return SENSOR_INFO.copy() # frisches Grundgerüst + return datamikro.copy() def save_data(data): with open(JSON_FILE, 'w', encoding='utf-8') as f: @@ -32,7 +33,7 @@ def save_data(data): def capture_and_store(): state = GPIO.input(SENSOR_PIN) - timestamp = int(time.time()) # Unix-Zeitstempel (int) + timestamp = int(time.time()) noise = True if state == 0 else False entry = { "ts": timestamp, "value": noise} diff --git a/sensors/sensor.md b/sensors/sensor.md deleted file mode 100644 index 21cdf84..0000000 --- a/sensors/sensor.md +++ /dev/null @@ -1,9 +0,0 @@ -Temperatur Sensor: Ich müss eine extra venv umgebung erstellen für den Sensor DHT11. Ich mache alles in Visula Studio Code. Ich habe eine Test programm versucht. test.temp.py -Fehlermeldungen: -1. Board nicht gefunden: pip install board -2. adafruit_dht nicht funktioniert: pip3 install adafruit-circuitpython-dht -3. RPI nicht gefunden: pip install RPI.GPIO - - - -TemperaturSensor: \ No newline at end of file diff --git a/sensors/temperaturSensor.py b/sensors/temperaturSensor.py index 7ff2017..6f67186 100644 --- a/sensors/temperaturSensor.py +++ b/sensors/temperaturSensor.py @@ -9,23 +9,30 @@ dhtDevice = adafruit_dht.DHT11(board.D23) json_file = "json/ky015_data.json" -datatemphum = { - "id": "sensor_002/3", - "type": "environment", - "unit": { - "temperature": "°C", - "humidity": "%" - }, - "reading": [] +datatemp = { + "location": "Hausstrasse - 3", + "sensors": [ + { + "id": "sensor_002", + "type": "temperature", + "unit": "°C", + "readings": [] + }, + { + "id": "sensor_003", + "type": "humidity", + "unit": "%", + "readings": [] + } + ] } - def load_data(): if os.path.exists(json_file): with open(json_file, 'r', encoding='utf-8') as f: return json.load(f) else: - return datatemphum.copy() + return datatemp.copy() def save_data(data): with open(json_file, 'w', encoding='utf-8') as f: @@ -35,17 +42,18 @@ max_entries=3000 def capture_and_store(temperature_c,humidity): timestamp = int(time.time()) + data=load_data() - data = load_data() - data["reading"].append({ - "ts": timestamp, - "temperature": temperature_c, - "humidity":humidity - }) + 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") + temp_sensor["readings"].append({"ts": timestamp, "value": temperature_c}) + hum_sensor["readings"].append({"ts": timestamp, "value": humidity}) - if len(data["reading"]) > max_entries: - data["reading"] = data["reading"][-max_entries:] + 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:] save_data(data)