fix time
This commit is contained in:
parent
d6c8082338
commit
5010544ba9
@ -29,39 +29,62 @@
|
|||||||
#define PIN_MOSI 19
|
#define PIN_MOSI 19
|
||||||
|
|
||||||
extern "C" void sync_system_time(unsigned int sec, unsigned int usec) {
|
extern "C" void sync_system_time(unsigned int sec, unsigned int usec) {
|
||||||
printf("SNTP callback received: %lu\n", (unsigned long)sec);
|
if (sec == 0) {
|
||||||
time_t unix_time = (time_t)sec;
|
printf("SNTP: Invalid timestamp received\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
u16_t timezone_offset = 7200;
|
printf("SNTP callback received: %lu\n", (unsigned long)sec);
|
||||||
|
|
||||||
// Apply timezone offset for local time
|
// Convert NTP timestamp to Unix timestamp
|
||||||
unix_time += timezone_offset;
|
#define NTP_DELTA 2208988800UL
|
||||||
|
time_t unix_time = (time_t)(sec - NTP_DELTA);
|
||||||
|
|
||||||
struct tm *time_info = gmtime(&unix_time);
|
u16_t timezone_offset = 7200;
|
||||||
if (time_info == NULL) {
|
|
||||||
printf("SNTP: Invalid timestamp %lu\n", (unsigned long)sec);
|
unix_time += timezone_offset;
|
||||||
return;
|
|
||||||
}
|
struct tm *time_info = gmtime(&unix_time);
|
||||||
|
if (time_info == NULL) {
|
||||||
|
printf("SNTP: Invalid timestamp %lu\n", (unsigned long)sec);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Got SNTP response: %02d/%02d/%04d %02d:%02d:%02d\n",
|
||||||
|
time_info->tm_mday, time_info->tm_mon + 1, time_info->tm_year + 1900,
|
||||||
|
time_info->tm_hour, time_info->tm_min, time_info->tm_sec);
|
||||||
|
|
||||||
|
datetime_t dt = {
|
||||||
|
.year = static_cast<int16_t>(time_info->tm_year + 1900),
|
||||||
|
.month = static_cast<int8_t>(time_info->tm_mon + 1),
|
||||||
|
.day = static_cast<int8_t>(time_info->tm_mday),
|
||||||
|
.dotw = static_cast<int8_t>(time_info->tm_wday),
|
||||||
|
.hour = static_cast<int8_t>(time_info->tm_hour),
|
||||||
|
.min = static_cast<int8_t>(time_info->tm_min),
|
||||||
|
.sec = static_cast<int8_t>(time_info->tm_sec)
|
||||||
|
};
|
||||||
|
|
||||||
|
// Set RTC
|
||||||
|
if (rtc_set_datetime(&dt)) {
|
||||||
|
printf("SNTP: Time synchronized to %04d-%02d-%02d %02d:%02d:%02d %s\n",
|
||||||
|
dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec,
|
||||||
|
(timezone_offset == 0) ? "UTC" : "Local");
|
||||||
|
} else {
|
||||||
|
printf("SNTP: Failed to set RTC\n");
|
||||||
|
}
|
||||||
|
|
||||||
datetime_t dt = {.year = static_cast<int16_t>(time_info->tm_year + 1900),
|
|
||||||
.month = static_cast<int8_t>(time_info->tm_mon + 1),
|
|
||||||
.day = static_cast<int8_t>(time_info->tm_mday),
|
|
||||||
.dotw = static_cast<int8_t>(time_info->tm_wday),
|
|
||||||
.hour = static_cast<int8_t>(time_info->tm_hour),
|
|
||||||
.min = static_cast<int8_t>(time_info->tm_min),
|
|
||||||
.sec = static_cast<int8_t>(time_info->tm_sec)};
|
|
||||||
|
|
||||||
// Sanity checks
|
// Sanity checks
|
||||||
if (dt.year < 2020 || dt.year > 2100 || dt.month < 1 || dt.month > 12 ||
|
if (dt.year < 2020 || dt.year > 2100 || dt.month < 1 || dt.month > 12 ||
|
||||||
dt.day < 1 || dt.day > 31 || dt.hour > 23 || dt.min > 59 || dt.sec > 59) {
|
dt.day < 1 || dt.day > 31 || dt.hour > 23 || dt.min > 59 || dt.sec > 59) {
|
||||||
printf("SNTP: Invalid date/time components\n");
|
printf("SNTP: Invalid date/time components\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set RTC
|
// Set RTC with error handling
|
||||||
if (rtc_set_datetime(&dt)) {
|
if (rtc_set_datetime(&dt)) {
|
||||||
printf("SNTP: Time set to %04d-%02d-%02d %02d:%02d:%02d %s\n", dt.year,
|
printf("SNTP: Time synchronized to %04d-%02d-%02d %02d:%02d:%02d %s\n",
|
||||||
dt.month, dt.day, dt.hour, dt.min, dt.sec,
|
dt.year, dt.month, dt.day, dt.hour, dt.min, dt.sec,
|
||||||
(timezone_offset == 0) ? "UTC" : "Local");
|
(timezone_offset == 0) ? "UTC" : "Local");
|
||||||
} else {
|
} else {
|
||||||
printf("SNTP: Failed to set RTC\n");
|
printf("SNTP: Failed to set RTC\n");
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user