This commit is contained in:
Tester23
2024-03-25 20:18:53 +01:00
parent 355731fd53
commit 995fa350bf
4 changed files with 15 additions and 15 deletions

View File

@@ -143,7 +143,7 @@ void Run_Animated() {
char *p;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return;

View File

@@ -69,8 +69,8 @@ static bool g_synced;
// time offset (time zone?) in seconds
//#define CFG_DEFAULT_TIMEOFFSETSECONDS (-8 * 60 * 60)
static int g_timeOffsetSeconds = 0;
// current time
unsigned int g_ntpTime;
// current time - this may be 32 or 64 bit, depending on platform
time_t g_ntpTime;
int NTP_GetTimesZoneOfsSeconds()
{
@@ -189,7 +189,7 @@ int NTP_GetWeekDay() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -201,7 +201,7 @@ int NTP_GetHour() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -213,7 +213,7 @@ int NTP_GetMinute() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -225,7 +225,7 @@ int NTP_GetSecond() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -237,7 +237,7 @@ int NTP_GetMDay() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -249,7 +249,7 @@ int NTP_GetMonth() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -261,7 +261,7 @@ int NTP_GetYear() {
struct tm *ltm;
// NOTE: on windows, you need _USE_32BIT_TIME_T
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (ltm == 0) {
return 0;
@@ -440,8 +440,8 @@ void NTP_CheckForReceive() {
g_ntpTime = secsSince1900 - NTP_OFFSET;
g_ntpTime += g_timeOffsetSeconds;
addLogAdv(LOG_INFO, LOG_FEATURE_NTP,"Unix time : %u",g_ntpTime);
ltm = gmtime((time_t*)&g_ntpTime);
addLogAdv(LOG_INFO, LOG_FEATURE_NTP,"Unix time : %u",(unsigned int)g_ntpTime);
ltm = gmtime(&g_ntpTime);
addLogAdv(LOG_INFO, LOG_FEATURE_NTP,"Local Time : %04d/%02d/%02d %02d:%02d:%02d",
ltm->tm_year+1900, ltm->tm_mon+1, ltm->tm_mday, ltm->tm_hour, ltm->tm_min, ltm->tm_sec);
@@ -520,7 +520,7 @@ void NTP_AppendInformationToHTTPIndexPage(http_request_t* request)
{
struct tm *ltm;
ltm = gmtime((time_t*)&g_ntpTime);
ltm = gmtime(&g_ntpTime);
if (g_synced == true)
hprintf255(request, "<h5>NTP (%s): Local Time: %04d/%02d/%02d %02d:%02d:%02d </h5>",

View File

@@ -28,7 +28,7 @@ int NTP_GetEventTime(int id);
int NTP_RemoveClockEvent(int id);
int NTP_ClearEvents();
extern unsigned int g_ntpTime;
extern time_t g_ntpTime;
extern struct SUN_DATA { /* sunrise / sunset globals */
int latitude; /* latitude * 1000000 */
int longitude; /* longitude * 1000000 */

View File

@@ -756,7 +756,7 @@ struct tm* TuyaMCU_Get_NTP_Time() {
struct tm* ptm;
addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU, "MCU time to set: %i\n", g_ntpTime);
ptm = gmtime((time_t*)&g_ntpTime);
ptm = gmtime(&g_ntpTime);
if (ptm != 0) {
addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU, "ptime ->gmtime => tm_hour: %i\n", ptm->tm_hour);
addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU, "ptime ->gmtime => tm_min: %i\n", ptm->tm_min);