Move selection of UART interface and baudrate to picoprobe_config.h (#7)
Co-authored-by: Liam Fraser <liam@raspberrypi.com>
diff --git a/src/cdc_uart.c b/src/cdc_uart.c
index 6c1c009..6a3dfa6 100755
--- a/src/cdc_uart.c
+++ b/src/cdc_uart.c
@@ -7,7 +7,7 @@
void cdc_uart_init(void) {
gpio_set_function(PICOPROBE_UART_TX, GPIO_FUNC_UART);
gpio_set_function(PICOPROBE_UART_RX, GPIO_FUNC_UART);
- uart_init(uart1, 115200);
+ uart_init(PICOPROBE_UART_INTERFACE, PICOPROBE_UART_BAUDRATE);
}
#define MAX_UART_PKT 64
@@ -17,8 +17,8 @@
// Consume uart fifo regardless even if not connected
uint rx_len = 0;
- while(uart_is_readable(uart1) && (rx_len < MAX_UART_PKT)) {
- rx_buf[rx_len++] = uart_getc(uart1);
+ while(uart_is_readable(PICOPROBE_UART_INTERFACE) && (rx_len < MAX_UART_PKT)) {
+ rx_buf[rx_len++] = uart_getc(PICOPROBE_UART_INTERFACE);
}
if (tud_cdc_connected()) {
@@ -33,12 +33,12 @@
if (tud_cdc_available()) {
// Is there any data from the host for us to tx
uint tx_len = tud_cdc_read(tx_buf, sizeof(tx_buf));
- uart_write_blocking(uart1, tx_buf, tx_len);
+ uart_write_blocking(PICOPROBE_UART_INTERFACE, tx_buf, tx_len);
}
}
}
void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* line_coding) {
picoprobe_info("New baud rate %d\n", line_coding->bit_rate);
- uart_init(uart1, line_coding->bit_rate);
-}
\ No newline at end of file
+ uart_init(PICOPROBE_UART_INTERFACE, line_coding->bit_rate);
+}
diff --git a/src/picoprobe_config.h b/src/picoprobe_config.h
index 155745c..54e72fc 100755
--- a/src/picoprobe_config.h
+++ b/src/picoprobe_config.h
@@ -30,6 +30,8 @@
// UART config
#define PICOPROBE_UART_TX 4
#define PICOPROBE_UART_RX 5
+#define PICOPROBE_UART_INTERFACE uart1
+#define PICOPROBE_UART_BAUDRATE 115200
// LED config
#ifndef PICOPROBE_LED
@@ -42,6 +44,4 @@
#define PICOPROBE_LED PICO_DEFAULT_LED_PIN
#endif
-#endif
-
#endif
\ No newline at end of file