Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

!155 STM32F1_v1.1.3_1666618914727

Browse Source 
Merge pull request !155 from pikabot/STM32F1_v1.1.3_1666618914727
This commit is contained in:
李昂 2022-10-24 13:51:34 +00:00 committed by Gitee
commit a9ed313968
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/STM32F1/STM32F1_UART.c
View File

@ -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};

1
packages.toml
View File

@ -317,6 +317,7 @@ releases = [
"v1.1.0 186b951078c76b1c80b8111d76097970c21a3004",
"v1.1.1 567d0b19ce998a290fa538845d107c744ccd0258",
"v1.1.2 55164edbf2ab7e2e9e754663579e3c93040da8fa",
"v1.1.3 7a68bf910047fb055e5dbc0bdfdfec1366ca2469"
]
[[packages]]