From 9388f765f476095cfedddc83947d8ce7b7dc3489 Mon Sep 17 00:00:00 2001
From: waldhauserlu78556 <waldhauserlu78556@th-nuernberg.de>
Date: Tue, 4 Apr 2023 15:56:13 +0200
Subject: [PATCH] DHT22 included

---
 software/roboter/raspy/raspySensors.py | 68 +++++++++++++++-----------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/software/roboter/raspy/raspySensors.py b/software/roboter/raspy/raspySensors.py
index 25d0a41..2b1037d 100644
--- a/software/roboter/raspy/raspySensors.py
+++ b/software/roboter/raspy/raspySensors.py
@@ -1,38 +1,38 @@
-from picamera import PiCamera
+#from picamera import PiCamera
+import adafruit_dht
+import board
+import json
 
 class RaspySensors:
     '''Class to handle all sensors'''
-    #Air Temp&Humidity
-    dht22 = 0
-
-    #Earth Humidity
-
-
-    #Brightness Sensor
-
-
-    #PiCamera
-    camera = PiCamera()
-
-    #GPS
-
-    #Varaibles
-    sensorData ={
-        "Air Temperature" : 0,
-        "Air Humidity" : 0,
-        "Earth Humidity" : 0,
-        "Brightness" : 0
-    }
-    image = 0
-    position = 0
-
     def __init__(self) -> None:
-        '''Init all Sensors
-        #Message if Error'''
-        dht22 = adafruit_dht.DHT22(board.D4, use_pulseio=False)
+        '''Init all Sensors'''
+        #Message if Error
+        #Air Temperature & Humidity
+        self.dht22 = adafruit_dht.DHT22(board.D4, use_pulseio=False)
+
+        #global Variables
+        self.sensorData ={
+            "Air Temperature" : 0,
+            "Air Humidity" : 0,
+            "Earth Humidity" : 0,
+            "Brightness" : 0
+        }
 
     def readSensors(self):
         '''Read all Sensors and return Dictionary with data'''
+
+        #read DHT22
+        #if Error reading Data try again
+        while True:
+            try:
+                self.sensorData["Air Temperature"] = self.dht22.temperature
+                self.sensorData["Air Humidity"] = self.dht22.humidity
+            except:
+                continue
+            
+            break
+
         return self.sensorData
     
     def takePicture(self):
@@ -41,4 +41,14 @@ class RaspySensors:
     
     def readPosition(self):
         '''Read and return Position'''
-        return self.position
\ No newline at end of file
+        return self.position
+
+
+#for Testing only
+def main():
+    sensors = RaspySensors()
+    test = sensors.readSensors()
+    print("Data:" + json.dumps(test))
+
+if __name__ == "__main__": 
+    main()   
\ No newline at end of file