From b734aa8763336f9cad2fd39927d544caec63f756 Mon Sep 17 00:00:00 2001
From: Lukas Bachschwell <lukas@lbsfilm.at>
Date: Fri, 17 May 2019 18:50:14 +0200
Subject: [PATCH] Now working

---
 .vscode/arduino.json |  2 +-
 src/light_main.cpp   | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.vscode/arduino.json b/.vscode/arduino.json
index 6f5baf3..6f3d9fc 100644
--- a/.vscode/arduino.json
+++ b/.vscode/arduino.json
@@ -1,5 +1,5 @@
 {
     "board": "esp8266:esp8266:d1",
     "configuration": "xtal=80,vt=flash,exception=disabled,eesz=4M,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=921600",
-    "port": "/dev/cu.wchusbserial144220"
+    "port": "/dev/cu.usbserial-144220"
 }
\ No newline at end of file
diff --git a/src/light_main.cpp b/src/light_main.cpp
index 08483c7..6ecf416 100644
--- a/src/light_main.cpp
+++ b/src/light_main.cpp
@@ -10,7 +10,7 @@
 #define blinkDuration 500
 #define connectDuration 1000
 
-#define lampOutputPin 12
+#define lampOutputPin 5
 bool isBlinking = false;
 bool lampState = false;
 
@@ -141,13 +141,13 @@ void browseService(const char *service, const char *proto) {
       Serial.print(MDNS.port(i));
       Serial.println(")");
 
-      if (MDNS.hostname(i) == "a2clcontroller") {
+      if (MDNS.hostname(i).startsWith("a2clcontroller")) {
         Serial.println("Trying to connect");
         Serial.println(MDNS.IP(i));
 
         foundIp = true;
         ip = MDNS.IP(i);
-        webSocket.begin(ip, 80, "/ws");
+        webSocket.begin(ip.toString(), 80, "/ws");
         webSocket.onEvent(webSocketEvent);
         // webSocket.setAuthorization("user", "Password");
         webSocket.setReconnectInterval(3000);
@@ -160,7 +160,8 @@ void browseService(const char *service, const char *proto) {
 
 void loop() {
   if (!foundIp && eth_connected && ((millis() - connectTimer) > connectDuration)) {
-    // browseService("http", "tcp");
+    browseService("http", "tcp");
+    /*
     ip = MDNS.queryHost("a2clcontroller");
     Serial.println(ip);
     foundIp = true;
@@ -168,12 +169,14 @@ void loop() {
     webSocket.onEvent(webSocketEvent);
     // webSocket.setAuthorization("user", "Password");
     webSocket.setReconnectInterval(3000);
+    */
     connectTimer = millis();
   }
 
-  // webSocket.loop();
+  if (foundIp)
+    webSocket.loop();
 
-  if (millis() - blinkTimer > blinkDuration) {
+  if (isBlinking && millis() - blinkTimer > blinkDuration) {
     lampState = !lampState;
     digitalWrite(lampOutputPin, lampState);
     blinkTimer = millis();