From 7a68bf910047fb055e5dbc0bdfdfec1366ca2469 Mon Sep 17 00:00:00 2001 From: lyon Date: Mon, 24 Oct 2022 21:43:05 +0800 Subject: [PATCH 1/2] add_files --- package/STM32F1/STM32F1_UART.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/package/STM32F1/STM32F1_UART.c b/package/STM32F1/STM32F1_UART.c index 37cad6dd8..c71638596 100644 --- a/package/STM32F1/STM32F1_UART.c +++ b/package/STM32F1/STM32F1_UART.c @@ -4,6 +4,8 @@ #include "dataStrs.h" extern PikaObj* pikaMain; +/* support by booter */ +extern UART_HandleTypeDef huart1; #ifdef UART1_EXIST pika_uart_t pika_uart1; @@ -18,8 +20,6 @@ pika_uart_t pika_uart3; pika_uart_t pika_uart4; #endif -/* support by booter */ -extern UART_HandleTypeDef huart1; static pika_uart_t* getPikaUart(uint8_t id) { #ifdef UART1_EXIST @@ -98,7 +98,12 @@ static uint8_t getUartId(UART_HandleTypeDef* huart) { return 0; } +extern UART_HandleTypeDef huart1; + static UART_HandleTypeDef* getUartHandle(uint8_t id) { + if(id == 1){ + return &huart1; + } pika_uart_t* pika_uart = getPikaUart(id); if (NULL == pika_uart) { return NULL; @@ -300,7 +305,7 @@ void STM32F1_UART_platformRead(PikaObj* self) { pika_uart->rxBuff[pika_uart->rxBuffOffset] = 0; UART_Start_Receive_IT( - &pika_uart->huart, + getUartHandle(id), (uint8_t*)(pika_uart->rxBuff + pika_uart->rxBuffOffset), 1); obj_setStr(self,"readData", readBuff); args_deinit(buffs); @@ -309,15 +314,7 @@ void STM32F1_UART_platformRead(PikaObj* self) { void STM32F1_UART_platformWrite(PikaObj* self) { char *data = obj_getStr(self, "writeData"); int id = obj_getInt(self, "id"); - HAL_UART_Transmit(getUartHandle(id), (uint8_t*)data, strGetSize(data), 100); -} - -void STM32F1_UART_clearRxBuff(pika_uart_t* pika_uart) { - pika_uart->rxBuffOffset = 0; - pika_uart->rxBuff[pika_uart->rxBuffOffset] = 0; - UART_Start_Receive_IT( - &pika_uart->huart, - (uint8_t*)(pika_uart->rxBuff + pika_uart->rxBuffOffset), 1); + HAL_UART_Transmit(getUartHandle(id), (uint8_t*)data, strGetSize(data), 0xffff); } char pikaShell[RX_BUFF_LENGTH] = {0}; From 5015cf5a16a768bb33d45be503fe09a349cd31b6 Mon Sep 17 00:00:00 2001 From: lyon Date: Mon, 24 Oct 2022 21:43:05 +0800 Subject: [PATCH 2/2] update_toml --- packages.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/packages.toml b/packages.toml index 1752dc895..b2b775a91 100644 --- a/packages.toml +++ b/packages.toml @@ -317,6 +317,7 @@ releases = [ "v1.1.0 186b951078c76b1c80b8111d76097970c21a3004", "v1.1.1 567d0b19ce998a290fa538845d107c744ccd0258", "v1.1.2 55164edbf2ab7e2e9e754663579e3c93040da8fa", + "v1.1.3 7a68bf910047fb055e5dbc0bdfdfec1366ca2469" ] [[packages]]