继续测试修改

jinlicong

2024-06-05 cf4d12fd8322cbb350dd3bc5af8c748e8790ac64

 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;
@@ -85,8 +86,8 @@
         //±¨¾¯´¥·¢Éϱ¨ÅжÏÂß¼­·ÅÔڲɼ¯Ç°Ã棬ÏÈ´¥·¢²É¼¯£¬ÔÙ´¥·¢Éϱ¨
         sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
         
//         /*485²É¼¯*/
////         rs485ReadDataPro(&sys_fun_run_ctrl_g);
         /*485²É¼¯*/
//         rs485ReadDataPro(&sys_fun_run_ctrl_g);
         
         /*½áË㣬°üº¬Âö³å¼ÆÈë*/
         SettlementPro();
@@ -109,16 +110,16 @@
         SysAlarmCtrlPro();
         
         
//         /*µÚÈý·½ÎÞÏßͨѶ£¬Ô¤Áô*/
//			
//			
//         /*˼Öþƽ̨ÎÞÏßͨѶ*/
////         WirelessRemoteCommPro(&sys_fun_run_ctrl_g);
//			
//         /*modbusµØÖ·±íÊý¾Ý¸üÐÂ*/
//			
//			
//			
         /*µÚÈý·½ÎÞÏßͨѶ£¬Ô¤Áô*/
			
			
         /*˼Öþƽ̨ÎÞÏßͨѶ*/
         WirelessRemoteCommPro(&sys_fun_run_ctrl_g);
			
         /*modbusµØÖ·±íÊý¾Ý¸üÐÂ*/
			
			
			
//         /*ÐÝÃß*/ 
//         //²¿·ÖÇé¿öϲ»ÄÜÐÝÃߣ¬Òª×öÅжϣ¬±ÈÈçÓÐÍ⹩µç¡¢RS485²É¼¯¹ý³ÌÖС¢Ô¶´«¹ý³ÌÖÐ
//         if(SysKeepRunningStatusGet(sys_fun_run_ctrl_g)==RESET){