readout prototype

libesphttpd/include/esp8266.h

@@ -28,6 +28,12 @@
 // this ideally would allow flash arrays, but alas works only for uint32_t
 #define FLASH_DATA ICACHE_RODATA_ATTR STORE_ATTR
 
+#define MIN(a,b) ((a)>(b)?(b):(a))
+#define MAX(a,b) ((a)<(b)?(b):(a))
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)
+
+
 #include "platform.h"
 #include "espmissingincludes.h"
 #include "esp_sdk_ver.h"

libesphttpd/include/httpd.h

@@ -72,7 +72,7 @@ typedef struct {
 #define ROUTE_CGI_ARG(path, handler, arg1)         ROUTE_CGI_ARG2(path, handler, arg1, NULL)
 #define ROUTE_CGI(path, handler)                   ROUTE_CGI_ARG2(path, handler, NULL, NULL)
 
-#define ROUTE_FILE(path, filepath)                 ROUTE_CGI_ARG(path, cgiEspFsStaticFile, filepath)
+#define ROUTE_FILE(path, filepath)                 ROUTE_CGI_ARG(path, cgiEspFsFile, filepath)
 
 // the argument of a template route is accessible as cgiArg2 on the connData struct.
 #define ROUTE_TPL(path, replacer)                  ROUTE_CGI_ARG(path, cgiEspFsTemplate, replacer)

libesphttpd/include/logging.h

@@ -18,9 +18,9 @@
 
 #define banner(fmt, ...) \
 	do {  \
-		printf("\x1b[32;1m");  \
+		printf(LOG_EOL "\x1b[32;1m");  \
 		uptime_print();  \
-		printf(" [i] "fmt"\x1b[0m"LOG_EOL, ##__VA_ARGS__);  \
+		printf(" [i] "fmt"\x1b[0m" LOG_EOL, ##__VA_ARGS__);  \
 	} while(0)