From 2d82c2dfc1a64b05cf92a1bf1bd6fc840cb84e79 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 18 十月 2018 16:24:29 +0800
Subject: [PATCH] Revert "配对完成，有bug"
---
源码/核心板/Src/application/serial_at_cmd_app.c | 142 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 127 insertions(+), 15 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..5c6c8c6 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,133 @@
#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;
-
+#include <stdio.h>
+#include "dw_app.h"
+#include "RTC.h"
+uint8_t m_frame_data[MAX_FRAME_LEN] = {0};
+uint8_t m_frame_data_len = 0;
+uint8_t g_pairstart=0;
void ParseFrame(void)
{
- if(!memcmp(g_frame_data, "SET", 3))
+ if(!memcmp(m_frame_data, "DIS1", 4))
{
- 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_DISTANCE1] =0;
+ for(uint8_t i=5; i < m_frame_data_len; i++)
+ {
+ if(m_frame_data[i]<58 && m_frame_data[i]>47)
+ {
+ g_com_map[ALARM_DISTANCE1] = g_com_map[ALARM_DISTANCE1]*10 + m_frame_data[i]- '0';
+ }
+ else
+ {
+ printf("Error: Wrong DISTANCE.\r\n");
+ break;
+ }
+ }
+ printf("When distance1 < %d cm, alarm1 is on.\n", g_com_map[ALARM_DISTANCE1]);
+ save_com_map_to_flash();
}
- else if(!memcmp(g_frame_data, "DEV", 3))
+ else if(!memcmp(m_frame_data, "DIS2", 4))
{
- g_alarm_dev = g_frame_data[3]-'0';
+ g_com_map[ALARM_DISTANCE2] =0;
+ for(uint8_t i=5; i < m_frame_data_len; i++)
+ {
+ if(m_frame_data[i]<58 && m_frame_data[i]>47)
+ {
+ g_com_map[ALARM_DISTANCE2] = g_com_map[ALARM_DISTANCE2]*10 + m_frame_data[i]- '0';
+ }
+ else
+ {
+ printf("Error: Wrong DISTANCE.\r\n");
+ break;
+ }
+ }
+ printf("When distance2 < %d cm, alarm2 is on.\n", g_com_map[ALARM_DISTANCE2]);
+ save_com_map_to_flash();
+ }
+ else if(!memcmp(m_frame_data, "DIS3", 4))
+ {
+ g_com_map[ALARM_DISTANCE3] =0;
+ for(uint8_t i=5; i < m_frame_data_len; i++)
+ {
+ if(m_frame_data[i]<58 && m_frame_data[i]>47)
+ {
+ g_com_map[ALARM_DISTANCE3] = g_com_map[ALARM_DISTANCE3]*10 + m_frame_data[i]- '0';
+ }
+ else
+ {
+ printf("Error: Wrong DISTANCE.\r\n");
+ break;
+ }
+ }
+ printf("When distance3 < %d cm, alarm3 is on.\n", g_com_map[ALARM_DISTANCE3]);
+ save_com_map_to_flash();
+ }
+ else if(!memcmp(m_frame_data, "DEV", 3))
+ {
+ g_com_map[ALARM_DEV] = m_frame_data[4]-'0';
+ printf("Alarm device is %d. \n", g_com_map[ALARM_DEV]);
+ save_com_map_to_flash();
+ }
+ else if(!memcmp(m_frame_data, "ID", 2))
+ {
+ g_com_map[DEV_ID] = 0;
+ for(uint8_t i=3; i < m_frame_data_len; i++)
+ {
+ if(m_frame_data[i]<58 && m_frame_data[i]>47)
+ {
+ g_com_map[DEV_ID] = g_com_map[DEV_ID]*10 + m_frame_data[i]- '0';
+ }
+ else
+ {
+ printf("Error: Wrong ID.\r\n");
+ break;
+ }
+ }
+ Dw1000_App_Init();
+ printf("set dev id = %d. \r\n", g_com_map[DEV_ID]);
+ save_com_map_to_flash();
+ }else if(!memcmp(m_frame_data, "INT", 3))
+ {
+ g_com_map[COM_INTERVAL] = 0;
+ for(uint8_t i=4; i < m_frame_data_len; i++)
+ {
+ if(m_frame_data[i]<58 && m_frame_data[i]>47)
+ {
+ g_com_map[COM_INTERVAL] = g_com_map[COM_INTERVAL]*10 + m_frame_data[i]- '0';
+ }
+ else
+ {
+ printf("Error: Wrong COM_INTERVAL.\r\n");
+ break;
+ }
+ }
+ printf("set dev interval = %d ms. \r\n", g_com_map[COM_INTERVAL]);
+ RTC_Configuration(g_com_map[COM_INTERVAL]*20);
+ save_com_map_to_flash();
+ }else if(!memcmp(m_frame_data, "PAIRID", 6))
+ {
+ g_com_map[PAIR_ID] = 0;
+ for(uint8_t i=7; i < m_frame_data_len; i++)
+ {
+ if(m_frame_data[i]<58 && m_frame_data[i]>47)
+ {
+ g_com_map[PAIR_ID] = g_com_map[PAIR_ID]*10 + m_frame_data[i]- '0';
+ }
+ else
+ {
+ printf("Error: Wrong PAIR_ID.\r\n");
+ break;
+ }
+ }
+ printf("set dev PAIR_ID = %d . \r\n", g_com_map[PAIR_ID]);
+ save_com_map_to_flash();
+ }else if(!memcmp(m_frame_data, "STARTPAIR", 9))
+ {
+ g_pairstart=1;
+ printf("Start Pair Mode. \r\n");
+ }else{
+ printf("Error: Wrong Command.\r\n");
}
}
@@ -39,20 +151,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