Compare commits

...

1 Commits

Author SHA1 Message Date
Jonathan Bell
ccd3fd6871 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
2023-08-11 10:29:01 +01:00
4 changed files with 24 additions and 5 deletions

View File

@@ -35,7 +35,7 @@
#define PROBE_PIN_SWCLK (PROBE_PIN_OFFSET + 0) // 2 #define PROBE_PIN_SWCLK (PROBE_PIN_OFFSET + 0) // 2
#define PROBE_PIN_SWDIO (PROBE_PIN_OFFSET + 1) // 3 #define PROBE_PIN_SWDIO (PROBE_PIN_OFFSET + 1) // 3
// Target reset config // Target reset config
#define PROBE_PIN_RESET 0 #define PROBE_PIN_RESET 1
// UART config // UART config
#define PICOPROBE_UART_TX 4 #define PICOPROBE_UART_TX 4

View File

@@ -139,7 +139,7 @@ void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* line_coding)
vTaskSuspend(uart_taskhandle); vTaskSuspend(uart_taskhandle);
interval = MAX(1, micros / ((1000 * 1000) / configTICK_RATE_HZ)); interval = MAX(1, micros / ((1000 * 1000) / configTICK_RATE_HZ));
debounce_ticks = MAX(1, configTICK_RATE_HZ / (interval * DEBOUNCE_MS)); 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); line_coding->bit_rate, micros, interval);
uart_deinit(PICOPROBE_UART_INTERFACE); uart_deinit(PICOPROBE_UART_INTERFACE);
tud_cdc_write_clear(); tud_cdc_write_clear();

View File

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

View File

@@ -26,21 +26,39 @@
#ifndef PICOPROBE_H_ #ifndef PICOPROBE_H_
#define PICOPROBE_H_ #define PICOPROBE_H_
#include "FreeRTOS.h"
#include "task.h"
#if false #if false
#define picoprobe_info(format,args...) printf(format, ## args) #define picoprobe_info(format,args...) \
do { \
vTaskSuspendAll(); \
printf(format, ## args); \
xTaskResumeAll(); \
} while (0)
#else #else
#define picoprobe_info(format,...) ((void)0) #define picoprobe_info(format,...) ((void)0)
#endif #endif
#if false #if false
#define picoprobe_debug(format,args...) printf(format, ## args) #define picoprobe_debug(format,args...) \
do { \
vTaskSuspendAll(); \
printf(format, ## args); \
xTaskResumeAll(); \
} while (0)
#else #else
#define picoprobe_debug(format,...) ((void)0) #define picoprobe_debug(format,...) ((void)0)
#endif #endif
#if false #if false
#define picoprobe_dump(format,args...) printf(format, ## args) #define picoprobe_dump(format,args...)\
do { \
vTaskSuspendAll(); \
printf(format, ## args); \
xTaskResumeAll(); \
} while (0)
#else #else
#define picoprobe_dump(format,...) ((void)0) #define picoprobe_dump(format,...) ((void)0)
#endif #endif