继续测试修改

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;
@@ -36,8 +37,6 @@
int main(void)
{
   System_power_on_init();
	
   led_init(); //ledµÆ
   
   /*¸÷ÖÖ³õʼ»¯*/
   //Ó²¼þÇý¶¯³õʼ»¯
@@ -55,15 +54,12 @@
   lcdDisplayPro();  //¸´Î»ÏÔʾÏÈ´ò¿ª
   
   while(1)
   {
      delay_ms(200);IWDT_Clr();
		
   {		
      if(sys_run_period==SET) 
      {
         sys_run_period = RESET;
         IWDT_Clr();
         LED_TOG;  //ledÉÁµÆ
			

         if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //»ñȡʱ¼ä
         {
            //?RTCʱ¼äÒì³£±¨¾¯
@@ -78,52 +74,52 @@
         /*LCDÏÔʾ*/
         lcdDisplayPro();
         
//         /*ÉÏλ»ú½»»¥,º¬¼æÈÝmodbus±»²É¼¯´¦Àí*/
//         upperComPro();
//			
//         /*¶Ô½ÓÉ豸½ÓÏß״̬¼ì²â*/
//         PulseAndAlarmLineCheck();
//			
//					
//         /*²É¼¯¡¢Éϱ¨¡¢·§¿ØÈÎÎñ¿ØÖÆ*/
//         //?ÈýÕß²»Í¬Ê±½øÐУ¬²É¼¯·ÅÔÚÉϱ¨Ö®Ç°£¬Í¬Ê±´¥·¢µÄ»°ÓÅÏȲɼ¯£¬
//         //±¨¾¯´¥·¢Éϱ¨ÅжÏÂß¼­·ÅÔڲɼ¯Ç°Ã棬ÏÈ´¥·¢²É¼¯£¬ÔÙ´¥·¢Éϱ¨
//         sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
//			
//         /*485²É¼¯*/
////         rs485ReadDataPro(&sys_fun_run_ctrl_g);
//			
//         /*½áË㣬°üº¬Âö³å¼ÆÈë*/
//         SettlementPro();
//			
//         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
//         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢
//         sizhuHistoryRecord(sys_clockBCD_g);
//			
//         /*µçԴ״̬»ñÈ¡*/ //·ÅÔÚ·§¿Ø֮ǰ£¬ÒòΪ·§¿ØÓнèµçÉè¼Æ£¬·§¿ØÇ°Èç¹û¼îµç²»×㣬ÔòÐèÒª½èµç
//         GetPwrStatusPro(&pwr_vol_g);
//			
//         /*·§¿Ø*/
////         valveCtrlPro(&sys_fun_run_ctrl_g);
//			
//			
//         /*ϵͳÆäËûÁãɢС¹¦ÄÜ´¦Àí*/
//         OtherFunPro();
//			
//         /*״̬×Ö¡¢±¨¾¯×Ö´¦Àí*/
//         SysAlarmCtrlPro();
//			
//			
//         /*µÚÈý·½ÎÞÏßͨѶ£¬Ô¤Áô*/
//			
//			
//         /*˼Öþƽ̨ÎÞÏßͨѶ*/
////         WirelessRemoteCommPro(&sys_fun_run_ctrl_g);
//			
//         /*modbusµØÖ·±íÊý¾Ý¸üÐÂ*/
//			
//			
//			
         /*ÉÏλ»ú½»»¥,º¬¼æÈÝmodbus±»²É¼¯´¦Àí*/
         upperComPro();
			
         /*¶Ô½ÓÉ豸½ÓÏß״̬¼ì²â*/
         PulseAndAlarmLineCheck();
			
					
         /*²É¼¯¡¢Éϱ¨¡¢·§¿ØÈÎÎñ¿ØÖÆ*/
         //?ÈýÕß²»Í¬Ê±½øÐУ¬²É¼¯·ÅÔÚÉϱ¨Ö®Ç°£¬Í¬Ê±´¥·¢µÄ»°ÓÅÏȲɼ¯£¬
         //±¨¾¯´¥·¢Éϱ¨ÅжÏÂß¼­·ÅÔڲɼ¯Ç°Ã棬ÏÈ´¥·¢²É¼¯£¬ÔÙ´¥·¢Éϱ¨
         sysRunFunCtrlPro(&sys_fun_run_ctrl_g,sys_clockBCD_g);
			
         /*485²É¼¯*/
//         rs485ReadDataPro(&sys_fun_run_ctrl_g);
			
         /*½áË㣬°üº¬Âö³å¼ÆÈë*/
         SettlementPro();
			
         /*Êý¾ÝÀúÊ·¼Ç¼´æ´¢*/
         //Êý¾ÝÀúÊ·¼Ç¼´æ´¢Èç¹ûÓöµ½²É¼¯ÖУ¬ÔòÑÓºóµÈ´ý²É¼¯Íê³ÉÔÙ´æ´¢
         sizhuHistoryRecord(sys_clockBCD_g);
			
         /*µçԴ״̬»ñÈ¡*/ //·ÅÔÚ·§¿Ø֮ǰ£¬ÒòΪ·§¿ØÓнèµçÉè¼Æ£¬·§¿ØÇ°Èç¹û¼îµç²»×㣬ÔòÐèÒª½èµç
         GetPwrStatusPro(&pwr_vol_g);
			
         /*·§¿Ø*/
         valveCtrlPro(&sys_fun_run_ctrl_g);
			
			
         /*ϵͳÆäËûÁãɢС¹¦ÄÜ´¦Àí*/
         OtherFunPro();
			
         /*״̬×Ö¡¢±¨¾¯×Ö´¦Àí*/
         SysAlarmCtrlPro();
			
			
         /*µÚÈý·½ÎÞÏßͨѶ£¬Ô¤Áô*/
			
			
         /*˼Öþƽ̨ÎÞÏßͨѶ*/
         WirelessRemoteCommPro(&sys_fun_run_ctrl_g);
			
         /*modbusµØÖ·±íÊý¾Ý¸üÐÂ*/
			
			
			
//         /*ÐÝÃß*/ 
//         //²¿·ÖÇé¿öϲ»ÄÜÐÝÃߣ¬Òª×öÅжϣ¬±ÈÈçÓÐÍ⹩µç¡¢RS485²É¼¯¹ý³ÌÖС¢Ô¶´«¹ý³ÌÖÐ
//         if(SysKeepRunningStatusGet(sys_fun_run_ctrl_g)==RESET){
@@ -140,8 +136,8 @@
//         }
      }
      
//      if(lcd_wake_up_flag_g)  //ΪÁË°´¼üÏÔʾûÓÐÑÓ³Ù¸Ð
//         lcdDisplayPro();
      if(lcd_wake_up_flag_g == SET)  //ΪÁË°´¼üÏÔʾûÓÐÑÓ³Ù¸Ð
         lcdDisplayPro();
      
   }
}