emulation on host: minor updates (#8454)

d-a-v · web-flow · commit 15e7d35d6e7c · 2022-02-20T16:27:52.000+03:00
* emulation on host: minor fixes
merge MockDigital.cpp and HostWiring.cpp

* emulation: share mockverbose between CI-on-host and emulation

* mock: add missing recently overridden method

* remove extern variable, use weak function
diff --git a/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer-impl.h b/libraries/ESP8266HTTPUpdateServer/src/ESP8266HTTPUpdateServer-impl.h
@@ -111,7 +111,7 @@ void ESP8266HTTPUpdateServerTemplate<ServerType>::setup(ESP8266WebServerTemplate
         }
       } else if(_authenticated && upload.status == UPLOAD_FILE_END && !_updaterError.length()){
         if(Update.end(true)){ //true to set the size to the current progress
-          if (_serial_output) Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);
+          if (_serial_output) Serial.printf("Update Success: %zu\nRebooting...\n", upload.totalSize);
         } else {
           _setUpdaterError();
         }
diff --git a/tests/host/Makefile b/tests/host/Makefile
@@ -136,7 +136,7 @@ MOCK_CPP_FILES_COMMON := \
 		MockUART.cpp \
 		MockTools.cpp \
 		MocklwIP.cpp \
-		MockDigital.cpp \
+		HostWiring.cpp \
 	)
 
 MOCK_CPP_FILES := $(MOCK_CPP_FILES_COMMON) \
@@ -356,7 +356,6 @@ MOCK_ARDUINO_LIBS := \
 		MockWiFiServerSocket.cpp \
 		MockWiFiServer.cpp \
 		UdpContextSocket.cpp \
-		HostWiring.cpp \
 		MockEsp.cpp \
 		MockEEPROM.cpp \
 		MockSPI.cpp \
diff --git a/tests/host/common/Arduino.cpp b/tests/host/common/Arduino.cpp
@@ -111,3 +111,11 @@ cont_t* g_pcont = NULL;
 extern "C" void cont_suspend(cont_t*)
 {
 }
+
+extern "C" int __mockverbose (const char* fmt, ...)
+{
+    (void)fmt;
+    return 0;
+}
+
+int mockverbose (const char* fmt, ...) __attribute__ ((weak, alias("__mockverbose"), format (printf, 1, 2)));
diff --git a/tests/host/common/HostWiring.cpp b/tests/host/common/HostWiring.cpp
@@ -37,6 +37,11 @@
 #define VERBOSE(x...) mockverbose(x)
 #endif
 
+#define GPIONUM 17
+
+static uint8_t _mode[GPIONUM];
+static uint8_t _gpio[GPIONUM];
+
 void pinMode (uint8_t pin, uint8_t mode)
 {
 	#define xxx(mode) case mode: m=STRHELPER(mode); break
@@ -53,11 +58,19 @@ void pinMode (uint8_t pin, uint8_t mode)
 	default: m="(special)";
 	}
 	VERBOSE("gpio%d: mode='%s'\n", pin, m);
+
+    if (pin < GPIONUM)
+    {
+      _mode[pin] = mode;
+    }
 }
 
 void digitalWrite(uint8_t pin, uint8_t val)
 {
 	VERBOSE("digitalWrite(pin=%d val=%d)\n", pin, val);
+    if (pin < GPIONUM) {
+        _gpio[pin] = val;
+    }
 }
 
 void analogWrite(uint8_t pin, int val)
@@ -80,6 +93,9 @@ int digitalRead(uint8_t pin)
 {
 	VERBOSE("digitalRead(%d)\n", pin);
 
-	// pin 0 is most likely a low active input
-	return pin ? 0 : 1;
+    if (pin < GPIONUM) {
+      return _gpio[pin] != 0;
+    } else {
+      return 0;
+    }
 }
diff --git a/tests/host/common/MockDigital.cpp b/tests/host/common/MockDigital.cpp
diff --git a/tests/host/common/MockEsp.cpp b/tests/host/common/MockEsp.cpp
@@ -142,6 +142,15 @@ void EspClass::getHeapStats(uint32_t* hfree, uint16_t* hmax, uint8_t* hfrag) {
   if (hfrag) *hfrag = 100 - (sqrt(hm) * 100) / hf;
 }
 
