From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001 From: jinlicong <493886250@qq.com> Date: Wed, 05 Jun 2024 17:38:06 +0800 Subject: [PATCH] 继续测试修改 --- Function/EXTERN_RTC/extern_rtc.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Function/EXTERN_RTC/extern_rtc.h b/Function/EXTERN_RTC/extern_rtc.h index 7249b35..3e8f998 100644 --- a/Function/EXTERN_RTC/extern_rtc.h +++ b/Function/EXTERN_RTC/extern_rtc.h @@ -9,6 +9,8 @@ #define EXT_RTC_INT_PIN GPIO_Pin_6 // P3.2 IIC SCA �ź� +#define YEAR_DEC_MAX 50 //������ֵʮ���� +#define YEAR_BCD_MAX 0x50 //������ֵBCD��ʽ // <<< Use Configuration Wizard in Context Menu >>> @@ -68,7 +70,7 @@ // <o> �����жϹ��� // <0x0=>�ر� <0x20=>���� - #define UPDATA_BIT_FLAG 0x000000 + #define UPDATA_BIT_FLAG 0x000020 // <o> �¶Ȳ������� // <0x0=>0.5S <0x40=>2.0S <0x80=>10S <0xC0=>30S @@ -117,13 +119,13 @@ void RTC_GPIO_Init(void); -void Set_Extern_Rtc_Time(uint16_t year,uint8_t month,uint8_t day,uint8_t week,uint8_t hour,uint8_t min,uint8_t sec); +ErrorStatus Set_Extern_Rtc_Time(uint16_t year,uint8_t month,uint8_t day,uint8_t week,uint8_t hour,uint8_t min,uint8_t sec); ErrorStatus Get_Extern_Rtc_Time(__IO sClockBCD * calendar_p); void Set_Rtc_UpdataInterrupt(void); -//extern __IO CALENDAR_TIME_T calendar_g; -//extern __IO CALENDAR_TIME_T calendar_test_g; +extern __IO sClockBCD sys_clockBCD_g; + ErrorStatus TimeEffectJudgm(const sClockBCD TimeBCD); -- Gitblit v1.9.3