|
|
@@ -38,8 +38,6 @@ void uart_terminal_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context)
|
|
|
static int32_t uart_worker(void* context) {
|
|
|
UART_TerminalUart* uart = (void*)context;
|
|
|
|
|
|
- uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
|
|
|
-
|
|
|
while(1) {
|
|
|
uint32_t events =
|
|
|
furi_thread_flags_wait(WORKER_ALL_RX_EVENTS, FuriFlagWaitAny, FuriWaitForever);
|
|
|
@@ -64,15 +62,9 @@ void uart_terminal_uart_tx(uint8_t* data, size_t len) {
|
|
|
|
|
|
UART_TerminalUart* uart_terminal_uart_init(UART_TerminalApp* app) {
|
|
|
UART_TerminalUart* uart = malloc(sizeof(UART_TerminalUart));
|
|
|
-
|
|
|
- furi_hal_console_disable();
|
|
|
- if(app->BAUDRATE == 0) {
|
|
|
- app->BAUDRATE = 115200;
|
|
|
- }
|
|
|
- furi_hal_uart_set_br(UART_CH, app->BAUDRATE);
|
|
|
- furi_hal_uart_set_irq_cb(UART_CH, uart_terminal_uart_on_irq_cb, uart);
|
|
|
-
|
|
|
uart->app = app;
|
|
|
+ // Init all rx stream and thread early to avoid crashes
|
|
|
+ uart->rx_stream = furi_stream_buffer_alloc(RX_BUF_SIZE, 1);
|
|
|
uart->rx_thread = furi_thread_alloc();
|
|
|
furi_thread_set_name(uart->rx_thread, "UART_TerminalUartRxThread");
|
|
|
furi_thread_set_stack_size(uart->rx_thread, 1024);
|
|
|
@@ -80,6 +72,14 @@ UART_TerminalUart* uart_terminal_uart_init(UART_TerminalApp* app) {
|
|
|
furi_thread_set_callback(uart->rx_thread, uart_worker);
|
|
|
|
|
|
furi_thread_start(uart->rx_thread);
|
|
|
+
|
|
|
+ furi_hal_console_disable();
|
|
|
+ if(app->BAUDRATE == 0) {
|
|
|
+ app->BAUDRATE = 115200;
|
|
|
+ }
|
|
|
+ furi_hal_uart_set_br(UART_CH, app->BAUDRATE);
|
|
|
+ furi_hal_uart_set_irq_cb(UART_CH, uart_terminal_uart_on_irq_cb, uart);
|
|
|
+
|
|
|
return uart;
|
|
|
}
|
|
|
|
|
|
@@ -94,4 +94,4 @@ void uart_terminal_uart_free(UART_TerminalUart* uart) {
|
|
|
furi_hal_console_enable();
|
|
|
|
|
|
free(uart);
|
|
|
-}
|
|
|
+}
|