WIP

Author: d-a-v

cores/esp8266/Esp.cpp

@@ -22,7 +22,7 @@
 #include "flash_utils.h"
 #include "eboot_command.h"
 #include <memory>
-#include "interrupts.h"
+#include <interrupts.h>
 #include "MD5Builder.h"
 #include "umm_malloc/umm_malloc.h"
 #include "cont.h"
@@ -165,6 +165,7 @@ void EspClass::restart(void)
 uint16_t EspClass::getVcc(void)
 {
     InterruptLock lock;
+    (void)lock;
     return system_get_vdd33();
 }
 
@@ -480,7 +481,7 @@ uint32_t EspClass::getFreeSketchSpace() {
     uint32_t usedSize = getSketchSize();
     // round one sector up
     uint32_t freeSpaceStart = (usedSize + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
-    uint32_t freeSpaceEnd = (uint32_t)&_SPIFFS_start - 0x40200000;
+    uint32_t freeSpaceEnd = (uint32_t)(unsigned long)&_SPIFFS_start - 0x40200000;
 
 #ifdef DEBUG_SERIAL
     DEBUG_SERIAL.printf("usedSize=%u freeSpaceStart=%u freeSpaceEnd=%u\r\n", usedSize, freeSpaceStart, freeSpaceEnd);

cores/esp8266/Updater.cpp

@@ -1,8 +1,8 @@
 #include "Updater.h"
 #include "Arduino.h"
 #include "eboot_command.h"
-#include "interrupts.h"
-#include "esp8266_peri.h"
+#include <interrupts.h>
+#include <esp8266_peri.h>
 
 //#define DEBUG_UPDATER Serial
 
@@ -89,7 +89,7 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
     //size of current sketch rounded to a sector
     uint32_t currentSketchSize = (ESP.getSketchSize() + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
     //address of the end of the space available for sketch and update
-    uint32_t updateEndAddress = (uint32_t)&_SPIFFS_start - 0x40200000;
+    uint32_t updateEndAddress = (uint32_t)(unsigned long)&_SPIFFS_start - 0x40200000;
     //size of the update rounded to a sector
     uint32_t roundedSize = (size + FLASH_SECTOR_SIZE - 1) & (~(FLASH_SECTOR_SIZE - 1));
     //address where we will start writing the update
@@ -108,7 +108,7 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
     }
   }
   else if (command == U_SPIFFS) {
-     updateStartAddress = (uint32_t)&_SPIFFS_start - 0x40200000;
+     updateStartAddress = (uint32_t)(unsigned long)&_SPIFFS_start - 0x40200000;
   }
   else {
     // unknown command
@@ -133,7 +133,7 @@ bool UpdaterClass::begin(size_t size, int command, int ledPin, uint8_t ledOn) {
 #ifdef DEBUG_UPDATER
   DEBUG_UPDATER.printf("[begin] _startAddress:     0x%08X (%d)\n", _startAddress, _startAddress);
   DEBUG_UPDATER.printf("[begin] _currentAddress:   0x%08X (%d)\n", _currentAddress, _currentAddress);
-  DEBUG_UPDATER.printf("[begin] _size:             0x%08X (%d)\n", _size, _size);
+  DEBUG_UPDATER.printf("[begin] _size:             0x%08X (%d)\n", (unsigned)_size, (unsigned)_size);
 #endif
 
   _md5.begin();
@@ -159,7 +159,7 @@ bool UpdaterClass::end(bool evenIfRemaining){
 
   if(hasError() || (!isFinished() && !evenIfRemaining)){
 #ifdef DEBUG_UPDATER
-    DEBUG_UPDATER.printf("premature end: res:%u, pos:%u/%u\n", getError(), progress(), _size);
+    DEBUG_UPDATER.printf("premature end: res:%u, pos:%u/%u\n", getError(), (unsigned)progress(), (unsigned)_size);
 #endif
 
     _reset();
@@ -199,10 +199,10 @@ bool UpdaterClass::end(bool evenIfRemaining){
     eboot_command_write(&ebcmd);
 
 #ifdef DEBUG_UPDATER
-    DEBUG_UPDATER.printf("Staged: address:0x%08X, size:0x%08X\n", _startAddress, _size);
+    DEBUG_UPDATER.printf("Staged: address:0x%08X, size:0x%08X\n", _startAddress, (unsigned)_size);
   }
   else if (_command == U_SPIFFS) {
-    DEBUG_UPDATER.printf("SPIFFS: address:0x%08X, size:0x%08X\n", _startAddress, _size);
+    DEBUG_UPDATER.printf("SPIFFS: address:0x%08X, size:0x%08X\n", _startAddress, (unsigned)_size);
 #endif
   }
 

libraries/DNSServer/src/DNSServer.cpp

@@ -10,7 +10,7 @@
 
 DNSServer::DNSServer()
 {
-  _ttl = htonl(60);
+  _ttl = lwip_htonl(60);
   _errorReplyCode = DNSReplyCode::NonExistentDomain;
 }
 
@@ -35,7 +35,7 @@ void DNSServer::setErrorReplyCode(const DNSReplyCode &replyCode)
 
 void DNSServer::setTTL(const uint32_t &ttl)
 {
-  _ttl = htonl(ttl);
+  _ttl = lwip_htonl(ttl);
 }
 
 void DNSServer::stop()
@@ -81,7 +81,7 @@ void DNSServer::processNextRequest()
 
 bool DNSServer::requestIncludesOnlyOneQuestion(const DNSHeader* dnsHeader)
 {
-  return ntohs(dnsHeader->QDCount) == 1 &&
+  return lwip_ntohs(dnsHeader->QDCount) == 1 &&
          dnsHeader->ANCount == 0 &&
          dnsHeader->NSCount == 0 &&
          dnsHeader->ARCount == 0;

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

@@ -734,7 +734,7 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size)
         free(buff);
 
         if(size && (int) size != bytesWritten) {
-            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %d mismatch!.\n", bytesWritten, size);
+            DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %d mismatch!.\n", bytesWritten, (int)size);
             DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] ERROR SEND PAYLOAD FAILED!");
             return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
         } else {

tests/host/Makefile

@@ -80,15 +80,18 @@ PREINCLUDES := \
 	-include common/mock.h \
 	-include common/c_types.h \
 
+ifneq ($(D),)
 DEBUG += -DDEBUG_ESP_PORT=Serial
 DEBUG += -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_MDNS
+endif
 
 CXXFLAGS += $(DEBUG) -std=c++11 -Wall -Werror -coverage -O0 -fno-common -g
 CFLAGS += -std=c99 -Wall -Werror -coverage -O0 -fno-common -g
 LDFLAGS += -coverage -O0 -g
 VALGRINDFLAGS += --leak-check=full --track-origins=yes --error-limit=no --show-leak-kinds=all --error-exitcode=999
 #
 CXXFLAGS += -Wno-nonnull-compare # libraries/ESP8266WiFi/src/include/UdpContext.h:85:9: error: nonnull argument ‘this’ compared to NULL [-Werror=nonnull-compare] -- (if(this != 0))
+CXXFLAGS += -Wno-error=format-security # cores/esp8266/Print.cpp:42:24: error: format not a string literal and no format arguments [-Werror=format-security] -- (os_printf_plus(not_the_best_way))
 
 remduplicates = $(strip $(if $1,$(firstword $1) $(call remduplicates,$(filter-out $(firstword $1),$1))))
 
@@ -157,7 +160,11 @@ $(OUTPUT_BINARY): $(CPP_OBJECTS_TESTS) $(BINDIR)/core.a
 #################################################
 # building ino sources
 
-MOCK_ARDUINO_LIBS := \
+ARDUINO_LIBS := \
+	$(addprefix $(CORE_PATH)/,\
+		IPAddress.cpp \
+		Updater.cpp \
+	) \
 	$(addprefix ../../libraries/,\
 		$(addprefix ESP8266WiFi/src/,\
 			ESP8266WiFi.cpp \
@@ -176,23 +183,27 @@ MOCK_ARDUINO_LIBS := \
 			detail/mimetable.cpp \
 		) \
 		ESP8266mDNS/ESP8266mDNS.cpp \
-	)
+		ArduinoOTA/ArduinoOTA.cpp \
+		DNSServer/src/DNSServer.cpp \
+		ESP8266AVRISP/src/ESP8266AVRISP.cpp \
+		ESP8266HTTPClient/src/ESP8266HTTPClient.cpp \
+	) \
 
 
 
-MOCK_ARDUINO_LIBS += \
+MOCK_ARDUINO_LIBS := \
 	common/MockClientContextSocket.cpp \
 	common/MockClientContext.cpp \
 	common/MockWiFiServerSocket.cpp \
 	common/MockWiFiServer.cpp \
 	common/MockUDPSocket.cpp \
 	common/ArduinoWire.cpp \
 	common/MockTools.cpp \
+	common/MockEsp.cpp \
+	common/MockEEPROM.cpp \
+	common/MockSPI.cpp \
 
-ARDUINO_LIBS += $(addprefix $(CORE_PATH)/,\
-	IPAddress.cpp \
-)
-
+ARDUINO_LIBS += 
 CPP_SOURCES_CORE_EMU = \
 	$(MOCK_CPP_FILES_EMU) \
 	$(CORE_CPP_FILES) \
@@ -206,18 +217,37 @@ bin/fullcore.a: $(C_OBJECTS) $(CPP_OBJECTS_CORE_EMU)
 	ranlib -c $@
 
 .PRECIOUS: %.cpp.o
-%: %.cpp.o bin/fullcore.a
+%: %.ino.cpp.o bin/fullcore.a
 	$(CXX) $(LDFLAGS) $< bin/fullcore.a -o $@
 	ln -sf ../$@ $(BINDIR)
 
 .PRECIOUS: %.cpp
-%.cpp: %.ino
-	cp $< $@
+%.ino.cpp: %.ino
+	@s=$<; \
+	n=$${s##*/}; \
+	(cd $${s%/*}; \
+	echo "#include \"$$n\""; \
+	for i in *.ino; do \
+		test "$$i" = "$$n" || echo "#include \"$$i\""; \
+	done; \
+	) > $@
 
 #################################################
 # Makefile.inc.ino generation
 -include $(BINDIR)/Makefile.inc.ino
 
+.PHONY: list
+list:
+	# copy examples locally
+	@for dir in ../../libraries/*/examples; do \
+		exampledir=$${dir%/*}; \
+		exampledirname=$${exampledir##*/}; \
+		for subdir in $$dir/*; do \
+			exname=$${subdir##*/}; \
+			echo "$$subdir/$$exname"; \
+		done; \
+	done; \
+
 $(BINDIR)/Makefile.inc.ino:
 	# copy examples locally
 	all=""; \

tests/host/common/Arduino.cpp

@@ -25,11 +25,22 @@ extern "C" unsigned long millis()
     return (time.tv_sec * 1000) + (time.tv_usec / 1000);
 }
 
+extern "C" unsigned long micros()
+{
+    timeval time;
+    gettimeofday(&time, NULL);
+    return (time.tv_sec * 1000000) + time.tv_usec;
+}
+
 
 extern "C" void yield()
 {
 }
 
+extern "C" void esp_yield()
+{
+}
+
 
 extern "C" void __panic_func(const char* file, int line, const char* func) {
     abort();
@@ -39,3 +50,8 @@ extern "C" void delay(unsigned long ms)
 {
     usleep(ms * 1000);
 }
+
+extern "C" void delayMicroseconds(unsigned int us)
+{
+    usleep(us);
+}

tests/host/common/ArduinoMain.cpp

@@ -11,6 +11,8 @@
 #include <poll.h>
 
 #include <unistd.h> // usleep
+#include <getopt.h>
+
 #include <map>
 
 std::map<int,UdpContext*> udps;
@@ -23,9 +25,43 @@ void register_udp (int sock, UdpContext* udp)
 		udps.erase(sock);
 }
 
+const char* host_interface = nullptr;
+
+void help (const char* argv0, int exitcode)
+{
+	printf(
+		"%s - compiled with esp8266/arduino emulator\n"
+		"options:\n"
+		"	-h\n"
+		"	-i <interface>\n"
+		,argv0);
+	exit(exitcode);
+}
+
+static struct option options[] =
+{
+	{ "help",		no_argument,		NULL, 'h' },
+	{ "interface",		required_argument,	NULL, 'i' },
+};
 
-int main (void)
+int main (int argc, char* const argv [])
 {
+	for (;;)
+	{
+		int n = getopt_long(argc, argv, "hi:", options, NULL);
+		if (n < 0)
+			break;
+		switch (n)
+		{
+		case 'h':
+			help(argv[0], EXIT_SUCCESS);
+			break;
+		case 'i':
+			host_interface = optarg;
+			break;
+		}
+	}
+
 	setup();
 	while (true)
 	{

tests/host/common/ArduinoWire.cpp

@@ -24,3 +24,18 @@ void digitalWrite(uint8_t pin, uint8_t val)
 	fprintf(stderr, MOCK "digitalWrite(pin=%d val=%d)\n", pin, val);
 }
 
+void analogWrite(uint8_t pin, int val)
+{
+	fprintf(stderr, MOCK "analogWrite(pin=%d, val=%d\n", pin, val);
+}
+
+int analogRead(uint8_t pin)
+{
+	(void)pin;
+	return 512;
+}
+
+void analogWriteRange(uint32_t range)
+{
+	fprintf(stderr, MOCK "analogWriteRange(range=%d)\n", range);
+}

tests/host/common/EEPROM.h

@@ -0,0 +1,51 @@
+
+#ifndef EEPROM_MOCK
+#define EEPROM_MOCK
+
+class EEPROMClass {
+public:
+  EEPROMClass(uint32_t sector);
+  EEPROMClass(void);
+  ~EEPROMClass();
+
+  void begin(size_t size);
+  uint8_t read(int address);
+  void write(int address, uint8_t val);
+  bool commit();
+  void end();
+
+  template<typename T> 
+  T& get(int const address, T& t)
+  {
+    if (address < 0 || address + sizeof(T) > _size)
+      return t;
+    for (size_t i = 0; i < sizeof(T); i++)
+        ((uint8_t*)&t)[i] = read(i);
+    return t;
+  }
+
+  template<typename T> 
+  const T& put(int const address, const T& t)
+  {
+    if (address < 0 || address + sizeof(T) > _size)
+      return t;
+    for (size_t i = 0; i < sizeof(T); i++)
+        write(i, ((uint8_t*)&t)[i]);
+    return t;
+  }
+
+  size_t length() { return _size; }
+
+  //uint8_t& operator[](int const address) { return read(address); }
+  uint8_t operator[] (int address) { return read(address); }
+
+protected:
+  size_t _size = 0;
+  int _fd = -1;
+};
+
+#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_EEPROM)
+extern EEPROMClass EEPROM;
+#endif
+
+#endif