From 71f8bdb7c63acc381d71105bb950411029f4250f Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Mon, 03 Jun 2024 20:00:58 +0800
Subject: [PATCH] 测试远传

---
 Function/VALVE/valve_control.c |  170 +++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 117 insertions(+), 53 deletions(-)

diff --git a/Function/VALVE/valve_control.c b/Function/VALVE/valve_control.c
index e750c7e..86d3edf 100644
--- a/Function/VALVE/valve_control.c
+++ b/Function/VALVE/valve_control.c
@@ -1,6 +1,8 @@
 #include "valve_control.h"
 #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;
 
@@ -33,25 +35,43 @@
 	CloseIO(VALVE_FORCE_OPEN_PORT,VALVE_FORCE_OPEN_PIN);
 }
 
+void Valve_CTRL_GPIO_Init(void)
+{
+	Motor_AB_GPIO_Init();
+	Motor_A_LOW;
+	Motor_B_LOW;
+	Motor_OP_CL_GPIO_Init_sleep_mode();
+	
+}
+
+
+
+
 
 void ValveMotorOpenRun(void)
 {
 	Motor_AB_GPIO_Init();
 	Motor_OP_CL_GPIO_Init();
 	Motor_A_HIGH;
-	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);
+	Motor_B_LOW;
 }
 
 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;
-	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);
+	Motor_B_HIGH;
 }
 
 void ValveMotorStop(void)
@@ -61,7 +81,11 @@
 	GPIO_EXTI_Init( Motor_OP_PORT, Motor_OP_PIN, EXTI_FALLING, DISABLE);
 	GPIO_EXTI_Init( Motor_CL_PORT, Motor_CL_PIN, EXTI_FALLING, DISABLE);
 	Motor_A_LOW;
-	Motor_B_HIGH;
+	Motor_B_LOW;
+	
+	//���ر�
+	borrow_Pwr_GPIO_Clk_Init();
+	BORROW_PWR_OFF;
 }
 
 
@@ -116,22 +140,34 @@
 uint16_t GetValveRunMaxTime(CALIBER_TYPE caliber_type_l)
 {
 	switch (caliber_type_l){			
-						case DN25_TYPE: return VALVE_HADE_RUN_TIME_DN25 ;break;
-						case DN32_TYPE: return VALVE_HADE_RUN_TIME_DN32 ;break;
-						case DN40_TYPE: return VALVE_HADE_RUN_TIME_DN40 ;break;
-						case DN50_TYPE:	return VALVE_HADE_RUN_TIME_DN50 ;break;
-						case DN80_TYPE:	return VALVE_HADE_RUN_TIME_DN80 ;break;	
-						case DN100_TYPE:	return VALVE_HADE_RUN_TIME_DN100 ;break;
-						case DN150_TYPE:	return VALVE_HADE_RUN_TIME_DN150 ;break;							
-						case DN200_TYPE:	return VALVE_HADE_RUN_TIME_DN200 ;break;						
-						default:	return VALVE_HADE_RUN_TIME_DN200 ;break;
+						case DN25_TYPE: return VALVE_HADE_RUN_TIME_DN25 ;
+						case DN32_TYPE: return VALVE_HADE_RUN_TIME_DN32 ;
+						case DN40_TYPE: return VALVE_HADE_RUN_TIME_DN40 ;
+						case DN50_TYPE:	return VALVE_HADE_RUN_TIME_DN50 ;
+						case DN80_TYPE:	return VALVE_HADE_RUN_TIME_DN80 ;
+						case DN100_TYPE:	return VALVE_HADE_RUN_TIME_DN100 ;
+						case DN150_TYPE:	return VALVE_HADE_RUN_TIME_DN150 ;							
+						case DN200_TYPE:	return VALVE_HADE_RUN_TIME_DN200 ;						
+						default:	return VALVE_HADE_RUN_TIME_DN200 ;
 				}
 }
 
 
 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;
@@ -139,8 +175,8 @@
 			valve_ctrl_para_g.valve_ctrl_order = VC_NONE;
 			
 		}else{
-			if(0){ //?Զ����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);
 		
@@ -148,12 +184,10 @@
 
 				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){
 		if(Read_OP_CL_VALVE_Status(0) == VALVE_CLOSE){
 			ValveMotorStop();
@@ -162,28 +196,29 @@
 			valve_ctrl_para_g.valve_ctrl_order = VC_NONE;
 			
 		}else{
-			if(0){ //?Զ����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.close_time_cnt = GetValveRunMaxTime(caliber_type_l);
 				ValveMotorCloseRun();
 
 				save_valve_para_g.valve_status = VALVE_CLOSING;
-				valve_ctrl_para_g.valve_ctrl_order = VC_NONE;
-				
+				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;
@@ -192,15 +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;
@@ -209,38 +244,63 @@
 			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
 		sys_fun_run_ctrl_p->valve_ctrl_flag.running_flag = RESET;
 	
+	
+	//״̬�ִ���
+	if(save_valve_para_g.valve_lock_state == VL_UNLOCK)
+		system_status_word_g.status_word.valve_lock = RESET;
+	else
+		system_status_word_g.status_word.valve_lock = SET;
+	
+	if(save_valve_para_g.valve_status == VALVE_ERROR){
+		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, ALARM_ID_VALVE_ABNORMAL);	
+			
+			system_alarm_word_for_valve_g.alarm_word.valve_error = SET; //�ط�����״̬��λ
+		}
+	}else{
+		system_status_word_g.status_word.valve_state = save_valve_para_g.valve_status;
+	}
+	
 }
 
 
 //���Ų�������������������������У������ط�������Ҫֹͣ������ת�����йط�
-ErrorStatus ValveCtrlOrder(VALVE_CTEL_TYPE_T valve_ctrl_order_l) 
+ErrorStatus ValveCtrlOrder(VALVE_CTRL_TYPE_T valve_ctrl_order_l) 
 {
 	switch(valve_ctrl_order_l){
 		case VC_NONE:break;
 		case VC_OPEN:
+			
+			if((__SYS_STATUS_BYTES_GET(alka_remove) == SET || __SYS_STATUS_BYTES_GET(alka_down) == SET)&&(__SYS_STATUS_BYTES_GET(power_state) ==RESET)){
+				return FAIL;//���û����û����磬��������
+			}
 			if((save_valve_para_g.valve_status == VALVE_CLOSE)&&(valve_ctrl_para_g.force_open_status==RESET)){
 				valve_ctrl_para_g.valve_ctrl_order = VC_OPEN;
+				pwr_vol_g.alka_flag = AMS_VALVE_CTRL_BEFORE;
 				return PASS;
 			}
 		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;
 			}
 		break;
@@ -248,12 +308,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;
 	}
@@ -276,13 +336,14 @@
 		if(valve_ctrl_para_g.force_open_status !=SET){
 			valve_ctrl_para_g.force_open_status =SET;
 			//��ʼ����ǿ��
+			
 		}
 			
 		
 	}else{
 		if(valve_ctrl_para_g.force_open_status ==SET){
 			valve_ctrl_para_g.force_open_status =RESET;
-			//��ʼ�ر�ǿ��
+			//ǿ������
 		}
 		
 	}
@@ -290,6 +351,9 @@
 	
 	if((valve_ctrl_para_g.force_open_status ==SET)&&(Read_OP_CL_VALVE_Status(0)==VALVE_OPEN)){
 		//?��⵽ǿ�������Ƿ���״̬��ȡ�Ѿ�����λ����ʾ�Ƴ�ǿ����Դ��
+		//
+		
+		
 	}
 	
 }

--
Gitblit v1.9.3