forked from SZV10X_Software/SZV103_FM33A0xxEV_SiZhu

jinlicong
2024-06-19 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c
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);
         /*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){
@@ -135,9 +136,14 @@
//         }
      }
      
      /***************************ÒÔÏ·ÅÔÚ1ÃëÖÜÆÚÍ⣬Ìá¸ßÏìÓ¦ËÙ¶È***********************************************/
      if(lcd_wake_up_flag_g == SET)  //ΪÁ˰´¼üÏÔʾûÓÐÑÓ³Ù¸Ð
         lcdDisplayPro();
      
      /*ÉÏλ»ú½»»¥,º¬¼æÈÝmodbus±»²É¼¯´¦Àí*/
      upperComPro();
   }
}