更新通讯协议,完善灯丝控制
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
#include "cmsis_os.h"
|
||||
#include "cpy_prot.h"
|
||||
#include "Param/param.h"
|
||||
#include "ADS8321/ads8321.h"
|
||||
#include "Filament/filament.h"
|
||||
#include "IAP/iap.h"
|
||||
|
||||
char gacVersionBuf[32];
|
||||
@@ -14,14 +14,13 @@ extern UART_HandleTypeDef huart4;
|
||||
static uint16_t gusMaxDataLen = 16 * 1024;
|
||||
|
||||
|
||||
static daq_packet_t *tx_packet_buf = NULL;
|
||||
static daq_packet_t *rx_packet_buf = NULL;
|
||||
static cpy_prot_packet_t *tx_packet_buf = NULL;
|
||||
static cpy_prot_packet_t *rx_packet_buf = NULL;
|
||||
static int rx_packet_ready = 0;
|
||||
static int tx_packet_busy = 0;
|
||||
|
||||
//函数声明
|
||||
static int daq_recv_packet(uint16_t data_len);
|
||||
|
||||
static int cpy_prot_recv_packet(uint16_t data_len);
|
||||
|
||||
static uint16_t crc16(const uint8_t *data, uint16_t len) {
|
||||
uint16_t crc = 0xFFFF;
|
||||
@@ -39,8 +38,8 @@ static uint16_t crc16(const uint8_t *data, uint16_t len) {
|
||||
return crc;
|
||||
}
|
||||
|
||||
static int check_packet(daq_packet_t *packet) {
|
||||
if (packet->header != DAQ_HEADER) {
|
||||
static int check_packet(cpy_prot_packet_t *packet) {
|
||||
if (packet->header != CPY_PROT_HEADER) {
|
||||
printf("header error, 0x%04X\r\n", packet->header);
|
||||
return 0;
|
||||
}
|
||||
@@ -94,12 +93,12 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
|
||||
}
|
||||
}
|
||||
|
||||
static int daq_send(const char *data, size_t len) {
|
||||
static int start_send(const char *data, size_t len) {
|
||||
//SCB_CleanDCache_by_Addr((volatile void *)data, len);
|
||||
return HAL_UART_Transmit_DMA(&huart4, (uint8_t *)data, len);
|
||||
}
|
||||
|
||||
static int daq_recv(char *data, size_t len) {
|
||||
static int start_recv(char *data, size_t len) {
|
||||
if (huart4.gState != HAL_UART_STATE_READY) {
|
||||
HAL_UART_AbortReceive(&huart4);
|
||||
}
|
||||
@@ -108,10 +107,10 @@ static int daq_recv(char *data, size_t len) {
|
||||
}
|
||||
|
||||
|
||||
int daq_send_packet(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
int cpy_prot_send_packet(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
uint16_t packet_len = DATA_LEN_2_PACKET_LEN(len);
|
||||
daq_packet_t *packet = tx_packet_buf;
|
||||
packet->header = DAQ_HEADER;
|
||||
cpy_prot_packet_t *packet = tx_packet_buf;
|
||||
packet->header = CPY_PROT_HEADER;
|
||||
packet->cmd = cmd;
|
||||
packet->len = len;
|
||||
if (data) {
|
||||
@@ -123,19 +122,16 @@ int daq_send_packet(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
uint16_t *pcrc = (uint16_t *)((uint8_t *)packet + packet_len - CRC_LEN);
|
||||
*pcrc = crc;
|
||||
|
||||
int ret = daq_send((const char *)packet, packet_len);
|
||||
int ret = start_send((const char *)packet, packet_len);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int cpy_prot_recv_packet(uint16_t data_len) {
|
||||
cpy_prot_packet_t *rx_packet = rx_packet_buf;
|
||||
|
||||
static int daq_recv_packet(uint16_t data_len) {
|
||||
daq_packet_t *rx_packet = rx_packet_buf;
|
||||
|
||||
return daq_recv((char *)rx_packet, DATA_LEN_2_PACKET_LEN(data_len));
|
||||
return start_recv((char *)rx_packet, DATA_LEN_2_PACKET_LEN(data_len));
|
||||
}
|
||||
|
||||
|
||||
|
||||
int cpyProtPacketHandle(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
// 处理接收到的数据包
|
||||
// printf("recv packet: cmd=0x%02X, len=%d\r\n", cmd, len);
|
||||
@@ -145,31 +141,35 @@ int cpyProtPacketHandle(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
case CPY_PROT_CMD_HEARTBEAT:
|
||||
{
|
||||
extern uint16_t gusTempVal;
|
||||
uint8_t aucRspData[10];
|
||||
uint8_t aucRspData[13];
|
||||
*((uint32_t *)&aucRspData[0]) = osKernelGetTickCount();
|
||||
*((uint16_t *)&aucRspData[4]) = gusTempVal;
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, aucRspData, sizeof(aucRspData));
|
||||
*((uint16_t *)&aucRspData[6]) = gusFilamentCurrent;
|
||||
*((uint16_t *)&aucRspData[8]) = gusFilamentVoltage;
|
||||
*((uint16_t *)&aucRspData[10]) = gusXrayCurrent;
|
||||
aucRspData[12] = gucWorkState;
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, aucRspData, sizeof(aucRspData));
|
||||
}
|
||||
break;
|
||||
|
||||
case CPY_PROT_CMD_VERSION:
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)gacVersionBuf, strlen(gacVersionBuf));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)gacVersionBuf, strlen(gacVersionBuf));
|
||||
break;
|
||||
|
||||
case CPY_PROT_CMD_PARAM_READ:
|
||||
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)gptSysParam, sizeof(sysParamDef));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)gptSysParam, sizeof(sysParamDef));
|
||||
break;
|
||||
|
||||
case CPY_PROT_CMD_PARAM_WRITE:
|
||||
if (len != sizeof(sysParamDef)) {
|
||||
const char *err_msg = "param write len error";
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
break;
|
||||
}
|
||||
memcpy(gptSysParam, data, sizeof(sysParamDef));
|
||||
saveSysParam();
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)gptSysParam, sizeof(sysParamDef));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)gptSysParam, sizeof(sysParamDef));
|
||||
break;
|
||||
|
||||
case CPY_PROT_CMD_IAP:
|
||||
@@ -178,31 +178,31 @@ int cpyProtPacketHandle(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
#ifdef BOOTLOADER
|
||||
case CPY_PROT_CMD_BOOT_BLOCKING:
|
||||
blockInBootloader(data[0]);
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, NULL, 0);
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, NULL, 0);
|
||||
printf("CPY_PROT_CMD_BOOT_BLOCKING\r\n");
|
||||
break;
|
||||
case CPY_PROT_CMD_JUMP_APP:
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, NULL, 0);
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, NULL, 0);
|
||||
osDelay(100);
|
||||
blockInBootloader(0);
|
||||
break;
|
||||
#endif
|
||||
case CPY_PROT_CMD_RESET:
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, NULL, 0);
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, NULL, 0);
|
||||
osDelay(100);
|
||||
systemReboot();
|
||||
break;
|
||||
case CPY_PROT_CMD_OTP_READ:
|
||||
{
|
||||
const sysOtpInfoDef *otpInfo = loadOtpInfo();
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)otpInfo, sizeof(sysOtpInfoDef));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)otpInfo, sizeof(sysOtpInfoDef));
|
||||
}
|
||||
break;
|
||||
case CPY_PROT_CMD_OTP_WRITE:
|
||||
{
|
||||
if (len != sizeof(sysOtpInfoDef)) {
|
||||
const char *err_msg = "otp write len error";
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ERROR, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ERROR, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
break;
|
||||
}
|
||||
const sysOtpInfoDef *otpInfo = (const sysOtpInfoDef *)data;
|
||||
@@ -210,25 +210,41 @@ int cpyProtPacketHandle(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
if (ret < 0) {
|
||||
char err_msg[64];
|
||||
sprintf(err_msg, "otp write failed: %d", ret);
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ERROR, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ERROR, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
break;
|
||||
}
|
||||
otpInfo = loadOtpInfo();
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)otpInfo, sizeof(sysOtpInfoDef));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)otpInfo, sizeof(sysOtpInfoDef));
|
||||
}
|
||||
break;
|
||||
case CPY_PROT_CMD_RESET_FACTORY:
|
||||
{
|
||||
systemResetFactory();
|
||||
const char *err_msg = "reset factory ok";
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
}
|
||||
break;
|
||||
case CPY_PROT_CMD_START:
|
||||
{
|
||||
if (gucWorkState == 0) {
|
||||
gucWorkState = 1;
|
||||
}
|
||||
const char *err_msg = "start ok";
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
}
|
||||
break;
|
||||
case CPY_PROT_CMD_STOP:
|
||||
{
|
||||
gucWorkState = 0;
|
||||
const char *err_msg = "stop ok";
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
}
|
||||
break;
|
||||
default:
|
||||
{
|
||||
const char *err_msg = "unknown cmd";
|
||||
printf("%s\n", err_msg);
|
||||
daq_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, (const uint8_t *)err_msg, strlen(err_msg));
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -257,7 +273,7 @@ static void ioCheck(void)
|
||||
static void cpyProtThread(void *arg)
|
||||
{
|
||||
int iCnt = 0;
|
||||
daq_recv_packet(gusMaxDataLen);
|
||||
cpy_prot_recv_packet(gusMaxDataLen);
|
||||
|
||||
while (1) {
|
||||
iCnt++;
|
||||
@@ -271,10 +287,10 @@ static void cpyProtThread(void *arg)
|
||||
// printf("wait tx complete timeout\n");
|
||||
// }
|
||||
// tx_packet_busy = 0;
|
||||
daq_recv_packet(gusMaxDataLen);
|
||||
cpy_prot_recv_packet(gusMaxDataLen);
|
||||
} else if (rx_packet_ready == -1) {
|
||||
rx_packet_ready = 0;
|
||||
daq_recv_packet(gusMaxDataLen);
|
||||
cpy_prot_recv_packet(gusMaxDataLen);
|
||||
}
|
||||
|
||||
ioCheck();
|
||||
@@ -282,7 +298,6 @@ static void cpyProtThread(void *arg)
|
||||
osDelay(1);
|
||||
if (iCnt > 1000) {
|
||||
iCnt = 0;
|
||||
// daq_send("hello", 5);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
#include "main.h"
|
||||
/* Exported types ------------------------------------------------------------*/
|
||||
|
||||
#define DAQ_HEADER 0x55AA
|
||||
#define DAQ_DATA_MIN_LEN 10
|
||||
#define CRC_LEN 2
|
||||
#define CPY_PROT_HEADER 0x55CC
|
||||
#define CPY_PROT_DATA_MIN_LEN 10
|
||||
#define CRC_LEN 2
|
||||
|
||||
|
||||
typedef enum {
|
||||
@@ -26,6 +26,9 @@ typedef enum {
|
||||
CPY_PROT_CMD_OTP_WRITE,
|
||||
CPY_PROT_CMD_RESET_FACTORY,
|
||||
|
||||
CPY_PROT_CMD_START = 0x10,
|
||||
CPY_PROT_CMD_STOP,
|
||||
|
||||
CPY_PROT_CMD_ACK = 0x80,
|
||||
CPY_PROT_CMD_ERROR = 0xC0,
|
||||
} cpy_prot_cmd_t;
|
||||
@@ -36,15 +39,14 @@ typedef struct {
|
||||
uint16_t header;
|
||||
uint8_t cmd;
|
||||
uint16_t len;
|
||||
uint8_t data[DAQ_DATA_MIN_LEN];
|
||||
} daq_packet_t;
|
||||
uint8_t data[CPY_PROT_DATA_MIN_LEN];
|
||||
} cpy_prot_packet_t;
|
||||
#pragma pack()
|
||||
|
||||
#define DATA_LEN_2_PACKET_LEN(data_len) ((data_len) < DAQ_DATA_MIN_LEN ? (sizeof(daq_packet_t) + CRC_LEN) : ((data_len) + sizeof(daq_packet_t) - DAQ_DATA_MIN_LEN + CRC_LEN))
|
||||
|
||||
#define DATA_LEN_2_PACKET_LEN(data_len) ((data_len) < CPY_PROT_DATA_MIN_LEN ? (sizeof(cpy_prot_packet_t) + CRC_LEN) : ((data_len) + sizeof(cpy_prot_packet_t) - CPY_PROT_DATA_MIN_LEN + CRC_LEN))
|
||||
|
||||
void cpyProtInit(void);
|
||||
int daq_send_packet(uint8_t cmd, const uint8_t *data, uint16_t len);
|
||||
int cpy_prot_send_packet(uint8_t cmd, const uint8_t *data, uint16_t len);
|
||||
|
||||
|
||||
#endif // CPY_PROT_H
|
||||
|
||||
Reference in New Issue
Block a user