From 0b55bc25498278869b095302678c11d37d155d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=82?= <645275593@qq.com> Date: Tue, 28 Dec 2021 02:50:40 +0000 Subject: [PATCH] update package/STM32G070CBBooter/main.c. --- package/STM32G070CBBooter/main.c | 47 ++++---------------------------- 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/package/STM32G070CBBooter/main.c b/package/STM32G070CBBooter/main.c index c4e8816cc..1983bd721 100644 --- a/package/STM32G070CBBooter/main.c +++ b/package/STM32G070CBBooter/main.c @@ -49,22 +49,15 @@ PikaObj *pikaMain; /* Private function prototypes -----------------------------------------------*/ void SystemClock_Config(void); -#define RX_Buff_SIZE 256 -char rxBuff[RX_Buff_SIZE] = { 0 }; -char rx_char = 0; -void clearBuff(char *buff, uint32_t size) { - for (int i = 0; i < size; i++) { - buff[i] = 0; - } -} - +static char rx_char = 0; void USART1_IRQHandler(void){ if (LL_USART_IsActiveFlag_RXNE(USART1)) { rx_char = LL_USART_ReceiveData8(USART1); } } -char pika_getchar(){ +/* support pikaScript Shell */ +char __platform_getchar(){ char res = 0; while(rx_char != 0){ res = rx_char; @@ -93,38 +86,8 @@ int main(void){ printf("| [ https://github.com/pikastech/pikascript ] |\r\n"); printf("| [ https://gitee.com/lyon1998/pikascript ] |\r\n"); printf("| |\r\n"); - printf("------------------------------------------------------------------\r\n"); - pikaMain = pikaScriptInit(); - printf(">>> "); - while (1){ - char inputChar = pika_getchar(); - printf("%c", inputChar); - if ((inputChar == '\b') || (inputChar == 127)){ - uint32_t size = strGetSize(rxBuff); - if(size == 0){ - printf(" "); - continue; - } - printf(" \b"); - rxBuff[size - 1] = 0; - continue; - } - if (inputChar != '\r' && inputChar != '\n') { - strAppendWithSize(rxBuff, &inputChar, 1); - continue; - } - if ( (inputChar == '\r') || (inputChar == '\n') ) { - printf("\r\n"); - if(strEqu("exit()", rxBuff)){ - /* exit pika shell */ - break; - } - obj_run(pikaMain, rxBuff); - printf(">>> "); - clearBuff(rxBuff, RX_Buff_SIZE); - continue; - } - } + printf("------------------------------------------------------------------\r\n"); + pikaScriptShell(pikaScriptInit()); /* after exit() from pika shell */ NVIC_SystemReset(); }