Uart receiving data via dma and selecting speed and UART for logging output

applications/main/gpio/usb_uart_bridge.c

@@ -24,17 +24,18 @@ typedef enum {
 
     WorkerEvtTxStop = (1 << 2),
     WorkerEvtCdcRx = (1 << 3),
+    WorkerEvtCdcTxComplete = (1 << 4),
 
-    WorkerEvtCfgChange = (1 << 4),
+    WorkerEvtCfgChange = (1 << 5),
 
-    WorkerEvtLineCfgSet = (1 << 5),
-    WorkerEvtCtrlLineSet = (1 << 6),
+    WorkerEvtLineCfgSet = (1 << 6),
+    WorkerEvtCtrlLineSet = (1 << 7),
 
 } WorkerEvtFlags;
 
 #define WORKER_ALL_RX_EVENTS                                                      \
     (WorkerEvtStop | WorkerEvtRxDone | WorkerEvtCfgChange | WorkerEvtLineCfgSet | \
-     WorkerEvtCtrlLineSet)
+     WorkerEvtCtrlLineSet | WorkerEvtCdcTxComplete)
 #define WORKER_ALL_TX_EVENTS (WorkerEvtTxStop | WorkerEvtCdcRx)
 
 struct UsbUartBridge {
@@ -75,13 +76,18 @@ static const CdcCallbacks cdc_cb = {
 
 static int32_t usb_uart_tx_thread(void* context);
 
-static void usb_uart_on_irq_cb(UartIrqEvent ev, uint8_t data, void* context) {
+static void usb_uart_on_irq_rx_dma_cb(
+    FuriHalUartDmaEvent ev,
+    FuriHalUartId id_uart,
+    size_t data_len,
+    void* context) {
     UsbUartBridge* usb_uart = (UsbUartBridge*)context;
 
-    if(ev == UartIrqEventRXNE) {
-        furi_stream_buffer_send(usb_uart->rx_stream, &data, 1, 0);
-        furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtRxDone);
-    }
+    UNUSED(ev);
+    uint8_t data[data_len];
+    furi_hal_uart_dma_rx(id_uart, data, data_len);
+    furi_stream_buffer_send(usb_uart->rx_stream, data, data_len, 100);
+    furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtRxDone);
 }
 
 static void usb_uart_vcp_init(UsbUartBridge* usb_uart, uint8_t vcp_ch) {
@@ -112,20 +118,17 @@ static void usb_uart_vcp_deinit(UsbUartBridge* usb_uart, uint8_t vcp_ch) {
 
 static void usb_uart_serial_init(UsbUartBridge* usb_uart, uint8_t uart_ch) {
     if(uart_ch == FuriHalUartIdUSART1) {
-        furi_hal_console_disable();
-    } else if(uart_ch == FuriHalUartIdLPUART1) {
-        furi_hal_uart_init(uart_ch, 115200);
+        furi_hal_console_deinit();
     }
-    furi_hal_uart_set_irq_cb(uart_ch, usb_uart_on_irq_cb, usb_uart);
+    furi_hal_uart_init(uart_ch, 115200);
+    furi_hal_uart_dma_start(uart_ch, usb_uart_on_irq_rx_dma_cb, usb_uart);
 }
 
 static void usb_uart_serial_deinit(UsbUartBridge* usb_uart, uint8_t uart_ch) {
     UNUSED(usb_uart);
-    furi_hal_uart_set_irq_cb(uart_ch, NULL, NULL);
+    furi_hal_uart_deinit(uart_ch);
     if(uart_ch == FuriHalUartIdUSART1)
-        furi_hal_console_enable();
-    else if(uart_ch == FuriHalUartIdLPUART1)
-        furi_hal_uart_deinit(uart_ch);
+        furi_hal_console_init(FuriHalUartIdUSART1, CONSOLE_BAUDRATE);
 }
 
 static void usb_uart_set_baudrate(UsbUartBridge* usb_uart, uint32_t baudrate) {
@@ -186,7 +189,7 @@ static int32_t usb_uart_worker(void* context) {
             furi_thread_flags_wait(WORKER_ALL_RX_EVENTS, FuriFlagWaitAny, FuriWaitForever);
         furi_check(!(events & FuriFlagError));
         if(events & WorkerEvtStop) break;
-        if(events & WorkerEvtRxDone) {
+        if(events & WorkerEvtRxDone || events & WorkerEvtCdcTxComplete) {
             size_t len = furi_stream_buffer_receive(
                 usb_uart->rx_stream, usb_uart->rx_buf, USB_CDC_PKT_LEN, 0);
             if(len > 0) {
@@ -196,8 +199,6 @@ static int32_t usb_uart_worker(void* context) {
                         furi_mutex_acquire(usb_uart->usb_mutex, FuriWaitForever) == FuriStatusOk);
                     furi_hal_cdc_send(usb_uart->cfg.vcp_ch, usb_uart->rx_buf, len);
                     furi_check(furi_mutex_release(usb_uart->usb_mutex) == FuriStatusOk);
-                } else {
-                    furi_stream_buffer_reset(usb_uart->rx_stream);
                 }
             }
         }
@@ -310,6 +311,7 @@ static int32_t usb_uart_tx_thread(void* context) {
 static void vcp_on_cdc_tx_complete(void* context) {
     UsbUartBridge* usb_uart = (UsbUartBridge*)context;
     furi_semaphore_release(usb_uart->tx_sem);
+    furi_thread_flags_set(furi_thread_get_id(usb_uart->thread), WorkerEvtCdcTxComplete);
 }
 
 static void vcp_on_cdc_rx(void* context) {

documentation/FuriHalBus.md

@@ -102,8 +102,8 @@ Below is the list of DMA channels and their usage by the system.
 |  --   | 3         |           |                           |
 |  --   | 4         | yes       | pulse reader              |
 |  --   | 5         |           |                           |
-|  --   | 6         |           |                           |
-|  --   | 7         |           |                           |
+|  --   | 6         | yes       | USART1_Rx                 |
+|  --   | 7         | yes       | LPUART1_Rx                |
 | DMA2  | 1         | yes       | infrared, lfrfid, subghz, |
 |  --   | 2         | yes       | --                        |
 |  --   | 3         | yes       | cc1101_ext                |

firmware/targets/f18/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,39.1,,
+Version,+,40.0,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1025,13 +1025,14 @@ Function,+,furi_hal_clock_mco_disable,void,
 Function,+,furi_hal_clock_mco_enable,void,"FuriHalClockMcoSourceId, FuriHalClockMcoDivisorId"
 Function,-,furi_hal_clock_resume_tick,void,
 Function,-,furi_hal_clock_suspend_tick,void,
+Function,+,furi_hal_console_deinit,void,
 Function,-,furi_hal_clock_switch_hse2hsi,void,
 Function,-,furi_hal_clock_switch_hse2pll,_Bool,
 Function,-,furi_hal_clock_switch_hsi2hse,void,
 Function,-,furi_hal_clock_switch_pll2hse,_Bool,
 Function,+,furi_hal_console_disable,void,
 Function,+,furi_hal_console_enable,void,
-Function,+,furi_hal_console_init,void,
+Function,+,furi_hal_console_init,void,"FuriHalUartId, uint32_t"
 Function,+,furi_hal_console_printf,void,"const char[], ..."
 Function,+,furi_hal_console_puts,void,const char*
 Function,+,furi_hal_console_set_tx_callback,void,"FuriHalConsoleTxCallback, void*"
@@ -1265,12 +1266,16 @@ Function,-,furi_hal_spi_dma_init,void,
 Function,+,furi_hal_spi_release,void,FuriHalSpiBusHandle*
 Function,+,furi_hal_switch,void,void*
 Function,+,furi_hal_uart_deinit,void,FuriHalUartId
+Function,+,furi_hal_uart_dma_bytes_available,size_t,FuriHalUartId
 Function,+,furi_hal_uart_init,void,"FuriHalUartId, uint32_t"
 Function,+,furi_hal_uart_resume,void,FuriHalUartId
+Function,+,furi_hal_uart_dma_rx,size_t,"FuriHalUartId, uint8_t*, size_t"
 Function,+,furi_hal_uart_set_br,void,"FuriHalUartId, uint32_t"
-Function,+,furi_hal_uart_set_irq_cb,void,"FuriHalUartId, void (*)(UartIrqEvent, uint8_t, void*), void*"
+Function,+,furi_hal_uart_dma_start,void,"FuriHalUartId, FuriHalUartDmaRxCallback, void*"
+Function,+,furi_hal_uart_set_irq_cb,void,"FuriHalUartId, FuriHalUartRxByteCallback, void*"
 Function,+,furi_hal_uart_suspend,void,FuriHalUartId
 Function,+,furi_hal_uart_tx,void,"FuriHalUartId, uint8_t*, size_t"
+Function,+,furi_hal_uart_wait_tx_complete,void,FuriHalUartId
 Function,+,furi_hal_usb_disable,void,
 Function,+,furi_hal_usb_enable,void,
 Function,+,furi_hal_usb_get_config,FuriHalUsbInterface*,

firmware/targets/f18/furi_hal/furi_hal.c

@@ -33,7 +33,7 @@ void furi_hal_init() {
     furi_hal_mpu_init();
     furi_hal_clock_init();
     furi_hal_random_init();
-    furi_hal_console_init();
+    furi_hal_console_init(FuriHalUartIdUSART1, CONSOLE_BAUDRATE);
     furi_hal_rtc_init();
     furi_hal_interrupt_init();
     furi_hal_flash_init();

firmware/targets/f7/api_symbols.csv

@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,39.1,,
+Version,+,40.0,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -1096,13 +1096,14 @@ Function,+,furi_hal_clock_mco_disable,void,
 Function,+,furi_hal_clock_mco_enable,void,"FuriHalClockMcoSourceId, FuriHalClockMcoDivisorId"
 Function,-,furi_hal_clock_resume_tick,void,
 Function,-,furi_hal_clock_suspend_tick,void,
+Function,+,furi_hal_console_deinit,void,
 Function,-,furi_hal_clock_switch_hse2hsi,void,
 Function,-,furi_hal_clock_switch_hse2pll,_Bool,
 Function,-,furi_hal_clock_switch_hsi2hse,void,
 Function,-,furi_hal_clock_switch_pll2hse,_Bool,
 Function,+,furi_hal_console_disable,void,
 Function,+,furi_hal_console_enable,void,
-Function,+,furi_hal_console_init,void,
+Function,+,furi_hal_console_init,void,"FuriHalUartId, uint32_t"
 Function,+,furi_hal_console_printf,void,"const char[], ..."
 Function,+,furi_hal_console_puts,void,const char*
 Function,+,furi_hal_console_set_tx_callback,void,"FuriHalConsoleTxCallback, void*"
@@ -1436,12 +1437,16 @@ Function,+,furi_hal_subghz_tx,_Bool,
 Function,+,furi_hal_subghz_write_packet,void,"const uint8_t*, uint8_t"
 Function,+,furi_hal_switch,void,void*
 Function,+,furi_hal_uart_deinit,void,FuriHalUartId
+Function,+,furi_hal_uart_dma_bytes_available,size_t,FuriHalUartId
 Function,+,furi_hal_uart_init,void,"FuriHalUartId, uint32_t"
 Function,+,furi_hal_uart_resume,void,FuriHalUartId
+Function,+,furi_hal_uart_dma_rx,size_t,"FuriHalUartId, uint8_t*, size_t"
 Function,+,furi_hal_uart_set_br,void,"FuriHalUartId, uint32_t"
-Function,+,furi_hal_uart_set_irq_cb,void,"FuriHalUartId, void (*)(UartIrqEvent, uint8_t, void*), void*"
+Function,+,furi_hal_uart_dma_start,void,"FuriHalUartId, FuriHalUartDmaRxCallback, void*"
+Function,+,furi_hal_uart_set_irq_cb,void,"FuriHalUartId, FuriHalUartRxByteCallback, void*"
 Function,+,furi_hal_uart_suspend,void,FuriHalUartId
 Function,+,furi_hal_uart_tx,void,"FuriHalUartId, uint8_t*, size_t"
+Function,+,furi_hal_uart_wait_tx_complete,void,FuriHalUartId
 Function,+,furi_hal_usb_disable,void,
 Function,+,furi_hal_usb_enable,void,
 Function,+,furi_hal_usb_get_config,FuriHalUsbInterface*,

firmware/targets/f7/furi_hal/furi_hal.c

@@ -33,7 +33,7 @@ void furi_hal_init() {
     furi_hal_mpu_init();
     furi_hal_clock_init();
     furi_hal_random_init();
-    furi_hal_console_init();
+    furi_hal_console_init(FuriHalUartIdUSART1, CONSOLE_BAUDRATE);
     furi_hal_rtc_init();
     furi_hal_interrupt_init();
     furi_hal_flash_init();

firmware/targets/f7/furi_hal/furi_hal_console.c

@@ -9,40 +9,55 @@
 
 #define TAG "FuriHalConsole"
 
-#ifdef HEAP_PRINT_DEBUG
-#define CONSOLE_BAUDRATE 1843200
-#else
-#define CONSOLE_BAUDRATE 230400
-#endif
-
 typedef struct {
     bool alive;
+    bool initialized;
+    FuriHalUartId channel;
+    uint32_t baudrate;
     FuriHalConsoleTxCallback tx_callback;
     void* tx_callback_context;
 } FuriHalConsole;
 
 FuriHalConsole furi_hal_console = {
+    .initialized = false,
     .alive = false,
+    .channel = FuriHalUartIdUSART1,
     .tx_callback = NULL,
+    .baudrate = CONSOLE_BAUDRATE,
     .tx_callback_context = NULL,
 };
 
-void furi_hal_console_init() {
-    furi_hal_uart_init(FuriHalUartIdUSART1, CONSOLE_BAUDRATE);
+void furi_hal_console_init(FuriHalUartId channel, uint32_t baudrate) {
+    furi_check(!furi_hal_console.initialized);
+
+    furi_hal_console.channel = channel;
+    furi_hal_console.baudrate = baudrate;
+    furi_hal_uart_init(channel, baudrate);
     furi_hal_console.alive = true;
+    furi_hal_console.initialized = true;
+}
+
+void furi_hal_console_deinit() {
+    furi_check(furi_hal_console.initialized);
+    furi_hal_uart_deinit(furi_hal_console.channel);
+    furi_hal_console.channel = FuriHalUartIdUSART1;
+    furi_hal_console.baudrate = CONSOLE_BAUDRATE;
+    furi_hal_console.alive = false;
+    furi_hal_console.initialized = false;
 }
 
 void furi_hal_console_enable() {
-    furi_hal_uart_set_irq_cb(FuriHalUartIdUSART1, NULL, NULL);
-    while(!LL_USART_IsActiveFlag_TC(USART1))
-        ;
-    furi_hal_uart_set_br(FuriHalUartIdUSART1, CONSOLE_BAUDRATE);
+    furi_check(furi_hal_console.initialized);
+    furi_hal_uart_set_irq_cb(furi_hal_console.channel, NULL, NULL);
+    furi_hal_uart_wait_tx_complete(furi_hal_console.channel);
+
+    furi_hal_uart_set_br(furi_hal_console.channel, furi_hal_console.baudrate);
     furi_hal_console.alive = true;
 }
 
 void furi_hal_console_disable() {
-    while(!LL_USART_IsActiveFlag_TC(USART1))
-        ;
+    furi_check(furi_hal_console.initialized);
+    furi_hal_uart_wait_tx_complete(furi_hal_console.channel);
     furi_hal_console.alive = false;
 }
 
@@ -63,10 +78,9 @@ void furi_hal_console_tx(const uint8_t* buffer, size_t buffer_size) {
         furi_hal_console.tx_callback(buffer, buffer_size, furi_hal_console.tx_callback_context);
     }
 
-    furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)buffer, buffer_size);
+    furi_hal_uart_tx(furi_hal_console.channel, (uint8_t*)buffer, buffer_size);
     // Wait for TC flag to be raised for last char
-    while(!LL_USART_IsActiveFlag_TC(USART1))
-        ;
+    furi_hal_uart_wait_tx_complete(furi_hal_console.channel);
     FURI_CRITICAL_EXIT();
 }
 
@@ -79,8 +93,7 @@ void furi_hal_console_tx_with_new_line(const uint8_t* buffer, size_t buffer_size
     // Transmit new line symbols
     furi_hal_uart_tx(FuriHalUartIdUSART1, (uint8_t*)"\r\n", 2);
     // Wait for TC flag to be raised for last char
-    while(!LL_USART_IsActiveFlag_TC(USART1))
-        ;
+    furi_hal_uart_wait_tx_complete(furi_hal_console.channel);
     FURI_CRITICAL_EXIT();
 }
 

firmware/targets/f7/furi_hal/furi_hal_console.h

@@ -4,13 +4,23 @@
 #include <stdint.h>
 #include <stdio.h>
 
+#include <furi_hal_uart.h>
+
+#ifdef HEAP_PRINT_DEBUG
+#define CONSOLE_BAUDRATE 1843200
+#else
+#define CONSOLE_BAUDRATE 230400
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef void (*FuriHalConsoleTxCallback)(const uint8_t* buffer, size_t size, void* context);
 
-void furi_hal_console_init();
+void furi_hal_console_init(FuriHalUartId channel, uint32_t baudrate);
+
+void furi_hal_console_deinit();
 
 void furi_hal_console_enable();
 

firmware/targets/f7/furi_hal/furi_hal_interrupt.c

@@ -58,6 +58,12 @@ const IRQn_Type furi_hal_interrupt_irqn[FuriHalInterruptIdMax] = {
     // LPTIMx
     [FuriHalInterruptIdLpTim1] = LPTIM1_IRQn,
     [FuriHalInterruptIdLpTim2] = LPTIM2_IRQn,
+
+    // UARTx
+    [FuriHalInterruptIdUart1] = USART1_IRQn,
+
+    // LPUARTx
+    [FuriHalInterruptIdLpUart1] = LPUART1_IRQn,
 };
 
 __attribute__((always_inline)) static inline void
@@ -328,3 +334,11 @@ void LPTIM1_IRQHandler() {
 void LPTIM2_IRQHandler() {
     furi_hal_interrupt_call(FuriHalInterruptIdLpTim2);
 }
+
+void USART1_IRQHandler(void) {
+    furi_hal_interrupt_call(FuriHalInterruptIdUart1);
+}
+
+void LPUART1_IRQHandler(void) {
+    furi_hal_interrupt_call(FuriHalInterruptIdLpUart1);
+}

firmware/targets/f7/furi_hal/furi_hal_interrupt.h

@@ -49,6 +49,12 @@ typedef enum {
     FuriHalInterruptIdLpTim1,
     FuriHalInterruptIdLpTim2,
 
+    //UARTx
+    FuriHalInterruptIdUart1,
+
+    //LPUARTx
+    FuriHalInterruptIdLpUart1,
+
     // Service value
     FuriHalInterruptIdMax,
 } FuriHalInterruptId;