Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2026-01-30 22:32:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

test1

Browse Source
This commit is contained in:
michael
2026-01-17 02:49:32 +01:00
parent a1ccda2e88
commit 4905663933
283 changed files with 32074 additions and 15759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/components/jomjol_time_sntp/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)
idf_component_register(SRCS ${app_sources}
INCLUDE_DIRS "."
REQUIRES esp_netif esp-tflite-micro jomjol_logfile jomjol_configfile)
INCLUDE_DIRS "." "../../include"
REQUIRES esp_netif esp-tflite-micro jomjol_logfile jomjol_flowcontroll jomjol_helper)

213
code/components/jomjol_time_sntp/time_sntp.cpp
View File

@@ -1,29 +1,30 @@
#include "defines.h"
#include "Helper.h"
#include "time_sntp.h"
#include <string>
#include <time.h>
#include <sys/time.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/event_groups.h"
#include "esp_system.h"
#include "esp_log.h"
#include "esp_attr.h"
#include "esp_sleep.h"
#include "esp_netif_sntp.h"
#include "../../include/defines.h"
#include "ClassFlow.h"
#include "ClassLogFile.h"
#include "configFile.h"
#include "Helper.h"
static const char *TAG = "SNTP";
static std::string timeZone = "";
static std::string timeServer = "undefined";
static std::string timeServer = "";
static bool useNtp = true;
static bool timeWasNotSetAtBoot = false;
static bool timeWasNotSetAtBoot_PrintStartBlock = false;
@@ -34,9 +35,7 @@ static std::string getServerName(void);
int LocalTimeToUTCOffsetSeconds;
std::string ConvertTimeToString(time_t _time, const char * frm)
std::string ConvertTimeToString(time_t _time, const char *frm)
{
struct tm timeinfo;
char strftime_buf[64];
@@ -47,8 +46,7 @@ std::string ConvertTimeToString(time_t _time, const char * frm)
return result;
}
std::string getCurrentTimeString(const char * frm)
std::string getCurrentTimeString(const char *frm)
{
time_t now;
struct tm timeinfo;
@@ -61,38 +59,41 @@ std::string getCurrentTimeString(const char * frm)
return result;
}
void time_sync_notification_cb(struct timeval *tv)
{
if (timeWasNotSetAtBoot_PrintStartBlock) {
if (timeWasNotSetAtBoot_PrintStartBlock)
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "==================== Start ======================");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "== Logs before time sync -> log_1970-01-01.txt ==");
timeWasNotSetAtBoot_PrintStartBlock = false;
}
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Time is synced with NTP Server " +
getServerName() + ": " + getCurrentTimeString("%Y-%m-%d %H:%M:%S"));
}
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Time is synced with NTP Server " + getServerName() + ": " + getCurrentTimeString("%Y-%m-%d %H:%M:%S"));
}
bool time_manual_reset_sync(void)
{
sntp_restart();
// sntp_init();
// sntp_init();
int retry = 0;
const int retry_count = 10;
while (sntp_get_sync_status() == SNTP_SYNC_STATUS_RESET && ++retry < retry_count) {
while (sntp_get_sync_status() == SNTP_SYNC_STATUS_RESET && ++retry < retry_count)
{
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Waiting for system time to be set... " + std::to_string(retry) + "/" + std::to_string(retry_count));
vTaskDelay(2000 / portTICK_PERIOD_MS);
}
if (retry >= retry_count)
{
return false;
}
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Waiting for system time successfull with " + std::to_string(retry) + "/" + std::to_string(retry_count));
return true;
}
int getUTCOffsetSeconds(std::string &zeitzone)
{
int offset = 0;
@@ -102,7 +103,7 @@ int getUTCOffsetSeconds(std::string &zeitzone)
time_t now;
struct tm timeinfo;
time (&now);
time(&now);
localtime_r(&now, &timeinfo);
char buffer[80];
strftime(buffer, 80, "%z", &timeinfo);
@@ -111,68 +112,70 @@ int getUTCOffsetSeconds(std::string &zeitzone)
if (zeitzone.length() == 5)
{
if (zeitzone[0] == '-')
vorzeichen = -1;
{
vorzeichen = -1;
}
stunden = stoi(zeitzone.substr(1, 2));
minuten = stoi(zeitzone.substr(3, 2));
offset = ((stunden * 60) + minuten) * 60;
}
return offset;
}
void setTimeZone(std::string _tzstring)
{
setenv("TZ", _tzstring.c_str(), 1);
tzset();
tzset();
_tzstring = "Time zone set to " + _tzstring;
LogFile.WriteToFile(ESP_LOG_INFO, TAG, _tzstring);
std::string zeitzone;
LocalTimeToUTCOffsetSeconds = getUTCOffsetSeconds(zeitzone);
// std::string zw = std::to_string(LocalTimeToUTCOffsetSeconds);
// std::string zw = std::to_string(LocalTimeToUTCOffsetSeconds);
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "time zone: " + zeitzone + " Delta to UTC: " + std::to_string(LocalTimeToUTCOffsetSeconds) + " seconds");
}
std::string getNtpStatusText(sntp_sync_status_t status) {
if (status == SNTP_SYNC_STATUS_COMPLETED) {
std::string getNtpStatusText(sntp_sync_status_t status)
{
if (status == SNTP_SYNC_STATUS_COMPLETED)
{
return "Synchronized";
}
else if (status == SNTP_SYNC_STATUS_IN_PROGRESS) {
else if (status == SNTP_SYNC_STATUS_IN_PROGRESS)
{
return "In Progress";
}
else { // SNTP_SYNC_STATUS_RESET
else
{
// SNTP_SYNC_STATUS_RESET
return "Reset";
}
}
bool getTimeIsSet(void) {
bool getTimeIsSet(void)
{
time_t now;
struct tm timeinfo;
time(&now);
localtime_r(&now, &timeinfo);
// Is time set? If not, tm_year will be (1970 - 1900).
if ((timeinfo.tm_year < (2022 - 1900))) {
if ((timeinfo.tm_year < (2022 - 1900)))
{
return false;
}
else {
else
{
return true;
}
}
/*void restartNtpClient(void) {
// sntp_restart();
// obtain_time();
}*/
bool getUseNtp(void) {
bool getUseNtp(void)
{
return useNtp;
}
@@ -181,100 +184,108 @@ bool getTimeWasNotSetAtBoot(void)
return timeWasNotSetAtBoot;
}
std::string getServerName(void) {
std::string getServerName(void)
{
char buf[100];
if (sntp_getservername(0)){
snprintf(buf, sizeof(buf), "%s", sntp_getservername(0));
if (esp_sntp_getservername(0))
{
snprintf(buf, sizeof(buf), "%s", esp_sntp_getservername(0));
return std::string(buf);
}
else { // we have either IPv4 or IPv6 address
ip_addr_t const *ip = sntp_getserver(0);
if (ipaddr_ntoa_r(ip, buf, sizeof(buf)) != NULL) {
else
{
// we have either IPv4 or IPv6 address
ip_addr_t const *ip = esp_sntp_getserver(0);
if (ipaddr_ntoa_r(ip, buf, sizeof(buf)) != NULL)
{
return std::string(buf);
}
}
return "";
}
/**
* Load the TimeZone and TimeServer from the config file and initialize the NTP client
*/
bool setupTime() {
time_t now;
struct tm timeinfo;
char strftime_buf[64];
ConfigFile configFile = ConfigFile(CONFIG_FILE);
if (!configFile.ConfigFileExists()){
bool setupTime()
{
FILE *pFile = fopen(CONFIG_FILE, "r");
if (pFile == NULL)
{
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "No ConfigFile defined - exit setupTime()!");
return false;
}
ClassFlow classFlow;
std::string aktparamgraph = "";
while (classFlow.GetNextParagraph(pFile, aktparamgraph))
{
if ((to_upper(aktparamgraph).compare("[SYSTEM]") == 0) || (to_upper(aktparamgraph).compare(";[SYSTEM]") == 0))
{
break;
}
}
if ((to_upper(aktparamgraph).compare("[SYSTEM]") != 0) && (to_upper(aktparamgraph).compare(";[SYSTEM]") != 0))
{
fclose(pFile);
return false;
}
time_t now;
struct tm timeinfo;
char strftime_buf[64];
std::vector<std::string> splitted;
std::string line = "";
bool disabledLine = false;
bool eof = false;
/* Load config from config file */
while ((!configFile.GetNextParagraph(line, disabledLine, eof) ||
(line.compare("[System]") != 0)) && !eof) {}
if (eof) {
return false;
}
while (classFlow.getNextLine(pFile, &aktparamgraph) && !classFlow.isNewParagraph(aktparamgraph))
{
splitted = split_line(aktparamgraph);
if (disabledLine) {
return false;
}
if (splitted.size() > 1)
{
std::string _param = to_upper(splitted[0]);
while (configFile.getNextLine(&line, disabledLine, eof) &&
!configFile.isNewParagraph(line)) {
splitted = ZerlegeZeile(line, "=");
if (toUpper(splitted[0]) == "TIMEZONE") {
if (splitted.size() <= 1) { // parameter part is empty
timeZone = "";
}
else {
if (_param == "TIMEZONE")
{
timeZone = splitted[1];
}
}
if (toUpper(splitted[0]) == "TIMESERVER") {
if (splitted.size() <= 1) { // Key has no value => we use this to show it as disabled
timeServer = "";
}
else {
else if (_param == "TIMESERVER")
{
timeServer = splitted[1];
}
}
}
fclose(pFile);
/* Setup NTP Server and Timezone */
if (timeServer == "undefined") {
if (timeServer == "undefined")
{
timeServer = "pool.ntp.org";
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "TimeServer not defined, using default: " + timeServer);
}
else if (timeServer == "") {
else if (timeServer == "")
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "TimeServer config empty, disabling NTP");
useNtp = false;
}
else {
else
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "TimeServer: " + timeServer);
}
if (timeZone == "") {
if (timeZone == "")
{
timeZone = "CET-1CEST,M3.5.0,M10.5.0/3";
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "TimeZone not set, using default: " + timeZone);
}
if (useNtp) {
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Configuring NTP Client...");
if (useNtp)
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Configuring NTP Client...");
esp_sntp_config_t config = ESP_NETIF_SNTP_DEFAULT_CONFIG(timeServer.c_str());
config.sync_cb = time_sync_notification_cb;
esp_netif_sntp_init(&config);
@@ -282,7 +293,7 @@ bool setupTime() {
setTimeZone(timeZone);
}
/* The RTC keeps the time after a restart (Except on Power On or Pin Reset)
/* The RTC keeps the time after a restart (Except on Power On or Pin Reset)
* There should only be a minor correction through NTP */
// Get current time from RTC
@@ -290,13 +301,15 @@ bool setupTime() {
localtime_r(&now, &timeinfo);
strftime(strftime_buf, sizeof(strftime_buf), "%Y-%m-%d %H:%M:%S", &timeinfo);
if (getTimeIsSet()) {
if (getTimeIsSet())
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Time is already set: " + std::string(strftime_buf));
}
else {
else
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "The local time is unknown, starting with " + std::string(strftime_buf));
if (useNtp) {
if (useNtp)
{
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "Once the NTP server provides a time, we will switch to that one");
timeWasNotSetAtBoot = true;
timeWasNotSetAtBoot_PrintStartBlock = true;
@@ -305,5 +318,3 @@ bool setupTime() {
return true;
}

15
code/components/jomjol_time_sntp/time_sntp.h
View File

@@ -1,24 +1,24 @@
#pragma once
#ifndef TIMESNTP_H
#define TIMESNTP_H
#ifndef TIME_SNTP_H
#define TIME_SNTP_H
#include <string>
#include <time.h>
#include <sys/time.h>
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/event_groups.h"
#include "esp_system.h"
#include "esp_log.h"
#include "esp_attr.h"
#include "esp_sleep.h"
#include "esp_sntp.h"
std::string getCurrentTimeString(const char * frm);
std::string ConvertTimeToString(time_t _time, const char * frm);
std::string getCurrentTimeString(const char *frm);
std::string ConvertTimeToString(time_t _time, const char *frm);
bool getTimeIsSet(void);
bool getTimeWasNotSetAtBoot(void);
@@ -30,5 +30,4 @@ bool time_manual_reset_sync(void);
extern int LocalTimeToUTCOffsetSeconds;
#endif //TIMESNTP_H
#endif // TIME_SNTP_H