测试远传

jinlicong

2024-06-03 71f8bdb7c63acc381d71105bb950411029f4250f

 Soft/system_run_fun.c

@@ -35,6 +35,8 @@
   Pulse_And_Alarm_Line_IO_Init();
   
   RS485_read_data_GPIO_Init();
	
   WRC_PWR_GPIO_Init(); //ÎÞÏßÔ¶´«µçÔ´¿ØÖÆIO
}

//ËùÓÐÍâÉèÇý¶¯ÅäÖÃ
@@ -70,10 +72,10 @@
   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( ALKA_PWR_LOSE_PORT, ALKA_PWR_LOSE_PIN, EXTI_FALLING, ENABLE);
   
   GPIO_EXTI_Init( LIMIT_TRIGGER_PORT, LIMIT_TRIGGER_PIN, EXTI_FALLING, ENABLE);
   
@@ -162,8 +164,11 @@
   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)   ;							
      }													
   }
   
   //·§ÃÅÔËÐгõʼ»¯
@@ -218,7 +223,8 @@
   
   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;
      if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag ==RESET)
         sys_fun_run_ctrl_p->rs485_ctrl_flag.start_flag = SET;
   }
   
   /*·§¿Ø¿ØÖÆ£¬·§¿Øͨ¹ý°´¼ü»òÕßÖ¸Áî¡¢Òì³£µÈ¿ØÖÆ£¬ÐèÒª²Ù×÷ʱֱ½Óµ÷ÓÃValveCtrlOrderº¯Êý¼´¿É£¬²»ÔÚ´Ë´¦Æô¶¯*/
@@ -258,7 +264,7 @@
   if(start_wrc_g  != WRC_MEANS_NONE){
      wrc_ctrl_para_g.wrc_start_flag = start_wrc_g;
      start_wrc_g = WRC_MEANS_NONE;
      if(sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag == RESET){
      if((sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag == RESET)&&(sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag == RESET )){
         pwr_vol_g.alka_flag = AMS_WRC_BEFORE;
         sys_fun_run_ctrl_p->wrc_ctrl_flag.start_flag = SET;
      }