espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed input debug log funcs to imp_ to avoid build collision if DEBUG_WS is enabled also

Browse Source
This commit is contained in:
MightyPork
2017-09-16 01:46:41 +02:00
parent 184c772b57
commit 92a454a2cf
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphttpdconfig.mk
+1 -1
View File
@@ -51,7 +51,7 @@ GLOBAL_CFLAGS = \
-DDEBUG_CGI=0 \ -DDEBUG_CGI=0 \
-DDEBUG_WIFI=0 \ -DDEBUG_WIFI=0 \
-DDEBUG_WS=0 \ -DDEBUG_WS=0 \
-DDEBUG_ANSI=1 \ -DDEBUG_ANSI=0 \
-DDEBUG_ANSI_NOIMPL=1 \ -DDEBUG_ANSI_NOIMPL=1 \
-DDEBUG_INPUT=0 \ -DDEBUG_INPUT=0 \
-DDEBUG_HEAP=1 \ -DDEBUG_HEAP=1 \
libesphttpd
+1 -1
Submodule libesphttpd updated: 3479ab3efc...58c81c0dfe
user/cgi_sockets.c
+4 -4
View File
@@ -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) // Add terminator if missing (seems to randomly happen)
data[len] = 0; 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; int y, x, m, b;
u8 btnNum; u8 btnNum;
@@ -271,7 +271,7 @@ void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags)
case 'i': case 'i':
// requests initial load // requests initial load
ws_dbg("Client requests initial load"); inp_dbg("Client requests initial load");
notifyContentTimCb(ws); notifyContentTimCb(ws);
break; break;
@@ -290,7 +290,7 @@ void ICACHE_FLASH_ATTR updateSockRx(Websock *ws, char *data, int len, int flags)
break; break;
default: default:
ws_warn("Bad command."); inp_warn("Bad command.");
} }
} }
@@ -307,7 +307,7 @@ void ICACHE_FLASH_ATTR heartbeatTimCb(void *unused)
/** Socket connected for updates */ /** Socket connected for updates */
void ICACHE_FLASH_ATTR updateSockConnect(Websock *ws) 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; ws->recvCb = updateSockRx;
TIMER_START(&heartbeatTim, heartbeatTimCb, HB_TIME, 1); TIMER_START(&heartbeatTim, heartbeatTimCb, HB_TIME, 1);
user/cgi_sockets.h
+6 -6
View File
@@ -17,13 +17,13 @@ void notify_growl(char *msg);
// defined in the makefile // defined in the makefile
#if DEBUG_INPUT #if DEBUG_INPUT
#define ws_warn warn #define inp_warn warn
#define ws_dbg dbg #define inp_dbg dbg
#define ws_info info #define inp_info info
#else #else
#define ws_warn(...) #define inp_warn(...)
#define ws_dbg(...) #define inp_dbg(...)
#define ws_info(...) #define inp_info(...)
#endif #endif
#endif //CGI_SOCKETS_H #endif //CGI_SOCKETS_H