From b39a40b0191e0a8b155db74e885ff66e17b91896 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Thu, 06 Jun 2024 19:25:15 +0800
Subject: [PATCH] 继续完善

---
 Function/WirelessRemoteComm/wireless_remote_comm.h |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Function/WirelessRemoteComm/wireless_remote_comm.h b/Function/WirelessRemoteComm/wireless_remote_comm.h
index e4b13dc..81e38da 100644
--- a/Function/WirelessRemoteComm/wireless_remote_comm.h
+++ b/Function/WirelessRemoteComm/wireless_remote_comm.h
@@ -10,6 +10,12 @@
 #define WRC_PWR_ON 			GPIO_SetBits(WRC_PWR_PORT, WRC_PWR_PIN)
 #define WRC_PWR_OFF			GPIO_ResetBits(WRC_PWR_PORT, WRC_PWR_PIN)
 
+//3V8ʹ��,��ʱ���ã�ֱ��3V8���ؿ��Ƽ���
+#define PWR_3V8_EN_PORT 		GPIOE
+#define PWR_3V8_EN_PIN 			GPIO_Pin_5
+#define PWR_3V8_ENABLE 			GPIO_SetBits(PWR_3V8_EN_PORT, PWR_3V8_EN_PIN)
+#define PWR_3V8_DIABLE			GPIO_ResetBits(PWR_3V8_EN_PORT, PWR_3V8_EN_PIN)
+
 //3V8����
 #define PWR_3V8_O_PORT 			GPIOE
 #define PWR_3V8_O_PIN 			GPIO_Pin_7
@@ -18,7 +24,7 @@
 #define PWR_3V8_OFF			GPIO_ResetBits(PWR_3V8_O_PORT, PWR_3V8_O_PIN)
 
 
-#define WRC_UART_SEND(__DATA__,__SIZE__) 	do{UARTx_SendData_Normal(WRC_UARTX,__DATA__,__SIZE__);delay_us(10);WRC_RX_DMA_CH0_reload();}while(0)
+#define WRC_UART_SEND(__DATA__,__SIZE__) 	do{UARTx_SendData_Normal(WRC_UARTX,__DATA__,__SIZE__);delay_us(10);WRC_RX_DMA_CH3_Init();}while(0)
 
 
 #define	WRC_MODULE_CMD_OPEN			0x1B
@@ -106,6 +112,7 @@
 	__IO LINK_STATUS	link_status;
 	WRC_ERR_CODE	wrc_err_code;
 	ErrorStatus	wrc_result_flag;  //���յ�ͨѶ����жϣ���ʼ��FAIL�����ո���Э��ȷ�ϱ���ͨѶ�Ƿ�ɹ�
+	ErrorStatus	report_result_flag;  //�ϱ��Ƿ�ɹ���־������һ��֮����û���ϴ��ɹ�������wrc_result_flag����һ�㣬ֻҪ�����ϱ�����Ӧ�������ϱ��ɹ������ܺ���ָ���ǰ�н���֡Ҳ����ɹ���
 	uint16_t	time_out_time_sec; //��ʱʱ��
 	__IO	uint16_t	wrc_OFF_cnt;    //Զ���رռ���,���ϼ����������ӳٹرյ�Դ���˳�ͨѶ����
 	
@@ -123,6 +130,14 @@
   FlagStatus recv_flag;
 }WRC_UART_PARA_T;
 
+
+typedef enum
+{
+	GMS_WORST = 3U,
+	GMS_POOR = 10U,
+	GMS_GENERAL = 15U,
+	GMS_BEST = 25U,
+}GPRS_MODULE_SIG;
 
 
 typedef struct{
@@ -155,7 +170,7 @@
 
 
 
-
+void WRC_PWR_GPIO_Init(void);
 
 void WirelessRemoteCommPro(FUN_START_CTRL_PARA_T * sys_fun_run_ctrl_p);
 

--
Gitblit v1.9.3