Update garage/Garage.ino

This commit is contained in:
2019-03-02 11:15:34 +00:00
parent 943f0aa5ff
commit f8a898c2be
+38 -13
View File
@@ -7,14 +7,17 @@ const char* PASSWORD = "5275274365464843";
ESP8266WebServer server(80); ESP8266WebServer server(80);
const int remotePin = D1; const int remotePin = D1;
const int buttonPin = D2; const int remoteButton = D2;
const int motorPin = D3; const int motorPin = D3;
const int motorButton = D4;
void setup() { void setup() {
Serial.begin(115200); Serial.begin(115200);
connectWifi(); connectWifi();
server.on("/trigger", handleRequest); server.on("/triggerRemote", handleTriggerRemote);
server.on("/triggerMotor", handleTriggerMotor);
server.on("/triggerAll", handleTriggerAll);
server.begin(); server.begin();
Serial.println("Server listening"); Serial.println("Server listening");
@@ -24,9 +27,6 @@ void setup() {
pinMode(motorPin, OUTPUT); pinMode(motorPin, OUTPUT);
} }
int buttonState = 0;
void loop() { void loop() {
if ((WiFi.status() == WL_CONNECTED)) { if ((WiFi.status() == WL_CONNECTED)) {
server.handleClient(); server.handleClient();
@@ -36,18 +36,43 @@ void loop() {
connectWifi(); connectWifi();
} }
buttonState = digitalRead(buttonPin); if (digitalRead(remoteButton) == LOW) {
Serial.println("Remote button pressed");
triggerRemote();
}
if (buttonState == LOW) { if (digitalRead(motorButton) == LOW) {
Serial.println("Button pressed"); Serial.println("Motor button pressed");
triggerAll(); triggerMotor();
} }
} }
void handleRequest() { void handleTriggerRemote() {
Serial.println("handleRequest()"); Serial.println("handleTriggerRemote()");
server.send(200, "text/plain", "Triggered"); server.send(200, "text/plain", "Trigger remote");
triggerAll(); 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() { void triggerAll() {