From 4441a65bfc0497abc3fb803117a0f14be2dc3f78 Mon Sep 17 00:00:00 2001 From: Johannes Krug Date: Tue, 14 May 2019 10:12:05 +0200 Subject: [PATCH] =?UTF-8?q?ordnerstruktur=20ver=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- arduino/Abmessungen bb104.txt | 3 + .../Bewegungsmelder_HC-SR501.ino | 0 .../ZweiBewegungsmelder.ino | 0 .../wlan_2bewegungssensoren.ino | 76 +++++++++---------- .../zweiBewegungsmelder_neu.ino | 0 .../analog_signal_output.ino | 0 .../digital_signal_output_test.ino | 0 .../Ultrasonic_Sensor/Ultrasonic_Sensor.ino | 0 .../Ultrasonic_Sensor_optimiert.ino | 34 +++++---- .../wlan_ultraschall/wlan_ultraschall.ino | 0 10 files changed, 62 insertions(+), 51 deletions(-) create mode 100644 arduino/Abmessungen bb104.txt rename arduino/{ => PIR}/Bewegungsmelder_HC-SR501/Bewegungsmelder_HC-SR501.ino (100%) rename arduino/{ => PIR}/ZweiBewegungsmelder/ZweiBewegungsmelder.ino (100%) rename arduino/{ => PIR}/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino (51%) rename arduino/{ => PIR}/zweiBewegungsmelder_neu/zweiBewegungsmelder_neu.ino (100%) rename arduino/{ => Soundmodul}/analog_signal_output/analog_signal_output.ino (100%) rename arduino/{ => Soundmodul}/digital_signal_output_test/digital_signal_output_test.ino (100%) rename arduino/{ => ultraschall}/Ultrasonic_Sensor/Ultrasonic_Sensor.ino (100%) rename arduino/{ => ultraschall}/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino (77%) rename arduino/{ => ultraschall}/wlan_ultraschall/wlan_ultraschall.ino (100%) diff --git a/arduino/Abmessungen bb104.txt b/arduino/Abmessungen bb104.txt new file mode 100644 index 0000000..09a186f --- /dev/null +++ b/arduino/Abmessungen bb104.txt @@ -0,0 +1,3 @@ +Höhe 3,0m +Breite 5,9m +Länge 8,9m \ No newline at end of file diff --git a/arduino/Bewegungsmelder_HC-SR501/Bewegungsmelder_HC-SR501.ino b/arduino/PIR/Bewegungsmelder_HC-SR501/Bewegungsmelder_HC-SR501.ino similarity index 100% rename from arduino/Bewegungsmelder_HC-SR501/Bewegungsmelder_HC-SR501.ino rename to arduino/PIR/Bewegungsmelder_HC-SR501/Bewegungsmelder_HC-SR501.ino diff --git a/arduino/ZweiBewegungsmelder/ZweiBewegungsmelder.ino b/arduino/PIR/ZweiBewegungsmelder/ZweiBewegungsmelder.ino similarity index 100% rename from arduino/ZweiBewegungsmelder/ZweiBewegungsmelder.ino rename to arduino/PIR/ZweiBewegungsmelder/ZweiBewegungsmelder.ino diff --git a/arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino b/arduino/PIR/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino similarity index 51% rename from arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino rename to arduino/PIR/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino index b3b5321..9da22f3 100644 --- a/arduino/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino +++ b/arduino/PIR/wlan_2bewegungssensoren/wlan_2bewegungssensoren.ino @@ -26,7 +26,7 @@ char msg[50]; void setup() { Serial.begin(115200); setup_wifi(); - client.setServer(MQTT_BROKER, 1883); + client.setServer(MQTT_BROKER, 1883); pinMode(ledPin, OUTPUT); pinMode(pirPin1, INPUT); pinMode(pirPin2, INPUT); @@ -53,61 +53,61 @@ void setup_wifi() { } void reconnect() { - while (!client.connected()) { - Serial.print("Reconnecting..."); - if (!client.connect("ESP8266Client")) { - Serial.print("failed, rc="); - Serial.print(client.state()); - Serial.println(" retrying in 5 seconds"); - delay(5000); - } + while (!client.connected()) { + Serial.print("Reconnecting..."); + if (!client.connect("ESP8266Client")) { + Serial.print("failed, rc="); + Serial.print(client.state()); + Serial.println(" retrying in 5 seconds"); + delay(5000); } + } } void loop() { - if (!client.connected()) { - reconnect(); - } - client.loop(); + if (!client.connected()) { + reconnect(); + } + client.loop(); 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 + 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); + client.publish("/gso/bb/104/Pir/1", msg); } - if(pirAn2){ - Serial.println("Steigende Flanke von PIR2"); - snprintf (msg,50,"%c%c",49,49); //Codierung PIR2 steigende Flanke: 11 + 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); + client.publish("/gso/bb/104/Pir/2", msg); } - if(pirAus1){ - Serial.println("Fallende Flanke von PIR1"); - snprintf (msg,50,"%c%c",48,48); //Codierung PIR1 fallende Flanke: 00 + 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); + client.publish("/gso/bb/104/Pir/1", msg); } - if(pirAus2){ - Serial.println("Fallende Flanke von PIR2"); - snprintf (msg,50,"%c%c",48,49); //Codierung PIR2 fallende Flanke: 01 + 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); + client.publish("/gso/bb/104/Pir/2", msg); } - pirValueAlt1=pirValueNeu1; - pirValueAlt2=pirValueNeu2; - } + pirValueAlt1 = pirValueNeu1; + pirValueAlt2 = pirValueNeu2; +} diff --git a/arduino/zweiBewegungsmelder_neu/zweiBewegungsmelder_neu.ino b/arduino/PIR/zweiBewegungsmelder_neu/zweiBewegungsmelder_neu.ino similarity index 100% rename from arduino/zweiBewegungsmelder_neu/zweiBewegungsmelder_neu.ino rename to arduino/PIR/zweiBewegungsmelder_neu/zweiBewegungsmelder_neu.ino diff --git a/arduino/analog_signal_output/analog_signal_output.ino b/arduino/Soundmodul/analog_signal_output/analog_signal_output.ino similarity index 100% rename from arduino/analog_signal_output/analog_signal_output.ino rename to arduino/Soundmodul/analog_signal_output/analog_signal_output.ino diff --git a/arduino/digital_signal_output_test/digital_signal_output_test.ino b/arduino/Soundmodul/digital_signal_output_test/digital_signal_output_test.ino similarity index 100% rename from arduino/digital_signal_output_test/digital_signal_output_test.ino rename to arduino/Soundmodul/digital_signal_output_test/digital_signal_output_test.ino diff --git a/arduino/Ultrasonic_Sensor/Ultrasonic_Sensor.ino b/arduino/ultraschall/Ultrasonic_Sensor/Ultrasonic_Sensor.ino similarity index 100% rename from arduino/Ultrasonic_Sensor/Ultrasonic_Sensor.ino rename to arduino/ultraschall/Ultrasonic_Sensor/Ultrasonic_Sensor.ino diff --git a/arduino/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino b/arduino/ultraschall/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino similarity index 77% rename from arduino/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino rename to arduino/ultraschall/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino index d39b759..24b8928 100644 --- a/arduino/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino +++ b/arduino/ultraschall/Ultrasonic_Sensor_optimiert/Ultrasonic_Sensor_optimiert.ino @@ -2,11 +2,11 @@ #include //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); @@ -84,38 +84,46 @@ void loop() { // Calculating the distance distance = duration * 0.034 / 2; // Prints the distance on the Serial Monitor - /* if ((distance != (distance_alt - 1)) && (distance != (distance_alt)) && (distance != (distance_alt + 1))) { //+-1 um störungen herauszufiltern - snprintf (msg, 50, "%d", distance); - Serial.print("Publish Motion: "); - Serial.println(msg); - client.publish("/home/data", msg); - delay(200); - } */ + /* if ((distance != (distance_alt - 1)) && (distance != (distance_alt)) && (distance != (distance_alt + 1))) { //+-1 um störungen herauszufiltern + snprintf (msg, 50, "%d", distance); + Serial.print("Publish Motion: "); + Serial.println(msg); + client.publish("/home/data", msg); + delay(200); + } */ if (bool1 == 0) { //alternativ: if ((distance != (DISTANCE - 1)) && (distance != (DISTANCE)) && (distance != (DISTANCE + 1))) { //+-1 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; diff --git a/arduino/wlan_ultraschall/wlan_ultraschall.ino b/arduino/ultraschall/wlan_ultraschall/wlan_ultraschall.ino similarity index 100% rename from arduino/wlan_ultraschall/wlan_ultraschall.ino rename to arduino/ultraschall/wlan_ultraschall/wlan_ultraschall.ino