improved simulation: GPIO added and dofile adapted

simulation/src/de/c3ma/ollo/WS2812Simulation.java

@@ -13,6 +13,7 @@ import org.luaj.vm2.lib.jse.JsePlatform;
 import de.c3ma.ollo.mockup.DoFileFunction;
 import de.c3ma.ollo.mockup.ESP8266Adc;
 import de.c3ma.ollo.mockup.ESP8266File;
+import de.c3ma.ollo.mockup.ESP8266GPIO;
 import de.c3ma.ollo.mockup.ESP8266Net;
 import de.c3ma.ollo.mockup.ESP8266Node;
 import de.c3ma.ollo.mockup.ESP8266Time;
@@ -46,11 +47,13 @@ public class WS2812Simulation implements LuaSimulation {
 		globals.load(espTmr);
 		globals.load(espFile);
 		globals.load(espNode);
+		globals.load(new ESP8266GPIO());
 		globals.load(adc);
 		globals.load(new ESP8266Wifi());
 		globals.load(new ESP8266Net());
 		globals.load(new ESP8266Time());
 		globals.set("dofile", doFile);
+		adc.setADC(50);
 
 		try {
 			File tempFile = File.createTempFile("NodemcuSimuFile", "");

simulation/src/de/c3ma/ollo/mockup/DoFileFunction.java

@@ -26,14 +26,13 @@ public class DoFileFunction extends OneArgFunction {
     public LuaValue call(LuaValue luaFilename) {
         String filename = luaFilename.checkjstring();
         
-        System.out.println("[Nodemcu] dofile " + filename);
+        //System.out.println("[Nodemcu] dofile " + filename);
         
         File f = new File(workingDir.getAbsolutePath() + File.separator + filename);
         
         if (f.exists()) {
             LuaValue chunk = this.globals.loadfile(f.getAbsolutePath());
-            chunk.call();
-            return LuaValue.valueOf(true);
+            return chunk.call();
         } else {
             return LuaValue.valueOf(false);
         }

simulation/src/de/c3ma/ollo/mockup/ESP8266GPIO.java

@@ -0,0 +1,51 @@
+package de.c3ma.ollo.mockup;
+
+import org.luaj.vm2.LuaTable;
+import org.luaj.vm2.LuaValue;
+import org.luaj.vm2.Varargs;
+import org.luaj.vm2.lib.TwoArgFunction;
+import org.luaj.vm2.lib.VarArgFunction;
+
+/**
+ * created at 08.05.2019 - 21:33:04<br />
+ * creator: ollo<br />
+ * project: ESP8266GPIO Emulation<br />
+ * $Id: $<br />
+ * @author ollo<br />
+ */
+public class ESP8266GPIO extends TwoArgFunction {
+
+	@Override
+	public LuaValue call(LuaValue modname, LuaValue env) {
+		env.checkglobals();
+        final LuaTable gpio = new LuaTable();
+        gpio.set("mode", new Mode());
+        gpio.set("read", new Read(this));
+        env.set("gpio", gpio);
+        env.get("package").get("loaded").set("gpio", gpio);
+        return gpio;
+	}
+	
+	private class Read extends VarArgFunction {
+		
+		private ESP8266GPIO mGpio = null;
+		
+		Read(ESP8266GPIO gpio) {
+			this.mGpio = gpio;
+		}
+    	
+        public Varargs invoke(Varargs varargs) {
+        	int pin = varargs.toint(0);
+        	//FIXME add here something to simulate a pin pressing
+            return LuaValue.valueOf((int)1);
+        }
+    }
+	
+	private class Mode extends VarArgFunction {
+    	
+        public Varargs invoke(Varargs varargs) {
+        	System.out.println("[GPIO] mode GPIO" + varargs.toint(0) + "=" + varargs.toint(1));
+            return LuaValue.valueOf(true);
+        }
+    }
+}