btl143/QDAC-firmware
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: btl143:5bb145fc5d8508d65787a676f52e2db2d46bcdb1
Branches Tags
btl143:master
...
compare: btl143:3fe85dc7db36cef17c88144679759f69f14c29c2
Branches Tags
btl143:master

2 Commits
5bb145fc5d ... 3fe85dc7db

Author SHA1 Message Date
bmy
3fe85dc7db Merge branches 'master' and 'master' of http://git.brisky.space/btl143/QDAC-firmware 2024-05-25 22:50:57 +08:00
bmy
194d26a9e0 fix: 修复下位机复位异常发送导致上位机卡死的问题 
经测试确实是 ORE 置位导致无法退出中断（现象为反复进入中断 ORE 和 FE 置位） fix #1
目前将串口2接收中断暂时打开，看后续是否有需求使用
 2024-04-08 17:30:26 +08:00
3 changed files with 13 additions and 9 deletions
Expand all files Collapse all files

14
app/by_frame.c
View File

@@ -16,7 +16,7 @@ void by_frame_init(void)
{ {
lwrb_init(&lwrb_ctx, frame_buffer_recv, sizeof(frame_buffer_recv)); // lwrb 最大元素数量为 buff 大小减一 lwrb_init(&lwrb_ctx, frame_buffer_recv, sizeof(frame_buffer_recv)); // lwrb 最大元素数量为 buff 大小减一
uart_init(BY_FRAME_UART_INDEX, BY_FRAME_UART_BAUDRATE, BY_FRAME_UART_TX_PIN, BY_FRAME_UART_RX_PIN); uart_init(BY_FRAME_UART_INDEX, BY_FRAME_UART_BAUDRATE, BY_FRAME_UART_TX_PIN, BY_FRAME_UART_RX_PIN);
// uart_rx_interrupt(BY_FRAME_UART_INDEX, ENABLE); uart_rx_interrupt(BY_FRAME_UART_INDEX, ENABLE);
} }
void by_frame_send(uint32_t *data_array) void by_frame_send(uint32_t *data_array)
@@ -46,12 +46,12 @@ void by_frame_send(uint32_t *data_array)
*/ */
void by_frame_parse(uint32_t *data_array) void by_frame_parse(uint32_t *data_array)
{ {
uint32_t len = lwrb_get_full(&lwrb_ctx); // 缓冲区大小 uint32_t len = lwrb_get_full(&lwrb_ctx); // 缓冲区大小
uint8_t status = 0; // 状态 0-未找到帧头 1-找到帧头 2-校验 uint8_t status = 0; // 状态 0-未找到帧头 1-找到帧头 2-校验
uint16_t frame_start = 0; // 帧起始位置 uint16_t frame_start = 0; // 帧起始位置
uint8_t frame_buf[4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)] = {0}; // 帧 uint8_t frame_buf[4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)] = {0}; // 帧
uint8_t buf[(4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)) * 2] = {0}; // 用于解析的数据块 uint8_t buf[(4 + BY_FRAME_DATA_NUM * sizeof(uint32_t)) * 2] = {0}; // 用于解析的数据块
const uint8_t data_byte_num = BY_FRAME_DATA_NUM * sizeof(uint32_t); const uint8_t data_byte_num = BY_FRAME_DATA_NUM * sizeof(uint32_t);
if (len < 2 * (4 + data_byte_num)) { if (len < 2 * (4 + data_byte_num)) {
// 当前要求缓冲区满 // 当前要求缓冲区满

2
app/by_frame.h
View File

@@ -18,8 +18,6 @@
#define BY_FRAME_DATA_NUM (3) #define BY_FRAME_DATA_NUM (3)
extern uint8_t frame_buffer[50];
extern void by_frame_init(void); extern void by_frame_init(void);
void by_frame_send(uint32_t *data_array); void by_frame_send(uint32_t *data_array);
void by_frame_parse(uint32_t *data_array); void by_frame_parse(uint32_t *data_array);

6
app/isr.c
View File

@@ -94,6 +94,12 @@ void USART2_IRQHandler(void)
if (USART_GetITStatus(USART2, USART_IT_RXNE) != RESET) { if (USART_GetITStatus(USART2, USART_IT_RXNE) != RESET) {
USART_ClearITPendingBit(USART2, USART_IT_RXNE); USART_ClearITPendingBit(USART2, USART_IT_RXNE);
} }
if (USART_GetFlagStatus(USART2, USART_FLAG_ORE) != RESET) {
USART_ClearFlag(USART2, USART_FLAG_ORE); // <20><><EFBFBD><EFBFBD> ORE <20><>־λ
USART_ReceiveData(USART2);
}
} }
void USART3_IRQHandler(void) void USART3_IRQHandler(void)
{ {