Fix debug prints

- The reset pin must move otherwise uart0 tx is squashed
- Don't preempt printf, it doesn't like it
- Set up the UART by default

include/board_debugprobe_config.h

@@ -50,4 +50,6 @@
 #define PICOPROBE_UART_RX_LED 7
 #define PICOPROBE_UART_TX_LED 8
 
+#define PROBE_PRODUCT_STRING "Debug Probe (CMSIS-DAP)"
+
 #endif

include/board_example_config.h

@@ -77,4 +77,6 @@
 #define PICOPROBE_UART_RX_LED 7
 #define PICOPROBE_UART_TX_LED 8
 
+#define PROBE_PRODUCT_STRING "Example Debug Probe"
+
 #endif

include/board_pico_config.h

@@ -35,7 +35,7 @@
 #define PROBE_PIN_SWCLK (PROBE_PIN_OFFSET + 0) // 2
 #define PROBE_PIN_SWDIO (PROBE_PIN_OFFSET + 1) // 3
 // Target reset config
-#define PROBE_PIN_RESET 0
+#define PROBE_PIN_RESET 1
 
 // UART config
 #define PICOPROBE_UART_TX 4
@@ -45,4 +45,6 @@
 
 #define PICOPROBE_USB_CONNECTED_LED 25
 
+#define PROBE_PRODUCT_STRING "Picoprobe (CMSIS-DAP)"
+
 #endif

src/cdc_uart.c

@@ -139,7 +139,7 @@ void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* line_coding)
   vTaskSuspend(uart_taskhandle);
   interval = MAX(1, micros / ((1000 * 1000) / configTICK_RATE_HZ));
   debounce_ticks = MAX(1, configTICK_RATE_HZ / (interval * DEBOUNCE_MS));
-  picoprobe_info("New baud rate %d micros %d interval %u\n",
+  picoprobe_info("New baud rate %ld micros %ld interval %lu\n",
                   line_coding->bit_rate, micros, interval);
   uart_deinit(PICOPROBE_UART_INTERFACE);
   tud_cdc_write_clear();

src/main.c

@@ -99,6 +99,7 @@ int main(void) {
     tusb_init();
 
     DAP_Setup();
+    stdio_uart_init();
 
     led_init();
 

src/picoprobe_config.h

@@ -26,29 +26,47 @@
 #ifndef PICOPROBE_H_
 #define PICOPROBE_H_
 
+#include "FreeRTOS.h"
+#include "task.h"
+
 #if false
-#define picoprobe_info(format,args...) printf(format, ## args)
+#define picoprobe_info(format,args...) \
+do { \
+	vTaskSuspendAll(); \
+	printf(format, ## args); \
+	xTaskResumeAll(); \
+} while (0)
 #else
 #define picoprobe_info(format,...) ((void)0)
 #endif
 
 
 #if false
-#define picoprobe_debug(format,args...) printf(format, ## args)
+#define picoprobe_debug(format,args...) \
+do { \
+	vTaskSuspendAll(); \
+	printf(format, ## args); \
+	xTaskResumeAll(); \
+} while (0)
 #else
 #define picoprobe_debug(format,...) ((void)0)
 #endif
 
 #if false
-#define picoprobe_dump(format,args...) printf(format, ## args)
+#define picoprobe_dump(format,args...)\
+do { \
+	vTaskSuspendAll(); \
+	printf(format, ## args); \
+	xTaskResumeAll(); \
+} while (0)
 #else
 #define picoprobe_dump(format,...) ((void)0)
 #endif
 
 // TODO tie this up with PICO_BOARD defines in the main SDK
 
-//#include "board_pico_config.h"
+#include "board_pico_config.h"
-#include "board_debugprobe_config.h"
+//#include "board_debugprobe_config.h"
 //#include "board_example_config.h"
 
 

src/usb_descriptors.c

@@ -133,7 +133,7 @@ char const* string_desc_arr [] =
 {
   (const char[]) { 0x09, 0x04 }, // 0: is supported language is English (0x0409)
   "Raspberry Pi", // 1: Manufacturer
-  "Debug Probe (CMSIS-DAP)", // 2: Product
+  PROBE_PRODUCT_STRING, // 2: Product
   usb_serial,     // 3: Serial, uses flash unique ID
   "CMSIS-DAP v1 Interface", // 4: Interface descriptor for HID transport
   "CMSIS-DAP v2 Interface", // 5: Interface descriptor for Bulk transport