继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 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;
@@ -69,10 +70,12 @@
   GPIO_EXTI_Init( KEY1_PORT, KEY1_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( KEY2_PORT, KEY2_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( KEY3_PORT, KEY3_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( KEY4_PORT, KEY4_PIN, EXTI_FALLING, ENABLE);
//   GPIO_EXTI_Init( KEY4_PORT, KEY4_PIN, EXTI_FALLING, ENABLE);
   
   GPIO_EXTI_Init( LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
	
   GPIO_EXTI_Init( LIMIT_TRIGGER_PORT, LIMIT_TRIGGER_PIN, EXTI_FALLING, ENABLE);
   
   /*Âö³åÏßÖжÏÅäÖÃÑ¡Ôñ,û¿ªÆô¸´ÓÃÇÒ¿ªÆôÁËÂö³å*/
   if(((flow_meter_para_g.broken_line_multiplex & BROKEN_LINE_MUTIPLEX_PULSE)!=BROKEN_LINE_MUTIPLEX_PULSE)&&   \
@@ -146,14 +149,24 @@
{
   //¸÷ÖÖ¹¦ÄÜÄ£¿éÔËÐÐËùÐèµÄ²ÎÊý³õʼ»¯
   
   /*״̬×Ö³õʼ*/
   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;
   system_status_word_g.status_word.lcd_mode = system_function_ctrl_word_g.fun_ctrl_word.lcd_mode;
	
   /****ÍⲿRTCÅäÖü°²ÎÊý³õʼ»¯***********/
   Set_Rtc_UpdataInterrupt(); //ÉèÖÃRTCΪÃëÖжÏ
   //¶ÁÈ¡ÍⲿRTCʱ¼ä£¬
   if(Get_Extern_Rtc_Time(&sys_clockBCD_g) ==FAIL)
   {
      //²ÉÓôæ´æ´¢¶ÁÈ¡µÄʱ¼äÉèÖõ½RTC
      Set_Extern_Rtc_Time(save_realtime_data_g.record_time_BCD.year,save_realtime_data_g.record_time_BCD.month,save_realtime_data_g.record_time_BCD.day,   \
                                    1,save_realtime_data_g.record_time_BCD.hour,save_realtime_data_g.record_time_BCD.min,save_realtime_data_g.record_time_BCD.sec); 
      if(Set_Extern_Rtc_Time(save_realtime_data_g.record_time_BCD.year,save_realtime_data_g.record_time_BCD.month,save_realtime_data_g.record_time_BCD.day,   \
                                    1,save_realtime_data_g.record_time_BCD.hour,save_realtime_data_g.record_time_BCD.min,save_realtime_data_g.record_time_BCD.sec) ==FAIL){
         //´æ´¢ÖÐʱ¼ä´íÎóÔòÉèÖÃĬÈÏÖµ
         Set_Extern_Rtc_Time(sys_clockBCD_g.year,sys_clockBCD_g.month,sys_clockBCD_g.day, 1,sys_clockBCD_g.hour,sys_clockBCD_g.min,sys_clockBCD_g.sec)   ;							
      }													
   }
   
   //·§ÃÅÔËÐгõʼ»¯
@@ -201,7 +214,12 @@
      start_rs485_g = RS485_START_REASON_RECORD;
   
   
   if(start_rs485_g  != RS485_START_REASON_NONE){
   //Éϱ¨Ö®Ç°´¥·¢²É¼¯
   if(start_wrc_g != WRC_MEANS_NONE){
      start_rs485_g = RS485_START_REASON_REPORT;
   }
	
   if(start_rs485_g != RS485_START_REASON_NONE){
      start_rs485_g = RS485_START_REASON_NONE;
      sys_fun_run_ctrl_p->rs485_ctrl_flag.start_flag = SET;
   }
@@ -210,7 +228,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 +249,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;