From d352b1982dc9b4fb2135c64cd909bb9cecc62139 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Fri, 14 Jun 2024 15:58:03 +0800
Subject: [PATCH] 添加.gitignore

---
 CORE/main.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/CORE/main.c b/CORE/main.c
index 2daf1c4..1b1c9cb 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;
@@ -86,7 +87,7 @@
 			sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
 			
 			/*485�ɼ�*/
-//			rs485ReadDataPro(&sys_fun_run_ctrl_g);
+			rs485ReadDataPro(&sys_fun_run_ctrl_g);
 			
 			/*���㣬�����������*/
 			SettlementPro();
@@ -138,6 +139,9 @@
 		if(lcd_wake_up_flag_g == SET)  //Ϊ�˰�����ʾû���ӳٸ�
 			lcdDisplayPro();
 		
+		/*��λ������,������modbus���ɼ�����*/
+		upperComPro();
+		
 	}
 }
 

--
Gitblit v1.9.3