From 08187305f2971d0e46fc919bb16ffd7d0a27b81a Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期六, 15 九月 2018 16:20:26 +0800
Subject: [PATCH] 1. 增加Flash读写功能 2. 增加map表读写功能 3. 修改一些全局变量的名称
---
源码/核心板/Src/application/serial_at_cmd_app.c | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c"
index c8864cb..913b7c5 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c"
@@ -1,21 +1,19 @@
#include "serial_at_cmd_app.h"
+#include "global_param.h"
#include <string.h>
-uint8_t g_frame_data[MAX_FRAME_LEN] = {0};
-uint8_t g_frame_data_len = 0;
-
-uint32_t g_alarm_dist = 200;
-uint8_t g_alarm_dev = 0;
+uint8_t m_frame_data[MAX_FRAME_LEN] = {0};
+uint8_t m_frame_data_len = 0;
void ParseFrame(void)
{
- if(!memcmp(g_frame_data, "SET", 3))
+ if(!memcmp(m_frame_data, "SET", 3))
{
- g_alarm_dist = (g_frame_data[3]-'0')*1000 + (g_frame_data[4]-'0')*100 + (g_frame_data[5]-'0')*10 + (g_frame_data[6]-'0');
+ g_com_map[ALARM_DISTANCE] = (m_frame_data[3]-'0')*1000 + (m_frame_data[4]-'0')*100 + (m_frame_data[5]-'0')*10 + (m_frame_data[6]-'0');
}
- else if(!memcmp(g_frame_data, "DEV", 3))
+ else if(!memcmp(m_frame_data, "DEV", 3))
{
- g_alarm_dev = g_frame_data[3]-'0';
+ g_com_map[ALARM_DEV] = m_frame_data[3]-'0';
}
}
@@ -39,20 +37,20 @@
{
s_usart_state = 3;
s_data_pos = 0;
- g_frame_data_len = 0;
+ m_frame_data_len = 0;
}
break;
case 3:
- g_frame_data_len = s_data_pos;
- g_frame_data[s_data_pos++] = data;
+ m_frame_data_len = s_data_pos;
+ m_frame_data[s_data_pos++] = data;
if(data == 0x0d)
{
s_usart_state = 4;
}
if(s_data_pos >= MAX_FRAME_LEN) //如果超过最大长度
{
- g_frame_data_len = MAX_FRAME_LEN;
+ m_frame_data_len = MAX_FRAME_LEN;
ParseFrame();
s_usart_state = 0;
}
--
Gitblit v1.9.3