From 4a58d6cce57e8324a86b4db4144b892086cdeb06 Mon Sep 17 00:00:00 2001 From: Chiara Date: Tue, 17 Jun 2025 09:53:16 +0200 Subject: [PATCH] =?UTF-8?q?Die=20Sensoren=20sind=20fertig.=20Der=20Python?= =?UTF-8?q?=20Code=20m=C3=BCsste=20passen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- _trash/KY015_data.json | 1 - _trash/ky018_data.json | 15 ------ _trash/ky037_data.json | 35 -------------- .../GPIO/__pycache__/__init__.cpython-311.pyc | Bin 343 -> 350 bytes .../RPi/__pycache__/__init__.cpython-311.pyc | Bin 182 -> 189 bytes .../__pycache__/adafruit_dht.cpython-311.pyc | Bin 13659 -> 13666 bytes .../__pycache__/board.cpython-311.pyc | Bin 19883 -> 19890 bytes .../__pycache__/digitalio.cpython-311.pyc | Bin 16032 -> 16039 bytes .../__pycache__/pulseio.cpython-311.pyc | Bin 1148 -> 1155 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 11159 -> 11166 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 6370 -> 6377 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 1130 -> 1137 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 200 -> 207 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 263 -> 270 bytes .../__pycache__/raspi_4b.cpython-311.pyc | Bin 1521 -> 1528 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 210 -> 217 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 218 -> 225 bytes .../bcm2711/__pycache__/pin.cpython-311.pyc | Bin 3429 -> 3436 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 218 -> 225 bytes .../__pycache__/PulseIn.cpython-311.pyc | Bin 10049 -> 10056 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 226 -> 233 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 224 -> 231 bytes .../__pycache__/rpi_gpio_pin.cpython-311.pyc | Bin 3344 -> 3351 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 7039 -> 7046 bytes .../__pycache__/board.cpython-311.pyc | Bin 72825 -> 72832 bytes .../__pycache__/chip.cpython-311.pyc | Bin 18122 -> 18129 bytes .../__pycache__/revcodes.cpython-311.pyc | Bin 11608 -> 11615 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 270 -> 277 bytes .../__pycache__/boards.cpython-311.pyc | Bin 11591 -> 11598 bytes .../__pycache__/chips.cpython-311.pyc | Bin 2224 -> 2231 bytes .../__pycache__/__init__.cpython-311.pyc | Bin 9579 -> 9586 bytes .../__pycache__/pin.cpython-311.pyc | Bin 9946 -> 9953 bytes sensors/lichtwiderstandsSensor.py | 15 +++--- sensors/mikrofonSensor.py | 13 +++--- sensors/sensor.md | 9 ---- sensors/temperaturSensor.py | 44 +++++++++++------- 36 files changed, 41 insertions(+), 91 deletions(-) delete mode 100644 _trash/KY015_data.json delete mode 100644 _trash/ky018_data.json delete mode 100644 _trash/ky037_data.json delete mode 100644 sensors/sensor.md 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 e6a3ec7097615e75373fbf29fca5c619a0314d8d..74b1281c3da7278f58a67455fae869e6f23ceef1 100644 GIT binary patch delta 35 pcmcc4bdQN=IWI340}$lj^UIjXvxhNs;z?Py_>!W;;*5z;ivYh93@HEr delta 28 icmcb|be)N3IWI340}$x+wkA&G*~92J@ucj;w}k+5j|n~i 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 0b334ec0fc88b5b772d278fe70455460fb19a0c7..b7876900589ed486f9c9849f54553cef4dde73ac 100644 GIT binary patch delta 35 pcmdnSxR;S PmlP!yXKc3Tl+ghIgyt0o delta 55 zcmaEqbvuiDIWI340}z~gY_^eGoKx0QKO;XkRlgupKRvTVKQXB|IU}dExHz#WDK)cX Jvm2+34gdfw5|{u0 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 44134f444f049849e8759f8e48c3a2ac574209e6..481e5d8944183861aefbd5169a8cf4d2b8a698f9 100644 GIT binary patch delta 64 zcmZ2In{m@@M(*Xjyj%=Gkblo_Blk~96;J(){M=Oif=vDN%o6>?q~hd^oYLar#G<5B RAV0pOD6u$Wv!Ya&F#xhz7G3}V delta 57 zcmdlqn{oAQM(*Xjyj%=GaPqO)M(&@IvQGLL`MIh31)2KknI-y(NyW(-Ii0{;N(J)c PONtVUGdAZj^DzPdPs9`( delta 55 zcmZqX{KLV$oR^o20SHb$HrvSU#w_cipOK%Ns$Y<)pPpHwpO{pfoRL#nT%1^xl$u$x Jxs;iY5dhDv5vl+H 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 a4a230242e46edd9394401cd4112090b098273ff..9749a139244c525d5d47ff3f13b721649a484e42 100644 GIT binary patch delta 62 zcmbOpJ};bmIWI340}$lj^V`V1lUXH3KO;XkRlgupKRvTVKQXB|IU}dExHz#WDHX_% PFDXha&e;5rd7C-_d;JzN delta 55 zcmbOiK0Ta!IWI340}y1~H`~a)lUX)YKO;XkRlgupKRvTVKQXB|IU}dExHz#WDK)cX J^9$x}>Hy}Z6I}oR 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 e76165a5335f384add901c5af34ebf37b6e0a669..780967d8a8b70cf24d1ac791471cb6201201eb81 100644 GIT binary patch delta 38 scmaE4_|lMjIWI340}$lj^V`Vn%)%Hm*`Gz0Exx2Eu{dLMHcPn(0NGUwHUIzs delta 31 lcmaE9_{flZIWI340}z~iY_^fxnT0WQvOkOL=3SN+w&dbZi00jB>{3ddzFy>7xkY$T6DM~EPnAlSd0F`M9Hvj+t delta 27 hcmeBUYG>kJ&dbZi00bu=n@!|SVN9P`AUknN6#!mD2loH~ 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 5fb5d44630f211e3377dc05129faad4ebb2fd7e5..8ef82e54a005a90c61cb68ffab3d01b3d0d5cf5c 100644 GIT binary patch delta 62 zcmey!{ezo(IWI340}$lj^V`VH$)b{{pOK%Ns$Y<)pPpHwpO{pfoRL#nT%1^xlnUg> PmlP!yXKXfPIlu@2Wj_?= delta 55 zcmeyt{gIn{IWI340}z~iY_^e`lSMXNKO;XkRlgupKRvTVKQXB|IU}dExHz#WDK)cX JvjximMgZge5_SLp 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 ae77fbde6623434e50052488e95f251e379eb8a9..0b0eabeb22a8f0e2c7ceab34e6526c0321ea5307 100644 GIT binary patch delta 34 ocmcb_c$1NPIWI340}$lj^P9+R%9u0JQI;*fq$sgCV`6M60HWIpHUIzs delta 27 hcmcb~c!`mFIWI340}z~iY&MbGlreRpqwK`g5&&vS2lfB} 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 bd7d611173ae8a978dd6cd4ab3675b7722810d91..54f0ff6c4ced4b4b33943cfa0cc4d2a3825247b9 100644 GIT binary patch delta 34 ocmcb`_>hr%IWI340}$lj^P9+R%2+bdQI;*fq$sgCV`6MA0HtFJRsaA1 delta 27 hcmaFJc#DyHIWI340}z~iY&MbGlreXrqwK`g8USo62o?YU 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 1d5d6f4861a3b738fc5d27c77cc874e3f56df065..f749d095c1e2cdb549fa186442414b2c41baf74f 100644 GIT binary patch delta 38 scmaDV^+t+&IWI340}$lj^V`V%nu9Ta@^=ndw)m2w#Nv$2!kj@Y0P4>R@c;k- delta 31 lcmaDO^;C*`IWI340}z~iY_^g6H3wtHhr%IWI340}$lj^P9+R%2+bdQI;*fq$sgCV`6MA0HtFJRsaA1 delta 27 hcmaFJc#DyHIWI340}z~iY&MbGlreXrqwK`g8USo62o?YU 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 f5ebecaa266a30ea8dbd36a567ad6eecae20fba6..2565f4a82674d87f36753f31834ceb9a9d0f021a 100644 GIT binary patch delta 38 scmX@;cfyZ*IWI340}$lj^V`V%o{6z~@^2=nq0PklE4*&oF delta 31 lcmX@%chHY}IWI340}z~iY_^g6JriTez%(IWI340}$lj^P9+R%2+eeQI;*fq$sgCV`6M80H^B;b^rhX delta 27 hcmaFK_=u5vIWI340}z~iY&MbGl(BT8qwK`g765Jv2sQu! 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 757be5c1547e1741688d73c03da5a344e1012913..c6755c6e838bfc8b91ffb28986100dfce327c419 100644 GIT binary patch delta 34 ocmaFB_?(e@IWI340}$lj^P9+R%2+kgQI;*fq$sgCV`6MG0H;X`ZU6uP delta 27 hcmaFP_<)gnIWI340}z~iY&MbGl(BfCqwK`gCID@c2rd8s 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 545e49f2d72a8df04f0a56f8ae48a02358eeeb91..5bcbdd43b7f734cae13bf47740fb844783461926 100644 GIT binary patch delta 38 scmbOrHC>8(IWI340}$lj^V`V%l##J+@<&Elw)m2w#Nv$2yiCm80MNe*=Kufz delta 31 lcmbO(H9?AdIWI340}z~iY_^g6DI;U~j=R0LP>XApigX delta 31 lcmZoO|8K^b8$iL^ek=v6`B~d>kKQ~psAX7g*vqV2JsW>?!r?j{@u_!4O V$d4~6N-WN3F67%@$j8XR2LK4n7Q6re delta 61 zcmZqJ$?|gt3-@wfUM>b8IPutQBey4?Y?OXRer~FML8g9sW{G}cQgL!dPHAy*Vo_3R PW=V4e-}VYVMh-pzbNLif 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 5c769616cb1d354f368f3d13f2376cd66d83711f..843293759b6d5620e1b9bdedca8bc8f33a9e6e0e 100644 GIT binary patch delta 64 zcmX@r%XqPuk$X8WFBbz4?!r?j{@u_!4u Lvt)BCvyU?X7j6@U 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 2c3706f03b4bd40a613adaae02fdb89f275f32cd..8a842391fadfd59837cca3f5738b04b2af5e9919 100644 GIT binary patch delta 38 scmcZ+bw7%GIWI340}$lj^V`VX%FUQEc_OzgTYO1TVsXaiwcM)}0qy_{m;e9( delta 31 mcmcZ~bt8&!J=0GJ61S^xk5 delta 27 hcmbQr)W^iVoR^o20SHb!Hk-(u&6qy1Tz2B@Dga;-2pIqX 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 263e27c0f39cd4be23a26b5e8779d1b26c2f04fd..de26435a797c9351ecf7a76171382c976bf4736c 100644 GIT binary patch delta 38 scmX>ebuNl~IWI340}$lj^V`Usq{NsrIZsKJExx2Eu{dLMm(pG?0OyhnRR910 delta 31 lcmX>Xbv%lDIWI340}z~eY_^d*Nr^Faa-Ndx=1EF>xB#JZ3KReU 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 e8ebcf9d1b2047ba4a04204e255411f0f1b522fc..3c9abe9737b49a0d840896d1e126d9ab61cbed10 100644 GIT binary patch delta 38 scmdlWxLuHYIWI340}$lj^V`Us%*L2KIiF3IExx2Eu{dLMH=8OG0LM}aqW}N^ delta 31 lcmdlkxIvJ6IWI340}z~eY_^d*nT;`Jaz2~v=E-a-OaO=U2x0&L 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 51a93c06585fd0661b8df319ba23a3b28d73ea89..2696eee9ebc75d6c34db374b42bec089c141e7f2 100644 GIT binary patch delta 38 tcmaFu^~sBSIWI340}$lj^V`ThiJLKI@;q)?w)m2w#Nv$2ySO(>0s!!J47&gT delta 31 mcmez5_1cSjIWI340}z~iY_^em5;tS$&xmQM(Exx2Eu{dM%N*O~g0P4&P3jhEB delta 31 lcmaFpd&`%5IWI340}z~iY_^fRQHC*Ka<7c+=8ZB2TmYk>3CjQg 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)