From f8a898c2beb267972f8b2fa07091c406ced39496 Mon Sep 17 00:00:00 2001 From: Tilman Date: Sat, 2 Mar 2019 11:15:34 +0000 Subject: [PATCH] Update garage/Garage.ino --- garage/Garage.ino | 51 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/garage/Garage.ino b/garage/Garage.ino index 5110689..c89dfc2 100644 --- a/garage/Garage.ino +++ b/garage/Garage.ino @@ -7,14 +7,17 @@ const char* PASSWORD = "5275274365464843"; ESP8266WebServer server(80); const int remotePin = D1; -const int buttonPin = D2; +const int remoteButton = D2; const int motorPin = D3; +const int motorButton = D4; void setup() { Serial.begin(115200); connectWifi(); - server.on("/trigger", handleRequest); + server.on("/triggerRemote", handleTriggerRemote); + server.on("/triggerMotor", handleTriggerMotor); + server.on("/triggerAll", handleTriggerAll); server.begin(); Serial.println("Server listening"); @@ -24,9 +27,6 @@ void setup() { pinMode(motorPin, OUTPUT); } - -int buttonState = 0; - void loop() { if ((WiFi.status() == WL_CONNECTED)) { server.handleClient(); @@ -36,18 +36,43 @@ void loop() { connectWifi(); } - buttonState = digitalRead(buttonPin); + if (digitalRead(remoteButton) == LOW) { + Serial.println("Remote button pressed"); + triggerRemote(); + } - if (buttonState == LOW) { - Serial.println("Button pressed"); - triggerAll(); + if (digitalRead(motorButton) == LOW) { + Serial.println("Motor button pressed"); + triggerMotor(); } } -void handleRequest() { - Serial.println("handleRequest()"); - server.send(200, "text/plain", "Triggered"); - triggerAll(); +void handleTriggerRemote() { + Serial.println("handleTriggerRemote()"); + server.send(200, "text/plain", "Trigger remote"); + triggerRemote(); +} + +void handleTriggerMotor() { + Serial.println("handleTriggerMotor()"); + server.send(200, "text/plain", "Trigger motor"); + triggerMotor(); +} + +void triggerRemote() { + digitalWrite(remotePin, HIGH); + digitalWrite(BUILTIN_LED, LOW); + delay(500); + digitalWrite(remotePin, LOW); + digitalWrite(BUILTIN_LED, HIGH); +} + +void triggerMotor() { + digitalWrite(motorPin, HIGH); + digitalWrite(BUILTIN_LED, LOW); + delay(500); + digitalWrite(motorPin, LOW); + digitalWrite(BUILTIN_LED, HIGH); } void triggerAll() {