+void EspClass::getHeapStats(uint32_t* hfree, uint32_t* hmax, uint8_t* hfrag) {
+  uint32_t hf = 10 * 1024;
+  float hm = 1 * 1024;
+
+  if (hfree) *hfree = hf;
+  if (hmax) *hmax = hm;
+  if (hfrag) *hfrag = 100 - (sqrt(hm) * 100) / hf;
+}
+
 bool EspClass::flashEraseSector(uint32_t sector)
 {
 	(void) sector;
@@ -263,3 +272,8 @@ void EspClass::setExternalHeap()
 void EspClass::resetHeap()
 {
 }
+
+void EspClass::reset ()
+{
+    abort();
+}
diff --git a/tests/host/common/MockTools.cpp b/tests/host/common/MockTools.cpp
@@ -78,3 +78,12 @@ void configTime(int timezone, int daylightOffset_sec,
 
 	mockverbose("configTime: TODO (tz=%dH offset=%dS) (time will be host's)\n", timezone, daylightOffset_sec);
 }
+
+void configTime(const char* tz, const char* server1, const char* server2, const char* server3)
+{
+	(void)server1;
+	(void)server2;
+	(void)server3;
+
+	mockverbose("configTime: TODO (tz='%s') (time will be host's)\n", tz);
+}

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ void ESP8266HTTPUpdateServerTemplate<ServerType>::setup(ESP8266WebServerTemplate`
`111`	`111`	`}`
`112`	`112`	`} else if(_authenticated && upload.status == UPLOAD_FILE_END && !_updaterError.length()){`
`113`	`113`	`if(Update.end(true)){ //true to set the size to the current progress`
`114`		`- if (_serial_output) Serial.printf("Update Success: %u\nRebooting...\n", upload.totalSize);`
	`114`	`+ if (_serial_output) Serial.printf("Update Success: %zu\nRebooting...\n", upload.totalSize);`
`115`	`115`	`} else {`
`116`	`116`	`_setUpdaterError();`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,3 +111,11 @@ cont_t* g_pcont = NULL;`
`111`	`111`	`extern "C" void cont_suspend(cont_t*)`
`112`	`112`	`{`
`113`	`113`	`}`
	`114`	`+`
	`115`	`+extern "C" int __mockverbose (const char* fmt, ...)`
	`116`	`+{`
	`117`	`+ (void)fmt;`
	`118`	`+ return 0;`
	`119`	`+}`
	`120`	`+`
	`121`	`+int mockverbose (const char* fmt, ...) __attribute__ ((weak, alias("__mockverbose"), format (printf, 1, 2)));`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,11 @@`
`37`	`37`	`#define VERBOSE(x...) mockverbose(x)`
`38`	`38`	`#endif`
`39`	`39`
	`40`	`+#define GPIONUM 17`
	`41`	`+`
	`42`	`+static uint8_t _mode[GPIONUM];`
	`43`	`+static uint8_t _gpio[GPIONUM];`
	`44`	`+`
`40`	`45`	`void pinMode (uint8_t pin, uint8_t mode)`
`41`	`46`	`{`
`42`	`47`	`#define xxx(mode) case mode: m=STRHELPER(mode); break`
`@@ -53,11 +58,19 @@ void pinMode (uint8_t pin, uint8_t mode)`
`53`	`58`	`default: m="(special)";`
`54`	`59`	`}`
`55`	`60`	`VERBOSE("gpio%d: mode='%s'\n", pin, m);`
	`61`	`+`
	`62`	`+ if (pin < GPIONUM)`
	`63`	`+ {`
	`64`	`+ _mode[pin] = mode;`
	`65`	`+ }`
`56`	`66`	`}`
`57`	`67`
`58`	`68`	`void digitalWrite(uint8_t pin, uint8_t val)`
`59`	`69`	`{`
`60`	`70`	`VERBOSE("digitalWrite(pin=%d val=%d)\n", pin, val);`
	`71`	`+ if (pin < GPIONUM) {`
	`72`	`+ _gpio[pin] = val;`
	`73`	`+ }`
`61`	`74`	`}`
`62`	`75`
`63`	`76`	`void analogWrite(uint8_t pin, int val)`
`@@ -80,6 +93,9 @@ int digitalRead(uint8_t pin)`
`80`	`93`	`{`
`81`	`94`	`VERBOSE("digitalRead(%d)\n", pin);`
`82`	`95`
`83`		`- // pin 0 is most likely a low active input`
`84`		`- return pin ? 0 : 1;`
	`96`	`+ if (pin < GPIONUM) {`
	`97`	`+ return _gpio[pin] != 0;`
	`98`	`+ } else {`
	`99`	`+ return 0;`
	`100`	`+ }`
`85`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,15 @@ void EspClass::getHeapStats(uint32_t* hfree, uint16_t* hmax, uint8_t* hfrag) {`
`142`	`142`	`if (hfrag) hfrag = 100 - (sqrt(hm) 100) / hf;`
`143`	`143`	`}`
`144`	`144`
	`145`	`+void EspClass::getHeapStats(uint32_t* hfree, uint32_t* hmax, uint8_t* hfrag) {`
	`146`	`+ uint32_t hf = 10 * 1024;`
	`147`	`+ float hm = 1 * 1024;`
	`148`	`+`
	`149`	`+ if (hfree) *hfree = hf;`
	`150`	`+ if (hmax) *hmax = hm;`
	`151`	`+ if (hfrag) hfrag = 100 - (sqrt(hm) 100) / hf;`
	`152`	`+}`
	`153`	`+`
`145`	`154`	`bool EspClass::flashEraseSector(uint32_t sector)`
`146`	`155`	`{`
`147`	`156`	`(void) sector;`
`@@ -263,3 +272,8 @@ void EspClass::setExternalHeap()`
`263`	`272`	`void EspClass::resetHeap()`
`264`	`273`	`{`
`265`	`274`	`}`
	`275`	`+`
	`276`	`+void EspClass::reset ()`
	`277`	`+{`
	`278`	`+ abort();`
	`279`	`+}`