pbio/debug: Replace usage with common module.

laurensvalk · laurensvalk · commit 0772d8713463 · 2025-12-29T12:27:19.000+01:00
No need to hook directly into the uart driver anymore.
diff --git a/lib/pbio/drv/bluetooth/bluetooth_btstack.c b/lib/pbio/drv/bluetooth/bluetooth_btstack.c
@@ -46,8 +46,8 @@
 #define DEBUG 0
 
 #if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
 #else
 #define DEBUG_PRINT(...)
 #endif
diff --git a/lib/pbio/drv/bluetooth/bluetooth_btstack_ev3.c b/lib/pbio/drv/bluetooth/bluetooth_btstack_ev3.c
@@ -46,16 +46,16 @@
 #define DEBUG 0
 
 #if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
 static void pbdrv_hci_dump_reset(void) {
 }
 static void pbdrv_hci_dump_log_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t len) {
-    pbdrv_uart_debug_printf("HCI %s packet type: %02x, len: %u\n", in ? "in" : "out", packet_type, len);
+    pbio_debug("HCI %s packet type: %02x, len: %u\n", in ? "in" : "out", packet_type, len);
 }
 static void pbdrv_hci_dump_log_message(int log_level, const char *format, va_list argptr) {
-    pbdrv_uart_debug_vprintf(format, argptr);
-    pbdrv_uart_debug_printf("\n");
+    pbio_debug_va(format, argptr);
+    pbio_debug("\n");
 }
 static const hci_dump_t bluetooth_btstack_classic_hci_dump = {
     .reset = pbdrv_hci_dump_reset,
diff --git a/lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c b/lib/pbio/drv/bluetooth/bluetooth_stm32_bluenrg.c
@@ -38,8 +38,8 @@
 #define DEBUG 0
 
 #if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
 #else
 #define DEBUG_PRINT(...)
 #endif
diff --git a/lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c b/lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c
@@ -46,11 +46,9 @@
 #define DEBUG 0
 
 #if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-// You can selectively enable these as relevant for the debug session.
-// Remember to set PBDRV_CONFIG_UART_DEBUG_FIRST_PORT in pbdrvconfig.
+#include <pbio/debug.h>
 #define DBG(...)
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#define DEBUG_PRINT pbio_debug
 #else
 #define DBG(...)
 #define DEBUG_PRINT(...)
diff --git a/lib/pbio/drv/counter/counter_ev3.c b/lib/pbio/drv/counter/counter_ev3.c
@@ -33,8 +33,8 @@
 #if DEBUG
 #include <stdio.h>
 #include <inttypes.h>
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
 #else
 #define DEBUG_PRINT(...)
 #endif
diff --git a/lib/pbio/drv/i2c/i2c_ev3.c b/lib/pbio/drv/i2c/i2c_ev3.c
@@ -31,8 +31,8 @@
 #if DEBUG
 #include <stdio.h>
 #include <inttypes.h>
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define debug_pr pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define debug_pr pbio_debug
 #define DBG_ERR(expr) expr
 #else
 #define debug_pr(...)
diff --git a/lib/pbio/drv/motor_driver/motor_driver_ev3.c b/lib/pbio/drv/motor_driver/motor_driver_ev3.c
@@ -33,8 +33,8 @@
 #if DEBUG
 #include <stdio.h>
 #include <inttypes.h>
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define debug_pr pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define debug_pr pbio_debug
 #define DBG_ERR(expr) expr
 #else
 #define debug_pr(...)
diff --git a/lib/pbio/drv/uart/uart_debug_first_port.h b/lib/pbio/drv/uart/uart_debug_first_port.h
@@ -37,7 +37,4 @@ static inline int pbdrv_uart_debug_next_char(void) {
 
 #endif // PBDRV_CONFIG_UART_DEBUG_FIRST_PORT
 
-// Convenient shorthand for pbdrv_uart_debug_printf.
-#define pbdrv_dbg(...) pbdrv_uart_debug_printf(__VA_ARGS__)
-
 #endif // _INTERNAL_PBDRV_UART_DEBUG_FIRST_PORT_H_
diff --git a/lib/pbio/drv/usb/usb_stm32.c b/lib/pbio/drv/usb/usb_stm32.c
@@ -31,15 +31,6 @@
 #include "./usb.h"
 #include "./usb_stm32.h"
 
-#define DEBUG 0
-
-#if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-// Remember to set PBDRV_CONFIG_UART_DEBUG_FIRST_PORT in pbdrvconfig.
-#define DEBUG_PRINT pbdrv_uart_debug_printf
-#else
-#define DEBUG_PRINT(...)
-#endif
 
 #if USBD_PYBRICKS_MAX_PACKET_SIZE != PBDRV_CONFIG_USB_MAX_PACKET_SIZE
 #error Inconsistent USB packet size
diff --git a/lib/pbio/src/port.c b/lib/pbio/src/port.c
@@ -25,8 +25,8 @@
 #if DEBUG
 #include <stdio.h>
 #include <inttypes.h>
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define debug_pr pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define debug_pr pbio_debug
 #define DBG_ERR(expr) expr
 #else
 #define debug_pr(...)
diff --git a/lib/pbio/src/port_dcm_pup.c b/lib/pbio/src/port_dcm_pup.c
@@ -16,8 +16,8 @@
 #if DEBUG
 #include <stdio.h>
 #include <inttypes.h>
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define debug_pr pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define debug_pr pbio_debug
 #define DBG_ERR(expr) expr
 #else
 #define debug_pr(...)
diff --git a/lib/pbio/src/port_lump.c b/lib/pbio/src/port_lump.c
@@ -21,8 +21,8 @@
 #if DEBUG
 #include <stdio.h>
 #include <inttypes.h>
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define debug_pr pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define debug_pr pbio_debug
 #define DBG_ERR(expr) expr
 #else
 #define debug_pr(...)
diff --git a/lib/pbio/sys/battery_temp.c b/lib/pbio/sys/battery_temp.c
@@ -8,6 +8,15 @@
 // LEGO MINDSTORMS EV3 battery temperature estimation from lms2012
 #if PBSYS_CONFIG_BATTERY_TEMP_ESTIMATION
 
+#define DEBUG 0
+
+#if DEBUG
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
+#else
+#define DEBUG_PRINT(...)
+#endif
+
 /**
  * Function for estimating new battery temperature based on measurements
  * of battery voltage and battery current.
@@ -132,9 +141,9 @@ float pbsys_battery_temp_update(float V_bat, float I_bat) {
     // Save R_bat_model for use in the next function call
     bat_temp.R_bat_model_old = R_bat_model;
 
-    //  pbdrv_uart_debug_printf("%c %f %f %f %f %f %f\r\n", bat_temp.has_passed_7v5_flag ? 'Y' : 'N',
-    //      (double)R_1A, (double)R_2A, (double)slope_A, (double)intercept_b,
-    //      (double)(R_bat_model - bat_temp.R_bat_model_old), (double)bat_temp.R_bat);
+    DEBUG_PRINT("%c %f %f %f %f %f %f\r\n", bat_temp.has_passed_7v5_flag ? 'Y' : 'N',
+        (double)R_1A, (double)R_2A, (double)slope_A, (double)intercept_b,
+        (double)(R_bat_model - bat_temp.R_bat_model_old), (double)bat_temp.R_bat);
 
     /**** Calculate the 4 types of temperature change for the batteries ****/
 
@@ -182,11 +191,11 @@ float pbsys_battery_temp_update(float V_bat, float I_bat) {
 
     /*****************************************************************************/
 
-    //  pbdrv_uart_debug_printf("%f %f %f %f %f <> %f %f %f %f %f\r\n",
-    //      (double)dT_bat_own, (double)dT_bat_loss_to_elec,
-    //      (double)dT_bat_gain_from_elec, (double)dT_bat_loss_to_room, (double)bat_temp.T_bat,
-    //      (double)dT_elec_own, (double)dT_elec_loss_to_bat, (double)dT_elec_gain_from_bat,
-    //      (double)dT_elec_loss_to_room, (double)bat_temp.T_elec);
+    DEBUG_PRINT("%f %f %f %f %f <> %f %f %f %f %f\r\n",
+        (double)dT_bat_own, (double)dT_bat_loss_to_elec,
+        (double)dT_bat_gain_from_elec, (double)dT_bat_loss_to_room, (double)bat_temp.T_bat,
+        (double)dT_elec_own, (double)dT_elec_loss_to_bat, (double)dT_elec_gain_from_bat,
+        (double)dT_elec_loss_to_room, (double)bat_temp.T_elec);
 
     // Refresh battery temperature
     bat_temp.T_bat += dT_bat_own + dT_bat_loss_to_elec + dT_bat_gain_from_elec + dT_bat_loss_to_room;
diff --git a/lib/pbio/sys/hmi_lcd.c b/lib/pbio/sys/hmi_lcd.c
@@ -32,8 +32,8 @@
 #define DEBUG 0
 
 #if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
 #else
 #define DEBUG_PRINT(...)
 #endif
diff --git a/lib/pbio/sys/hmi_pup.c b/lib/pbio/sys/hmi_pup.c
@@ -31,8 +31,8 @@
 #define DEBUG 0
 
 #if DEBUG
-#include <pbdrv/../../drv/uart/uart_debug_first_port.h>
-#define DEBUG_PRINT pbdrv_uart_debug_printf
+#include <pbio/debug.h>
+#define DEBUG_PRINT pbio_debug
 #else
 #define DEBUG_PRINT(...)
 #endif
