Merge branch 'master' of https://gitee.com/openLuat/luatos-soc-2024

openLuat · Dec 3, 2024 · 4fcc4d7 · 4fcc4d7
2 parents 181d97c + 5a768be
commit 4fcc4d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/interface/src/__wrap.c b/interface/src/__wrap.c
@@ -2,22 +2,9 @@
 #include "time.h"
 #include "osasys.h"
 #include "mw_aon_info.h"
+#include "slpman.h"
+
 extern MidWareAonInfo      *pMwAonInfo;
-//static void RTC_GetDateTime(Date_UserDataStruct *pDate, Time_UserDataStruct *pTime)
-//{
-//	PV_Union uPV;
-//	utc_timer_value_t *timeUtc = OsaSystemTimeReadRamUtc();
-//	uPV.u32 = timeUtc->UTCtimer1;
-//	pDate->Year = uPV.u16[1];
-//	pDate->Mon = uPV.u8[1];
-//	pDate->Day = uPV.u8[0];
-//	uPV.u32 = timeUtc->UTCtimer2;
-//	pTime->Hour = uPV.u8[3];
-//	pTime->Min = uPV.u8[2];
-//	pTime->Sec = uPV.u8[1];
-//	//DBG("%d,%d,%d,%d,%d,%d",pDate->Year,pDate->Mon,pDate->Day,pTime->Hour,pTime->Min,pTime->Sec);
-//	//Tamp2UTC(timeUtc->UTCsecs, pDate, pTime, 0);
-//}
 
 static struct tm prvTM;
 extern const uint32_t DayTable[2][12];

diff --git a/interface/src/luat_rtc_ec7xx.c b/interface/src/luat_rtc_ec7xx.c
@@ -28,10 +28,11 @@
 #include "mw_aon_info.h"
 #include "soc_service.h"
 extern MidWareAonInfo      *pMwAonInfo;
+extern void soc_save_tz(int8_t tz);
 
 void luat_rtc_set_timezone(int zone)
 {
-	soc_save_tz(zone);
+	soc_save_tz((int8_t)zone);
 }
 
 int luat_rtc_get_timezone(void)