From cf4d12fd8322cbb350dd3bc5af8c748e8790ac64 Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 05 Jun 2024 17:38:06 +0800
Subject: [PATCH] 继续测试修改
---
Function/WirelessRemoteComm/wireless_remote_comm.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 5 deletions(-)
diff --git a/Function/WirelessRemoteComm/wireless_remote_comm.h b/Function/WirelessRemoteComm/wireless_remote_comm.h
index 2923772..b9d908d 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,8 +24,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_CH3_Init();}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 +40,7 @@
WRC_CREATE_LINK, //��������
WRC_SEND_DATA, // �������ݸ�Զ��ģ��
WRC_WAIT_REC_DATA, //�ȴ��������ݲ�����
- WRC_CLOSE_PWR //�ر�ģ���Դ
+ WRC_OFF //�ر�ģ���Դ
} WRC_STATUS; // Զ��״̬
@@ -70,6 +82,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 +110,14 @@
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�����ո���Э��ȷ�ϱ���ͨѶ�Ƿ�ɹ�
+ ErrorStatus report_result_flag; //�ϱ��Ƿ�ɹ���־������һ��֮����û���ϴ��ɹ�������wrc_result_flag����һ�㣬ֻҪ�����ϱ�����Ӧ�������ϱ��ɹ������ܺ���ָ���ǰ�н���֡Ҳ����ɹ���
+ 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;
@@ -90,10 +131,18 @@
}WRC_UART_PARA_T;
+typedef enum
+{
+ GMS_WORST = 3U,
+ GMS_POOR = 10U,
+ GMS_GENERAL = 15U,
+ GMS_BEST = 25U,
+}GPRS_MODULE_SIG;
+
typedef struct{
-
- uint8_t SIM_Type;
+ uint8_t net_signal_intensity; //�����ź�ǿ��
+ uint8_t SIM_Type; //SIM������
char IMEI[15];
char ICCID[20];
int SNR;
@@ -121,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