修改报警相关处理

jinlicong

2024-05-24 1360095f8d64cf607d333d2fc7fd1dcd81d1bd7b

 Soft/system_run_fun.c

@@ -2,13 +2,17 @@
#include "system_eep_mem_manage.h"
#include "system_mem_para.h"
#include "eeprom.h"
#include "mbcrc.h"
#include "mbcrc1.h"
#include "gpio.h"
#include "extern_rtc.h"
#include "key.h"
#include "lcd_io_api.h"
#include "wireless_remote_comm.h"
#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;
WRC_START_MEANS   start_wrc_g = WRC_MEANS_NONE;
@@ -16,7 +20,8 @@

void allGpioInit(void)
{

   E2P_Ctrl_Gpio_Init();
	
   RTC_GPIO_Init();
   
   Key_GPIO_Init();
@@ -25,6 +30,11 @@
   
   Power_IO_Init();//µçÔ´Ïà¹Ø
   
   Valve_CTRL_GPIO_Init();
	
   Pulse_And_Alarm_Line_IO_Init();
	
   RS485_read_data_GPIO_Init();
}

//ËùÓÐÍâÉèÇý¶¯ÅäÖÃ
@@ -65,6 +75,16 @@
   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);
   
   /*Âö³åÏßÖжÏÅäÖÃÑ¡Ôñ,û¿ªÆô¸´ÓÃÇÒ¿ªÆôÁËÂö³å*/
   if(((flow_meter_para_g.broken_line_multiplex & BROKEN_LINE_MUTIPLEX_PULSE)!=BROKEN_LINE_MUTIPLEX_PULSE)&&   \
      ((flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_PULSE)||(flow_meter_para_g.flow_meter_conn_type==FLOW_METER_CONN_RS485_AND_PULSE))){
      if((flow_meter_para_g.flow_meter_code !=ASMODBUS)&&(flow_meter_para_g.flow_meter_code !=AS100MODBUS)&&(flow_meter_para_g.flow_meter_code !=SIARGO_MODBUS)){
         GPIO_EXTI_Init( LF_PULSE_INT_PORT, LF_PULSE_INT_PIN, EXTI_FALLING, ENABLE);
      }else{
         GPIO_EXTI_Init( LF_PULSE_INT_PORT, LF_PULSE_INT_PIN, EXTI_RISING, ENABLE);
      }
   }
	
   /*NVICÖжÏÅäÖÃ*/
   NVIC_DisableIRQ(GPIO_IRQn);
   NVIC_SetPriority(GPIO_IRQn,0);//ÖжÏÓÅÏȼ¶ÅäÖÃ
@@ -81,6 +101,7 @@
   SYSTEM_EEP_IDENTIFICATION_T      sys_eep_id_B_l={0};
   uint8_t    eep_none_flag = 1; //0´ú±í¿Õ£¬·Ç0´ú±í·Ç¿Õ
   
   EEPROM_CTRL_ENABLE;
   //¶ÁÈ¡²ÎÊý³õʼ»¯ÅäÖñêʶ 
   //Èç¹û±êʶÎÞ·¨Ê¶±ðÔò´ú±í´æ´¢ÐèҪȫ²¿Ð´ÈëĬÈÏÖµ
   //Èç¹û±êʶʶ±ð³É¹¦´ú±íÒÑÓвÎÊý£¬²ÎÊýÖ±½Ó´Ó´æ´¢ÀïÃæ¶ÁÈ¡
@@ -116,6 +137,8 @@
   //Èç¹û²¹¶¡±êʶÎÞ·¨Ê¶±ð»òÕßСÓÚ²¹¶¡Ê±¼ä£¬ÔòÐèÒª´ò²¹¶¡´¦Àí
   allParaPatchPro();
   
   EEPROM_CTRL_DISABLE;
	
}


@@ -123,6 +146,13 @@
void sysRunFunParaInit(void)
{
   //¸÷ÖÖ¹¦ÄÜÄ£¿éÔËÐÐËùÐèµÄ²ÎÊý³õʼ»¯
	
   /*״̬×Ö³õʼ*/
   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ΪÃëÖжÏ
@@ -144,7 +174,8 @@
   
   //²ð°å¡¢¿ª¸Ç״̬¼ì²â
   
   //Âö³åÏß״̬¼ì²â
   //Âö³åÏß¡¢±¨¾¯Ïß³õʼ
   PulseAndAlarmLineInit();
   
   
   
@@ -178,7 +209,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;
   }
@@ -186,7 +222,8 @@
   /*·§¿Ø¿ØÖÆ£¬·§¿Øͨ¹ý°´¼ü»òÕßÖ¸Áî¡¢Òì³£µÈ¿ØÖÆ£¬ÐèÒª²Ù×÷ʱֱ½Óµ÷ÓÃValveCtrlOrderº¯Êý¼´¿É£¬²»ÔÚ´Ë´¦Æô¶¯*/
   
   
   /*Ô¶³ÌͨѶÆô¶¯¿ØÖÆ£¬°´¼ü¡¢¼ä¸ô¡¢ÖÜÆÚ¡¢Òì³£±¨¾¯µÈ*/
	
   /*Ô¶³ÌͨѶÆô¶¯¿ØÖÆ£¬°´¼ü¡¢¼ä¸ô¡¢ÖÜÆÚ¡¢Òì³£±¨¾¯¡¢Öر¨µÈ*/
   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)
@@ -207,10 +244,22 @@
         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;
      start_wrc_g = WRC_MEANS_NONE;
      sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
      if(sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag == RESET){
         pwr_vol_g.alka_flag = AMS_WRC_BEFORE;
         sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
      }
   }
   
}