WIP

Author: d-a-v

libraries/ESP8266WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino

@@ -40,6 +40,8 @@ ESP8266WebServer server(80);
 
 const int led = 13;
 
+void drawGraph();
+
 void handleRoot() {
   digitalWrite(led, 1);
   char temp[400];

tests/host/Makefile

@@ -21,10 +21,10 @@ CORE_CPP_FILES := $(addprefix $(CORE_PATH)/,\
 	WString.cpp \
 	Print.cpp \
 	FS.cpp \
-	spiffs_api.cpp \
 	pgmspace.cpp \
 	MD5Builder.cpp \
 )
+#	spiffs_api.cpp \
 
 CORE_C_FILES := $(addprefix $(CORE_PATH)/,\
 	core_esp8266_noniso.c \
@@ -189,8 +189,6 @@ ARDUINO_LIBS := \
 		ESP8266HTTPClient/src/ESP8266HTTPClient.cpp \
 	) \
 
-
-
 MOCK_ARDUINO_LIBS := \
 	common/MockClientContextSocket.cpp \
 	common/MockClientContext.cpp \
@@ -210,7 +208,12 @@ CPP_SOURCES_CORE_EMU = \
 	$(MOCK_ARDUINO_LIBS) \
 	$(ARDUINO_LIBS) \
 
-CPP_OBJECTS_CORE_EMU = $(CPP_SOURCES_CORE_EMU:.cpp=.cpp.o)
+
+ULIBPATHS = $(shell echo $(ULIBDIR) | sed 's,:, ,g')
+USERLIBDIR = $(shell test -z "$(ULIBPATHS)" || for d in $(ULIBPATHS)/* $(ULIBPATHS)/*/src; do test -d $$d && echo -I$$d; done)
+INC_PATHS += $(USERLIBDIR)
+
+CPP_OBJECTS_CORE_EMU = $(CPP_SOURCES_CORE_EMU:.cpp=.cpp.o) $(USERLIB:.cpp=.cpp.o)
 
 bin/fullcore.a: $(C_OBJECTS) $(CPP_OBJECTS_CORE_EMU)
 	ar -rcu $@ $^
@@ -219,9 +222,9 @@ bin/fullcore.a: $(C_OBJECTS) $(CPP_OBJECTS_CORE_EMU)
 .PRECIOUS: %.cpp.o
 %: %.ino.cpp.o bin/fullcore.a
 	$(CXX) $(LDFLAGS) $< bin/fullcore.a -o $@
-	ln -sf ../$@ $(BINDIR)
+	test -r $@ && ln -sf ../$@ $(BINDIR) || ln -sf $@ $(BINDIR)
 
-.PRECIOUS: %.cpp
+.PRECIOUS: %.ino.cpp
 %.ino.cpp: %.ino
 	@s=$<; \
 	n=$${s##*/}; \

tests/host/README

@@ -2,6 +2,8 @@
 Host emulation (WIP)
 --------------------
 
+All results are stored or linked from ./bin/ .
+
 Regular host test:
 	make <no argument>
 
@@ -16,7 +18,6 @@ Build one example
 run it:
 	./bin/Blink -h
 
-
 Interesting examples:
 	make D=1 ../../libraries/esp8266/examples/Blink/Blink
 	make D=1 ../../libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient
@@ -25,3 +26,7 @@ Interesting examples:
 Needs tweaking:
 	make D=1 ../../libraries/ESP8266WebServer/examples/AdvancedWebServer/AdvancedWebServer
 		(declare 'void drawGraph();' on top of file)
+
+Compile your sketches (remove the .ino part of the sketch file name):
+	make D=1 ULIBDIR=/path/to/your/arduino/libraries:/path/to/another/one /path/to/your/sketchdir/sketch
+

tests/host/common/HardwareSerial.cpp

@@ -17,6 +17,11 @@ void HardwareSerial::begin (unsigned long baud, SerialConfig config, SerialMode
 		fprintf(stderr, MOCK "FIXME HardwareSerial::begin(baud=%ld config=0x%x mode=0x%x)\n", baud, (int)config, (int)mode);
 }
 
+void HardwareSerial::setDebugOutput (bool on)
+{
+	(void)on;
+}
+
 int HardwareSerial::available (void)
 {
 	printf(MOCK "TODO HardwareSerial::available\n");

tests/host/common/MockEsp.cpp

@@ -135,4 +135,9 @@ uint32_t EspClass::getFlashChipRealSize(void)
 uint32_t EspClass::getFlashChipSize(void)
 {
 	return magicFlashChipSize(4);
-}
+}
+
+String EspClass::getFullVersion ()
+{
+	return "host-emulation";
+}

tests/host/common/mock.h

@@ -76,7 +76,8 @@ class InterruptLock { };
 
 //
 
-#define ESP8266
+#define ARDUINO 1
+#define ESP8266 1
 #define A0 0
 #define LED_BUILTIN 0
 

tests/host/common/user_interface.cpp

@@ -363,6 +363,7 @@ bool wifi_station_scan(struct scan_config *config, scan_done_cb_t cb)
 	return false;
 }
 
+uint32_t core_version = 1;
 
 ///////////////////////////////////////
 // not user_interface