ordnerstruktur verändert

arduino/Abmessungen bb104.txt

@@ -0,0 +1,3 @@
+Höhe    3,0m
+Breite  5,9m
+Länge   8,9m

arduino/PIR/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino

@@ -73,41 +73,41 @@ void loop() {
 
   pirValueNeu1 = digitalRead(pirPin1);
   pirValueNeu2 = digitalRead(pirPin2);
-  digitalWrite(ledPin,(pirValueNeu1|pirValueNeu2));
+  digitalWrite(ledPin, (pirValueNeu1 | pirValueNeu2));
-  pirAn1= ((pirValueNeu1==1)&&(pirValueAlt1==0));
+  pirAn1 = ((pirValueNeu1 == 1) && (pirValueAlt1 == 0));
-  pirAn2= ((pirValueNeu2==1)&&(pirValueAlt2==0));
+  pirAn2 = ((pirValueNeu2 == 1) && (pirValueAlt2 == 0));
-  pirAus1= ((pirValueNeu1==0)&&(pirValueAlt1==1));
+  pirAus1 = ((pirValueNeu1 == 0) && (pirValueAlt1 == 1));
-  pirAus2= ((pirValueNeu2==0)&&(pirValueAlt2==1));
+  pirAus2 = ((pirValueNeu2 == 0) && (pirValueAlt2 == 1));
 
-  if(pirAn1){
+  if (pirAn1) {
     Serial.println("Steigende Flanke von PIR1");
-  snprintf (msg,50,"%c%c",49,48); //Codierung PIR1 steigende Flanke: 10
+    snprintf (msg, 50, "%c%c", 49, 48); //Codierung PIR1 steigende Flanke: 10
     Serial.print("Publish Motion: ");
     Serial.println(msg);
-    client.publish("/home/data", msg);
+    client.publish("/gso/bb/104/Pir/1", msg);
   }
-  if(pirAn2){
+  if (pirAn2) {
     Serial.println("Steigende Flanke von PIR2");
-  snprintf (msg,50,"%c%c",49,49); //Codierung PIR2 steigende Flanke: 11
+    snprintf (msg, 50, "%c%c", 49, 49); //Codierung PIR2 steigende Flanke: 11
     Serial.print("Publish Motion: ");
     Serial.println(msg);
-    client.publish("/home/data", msg);
+    client.publish("/gso/bb/104/Pir/2", msg);
   }
-  if(pirAus1){
+  if (pirAus1) {
     Serial.println("Fallende Flanke von PIR1");
-  snprintf (msg,50,"%c%c",48,48); //Codierung PIR1 fallende Flanke: 00
+    snprintf (msg, 50, "%c%c", 48, 48); //Codierung PIR1 fallende Flanke: 00
     Serial.print("Publish Motion: ");
     Serial.println(msg);
-    client.publish("/home/data", msg);
+    client.publish("/gso/bb/104/Pir/1", msg);
   }
-  if(pirAus2){
+  if (pirAus2) {
     Serial.println("Fallende Flanke von PIR2");
-  snprintf (msg,50,"%c%c",48,49); //Codierung PIR2 fallende Flanke: 01
+    snprintf (msg, 50, "%c%c", 48, 49); //Codierung PIR2 fallende Flanke: 01
     Serial.print("Publish Motion: ");
     Serial.println(msg);
-    client.publish("/home/data", msg);
+    client.publish("/gso/bb/104/Pir/2", msg);
   }
 
-    pirValueAlt1=pirValueNeu1;
+  pirValueAlt1 = pirValueNeu1;
-    pirValueAlt2=pirValueNeu2;
+  pirValueAlt2 = pirValueNeu2;
-  }
+}

arduino/ultraschall/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino

@@ -2,11 +2,11 @@
 #include <PubSubClient.h>
 
 //Eigene zu trackende Entfernung festlegen
-#define DISTANCE 15
+#define DISTANCE 155
 
 const char* SSID = "smartroom";
 const char* PSK = "smarthome";
-const char* MQTT_BROKER = "192.168.4.1";
+const char* MQTT_BROKER = "192.168.252.1";
 WiFiClient espClient;
 PubSubClient client(espClient);
 
@@ -96,25 +96,33 @@ void loop() {
     if (((DISTANCE + 2) < distance) || ((DISTANCE - 2) > distance)) { //darf +- 2 um festgelegte entfernung schwanken, um störungen herauszufiltern
       //Meldung an PI, dass die Distanz gestört ist
       snprintf (msg, 50, "%d", 1);
-      client.publish("/home/data", msg);
+      client.publish("/gso/bb/104/ultraschall/1", msg);
       //Serieller Monitor
       Serial.print("Motion detected! Distance: ");
-      Serial.println(msg);
+      Serial.println(distance);
 
       //Flag auf 1
       bool1 = 1;
+    }
+    else {
+      snprintf (msg, 50, "%d", 0);
+      client.publish("/gso/bb/104/ultraschall/1", msg);
 
     }
+
   }
   else if (bool1 == 1) {
     if (((DISTANCE + 2) < distance) || ((DISTANCE - 2) > distance)) { //darf +- 2 um festgelegte entfernung schwanken, um störungen herauszufiltern
       Serial.print("Still motion detected! Distance: ");
       Serial.println(distance);
+      //Meldung an PI, dass die Ausgangsdistanz wieder gemessen wird
+      snprintf (msg, 50, "%d", 1);
+      client.publish("/gso/bb/104/ultraschall/1", msg);
     }
     else {
       //Meldung an PI, dass die Ausgangsdistanz wieder gemessen wird
       snprintf (msg, 50, "%d", 0);
-      client.publish("/home/data", msg);
+      client.publish("/gso/bb/104/ultraschall/1", msg);
 
       //Flag wieder auf 0
       bool1 = 0;