private fork
Fork of GSwifiInterface by
Revision 22:2085f090fe31, committed 2014-06-06
- Comitter:
- okini3939
- Date:
- Fri Jun 06 00:41:27 2014 +0000
- Parent:
- 21:6431364fc667
- Commit message:
- modify httpd
Changed in this revision
GSwifi/GSwifi_conf.h | Show annotated file Show diff for this revision Revisions of this file |
GSwifi/GSwifi_httpd.cpp | Show annotated file Show diff for this revision Revisions of this file |
--- a/GSwifi/GSwifi_conf.h Thu Jun 05 06:12:59 2014 +0000 +++ b/GSwifi/GSwifi_conf.h Fri Jun 06 00:41:27 2014 +0000 @@ -3,7 +3,7 @@ //#define DEBUG_DUMP #define CFG_ENABLE_RTOS -//#define CFG_ENABLE_HTTPD +#define CFG_ENABLE_HTTPD //#define CFG_ENABLE_WEBSOCKET //#define CFG_ENABLE_SMTP //#define CFG_UART_DIRECT @@ -32,13 +32,13 @@ #elif defined(TARGET_KL25Z) #define CFG_DATA_SIZE 512 #endif -/* + #if defined(TARGET_LPC1768) || defined(TARGET_LPC176X) #define CFG_EXTENDED_MEMORY1 0x2007c000 #define CFG_EXTENDED_SIZE1 0x4000 #define CFG_EXTENDED_MEMORY2 0x20082000 #define CFG_EXTENDED_SIZE2 0x2000 #endif -*/ + #define CFG_HTTPD_HANDLER_NUM 10 #define CFG_HTTPD_KEEPALIVE 10
--- a/GSwifi/GSwifi_httpd.cpp Thu Jun 05 06:12:59 2014 +0000 +++ b/GSwifi/GSwifi_httpd.cpp Fri Jun 06 00:41:27 2014 +0000 @@ -36,14 +36,14 @@ for (i = 0; i < CFG_MAX_SOCKETS; i ++) { _httpd[i].uri = (char*)(CFG_EXTENDED_MEMORY2 + (n * i)); #ifdef CFG_ENABLE_RTOS - _httpd[i].websocket_key = (char*)malloc(30); +// _httpd[i].websocket_key = (char*)malloc(30); #endif } #else // CFG_EXTENDED_MEMORY for (i = 0; i < CFG_MAX_SOCKETS; i ++) { _httpd[i].uri = (char*)malloc(CFG_CMD_SIZE); #ifdef CFG_ENABLE_RTOS - _httpd[i].websocket_key = (char*)malloc(30); +// _httpd[i].websocket_key = (char*)malloc(30); #endif } #endif // CFG_EXTENDED_MEMORY