From 65062d0d5b21f838aa0043a15ce54cfab8d72c43 Mon Sep 17 00:00:00 2001
From: wujiazhi <1147861305@qq.com>
Date: Tue, 11 Jun 2024 14:23:53 +0800
Subject: [PATCH] 1.Fixed communication failure between MCU and wireless module 2.Fix the wrong judgment of alkaline lithium power
---
Function/EXTERN_RTC/extern_rtc.h | 38 ++++++--------------------------------
1 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/Function/EXTERN_RTC/extern_rtc.h b/Function/EXTERN_RTC/extern_rtc.h
index 3e8f998..f5370e8 100644
--- a/Function/EXTERN_RTC/extern_rtc.h
+++ b/Function/EXTERN_RTC/extern_rtc.h
@@ -2,15 +2,7 @@
#define _EXTERN_RTC_H_
#include "define_all.h"
-
-
-//�ⲿRTC�ж�IO
-#define EXT_RTC_INT_PORT GPIOD
-#define EXT_RTC_INT_PIN GPIO_Pin_6 // P3.2 IIC SCA �ź�
-
-
-#define YEAR_DEC_MAX 50 //������ֵʮ����
-#define YEAR_BCD_MAX 0x50 //������ֵBCD��ʽ
+#include "rtc.h"
// <<< Use Configuration Wizard in Context Menu >>>
@@ -70,7 +62,7 @@
// <o> �����жϹ���
// <0x0=>�ر� <0x20=>����
- #define UPDATA_BIT_FLAG 0x000020
+ #define UPDATA_BIT_FLAG 0x000000
// <o> �¶Ȳ�������
// <0x0=>0.5S <0x40=>2.0S <0x80=>10S <0xC0=>30S
@@ -100,34 +92,16 @@
uint16_t year;
}CALENDAR_TIME_T;//BCD
-
-
-typedef struct
-{
- uint8_t year; //�꣬BCD �� 00~99
- uint8_t month; //�£�BCD �� 01~12
- uint8_t day; //�գ�BCD �� 01~31
- uint8_t hour; //ʱ��BCD �� 00~23
- uint8_t min; //�֣�BCD �� 00~59
- uint8_t sec; //�룬BCD �� 00~59
-}sClockBCD;
-
-
-
-
#pragma pack()
-void RTC_GPIO_Init(void);
-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_Extern_Rtc_Time(uint16_t year,uint8_t month,uint8_t day,uint8_t week,uint8_t hour,uint8_t min,uint8_t sec);
+void Get_Extern_Rtc_Time(__IO CALENDAR_TIME_T * calendar_p);
void Set_Rtc_UpdataInterrupt(void);
-extern __IO sClockBCD sys_clockBCD_g;
-
-
-ErrorStatus TimeEffectJudgm(const sClockBCD TimeBCD);
+//extern __IO CALENDAR_TIME_T calendar_g;
+extern __IO CALENDAR_TIME_T calendar_test_g;
#endif
--
Gitblit v1.9.3