增加OTA协议

jinlicong

2024-06-19 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c

 Function/VALVE/valve_control.c

@@ -61,12 +61,14 @@
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);
      if(__SYS_STATUS_BYTES_GET(lith_low) == RESET && __SYS_STATUS_BYTES_GET(lith_down) == RESET && __SYS_STATUS_BYTES_GET(lith_remove) == RESET){
         if(__SYS_STATUS_BYTES_GET(power_state) == RESET){
            borrow_Pwr_GPIO_Clk_Init();
            BORROW_PWR_ON;
            delay_ms(1);
         }
      }
   }
   
@@ -178,7 +180,7 @@
         valve_ctrl_para_g.valve_ctrl_order = VC_NONE;
         
      }else{
         if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //?Ô¶´«¡¢485²É¼¯µÈÇé¿öÏÂÑÓ³ÙÖ´Ðз§ÃŶ¯×÷
         if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //Ô¶´«¡¢485²É¼¯µÈÇé¿öÏÂÑÓ³ÙÖ´Ðз§ÃŶ¯×÷
            ;
         }else{
            valve_ctrl_para_g.open_time_cnt = GetValveRunMaxTime(caliber_type_l);
@@ -206,7 +208,7 @@
         
         
      }else{
         if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //?Ô¶´«¡¢485²É¼¯µÈÇé¿öÏÂÑÓ³ÙÖ´Ðз§ÃŶ¯×÷
         if(sys_fun_run_ctrl_p->rs485_ctrl_flag.running_flag==SET||sys_fun_run_ctrl_p->wrc_ctrl_flag.running_flag==SET){ //Ô¶´«¡¢485²É¼¯µÈÇé¿öÏÂÑÓ³ÙÖ´Ðз§ÃŶ¯×÷
            ;
         }else{
            
@@ -246,13 +248,13 @@

   }
   
   //?ÅжϿª¹Ø·§ÊÇ·ñµ½Î»
   //ÅжϿª¹Ø·§ÊÇ·ñµ½Î»
   if(save_valve_para_g.valve_status==VALVE_OPENING){
      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;
         
@@ -269,7 +271,7 @@
         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;
         
@@ -378,7 +380,7 @@
      if(valve_ctrl_para_g.force_open_status !=SET){
         valve_ctrl_para_g.force_open_status =SET;
         //¿ªÊ¼Æô¶¯Ç¿¿ª
			
         sizhuValveActionLogHandle(VALVE_CTRL_FORCE_OPEN, VC_FORCE_OPEN,ALARM_ID_NORMAL);
      }
         
      
@@ -400,10 +402,10 @@
   
}

void   valveCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p) //?  Èç¹ûÒª²Ù×÷·§ÃÅÔòµ÷Óú¯ÊýValveCtrlOrder£¨VC_OPEN£©;Èë²Î´ú±í²Ù×÷ÄÚÈÝ
void   valveCtrlPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p) //Èç¹ûÒª²Ù×÷·§ÃÅÔòµ÷Óú¯ÊýValveCtrlOrder£¨VC_OPEN£©;Èë²Î´ú±í²Ù×÷ÄÚÈÝ
{
   
   ValveForceOpenSignalCheck();//?Ç¿¿ªÅжϴ¦Àí
   ValveForceOpenSignalCheck();//Ç¿¿ªÅжϴ¦Àí
   
   ValveCtrlHade(equipment_basic_inf_g.caliber_type,sys_fun_run_ctrl_p);//¹þµÂ·§ÃŲÙ×÷´¦Àíº¯Êý