From c48d53669ed0288d42f13391410cab159b91c40e Mon Sep 17 00:00:00 2001 From: zogodo <742782908@qq.com> Date: Sat, 8 Feb 2020 22:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TC1/TC1.mk | 1 - TC1/time_server/user_rtc.c | 1 - TC1/time_server/user_sntp.c | 52 ------------------------------------- TC1/time_server/user_sntp.h | 13 ---------- TC1/user_wifi.c | 1 - 5 files changed, 68 deletions(-) delete mode 100644 TC1/time_server/user_sntp.c delete mode 100644 TC1/time_server/user_sntp.h diff --git a/TC1/TC1.mk b/TC1/TC1.mk index f6c366d..25b6ae6 100644 --- a/TC1/TC1.mk +++ b/TC1/TC1.mk @@ -30,7 +30,6 @@ $(NAME)_SOURCES := main.c\ user_wifi.c\ user_gpio.c\ user_udp.c\ - time_server/user_sntp.c\ time_server/user_rtc.c\ mqtt_server/user_mqtt_client.c\ ota_server/user_ota.c\ diff --git a/TC1/time_server/user_rtc.c b/TC1/time_server/user_rtc.c index 5d278f4..c929066 100644 --- a/TC1/time_server/user_rtc.c +++ b/TC1/time_server/user_rtc.c @@ -4,7 +4,6 @@ #include "main.h" #include "user_gpio.h" #include "sntp.h" -#include "time_server/user_sntp.h" #include "c_json/c_json.h" #include "mqtt_server/user_mqtt_client.h" #include "mqtt_server/user_function.h" diff --git a/TC1/time_server/user_sntp.c b/TC1/time_server/user_sntp.c deleted file mode 100644 index 8a44d52..0000000 --- a/TC1/time_server/user_sntp.c +++ /dev/null @@ -1,52 +0,0 @@ -#include "http_server/web_log.h" -#define os_log(format, ...) do { custom_log("SNTP", format, ##__VA_ARGS__); web_log(format, ##__VA_ARGS__) } while(0) - -#include "main.h" -//#include "user_gpio.h" -#include "time_server/user_sntp.h" -#include "sntp.h" - -/* Callback function when MiCO UTC time in sync to NTP server */ -static void sntp_time_call_back(void) -{ - struct tm * currentTime; -// iso8601_time_t iso8601_time; - mico_utc_time_t utc_time; - mico_rtc_time_t rtc_time; - -// mico_time_get_iso8601_time(&iso8601_time); -// os_log("sntp_time_synced: %.26s", (char*)&iso8601_time); - - mico_time_get_utc_time(&utc_time); - utc_time+=28800; //+8:00 - currentTime = localtime((const time_t *)&utc_time); - rtc_time.sec = currentTime->tm_sec; - rtc_time.min = currentTime->tm_min; - rtc_time.hr = currentTime->tm_hour; - - rtc_time.date = currentTime->tm_mday; - rtc_time.weekday = currentTime->tm_wday; - rtc_time.month = currentTime->tm_mon + 1; - rtc_time.year = (currentTime->tm_year + 1900) % 100; - - MicoRtcSetTime(&rtc_time); - - - MicoRtcGetTime(&rtc_time); - os_log("SNTP time2:20%d/%d/%d %d %d:%d:%d",rtc_time.year,rtc_time.month,rtc_time.date,rtc_time.weekday,rtc_time.hr,rtc_time.min,rtc_time.sec); - -} - - -void sntp_init(void) -{ - struct in_addr ipp; - ipp.s_addr=0xd248912c; - sntp_set_server_ip_address (0,ipp); - sntp_start_auto_time_sync (15000, sntp_time_call_back); //每小时校准一次 - - mico_rtc_time_t rtc_time; - MicoRtcGetTime(&rtc_time); - os_log("time3:20%d/%d/%d %d %d:%d:%d",rtc_time.year,rtc_time.month,rtc_time.date,rtc_time.weekday,rtc_time.hr,rtc_time.min,rtc_time.sec); - -} diff --git a/TC1/time_server/user_sntp.h b/TC1/time_server/user_sntp.h deleted file mode 100644 index 8dc4a20..0000000 --- a/TC1/time_server/user_sntp.h +++ /dev/null @@ -1,13 +0,0 @@ - -#ifndef __USER_SNTP_H_ -#define __USER_SNTP_H_ - - -#include "mico.h" -#include "micokit_ext.h" - -extern void sntp_init(void); - - - -#endif diff --git a/TC1/user_wifi.c b/TC1/user_wifi.c index 72d8627..2c58575 100644 --- a/TC1/user_wifi.c +++ b/TC1/user_wifi.c @@ -3,7 +3,6 @@ #include "main.h" #include "mico_socket.h" #include "user_gpio.h" -#include "time_server/user_sntp.h" #include "mqtt_server/user_function.h" #include "http_server/web_log.h"