From a05cacad5239ab3f35ffb58f443356b484e6cc1b Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Tue, 21 May 2024 19:17:22 +0800
Subject: [PATCH] 继续完善远传

---
 Function/WirelessRemoteComm/wireless_remote_comm.h |   53 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Function/WirelessRemoteComm/wireless_remote_comm.h b/Function/WirelessRemoteComm/wireless_remote_comm.h
index 4908c5b..b60a2c5 100644
--- a/Function/WirelessRemoteComm/wireless_remote_comm.h
+++ b/Function/WirelessRemoteComm/wireless_remote_comm.h
@@ -4,14 +4,21 @@
 #include "system_general_para.h"
 
 // Զ����Դ
-#define WRC_PWR_PORT 			GPIOA
-#define WRC_PWR_PIN 			GPIO_Pin_7
-
+#define WRC_PWR_PORT 			GPIOE
+#define WRC_PWR_PIN 			GPIO_Pin_6
 
 #define WRC_PWR_ON 			GPIO_SetBits(WRC_PWR_PORT, WRC_PWR_PIN)
 #define WRC_PWR_OFF			GPIO_ResetBits(WRC_PWR_PORT, WRC_PWR_PIN)
 
-#define WRC_SEND_NORMAL(__DATA__,__SIZE__) 	UARTx_SendData_Normal(UART1,__DATA__,__SIZE__)
+//3V8����
+#define PWR_3V8_O_PORT 			GPIOE
+#define PWR_3V8_O_PIN 			GPIO_Pin_7
+
+#define PWR_3V8_ON 			GPIO_SetBits(PWR_3V8_O_PORT, PWR_3V8_O_PIN)
+#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)
 
 
 typedef enum
@@ -49,29 +56,55 @@
 
 typedef enum
 {
+  LINK_NONE = 0U,  // Ĭ��ֵ
+	LINK_OK,
+	LINK_ERR,
+} LINK_STATUS;       // ��������
+
+
+typedef enum
+{
   WRC_TIME_START_NONE = 0U,  // Ĭ��ֵ
 	WRC_TIME_START_INTERVAL,     //���
 	WRC_TIME_START_TIMING,       //��ʱ
 	WRC_TIME_START_TIMING_TIMING, //����Ͷ�ʱͬʱ��Ч
 } WRC_TIME_START_TYPE;       // ʱ��������ʽ
 
-
+#pragma	pack(1)
 
 typedef struct
 {
+	WRC_START_MEANS wrc_start_flag;
   __IO WRC_STATUS wrc_state;
-  WRC_START_MEANS wrc_start_flag;
+	__IO LINK_STATUS	link_status;
+  
 } WRC_CTRL_PARA_T;
 
 
+#define	WRC_REC_BUF_LENGTH	256
+typedef struct{
+
+	uint8_t  recv_buf[WRC_REC_BUF_LENGTH];
+	uint16_t recv_length;
+  FlagStatus recv_flag;
+}WRC_UART_PARA_T;
+
+
+
+typedef struct{
+	uint8_t				net_signal_intensity; //�����ź�ǿ��
+	uint8_t				SIM_Type;             //SIM������
+	char					IMEI[15];	
+	char					ICCID[20];	
+	int           SNR;
+}LINK_INFO_T;
 
 
 
 
 
 
-
-
+#pragma pack()
 
 
 
@@ -82,8 +115,8 @@
 
 
 extern WRC_CTRL_PARA_T wrc_ctrl_para_g;
-
-
+extern WRC_UART_PARA_T	wrc_uart_para_g;
+extern LINK_INFO_T	link_info_g;
 
 
 

--
Gitblit v1.9.3