From 92a454a2cf04c25a5fab60097cf80c77fac3b55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 16 Sep 2017 01:46:41 +0200
Subject: [PATCH] renamed input debug log funcs to imp_ to avoid build
 collision if DEBUG_WS is enabled also

---
 esphttpdconfig.mk  |  2 +-
 libesphttpd        |  2 +-
 user/cgi_sockets.c |  8 ++++----
 user/cgi_sockets.h | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/esphttpdconfig.mk b/esphttpdconfig.mk
index a46fa85..cd2a8ad 100644
--- a/esphttpdconfig.mk
+++ b/esphttpdconfig.mk
@@ -51,7 +51,7 @@ GLOBAL_CFLAGS = \
     -DDEBUG_CGI=0 \
     -DDEBUG_WIFI=0 \
     -DDEBUG_WS=0 \
-    -DDEBUG_ANSI=1 \
+    -DDEBUG_ANSI=0 \
     -DDEBUG_ANSI_NOIMPL=1 \
     -DDEBUG_INPUT=0 \
     -DDEBUG_HEAP=1 \
diff --git a/libesphttpd b/libesphttpd
index 3479ab3..58c81c0 160000
--- a/libesphttpd
+++ b/libesphttpd
@@ -1 +1 @@
-Subproject commit 3479ab3efcb4581669370cde6a607f936ff5515a
+Subproject commit 58c81c0dfe8e15888408886e168ed739aa8f311d
diff --git a/user/cgi_sockets.c b/user/cgi_sockets.c
index 6fcf87a..2c58514 100644
--- a/user/cgi_sockets.c
+++ b/user/cgi_sockets.c
@@ -235,7 +235,7 @@ void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags)
 	// Add terminator if missing (seems to randomly happen)
 	data[len] = 0;
 
-	ws_dbg("Sock RX str: %s, len %d", data, len);
+	inp_dbg("Sock RX str: %s, len %d", data, len);
 
 	int y, x, m, b;
 	u8 btnNum;
@@ -271,7 +271,7 @@ void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags)
 
 		case 'i':
 			// requests initial load
-			ws_dbg("Client requests initial load");
+			inp_dbg("Client requests initial load");
 			notifyContentTimCb(ws);
 			break;
 
@@ -290,7 +290,7 @@ void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags)
 			break;
 
 		default:
-			ws_warn("Bad command.");
+			inp_warn("Bad command.");
 	}
 }
 
@@ -307,7 +307,7 @@ void ICACHE_FLASH_ATTR heartbeatTimCb(void *unused)
 /** Socket connected for updates */
 void ICACHE_FLASH_ATTR updateSockConnect(Websock *ws)
 {
-	ws_info("Socket connected to "URL_WS_UPDATE);
+	inp_info("Socket connected to "URL_WS_UPDATE);
 	ws->recvCb = updateSockRx;
 
 	TIMER_START(&heartbeatTim, heartbeatTimCb, HB_TIME, 1);
diff --git a/user/cgi_sockets.h b/user/cgi_sockets.h
index 3d3a711..2010cfb 100644
--- a/user/cgi_sockets.h
+++ b/user/cgi_sockets.h
@@ -17,13 +17,13 @@ void notify_growl(char *msg);
 
 // defined in the makefile
 #if DEBUG_INPUT
-#define ws_warn warn
-#define ws_dbg dbg
-#define ws_info info
+#define inp_warn warn
+#define inp_dbg dbg
+#define inp_info info
 #else
-#define ws_warn(...)
-#define ws_dbg(...)
-#define ws_info(...)
+#define inp_warn(...)
+#define inp_dbg(...)
+#define inp_info(...)
 #endif
 
 #endif //CGI_SOCKETS_H