wirtz
/
esp-link
mirror of https://github.com/jeelabs/esp-link.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed whitespace

Browse Source
pull/47/head
Benjamin Runnels 9 years ago
parent 3337cc1508
commit b080f5243b
2 changed files with 140 additions and 140 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 68
      esp-link/cgi.c
  2. 212
      esp-link/log.c

68
esp-link/cgi.c
Unescape View File

@ -18,17 +18,17 @@ Some random cgi routines.
#include "cgi.h" #include "cgi.h"
void noCacheHeaders(HttpdConnData *connData, int code) { void noCacheHeaders(HttpdConnData *connData, int code) {
httpdStartResponse(connData, code); httpdStartResponse(connData, code);
httpdHeader(connData, "Cache-Control", "no-cache, no-store, must-revalidate"); httpdHeader(connData, "Cache-Control", "no-cache, no-store, must-revalidate");
httpdHeader(connData, "Pragma", "no-cache"); httpdHeader(connData, "Pragma", "no-cache");
httpdHeader(connData, "Expires", "0"); httpdHeader(connData, "Expires", "0");
} }
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
jsonHeader(HttpdConnData *connData, int code) { jsonHeader(HttpdConnData *connData, int code) {
noCacheHeaders(connData, code); noCacheHeaders(connData, code);
httpdHeader(connData, "Content-Type", "application/json"); httpdHeader(connData, "Content-Type", "application/json");
httpdEndHeaders(connData); httpdEndHeaders(connData);
} }
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
@ -119,43 +119,43 @@ UTILS_StrToIP(const char* str, void *ip){
// Handle system information variables and print their value, returns the number of // Handle system information variables and print their value, returns the number of
// characters appended to buff // characters appended to buff
int ICACHE_FLASH_ATTR printGlobalInfo(char *buff, int buflen, char *token) { int ICACHE_FLASH_ATTR printGlobalInfo(char *buff, int buflen, char *token) {
if (TOKEN("si_chip_id")) { if (TOKEN("si_chip_id")) {
return os_sprintf(buff, "0x%x", system_get_chip_id()); return os_sprintf(buff, "0x%x", system_get_chip_id());
} else if (TOKEN("si_freeheap")) { } else if (TOKEN("si_freeheap")) {
return os_sprintf(buff, "%dKB", system_get_free_heap_size()/1024); return os_sprintf(buff, "%dKB", system_get_free_heap_size()/1024);
} else if (TOKEN("si_uptime")) { } else if (TOKEN("si_uptime")) {
uint32 t = system_get_time() / 1000000; // in seconds uint32 t = system_get_time() / 1000000; // in seconds
return os_sprintf(buff, "%dd%dh%dm%ds", t/(24*3600), (t/(3600))%24, (t/60)%60, t%60); return os_sprintf(buff, "%dd%dh%dm%ds", t/(24*3600), (t/(3600))%24, (t/60)%60, t%60);
} else if (TOKEN("si_boot_version")) { } else if (TOKEN("si_boot_version")) {
return os_sprintf(buff, "%d", system_get_boot_version()); return os_sprintf(buff, "%d", system_get_boot_version());
} else if (TOKEN("si_boot_address")) { } else if (TOKEN("si_boot_address")) {
return os_sprintf(buff, "0x%x", system_get_userbin_addr()); return os_sprintf(buff, "0x%x", system_get_userbin_addr());
} else if (TOKEN("si_cpu_freq")) { } else if (TOKEN("si_cpu_freq")) {
return os_sprintf(buff, "%dMhz", system_get_cpu_freq()); return os_sprintf(buff, "%dMhz", system_get_cpu_freq());
} else { } else {
return 0; return 0;
} }
} }
#endif #endif
extern char *esp_link_version; // in user_main.c extern char *esp_link_version; // in user_main.c
int ICACHE_FLASH_ATTR cgiMenu(HttpdConnData *connData) { int ICACHE_FLASH_ATTR cgiMenu(HttpdConnData *connData) {
if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up. if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
char buff[1024]; char buff[1024];
// don't use jsonHeader so the response does get cached // don't use jsonHeader so the response does get cached
httpdStartResponse(connData, 200); httpdStartResponse(connData, 200);
httpdHeader(connData, "Cache-Control", "max-age=3600, must-revalidate"); httpdHeader(connData, "Cache-Control", "max-age=3600, must-revalidate");
httpdHeader(connData, "Content-Type", "application/json"); httpdHeader(connData, "Content-Type", "application/json");
httpdEndHeaders(connData); httpdEndHeaders(connData);
// construct json response // construct json response
os_sprintf(buff, os_sprintf(buff,
"{\"menu\": [\"Home\", \"/home.html\", " "{\"menu\": [\"Home\", \"/home.html\", "
"\"Wifi\", \"/wifi/wifi.html\"," "\"Wifi\", \"/wifi/wifi.html\","
"\"\xC2\xB5" "C Console\", \"/console.html\", " "\"\xC2\xB5" "C Console\", \"/console.html\", "
"\"REST/MQTT\", \"/mqtt.html\"," "\"REST/MQTT\", \"/mqtt.html\","
"\"Debug log\", \"/log.html\" ],\n" "\"Debug log\", \"/log.html\" ],\n"
" \"version\": \"%s\" }", esp_link_version); " \"version\": \"%s\" }", esp_link_version);
httpdSend(connData, buff, -1); httpdSend(connData, buff, -1);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }

212
esp-link/log.c
Unescape View File

@ -22,139 +22,139 @@ static bool log_newline; // at start of a new line
// when we connect to wifi AP. Here this is gated by the flash setting // when we connect to wifi AP. Here this is gated by the flash setting
void ICACHE_FLASH_ATTR void ICACHE_FLASH_ATTR
log_uart(bool enable) { log_uart(bool enable) {
if (!enable && !log_no_uart && flashConfig.log_mode != LOG_MODE_ON) { if (!enable && !log_no_uart && flashConfig.log_mode != LOG_MODE_ON) {
// we're asked to turn uart off, and uart is on, and the flash setting isn't always-on // we're asked to turn uart off, and uart is on, and the flash setting isn't always-on
#if 1 #if 1
#ifdef LOG_DBG #ifdef LOG_DBG
os_printf("Turning OFF uart log\n"); os_printf("Turning OFF uart log\n");
#endif #endif
os_delay_us(4*1000L); // time for uart to flush os_delay_us(4*1000L); // time for uart to flush
log_no_uart = !enable; log_no_uart = !enable;
#endif #endif
} else if (enable && log_no_uart && flashConfig.log_mode != LOG_MODE_OFF) { } else if (enable && log_no_uart && flashConfig.log_mode != LOG_MODE_OFF) {
// we're asked to turn uart on, and uart is off, and the flash setting isn't always-off // we're asked to turn uart on, and uart is off, and the flash setting isn't always-off
log_no_uart = !enable; log_no_uart = !enable;
#ifdef LOG_DBG #ifdef LOG_DBG
os_printf("Turning ON uart log\n"); os_printf("Turning ON uart log\n");
#endif #endif
} }
} }
static void ICACHE_FLASH_ATTR static void ICACHE_FLASH_ATTR
log_write(char c) { log_write(char c) {
log_buf[log_wr] = c; log_buf[log_wr] = c;
log_wr = (log_wr+1) % BUF_MAX; log_wr = (log_wr+1) % BUF_MAX;
if (log_wr == log_rd) { if (log_wr == log_rd) {
log_rd = (log_rd+1) % BUF_MAX; // full, eat first char log_rd = (log_rd+1) % BUF_MAX; // full, eat first char
log_pos++; log_pos++;
} }
} }
#if 0 #if 0
static char ICACHE_FLASH_ATTR static char ICACHE_FLASH_ATTR
log_read(void) { log_read(void) {
char c = 0; char c = 0;
if (log_rd != log_wr) { if (log_rd != log_wr) {
c = log_buf[log_rd]; c = log_buf[log_rd];
log_rd = (log_rd+1) % BUF_MAX; log_rd = (log_rd+1) % BUF_MAX;
} }
return c; return c;
} }
#endif #endif
static void ICACHE_FLASH_ATTR static void ICACHE_FLASH_ATTR
log_write_char(char c) { log_write_char(char c) {
// Uart output unless disabled // Uart output unless disabled
if (!log_no_uart) { if (!log_no_uart) {
if (log_newline) { if (log_newline) {
char buff[16]; char buff[16];
int l = os_sprintf(buff, "%6d> ", (system_get_time()/1000)%1000000); int l = os_sprintf(buff, "%6d> ", (system_get_time()/1000)%1000000);
for (int i=0; i<l; i++) for (int i=0; i<l; i++)
uart0_write_char(buff[i]); uart0_write_char(buff[i]);
log_newline = false; log_newline = false;
} }
uart0_write_char(c); uart0_write_char(c);
if (c == '\n') { if (c == '\n') {
log_newline = true; log_newline = true;
uart0_write_char('\r'); uart0_write_char('\r');
} }
} }
// Store in log buffer // Store in log buffer
if (c == '\n') log_write('\r'); if (c == '\n') log_write('\r');
log_write(c); log_write(c);
} }
int ICACHE_FLASH_ATTR int ICACHE_FLASH_ATTR
ajaxLog(HttpdConnData *connData) { ajaxLog(HttpdConnData *connData) {
char buff[2048]; char buff[2048];
int len; // length of text in buff int len; // length of text in buff
int log_len = (log_wr+BUF_MAX-log_rd) % BUF_MAX; // num chars in log_buf int log_len = (log_wr+BUF_MAX-log_rd) % BUF_MAX; // num chars in log_buf
int start = 0; // offset onto log_wr to start sending out chars int start = 0; // offset onto log_wr to start sending out chars
if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up. if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
jsonHeader(connData, 200); jsonHeader(connData, 200);
// figure out where to start in buffer based on URI param // figure out where to start in buffer based on URI param
len = httpdFindArg(connData->getArgs, "start", buff, sizeof(buff)); len = httpdFindArg(connData->getArgs, "start", buff, sizeof(buff));
if (len > 0) { if (len > 0) {
start = atoi(buff); start = atoi(buff);
if (start < log_pos) { if (start < log_pos) {
start = 0; start = 0;
} else if (start >= log_pos+log_len) { } else if (start >= log_pos+log_len) {
start = log_len; start = log_len;
} else { } else {
start = start - log_pos; start = start - log_pos;
} }
} }
// start outputting // start outputting
len = os_sprintf(buff, "{\"len\":%d, \"start\":%d, \"text\": \"", len = os_sprintf(buff, "{\"len\":%d, \"start\":%d, \"text\": \"",
log_len-start, log_pos+start); log_len-start, log_pos+start);
int rd = (log_rd+start) % BUF_MAX; int rd = (log_rd+start) % BUF_MAX;
while (len < 2040 && rd != log_wr) { while (len < 2040 && rd != log_wr) {
uint8_t c = log_buf[rd]; uint8_t c = log_buf[rd];
if (c == '\\' || c == '"') { if (c == '\\' || c == '"') {
buff[len++] = '\\'; buff[len++] = '\\';
buff[len++] = c; buff[len++] = c;
} else if (c < ' ') { } else if (c < ' ') {
len += os_sprintf(buff+len, "\\u%04x", c); len += os_sprintf(buff+len, "\\u%04x", c);
} else { } else {
buff[len++] = c; buff[len++] = c;
} }
rd = (rd + 1) % BUF_MAX; rd = (rd + 1) % BUF_MAX;
} }
os_strcpy(buff+len, "\"}"); len+=2; os_strcpy(buff+len, "\"}"); len+=2;
httpdSend(connData, buff, len); httpdSend(connData, buff, len);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
static char *dbg_mode[] = { "auto", "off", "on" }; static char *dbg_mode[] = { "auto", "off", "on" };
int ICACHE_FLASH_ATTR int ICACHE_FLASH_ATTR
ajaxLogDbg(HttpdConnData *connData) { ajaxLogDbg(HttpdConnData *connData) {
if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up. if (connData->conn==NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up.
char buff[512]; char buff[512];
int len, status = 400; int len, status = 400;
len = httpdFindArg(connData->getArgs, "mode", buff, sizeof(buff)); len = httpdFindArg(connData->getArgs, "mode", buff, sizeof(buff));
if (len > 0) { if (len > 0) {
int8_t mode = -1; int8_t mode = -1;
if (os_strcmp(buff, "auto") == 0) mode = LOG_MODE_AUTO; if (os_strcmp(buff, "auto") == 0) mode = LOG_MODE_AUTO;
if (os_strcmp(buff, "off") == 0) mode = LOG_MODE_OFF; if (os_strcmp(buff, "off") == 0) mode = LOG_MODE_OFF;
if (os_strcmp(buff, "on") == 0) mode = LOG_MODE_ON; if (os_strcmp(buff, "on") == 0) mode = LOG_MODE_ON;
if (mode >= 0) { if (mode >= 0) {
flashConfig.log_mode = mode; flashConfig.log_mode = mode;
if (mode != LOG_MODE_AUTO) log_uart(mode == LOG_MODE_ON); if (mode != LOG_MODE_AUTO) log_uart(mode == LOG_MODE_ON);
status = configSave() ? 200 : 400; status = configSave() ? 200 : 400;
} }
} else if (connData->requestType == HTTPD_METHOD_GET) { } else if (connData->requestType == HTTPD_METHOD_GET) {
status = 200; status = 200;
} }
jsonHeader(connData, status); jsonHeader(connData, status);
os_sprintf(buff, "{\"mode\": \"%s\"}", dbg_mode[flashConfig.log_mode]); os_sprintf(buff, "{\"mode\": \"%s\"}", dbg_mode[flashConfig.log_mode]);
httpdSend(connData, buff, -1); httpdSend(connData, buff, -1);
return HTTPD_CGI_DONE; return HTTPD_CGI_DONE;
} }
void ICACHE_FLASH_ATTR dumpMem(void *addr, int len) { void ICACHE_FLASH_ATTR dumpMem(void *addr, int len) {
@ -172,9 +172,9 @@ void ICACHE_FLASH_ATTR dumpMem(void *addr, int len) {
} }
void ICACHE_FLASH_ATTR logInit() { void ICACHE_FLASH_ATTR logInit() {
log_no_uart = flashConfig.log_mode == LOG_MODE_OFF; // ON unless set to always-off log_no_uart = flashConfig.log_mode == LOG_MODE_OFF; // ON unless set to always-off
log_wr = 0; log_wr = 0;
log_rd = 0; log_rd = 0;
os_install_putc1((void *)log_write_char); os_install_putc1((void *)log_write_char);
} }

Write Preview
Loading…
Cancel
Save