继续完善远传

jinlicong

2024-05-21 a05cacad5239ab3f35ffb58f443356b484e6cc1b

 CORE/main.c

@@ -24,6 +24,7 @@
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "billing.h"
#include "linked_list.h"


FlagStatus key_awaken_flag_g = RESET;
@@ -56,7 +57,8 @@
         if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL) //»ñȡʱ¼ä
         {
            //?RTCʱ¼äÒì³£±¨¾¯
            __SYS_STATUS_ALARM_BYTES_SET(rtc_err);
            if(__SYS_ALARM_CTL_BYTES_GET(rtc_err) == SET)
               __SYS_STATUS_ALARM_BYTES_SET(rtc_err,ALARM_ID_RTC_BAT_LOW);
         }
         
         /*°´¼üʶ±ð*/
@@ -66,7 +68,7 @@
         /*LCDÏÔʾ*/
         lcdDisplayPro();
         
         /*ÉÏλ»ú½»»¥*/
         /*ÉÏλ»ú½»»¥,º¬¼æÈÝmodbus±»²É¼¯´¦Àí*/
         upperComPro();
         
         /*¶Ô½ÓÉ豸½ÓÏß״̬¼ì²â*/
@@ -90,6 +92,7 @@
         
         /*µçԴ״̬»ñÈ¡*/ //·ÅÔÚ·§¿Ø֮ǰ£¬ÒòΪ·§¿ØÓнèµçÉè¼Æ£¬·§¿ØÇ°Èç¹û¼îµç²»×㣬ÔòÐèÒª½èµç
         GetPwrStatusPro(&pwr_vol_g);
			
         /*·§¿Ø*/
         valveCtrlPro(&sys_fun_run_ctrl_g);
         
@@ -123,12 +126,11 @@
               for(uint8_t count_i=0;count_i<(PULSE_CHECK_DELAY_MS &0xff);count_i++){
                  delay_ms(1);
                  if(pulse_exti_flag == RESET) 
                     break;
						
               }
					
               //ÐÝÃß
                     break;						
               }				
            }
            //ÐÝÃß
				
            
         }