mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-09 04:56:53 +03:00
log NTP server name (#1497)
* log NTP server name * . * . * replace calls to /wasserzaehler.html with calls to /value (#1469) Co-authored-by: CaCO3 <caco@ruinelli.ch> * Fix cookie usage, use correct http response codes, add 404 page (#1495) * replaced some HTTP response code with better matching codes * add custom 404 page, add log entry for debugging * fix cookie * replace non-necessary whitespace * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Don't autofail if NTP server can't be reached during initalization (#1498) This fixes an issue with a restricted network without internet access, where the hardcoded ntp server can't be reached and thus the esp resets, as it's not able to finish initalization. * Update Changelog.md * Update Changelog.md for release * Fix for securing wlan.ini (#1509) * Fix for securing wlan.ini * Fixing error with ' instead of " * Changing to errorcode 403 * maybe strcmp instead of regular == Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> * Update Web-Installer * solves #1530 (#1531) * Refactor JSON (#1518) * use correct log level * corrected logging * typo * refactored JSON generagion: removed unused parameters, consolidated into singel function, added "pre" * Wrapped 'rate' into double quotes, like all other JSON values Co-authored-by: CaCO3 <caco@ruinelli.ch> * Various corrections (#1519) * use correct log level * corrected logging * typo * add release to webinstaller * changed logs, added INFO log of raw, value, error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * Prevent auto restart on cam framebuffer init error (#1522) * use correct log level * revert autorestart on camera framebuffer init error * . Co-authored-by: CaCO3 <caco@ruinelli.ch> * #1524 - ensure the recognized digit is less than 10 (#1525) * fix kernel panic (vector out of range) in getReadoutRawString * fix key of caches * fix key of caches * fix key caches * fix cache keys * fix cache keys * move set variables to top * debug * fix key * testing * try fix changelog * test * Update Changelog.md for release * Revert "Update Changelog.md for release" This reverts commit4f51ec7962. * remove testing * fix release creation * testing * Update Changelog.md for release * test * Revert "Merge branch 'master' of https://github.com/haverland/AI-on-the-edge-device" This reverts commitf68695a4c0, reversing changes made toa096cf7182. * Revert "test" This reverts commita096cf7182. * revert testing * #1524 - ensure the result of ZeigerEvalHybridNeu is <10 * Fix late digit transition #1503 Co-authored-by: github-actions <github-actions@github.com> * only use sntp_getservername() after init sntp * set default NTP server on dnew installations Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Ralf Rachinger <git@ralfrachinger.de> Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: parhedberg <par.hedberg@gmail.com> Co-authored-by: Pär Hedberg <par.hedberg@nordicmedtest.se> Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Co-authored-by: Frank Haverland <fspapaping@googlemail.com>
This commit is contained in:
@@ -874,6 +874,7 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
|
|||||||
UpdatePreValueINI = true;
|
UpdatePreValueINI = true;
|
||||||
|
|
||||||
string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
|
string _zw = NUMBERS[j]->name + ": Raw: " + NUMBERS[j]->ReturnRawValue + ", Value: " + NUMBERS[j]->ReturnValue + ", Status: " + NUMBERS[j]->ErrorMessageText;
|
||||||
|
ESP_LOGD(TAG, "%s", zw.c_str());
|
||||||
LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw);
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, _zw);
|
||||||
WriteDataLog(j);
|
WriteDataLog(j);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,8 +63,8 @@ bool setup_time()
|
|||||||
|
|
||||||
// Is time set? If not, tm_year will be (1970 - 1900).
|
// Is time set? If not, tm_year will be (1970 - 1900).
|
||||||
if (!getTimeIsSet()) {
|
if (!getTimeIsSet()) {
|
||||||
ESP_LOGI(TAG, "Time is not set yet. Getting time over NTP.");
|
|
||||||
initialize_sntp();
|
initialize_sntp();
|
||||||
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Time is not set yet. Getting time over NTP server " + std::string(sntp_getservername(0)));
|
||||||
if (!obtain_time()) {
|
if (!obtain_time()) {
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
@@ -105,7 +105,7 @@ static bool obtain_time(void)
|
|||||||
time(&now);
|
time(&now);
|
||||||
localtime_r(&now, &timeinfo);
|
localtime_r(&now, &timeinfo);
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Waiting until we get a time from the NTP server...");
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Waiting until we get a time from the NTP server " + std::string(sntp_getservername(0)));
|
||||||
while (true) {
|
while (true) {
|
||||||
retry++;
|
retry++;
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@ static bool obtain_time(void)
|
|||||||
sntp_sync_status_t status = sntp_get_sync_status();
|
sntp_sync_status_t status = sntp_get_sync_status();
|
||||||
logNtpStatus(status);
|
logNtpStatus(status);
|
||||||
if (status == SNTP_SYNC_STATUS_COMPLETED) {
|
if (status == SNTP_SYNC_STATUS_COMPLETED) {
|
||||||
ESP_LOGI(TAG, "Time is synced with NTP Server");
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Time is synced with NTP Server " + std::string(sntp_getservername(0)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,10 +146,10 @@ void logNtpStatus(sntp_sync_status_t status) {
|
|||||||
|
|
||||||
void reset_servername(std::string _servername)
|
void reset_servername(std::string _servername)
|
||||||
{
|
{
|
||||||
ESP_LOGD(TAG, "Set SNTP-Server: %s", _servername.c_str());
|
|
||||||
sntp_stop();
|
sntp_stop();
|
||||||
sntp_setoperatingmode(SNTP_OPMODE_POLL);
|
sntp_setoperatingmode(SNTP_OPMODE_POLL);
|
||||||
sntp_setservername(0, _servername.c_str());
|
sntp_setservername(0, _servername.c_str());
|
||||||
|
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Set SNTP-Server to " + std::string(sntp_getservername(0)));
|
||||||
sntp_init();
|
sntp_init();
|
||||||
obtain_time();
|
obtain_time();
|
||||||
std::string zw = gettimestring("%Y%m%d-%H%M%S");
|
std::string zw = gettimestring("%Y%m%d-%H%M%S");
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ LogfileRetentionInDays = 3
|
|||||||
|
|
||||||
[System]
|
[System]
|
||||||
TimeZone = CET-1CEST,M3.5.0,M10.5.0/3
|
TimeZone = CET-1CEST,M3.5.0,M10.5.0/3
|
||||||
;TimeServer = undefined
|
;TimeServer = pool.ntp.org
|
||||||
;AutoAdjustSummertime = false
|
;AutoAdjustSummertime = false
|
||||||
;Hostname = undefined
|
;Hostname = undefined
|
||||||
SetupMode = true
|
SetupMode = true
|
||||||
|
|||||||
Reference in New Issue
Block a user