From f1f192932a7748dd716aec94dce116a502ad1b0d Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Fri, 16 Aug 2019 14:03:05 +0200
Subject: [PATCH] update

---
 esh-actor/.vscode/extensions.json  | 12 ++++++------
 esh-actor/src/main.cpp             |  9 ++++++---
 esh-esp.code-workspace             |  4 ++++
 esh-sensor/.vscode/extensions.json | 12 ++++++------
 esh-sensor/platformio.ini          |  2 +-
 esh-sensor/src/main.cpp            |  4 ++--
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/esh-actor/.vscode/extensions.json b/esh-actor/.vscode/extensions.json
index 8281e64..272828b 100644
--- a/esh-actor/.vscode/extensions.json
+++ b/esh-actor/.vscode/extensions.json
@@ -1,7 +1,7 @@
-{
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
-	// for the documentation about the extensions.json format
-	"recommendations": [
-		"platformio.platformio-ide"
-	]
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+		"platformio.platformio-ide"
+	]
 }
\ No newline at end of file
diff --git a/esh-actor/src/main.cpp b/esh-actor/src/main.cpp
index 4771236..1e57bb8 100644
--- a/esh-actor/src/main.cpp
+++ b/esh-actor/src/main.cpp
@@ -24,11 +24,12 @@ void setup(void) {
     u8g2.setFont(u8g2_font_6x10_mf);
     u8g2.setFontMode(0);
     WiFi.mode(WIFI_STA);
-    WiFiMulti.addAP("Darknet-IOT", "kekseFTW");
+    WiFiMulti.addAP("MSTN-WS-N", "DEADC0FFEE1234567890DEC0DE");
 }
 
 uint16_t adcval = 300;
 unsigned char contrast = 0;
+String state = "Off";
 void loop(void) {
     u8g2.firstPage();
     WiFiClient client;
@@ -45,8 +46,8 @@ void loop(void) {
             u8g2.drawStr(0, 17, ipbuf);
             u8g2.drawStr(0, 27, "api rq...");
 
-            String url = String("http://ctrans.local:5000/api") + "?mac=" + WiFi.macAddress() + "&datatype=int"
-                    +  "&actortype=ESP8266_simple_actor" + "&state=Waiting";
+            String url = String("http://kaby.fritz.box:5000/api") + "?mac=" + WiFi.macAddress() + "&datatype=int"
+                    +  "&actortype=ESP8266_simple_actor" + "&state=" + state;
 
             if(http.begin(client, url)) {
                 int httpCode = http.GET();
@@ -55,10 +56,12 @@ void loop(void) {
                     Serial.printf("HTTP Response Code: %d\n", httpCode);
                     if (payload == "1"){
                         Serial.println("HIGH:" + payload);
+                        state = "On";
                         digitalWrite(D3, HIGH);
                     }
                     else{
                         Serial.println("LOW:" + payload);
+                        state = "Off";
                         digitalWrite(D3, LOW);
                     }
                     if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY) {
diff --git a/esh-esp.code-workspace b/esh-esp.code-workspace
index 70a2970..1fba8fa 100644
--- a/esh-esp.code-workspace
+++ b/esh-esp.code-workspace
@@ -12,6 +12,10 @@
 		"terminal.integrated.env.linux": {
 			"PATH": "/home/laura/.platformio/penv/bin:/home/laura/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl",
 			"PLATFORMIO_CALLER": "vscode"
+		},
+		"terminal.integrated.env.osx": {
+			"PATH": "/Users/laura/.platformio/penv/bin:/Users/laura/.platformio/penv:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:/Applications/VMware Fusion.app/Contents/Public:/Library/TeX/texbin:/usr/local/MacGPG2/bin:/usr/local/share/dotnet:~/.dotnet/tools",
+			"PLATFORMIO_CALLER": "vscode"
 		}
 	}
 }
\ No newline at end of file
diff --git a/esh-sensor/.vscode/extensions.json b/esh-sensor/.vscode/extensions.json
index 8281e64..272828b 100644
--- a/esh-sensor/.vscode/extensions.json
+++ b/esh-sensor/.vscode/extensions.json
@@ -1,7 +1,7 @@
-{
-	// See http://go.microsoft.com/fwlink/?LinkId=827846
-	// for the documentation about the extensions.json format
-	"recommendations": [
-		"platformio.platformio-ide"
-	]
+{
+	// See http://go.microsoft.com/fwlink/?LinkId=827846
+	// for the documentation about the extensions.json format
+	"recommendations": [
+		"platformio.platformio-ide"
+	]
 }
\ No newline at end of file
diff --git a/esh-sensor/platformio.ini b/esh-sensor/platformio.ini
index 6bb127a..9be829c 100644
--- a/esh-sensor/platformio.ini
+++ b/esh-sensor/platformio.ini
@@ -11,4 +11,4 @@
 [env:nodemcuv2]
 platform = espressif8266
 board = nodemcuv2
-framework = arduino
+framework = arduino
\ No newline at end of file
diff --git a/esh-sensor/src/main.cpp b/esh-sensor/src/main.cpp
index 6843a4d..e7f3704 100644
--- a/esh-sensor/src/main.cpp
+++ b/esh-sensor/src/main.cpp
@@ -22,7 +22,7 @@ void setup(void) {
     u8g2.setFont(u8g2_font_6x10_mf);
     u8g2.setFontMode(0);
     WiFi.mode(WIFI_STA);
-    WiFiMulti.addAP("Darknet-IOT", "kekseFTW");
+    WiFiMulti.addAP("MSTN-WS-N", "DEADC0FFEE1234567890DEC0DE");
     pinMode(D3, INPUT_PULLUP);
     pinMode(D6, INPUT_PULLUP);
     pinMode(D7, INPUT_PULLUP);
@@ -59,7 +59,7 @@ void loop(void) {
                 if (!tmp){
                     tmp = true;
                     state = !state;
-                    String url = String("http://ctrans.local:5000/api") + "?mac=" + WiFi.macAddress() + "&datatype=bool"
+                    String url = String("http://kaby.fritz.box:5000/api") + "?mac=" + WiFi.macAddress() + "&datatype=bool"
                     +  "&sensortype=ESP8266_simple_sensor" + "&value=" + state + "&displayunit=nA";
                     if(http.begin(client, url)) {
                         int httpCode = http.GET();