继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 Function/VALVE/valve_control.c

@@ -2,6 +2,7 @@
#include "gpio.h"
#include "system_mem_para.h"
#include "power_manage.h"
#include "linked_list.h"

__IO VALVE_CTRL_PARA_T   valve_ctrl_para_g;

@@ -59,6 +60,16 @@

void ValveMotorCloseRun(void)
{
	
   //ÅжÏÊÇ·ñÐèÒª½èµç¹Ø·§,ÎÞÍâµç£¬¼îµçµôµç»òÕßÒƳý״̬Ͻèµã
   if(__SYS_STATUS_BYTES_GET(alka_remove) == SET && __SYS_STATUS_BYTES_GET(alka_down) == SET){
      if(__SYS_STATUS_BYTES_GET(power_state) == RESET){
         borrow_Pwr_GPIO_Clk_Init();
         BORROW_PWR_ON;
         delay_ms(1);
      }
   }
	
   Motor_AB_GPIO_Init();
   Motor_OP_CL_GPIO_Init();
   Motor_A_LOW;
@@ -75,6 +86,10 @@
   GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, DISABLE);
   Motor_A_LOW;
   Motor_B_LOW;
	
   //½èµç¹Ø±Õ
   borrow_Pwr_GPIO_Clk_Init();
   BORROW_PWR_OFF;
}


@@ -236,7 +251,7 @@
      if(system_status_word_g.status_word.valve_state != VALVE_ERROR){
         //´¥·¢·§ÃÅÒì³£±¨¾¯
         if(__SYS_ALARM_REPORT_CTL_BYTES_GET(valve_error) == SET)
            __SYS_ALARM_BYTES_SET(valve_error, SET);	
            __SYS_ALARM_BYTES_SET(valve_error, ALARM_ID_VALVE_ABNORMAL);	
         
         system_alarm_word_for_valve_g.alarm_word.valve_error = SET; //¹Ø·§±¨¾¯×´Ì¬ÖÃλ
      }
@@ -271,12 +286,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;
   }