diff --git a/code/components/jomjol_logfile/ClassLogFile.cpp b/code/components/jomjol_logfile/ClassLogFile.cpp index 492da341..9f958f01 100644 --- a/code/components/jomjol_logfile/ClassLogFile.cpp +++ b/code/components/jomjol_logfile/ClassLogFile.cpp @@ -164,7 +164,9 @@ void ClassLogFile::WriteToDedicatedFile(std::string _fn, esp_log_level_t level, break; } - logline = logline + "\t<" + loglevelString + ">\t" + message.c_str() + "\n"; + char uptime[20]; + snprintf(uptime, sizeof(uptime), "%8d", (uint32_t)(esp_timer_get_time()/1000/1000)); // in seconds + logline = "[" + std::string(uptime) + "] " + logline + "\t<" + loglevelString + ">\t" + message + "\n"; fputs(logline.c_str(), pFile); fclose(pFile); } else { diff --git a/code/main/main.cpp b/code/main/main.cpp index 546bbf79..852429f9 100644 --- a/code/main/main.cpp +++ b/code/main/main.cpp @@ -170,26 +170,16 @@ extern "C" void app_main(void) string versionFormated = "Tag: '" + std::string(GIT_TAG) + "', " + versionFormated; } - ESP_LOGD(TAG, "============================================================================================="); - ESP_LOGD(TAG, "%s", versionFormated.c_str()); - ESP_LOGD(TAG, "============================================================================================="); - ESP_LOGD(TAG, "Reset reason: %s", getResetReason().c_str()); - + LogFile.CreateLogDirectories(); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================================================="); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "==================== Startup ===================="); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================================================="); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, versionFormated); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reset reason: " + getResetReason()); CheckOTAUpdate(); - - LogFile.CreateLogDirectories(); CheckUpdate(); -/* - int mk_ret = mkdir("/sdcard/new_fd_mkdir", 0775); - ESP_LOGI(TAG, "mkdir ret %d", mk_ret); - mk_ret = mkdir("/sdcard/new_fd_mkdir/test", 0775); - ESP_LOGI(TAG, "mkdir ret %d", mk_ret); - MakeDir("/sdcard/test2"); - MakeDir("/sdcard/test2/intern"); -*/ - char *ssid = NULL, *passwd = NULL, *hostname = NULL, *ip = NULL, *gateway = NULL, *netmask = NULL, *dns = NULL; LoadWlanFromFile("/sdcard/wlan.ini", ssid, passwd, hostname, ip, gateway, netmask, dns); @@ -229,11 +219,9 @@ extern "C" void app_main(void) setBootTime(); - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "============================================================================================="); - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================== Main Started ============================================"); - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "============================================================================================="); - LogFile.WriteToFile(ESP_LOG_INFO, TAG, versionFormated); - LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Reset reason: " + getResetReason()); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================================================="); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================== Main Started ================="); + LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================================================="); if (getHTMLcommit() != std::string(GIT_REV)) { LogFile.WriteToFile(ESP_LOG_WARN, TAG, std::string("Web UI version (") + getHTMLcommit() + ") does not match firmware version (" + std::string(GIT_REV) + ") !"); diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html index 97371787..ab0e50f7 100644 --- a/sd-card/html/edit_config_param.html +++ b/sd-card/html/edit_config_param.html @@ -1268,7 +1268,7 @@ textarea {