From 5b6fe0edc2790d1948c09b191a2a565e8874f875 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 24 五月 2022 09:57:23 +0800
Subject: [PATCH] V1.64 只和3个基站测距
---
源码/核心板/Src/application/serial_at_cmd_app.c | 116 +++++++++++++++++++++++++--------------------------------
1 files changed, 51 insertions(+), 65 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 77ef341..b50be74 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"
@@ -5,9 +5,9 @@
#include "dw_app.h"
#include "RTC.h"
-#define MSG_RW 3
+#define MSG_RW 3
+#define MSG_WTAG 6
#define MSG_USERDATA 0x10
-#define MSG_WTAG 6
#define CMD_READ 1
#define CMD_WRITE 2
@@ -23,7 +23,6 @@
UsartReceiveWaitData,
UsartReceiveWaitChecksum0,
UsartReceiveWaitChecksum1
-
}UsartRecvPackState;
uint8_t mUsartReceivePack[100] = {0};
@@ -65,9 +64,9 @@
UART_PushFrame(send_frame, data_length+9);
}
u8 remotetag_para[30],remotetag_paralen,userdata_len,userdata[50];
+
u8 remotesend_state=0;
u16 rec_checksum,userdata_targetid;
-uint16_t configremotetagID;
u32 getuserdata_tick;
void UsartParseDataHandler(uint8_t data)
{
@@ -75,114 +74,101 @@
uint16_t checksum = 0;
static uint8_t pack_datalen = 0,pack_length = 0,pack_index = 0,pack_msgtype = 0,pack_cmd = CMD_READ;
static uint8_t index = 0;
- uint8_t i;
+
- if(usart_receive_state == UsartReceiveWaitChecksum1) { //若收到校验和包
+ if(usart_receive_state == UsartReceiveWaitChecksum1) { //???????.
checksum = 0;
- for(int i = 0; i<pack_length-2; i++) {
+ for(int i = 0; i<pack_length-5; i++) {
checksum += mUsartReceivePack[i];
}
- checksum += pack_msgtype;
+ checksum += pack_cmd;
checksum += pack_length;
+ checksum += pack_index;
+ checksum += pack_datalen;
+ checksum += pack_msgtype;
checksum = ~checksum;
rec_checksum = rec_checksum|(data<<8);
- if(rec_checksum == checksum) //校验通过
+ if(rec_checksum == checksum) //????
{
switch(pack_msgtype)
{
case MSG_RW:
- pack_cmd = mUsartReceivePack[0];
- pack_index = mUsartReceivePack[1];
- pack_datalen = mUsartReceivePack[2];
switch(pack_cmd)
{
case CMD_WRITE:
- //从mUsartReceivePack中读取pack_length长度的字节，放到全局变量中
- memcpy((uint8_t*)&g_com_map + pack_index, &mUsartReceivePack[3], pack_datalen);
- // memcpy((uint8_t*)&g_com_map2 + pack_index, &mUsartReceivePack[3], pack_datalen);
- //返回一个error状态
+ //?mUsartReceivePack???pack_length?????,???????
+ memcpy((uint8_t*)&g_com_map + pack_index, mUsartReceivePack, pack_datalen);
+ //????error??
//SendComMap(pack_datalen,pack_index);
- SendConfigConfirm(pack_msgtype,pack_length);
- if(pack_index==CNT_RESTART*2)
- {
-
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
- if(pack_index==CNT_UPDATE*2)
- {
- uint32_t result = 0;
- u16 tmp = 0xAAAA;
-
- __disable_irq();
- result = FLASH_Prepare(0x8004A38, 2);
- if(result)
- result = FLASH_Write(0x8004A38, (const uint8_t*)&tmp, 2);
- __enable_irq();
- printf("进入升级模式\r\n");
- //delay_ms(100);
- SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
- }
save_com_map_to_flash();
- delay_ms(100);
- NVIC_SystemReset();
+ SendConfigConfirm(pack_msgtype,pack_length);
+ delay_ms(500);
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //?????bootloader
break;
case CMD_READ:
- //read包中data字节，即mUsartReceivePack[0]表示数据长度；
- //从g_com_data结构体中的第index位置读取长度为mUsartReceivePack[0]的字节，发送出来
-
+ //read??data??,?mUsartReceivePack[0]??????;
+ //?g_com_data??????index???????mUsartReceivePack[0]???,????
SendComMap(pack_datalen,pack_index);
break;
default:
break;
}
break;
- case MSG_WTAG: //修改标签参数
- remotesend_state=1;
- memcpy(&configremotetagID,&mUsartReceivePack[0],2);
- //configremotetagID = pack_cmd|pack_index<<8;
- //remotetag_para[0] = mUsartReceivePack[2];
- remotetag_paralen = mUsartReceivePack[4]+3;
- memcpy(&remotetag_para[1],&mUsartReceivePack[3],remotetag_paralen);
+ case MSG_WTAG:
+ remotesend_state++;
+ if(remotesend_state>14)
+ remotesend_state=1;
+ memcpy(remotetag_para,mUsartReceivePack,REMOTEPARA_LEN);
break;
- case MSG_USERDATA:
- userdata_len = mUsartReceivePack[2];
- memcpy(&userdata_targetid,mUsartReceivePack,2);
+
+ case MSG_USERDATA:
+ userdata_targetid = pack_cmd|pack_index<<8;
+ userdata_len = pack_datalen;
+ //memcpy(&userdata_targetid,mUsartReceivePack,2);
if(userdata_len==USERDATA_LEN)
{
- memcpy(userdata,&mUsartReceivePack[0],USERDATA_LEN+3);
+ memcpy(userdata,&userdata_targetid,2);
+ userdata[2] = userdata_len;
+ memcpy(&userdata[3],&mUsartReceivePack,USERDATA_LEN);
getuserdata_tick = time32_incr;
SendConfigConfirm(pack_msgtype,pack_length);
}
break;
-
}
- }
+ }
usart_receive_state = UsartReceiveWaitHead0;
pack_index = 0;
pack_length = 0;
index=0;
- }else if(usart_receive_state==UsartReceiveWaitChecksum0)
- {
- rec_checksum = data;
+ } else if((usart_receive_state == UsartReceiveWaitChecksum0) ) {
+ rec_checksum = data;
usart_receive_state = UsartReceiveWaitChecksum1;
- }
- else if(usart_receive_state == UsartReceiveWaitData) { //若果收到的是正常通讯包
+ }else if((usart_receive_state == UsartReceiveWaitData) ) { //???????????
mUsartReceivePack[index] = data;
index++;
- if(index == pack_length-2) { //如果收到的index与长度相等
+ if(index == pack_length-5) { //?????index?????
usart_receive_state = UsartReceiveWaitChecksum0;
}
- } else if(usart_receive_state == UsartReceiveWaitLength) { //收到长度字节
+ } else if(usart_receive_state == UsartReceiveWaitDataLen) { //????????
+ pack_datalen = data;
+ usart_receive_state = UsartReceiveWaitData;
+ }else if(usart_receive_state == UsartReceiveWaitIndex) { //????????
+ pack_index = data;
+ usart_receive_state = UsartReceiveWaitDataLen;
+ } else if(usart_receive_state == UsartReceiveWaitCMD) { //????????
+ pack_cmd = data;
+ usart_receive_state = UsartReceiveWaitIndex;
+ } else if(usart_receive_state == UsartReceiveWaitLength) { //??????
pack_length = data;
pack_index = 0;
- usart_receive_state = UsartReceiveWaitData;
+ usart_receive_state = UsartReceiveWaitCMD;
- } else if((usart_receive_state == UsartReceiveWaitHead0) && (data == 0x55)) { //收到第一个包头
+ } else if((usart_receive_state == UsartReceiveWaitHead0) && (data == 0x55)) { //???????
usart_receive_state = UsartReceiveWaitHead1;
- } else if((usart_receive_state == UsartReceiveWaitHead1) && (data == 0xAA)) { //收到第二个包头
+ } else if((usart_receive_state == UsartReceiveWaitHead1) && (data == 0xAA)) { //???????
usart_receive_state = UsartReceiveWaitMsgType;
}else if ((usart_receive_state == UsartReceiveWaitMsgType)) {
usart_receive_state = UsartReceiveWaitLength;
@@ -194,4 +180,4 @@
pack_length = 0;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3