console: Extend for bleuart

rymanluk · Aug 5, 2024 · 53d3410 · 53d3410
1 parent 1430ea6
commit 53d3410
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/hw/usb/tinyusb/cdc_console/src/cdc_console.c b/hw/usb/tinyusb/cdc_console/src/cdc_console.c
@@ -28,6 +28,7 @@
 static struct os_event rx_receive_event;
 static struct os_event tx_flush_event;
 static bool connected;
+static console_ble_tx_cb console_compat_ble_tx_cb;
 
 static const struct cdc_callbacks console_cdc_callback;
 
@@ -65,9 +66,18 @@ console_out_nolock(int c)
 
     cdc_schedule_tx_flush();
 
+    if (console_compat_ble_tx_cb) {
+        console_compat_ble_tx_cb(c);
+    }
     return c;
 }
 
+int console_ble_uart_init(console_ble_tx_cb tx_cb)
+{
+    console_compat_ble_tx_cb = tx_cb;
+    return 0;
+}
+
 void
 console_rx_restart(void)
 {

diff --git a/sys/console/full/include/console/console.h b/sys/console/full/include/console/console.h
@@ -42,6 +42,8 @@ struct console_input {
     char line[MYNEWT_VAL(CONSOLE_MAX_INPUT_LEN)];
 };
 
+//typedef int (*console_ble_tx_cb)(const char *, int);
+typedef int (*console_ble_tx_cb)(int c);
 typedef void (*console_rx_cb)(void);
 typedef int (*console_append_char_cb)(char *line, uint8_t byte);
 typedef void (*completion_cb)(char *str, console_append_char_cb cb);
@@ -55,6 +57,7 @@ void console_deinit(void);
  */
 void console_reinit(void);
 int console_init(console_rx_cb rx_cb);
+int console_ble_uart_init(console_ble_tx_cb tx_cb);
 int console_is_init(void);
 void console_write(const char *str, int cnt);
 #if MYNEWT_VAL(CONSOLE_COMPAT)

diff --git a/sys/console/full/src/uart_console.c b/sys/console/full/src/uart_console.c
@@ -36,6 +36,8 @@ struct console_ring {
     uint8_t *buf;
 };
 
+static console_ble_tx_cb console_compat_ble_tx_cb;
+
 static struct uart_dev *uart_dev;
 static struct console_ring cr_tx;
 static uint8_t cr_tx_buf[MYNEWT_VAL(CONSOLE_UART_TX_BUF_SIZE)];
@@ -169,6 +171,9 @@ console_out_nolock(int c)
     write_char_cb(uart_dev, c);
     uart_start_tx(uart_dev);
 
+    if (console_compat_ble_tx_cb) {
+        console_compat_ble_tx_cb(c);
+    }
     return c;
 }
 
@@ -279,6 +284,12 @@ uart_console_deinit(void)
     return 0;
 }
 
+int console_ble_uart_init(console_ble_tx_cb tx_cb)
+{
+    console_compat_ble_tx_cb = tx_cb;
+    return 0;
+}
+
 int
 uart_console_init(void)
 {
@@ -312,4 +323,5 @@ uart_console_init(void)
     }
     return 0;
 }
+
 #endif /* MYNEWT_VAL(CONSOLE_UART) */