测试和修改了一些功能bug

jinlicong

2024-05-31 08b3909c40a192778719c6262bbee4745682948d

 Function/VALVE/valve_control.c

@@ -54,8 +54,6 @@
   Motor_OP_CL_GPIO_Init();
   Motor_A_HIGH;
   Motor_B_LOW;
   GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, ENABLE);
}

void ValveMotorCloseRun(void)
@@ -74,8 +72,6 @@
   Motor_OP_CL_GPIO_Init();
   Motor_A_LOW;
   Motor_B_HIGH;
   GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, ENABLE);
   GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, ENABLE);
}

void ValveMotorStop(void)
@@ -159,7 +155,19 @@

void ValveCtrlHade(CALIBER_TYPE caliber_type_l,FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p)
{
   if(valve_ctrl_para_g.valve_ctrl_order == VC_OPEN){
	
   if(valve_ctrl_para_g.force_open_status ==SET){
      //Ç¿¿ªÓÅÏȼ¶¸ß£¬¼ì²âµ½Ç¿¿ª²»Ö´Ðз§ÃÅ¿ØÖÆ,¹Ø±ÕÖжϼì²â¡£  ¼ì²â·§ÃÅ״̬£¬Èç¹û¿ªµ½Î»£¬×´Ì¬±ä¸üΪ¿ª£¬·ñÔò״̬Ϊ¿ª·§ÖÐ
      GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, DISABLE);
      if(Read_OP_CL_VALVE_Status(0) !=VALVE_OPEN){
         save_valve_para_g.valve_status = VALVE_OPENING;
         ValveMotorStop();		
      }else{
         save_valve_para_g.valve_status = VALVE_OPEN;
      }
		
      return ;  //Ç¿¿ªÐźÅÓÐЧʱ£¬Ö±½ÓÌø³öº¯Êý£¬²»ÅжϺóÐøÂß¼­
   }else if(valve_ctrl_para_g.valve_ctrl_order == VC_OPEN){
      if(Read_OP_CL_VALVE_Status(0) == VALVE_OPEN){
         ValveMotorStop();
         save_valve_para_g.valve_status = VALVE_OPEN;
@@ -176,6 +184,8 @@

            save_valve_para_g.valve_status = VALVE_OPENING;
            valve_ctrl_para_g.valve_ctrl_order = VC_NONE;
            delay_ms(10);  //ÑÓºó´ò¿ªÖÕ¶Ë
            GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, ENABLE);
         }
      }
   }else if(valve_ctrl_para_g.valve_ctrl_order == VC_CLOSE){
@@ -195,15 +205,20 @@

            save_valve_para_g.valve_status = VALVE_CLOSING;
            valve_ctrl_para_g.valve_ctrl_order = VC_NONE;   
            delay_ms(10);  //ÑÓºó´ò¿ªÖÕ¶Ë
            GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, ENABLE);
         }
      }
   }else if(valve_ctrl_para_g.valve_ctrl_order == VC_LOCK){
      save_valve_para_g.valve_lock_state = VL_LOCK;	
   }else{

   }
   
   //?ÅжϿª¹Ø·§ÊÇ·ñµ½Î»
   if(save_valve_para_g.valve_status==VALVE_OPENING){
      if(valve_ctrl_para_g.open_time_cnt==0){
      if(Read_OP_CL_VALVE_Status(0) ==VALVE_OPEN){
         ValveMotorStop();//¹Ø±ÕÇý¶¯
         save_valve_para_g.valve_status = VALVE_OPEN;
      }else if(valve_ctrl_para_g.open_time_cnt==0){
         //?³¬Ê±½áÊø
         ValveMotorStop();
         save_valve_para_g.valve_status = VALVE_ERROR;
@@ -212,12 +227,15 @@
         valve_ctrl_para_g.open_time_cnt--;
      }
      
      if(valve_ctrl_para_g.force_open_status ==SET){
         //¿ª·§¹ý³ÌÖÐÓöµ½Ç¿¿ª£¬¹Ø±ÕÇý¶¯
         ValveMotorStop();
      }
//      if(valve_ctrl_para_g.force_open_status ==SET){
//         //¿ª·§¹ý³ÌÖÐÓöµ½Ç¿¿ª£¬¹Ø±ÕÇý¶¯
//         ValveMotorStop();
//      }
   }else if(save_valve_para_g.valve_status==VALVE_CLOSING){
      if(valve_ctrl_para_g.close_time_cnt==0){
      if(Read_OP_CL_VALVE_Status(0) ==VALVE_CLOSE){
         ValveMotorStop();//¹Ø±ÕÇý¶¯
         save_valve_para_g.valve_status = VALVE_CLOSE;
      }else if(valve_ctrl_para_g.close_time_cnt==0){
         //?³¬Ê±½áÊø
         ValveMotorStop();
         save_valve_para_g.valve_status = VALVE_ERROR;
@@ -226,15 +244,15 @@
         valve_ctrl_para_g.close_time_cnt--;
      }
      
      if(valve_ctrl_para_g.force_open_status ==SET){
         //¹Ø·§¹ý³ÌÖÐÓöµ½Ç¿¿ª£¬¹Ø±ÕÇý¶¯£¬×´Ì¬¸Ä±ä³É¿ª·§ÖУ¬ÖØÖÿª·§¼Æʱ
         ValveMotorStop();
         save_valve_para_g.valve_status = VALVE_OPENING;
         valve_ctrl_para_g.open_time_cnt = GetValveRunMaxTime(caliber_type_l);
      }
//      if(valve_ctrl_para_g.force_open_status ==SET){
//         //¹Ø·§¹ý³ÌÖÐÓöµ½Ç¿¿ª£¬¹Ø±ÕÇý¶¯£¬×´Ì¬¸Ä±ä³É¿ª·§ÖУ¬ÖØÖÿª·§¼Æʱ
//         ValveMotorStop();
//         save_valve_para_g.valve_status = VALVE_OPENING;
//         valve_ctrl_para_g.open_time_cnt = GetValveRunMaxTime(caliber_type_l);
//      }
   }
   
	
   //·§ÃŲÙ×÷½øÐÐÖÐ״̬ÖÃλ
   if((save_valve_para_g.valve_status==VALVE_OPENING)||(save_valve_para_g.valve_status==VALVE_CLOSING))
      sys_fun_run_ctrl_p->valve_ctrl_flag.running_flag = SET;
   else
@@ -276,7 +294,7 @@
      break;
      
      case VC_CLOSE:
         if((save_valve_para_g.valve_status != VALVE_CLOSE)&&(valve_ctrl_para_g.force_open_status==RESET)){
         if((save_valve_para_g.valve_status != VALVE_CLOSE)&&(save_valve_para_g.valve_status != VALVE_CLOSING)&&(valve_ctrl_para_g.force_open_status==RESET)){
            valve_ctrl_para_g.valve_ctrl_order = VC_CLOSE;
            pwr_vol_g.alka_flag = AMS_VALVE_CTRL_BEFORE;
            return PASS;
@@ -286,12 +304,12 @@
      case VC_UNLOCK:
         save_valve_para_g.valve_lock_state = VL_UNLOCK;
         return PASS;
      break;
//      break;
      
      case VC_LOCK:
         save_valve_para_g.valve_lock_state = VL_LOCK;
         return PASS;
      break;
//      break;
      
      default: break;
   }
@@ -321,7 +339,7 @@
   }else{
      if(valve_ctrl_para_g.force_open_status ==SET){
         valve_ctrl_para_g.force_open_status =RESET;
         //¿ªÊ¼¹Ø±ÕÇ¿¿ª
         //Ç¿¿ª½áÊø
      }
      
   }