From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 19 Jun 2024 17:25:45 +0800
Subject: [PATCH] 增加OTA协议
---
CORE/main.c | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/CORE/main.c b/CORE/main.c
index 2daf1c4..05bb0c5 100644
--- a/CORE/main.c
+++ b/CORE/main.c
@@ -27,6 +27,7 @@
#include "linked_list.h"
#include "other_fun.h"
#include "sys_sleep.h"
+#include "off_chip_flash.h"
FlagStatus key_awaken_flag_g = RESET;
@@ -61,7 +62,7 @@
if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //��ȡʱ��
{
- //?RTCʱ���쳣����
+ //RTCʱ���쳣����
if(__SYS_ALARM_CTL_BYTES_GET(rtc_err) == SET)
__SYS_STATUS_ALARM_BYTES_SET(rtc_err,ALARM_ID_RTC_BAT_LOW);
}
@@ -81,12 +82,12 @@
/*�ɼ����ϱ��������������*/
- //?���߲�ͬʱ���У��ɼ������ϱ�֮ǰ��ͬʱ�����Ļ����Ȳɼ���
+ //���߲�ͬʱ���У��ɼ������ϱ�֮ǰ��ͬʱ�����Ļ����Ȳɼ���
//���������ϱ��ж������ڲɼ�ǰ�棬�ȴ����ɼ����ٴ����ϱ�
sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
/*485�ɼ�*/
-// rs485ReadDataPro(&sys_fun_run_ctrl_g);
+ rs485ReadDataPro(&sys_fun_run_ctrl_g);
/*���㣬�����������*/
SettlementPro();
@@ -135,9 +136,14 @@
// }
}
+
+ /***************************���·���1�������⣬�����Ӧ�ٶ�***********************************************/
if(lcd_wake_up_flag_g == SET) //Ϊ�˰�����ʾû���ӳٸ�
lcdDisplayPro();
+ /*��λ������,������modbus���ɼ�����*/
+ upperComPro();
+
}
}
--
Gitblit v1.9.3