From 66ea95dcb8fd91d29465c2f11ced4dd6153a2504 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 22 May 2024 17:15:02 +0800
Subject: [PATCH] 继续完善远传

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

diff --git a/Function/WirelessRemoteComm/wireless_remote_comm.h b/Function/WirelessRemoteComm/wireless_remote_comm.h
index b60a2c5..e4b13dc 100644
--- a/Function/WirelessRemoteComm/wireless_remote_comm.h
+++ b/Function/WirelessRemoteComm/wireless_remote_comm.h
@@ -18,8 +18,14 @@
 #define PWR_3V8_OFF			GPIO_ResetBits(PWR_3V8_O_PORT, PWR_3V8_O_PIN)
 
 
-#define WRC_SEND_NORMAL(__DATA__,__SIZE__) 	do{UARTx_SendData_Normal(UART1,__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_CH0_reload();}while(0)
 
+
+#define	WRC_MODULE_CMD_OPEN			0x1B
+#define	WRC_MODULE_CMD_LINK_STATUS_ACK			0x41
+#define	WRC_MODULE_CMD_DATA_UP	0x67
+
+#define	WRC_MODULE_CMD_DATA_RECV	"+R"
 
 typedef enum
 {
@@ -28,7 +34,7 @@
 	WRC_CREATE_LINK,  //��������
 	WRC_SEND_DATA,    // �������ݸ�Զ��ģ��
 	WRC_WAIT_REC_DATA,	//�ȴ��������ݲ�����
-	WRC_CLOSE_PWR				//�ر�ģ���Դ
+	WRC_OFF				//�ر�ģ���Դ
 
 } WRC_STATUS;       // Զ��״̬
 
@@ -70,6 +76,27 @@
 	WRC_TIME_START_TIMING_TIMING, //����Ͷ�ʱͬʱ��Ч
 } WRC_TIME_START_TYPE;       // ʱ��������ʽ
 
+
+typedef enum
+{
+  WRC_ERR_NONE,
+	WRC_ERR_PWR = 0x01U,
+	
+	WRC_ERR_WAIT_LINK_TIME_OUT,  //������ʱ
+	WRC_ERR_WAIT_ACK_TIME_OUT,  //�ȴ���Ӧ��ʱ
+	
+	WRC_ERR_SEND_DATA = 0x10U,  //�������ݴ����쳣
+	
+	
+	
+	
+} WRC_ERR_CODE;       // ������
+
+
+
+
+
+
 #pragma	pack(1)
 
 typedef struct
@@ -77,6 +104,13 @@
 	WRC_START_MEANS wrc_start_flag;
   __IO WRC_STATUS wrc_state;
 	__IO LINK_STATUS	link_status;
+	WRC_ERR_CODE	wrc_err_code;
+	ErrorStatus	wrc_result_flag;  //���յ�ͨѶ����жϣ���ʼ��FAIL�����ո���Э��ȷ�ϱ���ͨѶ�Ƿ�ɹ�
+	uint16_t	time_out_time_sec; //��ʱʱ��
+	__IO	uint16_t	wrc_OFF_cnt;    //Զ���رռ���,���ϼ����������ӳٹرյ�Դ���˳�ͨѶ����
+	
+	uint16_t	wrc_restart_num_cnt;  //�ر��������������¼���
+	uint16_t	wrc_restart_time_sec_cnt;  //�ر����ʱ����������¼�����
   
 } WRC_CTRL_PARA_T;
 

--
Gitblit v1.9.3