inverted inputs

BauerPh · Jul 16, 2018 · e0613ff · e0613ff
1 parent 1c4fa54
commit e0613ff
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/ESP8266_Firmware/ESP8266_Firmware.ino b/ESP8266_Firmware/ESP8266_Firmware.ino
@@ -4,7 +4,7 @@
 #include <Bounce2.h>
 #include <JSONtoSPIFFS.h>
 
-#include "Modul_Info_1O.h"
+#include "Modul_Info_2O.h"
 
 #define CONFIGFILE_MQTT "config_MQTT.json"
 #define CONFIGFILE_IO "config_IO.json"
@@ -153,8 +153,8 @@ void evaluateInput(int x, Bounce &debouncer) {
 	int tmpInNr = x - 1;
 	if (tmpInNr < 0 || tmpInNr > 1) return;
 	debouncer.update();
-	//Rising Edge
-	if (debouncer.rose()) {
+	//Rising Edge (Opto inverts Signal!!!)
+	if (debouncer.fell()) {
 		switch (InConf[tmpInNr].ctrlOutput1RisingEdge) {
 		case 1: //ON
 			if (!lockOutput[0]) output[0] = true;
@@ -189,8 +189,8 @@ void evaluateInput(int x, Bounce &debouncer) {
 			mqttClient.publish(InConf[tmpInNr].cmd.topic.c_str(), InConf[tmpInNr].cmd.qos, InConf[tmpInNr].cmd.retain, InConf[tmpInNr].cmd.payloadOn.c_str());
 		}
 	}
-	//Falling Edge
-	else if (debouncer.fell()) {
+	//Falling Edge (Opto inverts Signal!!!)
+	else if (debouncer.rose()) {
 		switch (InConf[tmpInNr].ctrlOutput1FallingEdge) {
 		case 1: //ON
 			if (!lockOutput[0]) output[0] = true;

diff --git a/ESP8266_Firmware/Modul_Info_1O.h b/ESP8266_Firmware/Modul_Info_1O.h
@@ -1,5 +1,5 @@
 #define MODEL_NAME "ESP_230V_IO_UP_1O"
-#define VERSION "1.3.3"
+#define VERSION "1.3.4"
 //************************ IOs ***************************
 #define INPUT1_PIN 12
 #define INPUT2_PIN 13

diff --git a/ESP8266_Firmware/Modul_Info_2O.h b/ESP8266_Firmware/Modul_Info_2O.h
@@ -1,5 +1,5 @@
 #define MODEL_NAME "ESP_230V_IO_UP_2O"
-#define VERSION "1.3.3"
+#define VERSION "1.3.4"
 //************************ IOs ***************************
 #define INPUT1_PIN 12
 #define INPUT2_PIN 13

diff --git a/ESP8266_Firmware/data/admin.html b/ESP8266_Firmware/data/admin.html
@@ -30,6 +30,6 @@
         <td align="left"><hr></td>
     </tr>
     <tr>
-        <td align="left">Version: 1.3.3</td>
+        <td align="left">Version: 1.3.4</td>
     </tr>    
 </table>
diff --git a/php_updateServer/version.php b/php_updateServer/version.php
@@ -1,8 +1,8 @@
 <?PHP
 return array(
 
-	"ESP_230V_IO_UP_1O" => "1.3.3",
-	"ESP_230V_IO_UP_2O" => "1.3.3",
+	"ESP_230V_IO_UP_1O" => "1.3.4",
+	"ESP_230V_IO_UP_2O" => "1.3.4",
 
 );
 ?>