From 989d8b263a6db4e0e767a63613ac3db346c96d7b Mon Sep 17 00:00:00 2001
From: ollo <ollo@olloThinkPad>
Date: Tue, 2 Jan 2018 12:47:31 +0100
Subject: [PATCH] Wifi configured

---
 .../src/de/c3ma/ollo/WS2812Simulation.java    |  4 ++
 .../src/de/c3ma/ollo/mockup/ESP8266Wifi.java  | 40 ++++++++++++-------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/simulation/src/de/c3ma/ollo/WS2812Simulation.java b/simulation/src/de/c3ma/ollo/WS2812Simulation.java
index 57c28f6..fc585de 100644
--- a/simulation/src/de/c3ma/ollo/WS2812Simulation.java
+++ b/simulation/src/de/c3ma/ollo/WS2812Simulation.java
@@ -10,7 +10,9 @@ import org.luaj.vm2.lib.jse.JsePlatform;
 
 import de.c3ma.ollo.mockup.DoFileFunction;
 import de.c3ma.ollo.mockup.ESP8266File;
+import de.c3ma.ollo.mockup.ESP8266Net;
 import de.c3ma.ollo.mockup.ESP8266Node;
+import de.c3ma.ollo.mockup.ESP8266Time;
 import de.c3ma.ollo.mockup.ESP8266Tmr;
 import de.c3ma.ollo.mockup.ESP8266Uart;
 import de.c3ma.ollo.mockup.ESP8266Wifi;
@@ -40,6 +42,8 @@ public class WS2812Simulation implements LuaSimulation {
         globals.load(espFile);
         globals.load(espNode);
         globals.load(new ESP8266Wifi());
+        globals.load(new ESP8266Net());
+        globals.load(new ESP8266Time());
         globals.set("dofile", doFile);
         
         try {
diff --git a/simulation/src/de/c3ma/ollo/mockup/ESP8266Wifi.java b/simulation/src/de/c3ma/ollo/mockup/ESP8266Wifi.java
index 48bcb3b..3f0d41d 100644
--- a/simulation/src/de/c3ma/ollo/mockup/ESP8266Wifi.java
+++ b/simulation/src/de/c3ma/ollo/mockup/ESP8266Wifi.java
@@ -26,8 +26,15 @@ public class ESP8266Wifi extends TwoArgFunction {
         env.checkglobals();
         final LuaTable wifi = new LuaTable();
         wifi.set("setmode", new SetModeFunction());
-        wifi.set("ap", new ApFunction());
+        final LuaTable ap = new LuaTable();
+        ap.set("config", new ConfigFunction());
+        wifi.set("ap", ap);
+        final LuaTable sta = new LuaTable();
+        sta.set("status", new StatusFunction());
+        sta.set("getip", new GetIpFunction());
+        wifi.set("sta", sta);
         wifi.set("SOFTAP", "SOFTAP");
+        wifi.set("STATION", "STATION");
         env.set("wifi", wifi);
         env.get("package").get("loaded").set("wifi", wifi);        
         return wifi;
@@ -44,19 +51,6 @@ public class ESP8266Wifi extends TwoArgFunction {
         
     }
     
-    private class ApFunction extends TwoArgFunction {
-
-        @Override
-        public LuaValue call(LuaValue modname, LuaValue env) {
-            final LuaTable ap = new LuaTable();
-            ap.set("config", new ConfigFunction());
-            env.set("ap", ap);
-            env.get("package").get("loaded").set("wifi.ap", ap); 
-            return ap;
-        }
-        
-    }
-    
     private class ConfigFunction extends OneArgFunction {
 
         @Override
@@ -66,4 +60,22 @@ public class ESP8266Wifi extends TwoArgFunction {
         }
         
     }
+    
+    private class StatusFunction extends ZeroArgFunction {
+
+        @Override
+        public LuaValue call() {
+            return LuaValue.valueOf(5);
+        }
+        
+    }
+    
+    private class GetIpFunction extends ZeroArgFunction {
+
+        @Override
+        public LuaValue call() {
+            return LuaValue.valueOf("127.0.0.1");
+        }
+        
+    }
 }