优化
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "Param/param.h"
|
||||
#include "Filament/filament.h"
|
||||
#include "IAP/iap.h"
|
||||
#include "OSU/osu.h"
|
||||
|
||||
char gacVersionBuf[32];
|
||||
|
||||
@@ -40,7 +41,7 @@ static uint16_t crc16(const uint8_t *data, uint16_t len) {
|
||||
|
||||
static int check_packet(cpy_prot_packet_t *packet) {
|
||||
if (packet->header != CPY_PROT_HEADER) {
|
||||
printf("header error, 0x%04X\r\n", packet->header);
|
||||
// printf("header error, 0x%04X\r\n", packet->header);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -70,9 +71,9 @@ void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
|
||||
|
||||
void HAL_UARTEx_RxEventCallback_UART4(UART_HandleTypeDef *huart, uint16_t Size)
|
||||
{
|
||||
if ((huart->Instance == huart4.Instance) && (huart->RxEventType == HAL_UART_RXEVENT_IDLE)) {
|
||||
if ((huart->Instance == huart4.Instance && huart->RxEventType == HAL_UART_RXEVENT_IDLE)) {
|
||||
//SCB_InvalidateDCache_by_Addr((volatile void *)rx_packet_buf, Size);
|
||||
printf("rx packet %d\r\n", Size);
|
||||
// printf("rx packet %d\r\n", Size);
|
||||
// for (int i = 0; i < Size; i++) {
|
||||
// printf("%02X ", ((uint8_t *)rx_packet_buf)[i]);
|
||||
// }
|
||||
@@ -99,9 +100,7 @@ static int start_send(const 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);
|
||||
}
|
||||
HAL_UART_AbortReceive(&huart4);
|
||||
|
||||
return HAL_UARTEx_ReceiveToIdle_DMA(&huart4, (uint8_t *)data, len);
|
||||
}
|
||||
@@ -141,13 +140,15 @@ int cpyProtPacketHandle(uint8_t cmd, const uint8_t *data, uint16_t len) {
|
||||
case CPY_PROT_CMD_HEARTBEAT:
|
||||
{
|
||||
extern uint16_t gusTempVal;
|
||||
uint8_t aucRspData[13];
|
||||
uint8_t aucRspData[16];
|
||||
*((uint32_t *)&aucRspData[0]) = osKernelGetTickCount();
|
||||
*((uint16_t *)&aucRspData[4]) = gusTempVal;
|
||||
*((uint16_t *)&aucRspData[6]) = gusFilamentCurrent;
|
||||
*((uint16_t *)&aucRspData[8]) = gusFilamentVoltage;
|
||||
*((uint16_t *)&aucRspData[10]) = gusXrayCurrent;
|
||||
aucRspData[12] = gucWorkState;
|
||||
*((uint16_t *)&aucRspData[12]) = gusOsuTemp;
|
||||
aucRspData[14] = gusOsuLevel;
|
||||
aucRspData[15] = gucWorkState;
|
||||
cpy_prot_send_packet(cmd | CPY_PROT_CMD_ACK, aucRspData, sizeof(aucRspData));
|
||||
}
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user