forked from SZV10X_Software/SZV103_FM33A0xxEV_SiZhu

jinlicong
2024-05-23 e5ec6ffc2fa0c07785c9d797c3fd74fd3031059f
Soft/system_run_fun.c
@@ -11,6 +11,7 @@
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "valve_control.h"
#include "linked_list.h"
RS485_START_REASON   start_rs485_g = RS485_START_REASON_NONE;
@@ -146,6 +147,13 @@
{
   //¸÷ÖÖ¹¦ÄÜÄ£¿éÔËÐÐËùÐèµÄ²ÎÊý³õʼ»¯
   
   /*״̬×Ö³õʼ*/
   system_status_word_g.status_word.account_state = (system_function_ctrl_word_g.fun_ctrl_word.account_open == 1)?1:0;
   system_status_word_g.status_word.valve_lock = (save_valve_para_g.valve_lock_state == VL_LOCK)?1:0;
   system_status_word_g.status_word.virtual_billing = (system_function_ctrl_word_g.fun_ctrl_word.virtual_billing == 1)?1:0;
   system_status_word_g.status_word.billing_type = system_function_ctrl_word_g.fun_ctrl_word.billing_type;
   /****ÍⲿRTCÅäÖü°²ÎÊý³õʼ»¯***********/
   Set_Rtc_UpdataInterrupt(); //ÉèÖÃRTCΪÃëÖжÏ
   //¶ÁÈ¡ÍⲿRTCʱ¼ä£¬
@@ -210,7 +218,7 @@
   
   
   
   /*Ô¶³ÌͨѶÆô¶¯¿ØÖÆ£¬°´¼ü¡¢¼ä¸ô¡¢ÖÜÆÚ¡¢Òì³£±¨¾¯µÈ*/
   /*Ô¶³ÌͨѶÆô¶¯¿ØÖÆ£¬°´¼ü¡¢¼ä¸ô¡¢ÖÜÆÚ¡¢Òì³£±¨¾¯¡¢Öر¨µÈ*/
   if((wrc_para_sizhu_g.time_start_type&WRC_TIME_START_INTERVAL)==WRC_TIME_START_INTERVAL){
      for(uint16_t count_i=0;count_i<wrc_para_sizhu_g.timing_send_num;count_i++){
         if(count_i>=12)
@@ -231,6 +239,14 @@
         start_wrc_g = WRC_MEANS_RTC_INTERVAL;
   }
   
   if((wrc_ctrl_para_g.wrc_restart_num_cnt > 0)&&(wrc_ctrl_para_g.wrc_restart_time_sec_cnt == 0)){
      if(start_wrc_g == WRC_MEANS_NONE){
         //´¥·¢Öر¨Éϱ¨
         start_wrc_g = WRC_MEANS_AGAIN;
         wrc_ctrl_para_g.wrc_restart_num_cnt -- ;
      }
   }
   
   if(start_wrc_g  != WRC_MEANS_NONE){
      wrc_ctrl_para_g.wrc_start_flag = start_wrc_g;