继续完善远传

jinlicong

2024-05-22 66ea95dcb8fd91d29465c2f11ced4dd6153a2504

 HARDWARE/EXTI/exti.c

@@ -9,6 +9,10 @@
#include "valve_control.h"
#include "system_mem_para.h"
#include "system_run_fun.h"
#include "power_manage.h"
#include "pulse_and_alarm_line.h"
#include "tim.h"
#include "wireless_remote_comm.h"

void NMI_Handler(void)
{
@@ -42,12 +46,18 @@
      }

      // ÅжÏGPRS³¬Ê±Ê±¼ä
      if (sys_delay_sec_para_g.gprs_timeout_para.delay_time)
      if (sys_delay_sec_para_g.wrc_timeout_para.delay_time)
      {
         if (!(--sys_delay_sec_para_g.gprs_timeout_para.delay_time))
            sys_delay_sec_para_g.gprs_timeout_para.delay_flag = SET;
         if (!(--sys_delay_sec_para_g.wrc_timeout_para.delay_time))
            sys_delay_sec_para_g.wrc_timeout_para.delay_flag = SET;
      }
      
      //wrcÖر¨Ê±¼äµ¹¼Æʱ
      if (wrc_ctrl_para_g.wrc_restart_time_sec_cnt)
      {
         if (!(--wrc_ctrl_para_g.wrc_restart_time_sec_cnt))
            ;
      }

   }
   
@@ -60,11 +70,13 @@
         if(KEY3_IO_READ==Bit_RESET)
         {
            //¿ª·§
				
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET ||__SYS_STATUS_BYTES_GET(valve_lock) == RESET )
               ValveCtrlOrder(VC_OPEN);
         }else if(KEY2_IO_READ==Bit_RESET)
         {
            //¹Ø·§
				
            if(__SYS_STATUS_BYTES_GET(account_state) == RESET)
               ValveCtrlOrder(VC_OPEN);
         }else
         {
            //µ¥»÷µçÔ´
@@ -122,6 +134,36 @@
   }
   
   
   if(GPIO_EXTI_EXTIISR_ChkEx(LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN)  == SET)
   {
      GPIO_EXTI_EXTIISR_ClrEx(LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN);

//      __SYS_STATUS_ALARM_BYTES_SET(lith_remove);
      pwr_vol_g.lith_lose_check_flag = SET;
   }
   if(GPIO_EXTI_EXTIISR_ChkEx(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN)  == SET)
   {
      GPIO_EXTI_EXTIISR_ClrEx(ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN);

//      __SYS_STATUS_ALARM_BYTES_SET(alka_remove);
		
      pwr_vol_g.alka_lose_check_flag = SET;
   }
	
	
   if(GPIO_EXTI_EXTIISR_ChkEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN)  == SET) //¼Æ·ÑµÍƵÂö³å
   {
      GPIO_EXTI_EXTIISR_ClrEx(LF_PULSE_INT_PORT, LF_PULSE_INT_PIN);
      //Ä¿Ç°½ö¿ªÆô¼Æ·ÑÂö³å¹¦ÄÜÇÒûÓб»¸´ÓòÅÐèÒª´¦Àí
      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))){
         pulse_exti_flag = SET;
         BTx_CR1_CHEN_Setable(BT1,ENABLE);   //¿ªÆô¶¨Ê±Æ÷
			
      }

   }
	
   
//   if(GPIO_EXTI_EXTIISR_ChkEx(VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN)  == SET)
//   {
@@ -152,27 +194,7 @@
////#endif   
////      }
////   }
//   if(GPIO_EXTI_EXTIISR_ChkEx(LITHIUM_PWR_DOWN_PORT, LITHIUM_PWR_DOWN_PIN)  == SET)
//   {
//      GPIO_EXTI_EXTIISR_ClrEx(LITHIUM_PWR_DOWN_PORT, LITHIUM_PWR_DOWN_PIN);
//#ifdef RS232_PRINTF
//    printf("﮵çµôµç\r\n");
//#endif
//      __SYS_STATUS_ALARM_BYTES_SET(lith_remove);
//      pwr_vol_g.lith_vcc_per = 0;
//      SLAVE_PWR_OFF; //µôµçºóС°åµçѹ²»ÎÈ£¬»á²úÉúÁ÷Á¿Êý¾Ý»ìÂÒ£¬´Ó¶øµ¼Ö¸÷ÖÖ·ÇÕý³£±¨¾¯£¬ËùÒÔÐèÒª¹Ø±ÕµçÔ´£¬»Ö¸´ºóÔÙ¿ªÆô¡£
////    pwr_vol_g.lith_flag = LMS_PERIOD; // µôµçºóÁ¢Âí²É¼¯Ò»´ÎµçÁ¿	
//   }
//   if(GPIO_EXTI_EXTIISR_ChkEx(ALKALI_PWR_DOWN_PORT, ALKALI_PWR_DOWN_PIN)  == SET)
//   {
//      GPIO_EXTI_EXTIISR_ClrEx(ALKALI_PWR_DOWN_PORT, ALKALI_PWR_DOWN_PIN);
//#ifdef RS232_PRINTF
//    printf("¼îµçµôµç\r\n");
//#endif
//      __SYS_STATUS_ALARM_BYTES_SET(alka_remove);
//		
////    pwr_vol_g.alka_flag = AMS_PERIOD; // µôµçºóÁ¢Âí²É¼¯Ò»´ÎµçÁ¿
//   }

}

void All_Exti_Init(void)
@@ -182,9 +204,9 @@
//   
//      GPIO_EXTI_Init( KEYA_S1_PORT, KEYA_S1_PIN, EXTI_FALLING, ENABLE);   //ÊäÈëÖжϴò¿ª¡¢Ï½µÑØ´¥·¢¡¢¿ªÆôÊý×ÖÂ˲¨ //PD6
//      GPIO_EXTI_Init( VALVE_FORCED_OPEN_PORT, VALVE_FORCED_OPEN_PIN, EXTI_RISING, ENABLE);   //PA1
//    GPIO_EXTI_Init( LITHIUM_PWR_DOWN_PORT, LITHIUM_PWR_DOWN_PIN, EXTI_FALLING, ENABLE);   //PF11
//    GPIO_EXTI_Init( LITH_PWR_LOSE_PORT, LITH_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);   //PF11
////      GPIO_EXTI_Init( LIT_PWR_UNDER_PORT, LIT_PWR_UNDER_PIN, EXTI_FALLING, ENABLE);   //PF6
//      GPIO_EXTI_Init( ALKALI_PWR_DOWN_PORT, ALKALI_PWR_DOWN_PIN, EXTI_FALLING, ENABLE);   //PA4
//      GPIO_EXTI_Init( ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);   //PA4
////      GPIO_EXTI_Init( UNCAP_DETECTION_PORT, UNCAP_DETECTION_PIN, EXTI_RISING, ENABLE);   //PF5

////      GPIO_PINWKSEL_SetEx(PINWKEN_PF5,GPIO_PINWKEN_PINWKSEL_RISING);