阀门控制进一步完善

jinlicong

2024-05-17 6ea1a42391f86e72f53042a966dae970a3fd77cb

 Soft/system_run_fun.c

@@ -9,6 +9,9 @@
#include "lcd_io_api.h"
#include "wireless_remote_comm.h"
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "valve_control.h"


RS485_START_REASON   start_rs485_g = RS485_START_REASON_NONE;
WRC_START_MEANS   start_wrc_g = WRC_MEANS_NONE;
@@ -16,7 +19,8 @@

void allGpioInit(void)
{

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

//ËùÓÐÍâÉèÇý¶¯ÅäÖÃ
@@ -62,8 +71,18 @@
   GPIO_EXTI_Init( KEY3_PORT, KEY3_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);
   
	
   /*Âö³åÏßÖжÏÅäÖÃÑ¡Ôñ,û¿ªÆô¸´ÓÃÇÒ¿ªÆôÁËÂö³å*/
   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);
@@ -81,6 +100,7 @@
   SYSTEM_EEP_IDENTIFICATION_T      sys_eep_id_B_l={0};
   uint8_t    eep_none_flag = 1; //0´ú±í¿Õ£¬·Ç0´ú±í·Ç¿Õ
   
   EEPROM_CTRL_ENABLE;
   //¶ÁÈ¡²ÎÊý³õʼ»¯ÅäÖñêʶ 
   //Èç¹û±êʶÎÞ·¨Ê¶±ðÔò´ú±í´æ´¢ÐèҪȫ²¿Ð´ÈëĬÈÏÖµ
   //Èç¹û±êʶʶ±ð³É¹¦´ú±íÒÑÓвÎÊý£¬²ÎÊýÖ±½Ó´Ó´æ´¢ÀïÃæ¶ÁÈ¡
@@ -116,6 +136,8 @@
   //Èç¹û²¹¶¡±êʶÎÞ·¨Ê¶±ð»òÕßСÓÚ²¹¶¡Ê±¼ä£¬ÔòÐèÒª´ò²¹¶¡´¦Àí
   allParaPatchPro();
   
   EEPROM_CTRL_DISABLE;
	
}


@@ -144,7 +166,8 @@
   
   //²ð°å¡¢¿ª¸Ç״̬¼ì²â
   
   //Âö³åÏß״̬¼ì²â
   //Âö³åÏß¡¢±¨¾¯Ïß³õʼ
   PulseAndAlarmLineInit();
   
   
   
@@ -186,6 +209,7 @@
   /*·§¿Ø¿ØÖÆ£¬·§¿Øͨ¹ý°´¼ü»òÕßÖ¸Áî¡¢Òì³£µÈ¿ØÖÆ£¬ÐèÒª²Ù×÷ʱֱ½Óµ÷ÓÃ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++){
@@ -209,8 +233,12 @@
   
   
   if(start_wrc_g  != WRC_MEANS_NONE){
		
      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;
      }
   }
   
}