From 71f8bdb7c63acc381d71105bb950411029f4250f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 03 Jun 2024 20:00:58 +0800
Subject: [PATCH] 测试远传
---
CORE/main.c | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/CORE/main.c b/CORE/main.c
index c254364..2daf1c4 100644
--- a/CORE/main.c
+++ b/CORE/main.c
@@ -25,6 +25,8 @@
#include "pulse_and_alarm_line.h"
#include "billing.h"
#include "linked_list.h"
+#include "other_fun.h"
+#include "sys_sleep.h"
FlagStatus key_awaken_flag_g = RESET;
@@ -34,7 +36,7 @@
int main(void)
{
System_power_on_init();
-
+
/*���ֳ�ʼ��*/
//Ӳ��������ʼ��
hardwareDriversInit();
@@ -47,13 +49,16 @@
allExtiIRQ();
IWDT_Clr();
+
+ lcdDisplayPro(); //��λ��ʾ�ȴ�
+
while(1)
- {
+ {
if(sys_run_period==SET)
{
sys_run_period = RESET;
IWDT_Clr();
-
+
if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //��ȡʱ��
{
//?RTCʱ���쳣����
@@ -81,7 +86,7 @@
sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
/*485�ɼ�*/
- rs485ReadDataPro(&sys_fun_run_ctrl_g);
+// rs485ReadDataPro(&sys_fun_run_ctrl_g);
/*���㣬�����������*/
SettlementPro();
@@ -97,6 +102,9 @@
valveCtrlPro(&sys_fun_run_ctrl_g);
+ /*ϵͳ������ɢС���ܴ���*/
+ OtherFunPro();
+
/*״̬�֡������ִ���*/
SysAlarmCtrlPro();
@@ -111,24 +119,25 @@
- /*����*/
- //��������²������ߣ�Ҫ���жϣ���������硢RS485�ɼ������С�Զ��������
- if(SysKeepRunningStatusGet(sys_fun_run_ctrl_g)==RESET){
- //���ߴ���
- if(pulse_exti_flag==SET){ //�ȴ����������
- for(uint8_t count_i=0;count_i<(PULSE_CHECK_DELAY_MS &0xff);count_i++){
- delay_ms(1);
- if(pulse_exti_flag == RESET)
- break;
- }
- }
- //����
-
-
- }
-
-
+// /*����*/
+// //��������²������ߣ�Ҫ���жϣ���������硢RS485�ɼ������С�Զ��������
+// if(SysKeepRunningStatusGet(sys_fun_run_ctrl_g)==RESET){
+// //���ߴ���
+// if(pulse_exti_flag==SET){ //�ȴ����������
+// for(uint8_t count_i=0;count_i<(PULSE_CHECK_DELAY_MS &0xff);count_i++){
+// delay_ms(1);
+// if(pulse_exti_flag == RESET)
+// break;
+// }
+// }
+// //����
+// DeepSleepMode();
+// }
}
+
+ if(lcd_wake_up_flag_g == SET) //Ϊ�˰�����ʾû���ӳٸ�
+ lcdDisplayPro();
+
}
}
--
Gitblit v1.9.3