From 0821b8ed9fe6df70293aa2f4ca6c74c029d043c5 Mon Sep 17 00:00:00 2001
From: Johannes Krug <johannes.krug98@gmail.com>
Date: Tue, 16 Apr 2019 13:08:07 +0200
Subject: [PATCH] =?UTF-8?q?Wlan=20Daten=C3=BCbertragung=20an=20PIR=20und?=
 =?UTF-8?q?=20Ultraschallsensor=20funktioniert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wlan_2bewegungssensoren.ino               | 46 +++++++++++++++++--
 arduino/wlan_ultraschall/wlan_ultraschall.ino |  4 +-
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino b/arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino
index 8271533..b3b5321 100644
--- a/arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino
+++ b/arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino
@@ -3,7 +3,7 @@
 
 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);
 
@@ -66,12 +66,48 @@ void reconnect() {
 
 
 void loop() {
+   if (!client.connected()) {
+        reconnect();
+    }
+    client.loop();
 
-  if((distance!=(distance_alt-1))&&(distance!=(distance_alt))&&(distance!=(distance_alt+1))){//+-1 um störungen herauszufiltern
-    snprintf (msg,50,"%d", distance);
+  pirValueNeu1 = digitalRead(pirPin1);
+  pirValueNeu2 = digitalRead(pirPin2);
+  digitalWrite(ledPin,(pirValueNeu1|pirValueNeu2));
+  pirAn1= ((pirValueNeu1==1)&&(pirValueAlt1==0));
+  pirAn2= ((pirValueNeu2==1)&&(pirValueAlt2==0));
+  pirAus1= ((pirValueNeu1==0)&&(pirValueAlt1==1));
+  pirAus2= ((pirValueNeu2==0)&&(pirValueAlt2==1));
+  
+  if(pirAn1){
+  Serial.println("Steigende Flanke von PIR1");
+  snprintf (msg,50,"%c%c",49,48); //Codierung PIR1 steigende Flanke: 10
     Serial.print("Publish Motion: ");
     Serial.println(msg);
     client.publish("/home/data", msg);
-    delay(500);
   }
-}
+  if(pirAn2){
+  Serial.println("Steigende Flanke von PIR2");
+  snprintf (msg,50,"%c%c",49,49); //Codierung PIR2 steigende Flanke: 11
+    Serial.print("Publish Motion: ");
+    Serial.println(msg);
+    client.publish("/home/data", msg);
+  }
+  if(pirAus1){
+  Serial.println("Fallende Flanke von PIR1");
+  snprintf (msg,50,"%c%c",48,48); //Codierung PIR1 fallende Flanke: 00
+    Serial.print("Publish Motion: ");
+    Serial.println(msg);
+    client.publish("/home/data", msg);
+  }
+  if(pirAus2){
+  Serial.println("Fallende Flanke von PIR2");
+  snprintf (msg,50,"%c%c",48,49); //Codierung PIR2 fallende Flanke: 01
+    Serial.print("Publish Motion: ");
+    Serial.println(msg);
+    client.publish("/home/data", msg);
+  }
+
+    pirValueAlt1=pirValueNeu1;
+    pirValueAlt2=pirValueNeu2;
+  }
diff --git a/arduino/wlan_ultraschall/wlan_ultraschall.ino b/arduino/wlan_ultraschall/wlan_ultraschall.ino
index 4b9e2da..56e742d 100644
--- a/arduino/wlan_ultraschall/wlan_ultraschall.ino
+++ b/arduino/wlan_ultraschall/wlan_ultraschall.ino
@@ -8,8 +8,8 @@ WiFiClient espClient;
 PubSubClient client(espClient);
 
 // defines pins numbers
-const int trigPin = 2;  //D4
-const int echoPin = 0;  //D3
+const int trigPin = D4;  //D4
+const int echoPin = D3;  //D3
 
 long duration;
 int distance;