diff --git a/esp-link/cgiservices.c b/esp-link/cgiservices.c index 4b4721c..18fe61f 100644 --- a/esp-link/cgiservices.c +++ b/esp-link/cgiservices.c @@ -108,8 +108,7 @@ int ICACHE_FLASH_ATTR cgiServicesInfo(HttpdConnData *connData) { if (connData->conn == NULL) return HTTPD_CGI_DONE; // Connection aborted. Clean up. os_sprintf(buff, - "{ " - "\"syslog_enable\": \"%s\", " + "{ " "\"syslog_host\": \"%s\", " "\"syslog_minheap\": %d, " "\"syslog_filter\": %d, " @@ -120,7 +119,6 @@ int ICACHE_FLASH_ATTR cgiServicesInfo(HttpdConnData *connData) { "\"mdns_enable\": \"%s\", " "\"mdns_servername\": \"%s\"" " }", - flashConfig.syslog_enable ? "enabled" : "disabled", flashConfig.syslog_host, flashConfig.syslog_minheap, flashConfig.syslog_filter, @@ -142,8 +140,6 @@ int ICACHE_FLASH_ATTR cgiServicesSet(HttpdConnData *connData) { int8_t syslog = 0; - syslog |= getBoolArg(connData, "syslog_enable", &flashConfig.syslog_enable); - if (syslog < 0) return HTTPD_CGI_DONE; syslog |= getStringArg(connData, "syslog_host", flashConfig.syslog_host, sizeof(flashConfig.syslog_host)); if (syslog < 0) return HTTPD_CGI_DONE; syslog |= getUInt16Arg(connData, "syslog_minheap", &flashConfig.syslog_minheap); diff --git a/esp-link/config.c b/esp-link/config.c index f6957b2..9b928cc 100644 --- a/esp-link/config.c +++ b/esp-link/config.c @@ -27,10 +27,10 @@ FlashConfig flashDefault = { .mqtt_host = "\0", .mqtt_clientid = "\0", .mqtt_username= "\0", .mqtt_password = "\0", .mqtt_status_topic = "\0", .sys_descr = "\0", - .rx_pullup = 1, - .mdns_enable = 1, .mdns_servername = "http\0", - .sntp_server = "us.pool.ntp.org\0", .timezone_offset = 0, - .syslog_enable= 0, .syslog_host = "\0", .syslog_minheap = 8192, .syslog_filter = 7, .syslog_showtick = 1, .syslog_showdate = 0, + .rx_pullup = 1, + .sntp_server = "us.pool.ntp.org\0", + .syslog_host = "\0", .syslog_minheap = 8192, .syslog_filter = 7, .syslog_showtick = 1, .syslog_showdate = 0, + .mdns_enable = 1, .mdns_servername = "http\0", .timezone_offset = 0 }; typedef union { diff --git a/esp-link/config.h b/esp-link/config.h index fafdab7..59d5f3d 100644 --- a/esp-link/config.h +++ b/esp-link/config.h @@ -28,16 +28,15 @@ typedef struct { mqtt_status_topic[32]; char sys_descr[129]; // system description int8_t rx_pullup; // internal pull-up on RX pin - uint8_t mdns_enable; - char mdns_servername[32], - sntp_server[32]; - int8_t timezone_offset; - uint8_t syslog_enable; + char sntp_server[32]; char syslog_host[32]; uint16_t syslog_minheap; // min. heap to allow queuing uint8_t syslog_filter, // min. severity syslog_showtick, // show system tick (µs) syslog_showdate; // populate SYSLOG date field + uint8_t mdns_enable; + char mdns_servername[32]; + int8_t timezone_offset; } FlashConfig; extern FlashConfig flashConfig; diff --git a/html/services.html b/html/services.html index 3f8c548..2ca4c81 100644 --- a/html/services.html +++ b/html/services.html @@ -12,11 +12,6 @@