1.20

klausahrenberg · Jan 17, 2021 · 301ccf9 · 301ccf9
1 parent 210154f
commit 301ccf9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/WNeoCoolcam/platformio.ini b/WNeoCoolcam/platformio.ini
@@ -20,7 +20,7 @@ build_flags =
     -I ../../WAdapter/WAdapter
 lib_deps =
     ESP8266WiFi
-    ottowinter/ESPAsyncWebServer-esphome@^1.2.7
+    https://github.com/me-no-dev/ESPAsyncWebServer
     AsyncTCP
     ESP8266mDNS
     DNSServer

diff --git a/WNeoCoolcam/src/WNeoCoolcam.cpp b/WNeoCoolcam/src/WNeoCoolcam.cpp
@@ -4,7 +4,7 @@
 
 
 #define APPLICATION "Neo Coolcam"
-#define VERSION "1.18"
+#define VERSION "1.20"
 #define FLAG_SETTINGS 0x17
 #define DEBUG false
 

diff --git a/WNeoCoolcam/src/WNeoDevice.h b/WNeoCoolcam/src/WNeoDevice.h
@@ -67,7 +67,7 @@ class WNeoDevice: public WDevice {
     network->addCustomPage(configPage);
 		//StatusLed
 		if (supportedDevices[getDeviceType()].statusLed != NO_PIN) {
-			this->statusLed = new WLed(supportedDevices[getDeviceType()].statusLed);
+			network->setStatusLedPin(supportedDevices[getDeviceType()].statusLed);
 		}
 		for (int i = 0; i < COUNT_MAX_RELAIS; i++) {
 			if (supportedDevices[getDeviceType()].relayPins[i] != NO_PIN) {
@@ -81,6 +81,17 @@ class WNeoDevice: public WDevice {
 				//Property
 				onOffProperty = WProperty::createOnOffProperty(pN.c_str(), pD.c_str());
 				this->addProperty(onOffProperty);
+				//toggle property
+				pN = "trigger";
+				pD = "Trigger";
+				if (i > 0) {
+					pN.concat(i + 1);
+					pD.concat(" ");
+					pD.concat(i + 1);
+				}
+				triggerProperty = WProperty::createOnOffProperty(pN.c_str(), pD.c_str());
+				triggerProperty->setVisibility(MQTT);
+				this->addProperty(triggerProperty);
 				if (getDeviceMode() != MODE_NO_RELAY_USAGE) {
 					//Relay
 					pN = "relay";
@@ -109,6 +120,7 @@ class WNeoDevice: public WDevice {
 				//If more buttons than relais, than assign all buttons to last relay, e.g. SonoffBasic
 				WSwitch* button = new WSwitch(supportedDevices[getDeviceType()].switchPins[i], supportedDevices[getDeviceType()].switchModes[i]);
 				button->setProperty(onOffProperty);
+				button->setTriggerProperty(triggerProperty);
 				this->addPin(button);
 			}
 
@@ -207,6 +219,7 @@ class WNeoDevice: public WDevice {
 	WProperty* ledProgram;
 	W2812Led* ledStrip;
 	WProperty* onOffProperty;
+	WProperty* triggerProperty;
 	WProperty* mainLedRelay;
 	WProperty* showAsWebthingDevice;
 };

diff --git a/WNeoCoolcam_1.18.bin → WNeoCoolcam_1.20.bin b/WNeoCoolcam_1.18.bin → WNeoCoolcam_1.20.bin