This commit is contained in:
2026-09-01 14:09:31 +08:00
parent 653c7ec412
commit dac0e92ac9
11 changed files with 127 additions and 62 deletions
+9 -8
View File
@@ -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;
+6 -6
View File
@@ -102,8 +102,6 @@ static void filamentThread(void *arg)
HAL_ADCEx_MultiModeStart_DMA(&hadc1, (uint32_t *)gausAdcBuf, ADC_CHNL_NUM);
debug("ADC_CHNL_NUM = %d\n", ADC_CHNL_NUM);
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, 0);
HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
@@ -125,8 +123,8 @@ static void filamentThread(void *arg)
iWorkCmd = 3;
if (gucWorkState == 1) {
gucWorkState = 2;
if (gusNormalDuty == 0) {
gusNormalDuty = gusPreheatDuty * 2;
if (gusNormalDuty < gusPreheatDuty * 1.5 ) {
gusNormalDuty = gusPreheatDuty * 1.5;
}
gusDuty = gusNormalDuty;
__HAL_TIM_SET_COMPARE(&htim1, TIM_CHANNEL_1, gusDuty);
@@ -157,9 +155,11 @@ static void filamentThread(void *arg)
continue;
}
iCnt = 0;
printf("\n");
printf("\n");
printf("ADC: %d,%d,%d\n", gausAdcBuf[0], gausAdcBuf[1], gausAdcBuf[2]);
printf("duty:%d%%,I:%.3fA,V:%.2fV\n", gusDuty, gusFilamentCurrent/1000.0, gusFilamentVoltage/1000.0);
printf("workState:%d,duty:%d%%,I:%.3fA,V:%.2fV\n", gucWorkState, gusDuty * 100 / 2400, gusFilamentCurrent/1000.0, gusFilamentVoltage/1000.0);
}
}
+5
View File
@@ -2,6 +2,9 @@
#include "cmsis_os.h"
#include "osu.h"
uint16_t gusOsuLevel = 0;
uint16_t gusOsuTemp = 0;
extern UART_HandleTypeDef huart3;
static uint8_t gausRcvBuf[100];
static int rx_packet_ready = 0;
@@ -39,6 +42,8 @@ static void osuDataProcess(void) {
int level = gausRcvBuf[4];
int temp = gausRcvBuf[5] * 256 + gausRcvBuf[6];
printf("osu packet level, %d, temp, %.1f\r\n", level, temp / 10.0);
gusOsuLevel = level;
gusOsuTemp = temp;
}
void HAL_UARTEx_RxEventCallback_UART3(UART_HandleTypeDef *huart, uint16_t Size)
+3
View File
@@ -6,6 +6,9 @@
#include "main.h"
/* Exported types ------------------------------------------------------------*/
extern uint16_t gusOsuLevel;
extern uint16_t gusOsuTemp;
void osuInit(void);
+6 -2
View File
@@ -22,7 +22,8 @@ static HAL_StatusTypeDef SPI_Transmit(uint8_t* send_buf, uint16_t size)
*/
static HAL_StatusTypeDef SPI_Receive(uint8_t* recv_buf, uint16_t size)
{
return HAL_SPI_Receive(&hspi1, recv_buf, size, 100);
memset(recv_buf, 0xFF, size);
return HAL_SPI_TransmitReceive(&hspi1, recv_buf, recv_buf, size, 100);
}
@@ -135,10 +136,13 @@ AGAIN:
{
HAL_GPIO_WritePin(FLASH_CS_GPIO_Port, FLASH_CS_Pin, GPIO_PIN_SET);
return 0;
} else {
debug("spi read data %d bytes failed:%d", nbytes, ret);
}
} else {
debug("spi read cmd failed:%d", ret);
}
debug("spi read failed:%d", ret);
if (iCnt < 3) {
iCnt++;
goto AGAIN;