!debug city poweroff

Author: laurensvalk

lib/pbio/drv/bluetooth/bluetooth.c

@@ -21,7 +21,7 @@
 
 #include "./bluetooth.h"
 
-#define DEBUG 0
+#define DEBUG 1
 
 #if DEBUG
 #include <pbio/debug.h>

lib/pbio/drv/bluetooth/bluetooth_stm32_cc2640.c

@@ -43,7 +43,7 @@
 #include "./bluetooth.h"
 #include "./bluetooth_stm32_cc2640.h"
 
-#define DEBUG 0
+#define DEBUG 1
 
 #if DEBUG
 #include <pbio/debug.h>

lib/pbio/drv/uart/uart_debug_first_port.c

@@ -89,7 +89,7 @@ static pbio_error_t pbdrv_uart_debug_process_thread(pbio_os_state_t *state, void
         lwrb_init(&ring_buffer, ring_buf_storage, sizeof(ring_buf_storage));
     }
 
-    while (pbdrv_uart_get_instance(0, &debug_uart) != PBIO_SUCCESS) {
+    while (pbdrv_uart_get_instance(1, &debug_uart) != PBIO_SUCCESS) {
         pbio_os_request_poll();
         PBIO_OS_AWAIT_ONCE(state);
     }

lib/pbio/platform/city_hub/pbdrvconfig.h

@@ -71,7 +71,7 @@
 #define PBDRV_CONFIG_RESET_STM32_HAS_BLE_BOOTLOADER (1)
 
 #define PBDRV_CONFIG_UART                           (1)
-#define PBDRV_CONFIG_UART_DEBUG_FIRST_PORT          (0)
+#define PBDRV_CONFIG_UART_DEBUG_FIRST_PORT          (1)
 #define PBDRV_CONFIG_UART_STM32F0                   (1)
 #define PBDRV_CONFIG_UART_STM32F0_NUM_UART          (2)
 

lib/pbio/platform/city_hub/platform.c

@@ -178,11 +178,7 @@ const pbdrv_ioport_platform_data_t pbdrv_ioport_platform_data[PBDRV_CONFIG_IOPOR
             .uart_tx_alt_uart = 1, // USART3
             .uart_rx_alt_uart = 1, // USART3
         },
-        #if PBDRV_CONFIG_UART_DEBUG_FIRST_PORT
-        .supported_modes = PBIO_PORT_MODE_UART,
-        #else // PBDRV_CONFIG_UART_DEBUG_FIRST_PORT
         .supported_modes = PBIO_PORT_MODE_LEGO_DCM | PBIO_PORT_MODE_UART,
-        #endif
     },
     {
         .port_id = PBIO_PORT_ID_B,
@@ -200,7 +196,7 @@ const pbdrv_ioport_platform_data_t pbdrv_ioport_platform_data[PBDRV_CONFIG_IOPOR
             .uart_tx_alt_uart = 0, // USART4
             .uart_rx_alt_uart = 0, // USART4
         },
-        .supported_modes = PBIO_PORT_MODE_LEGO_DCM | PBIO_PORT_MODE_UART,
+        .supported_modes = PBIO_PORT_MODE_UART,
     },
 };
 

lib/pbio/src/port.c

@@ -554,8 +554,8 @@ void pbio_port_power_off(void) {
     // We also want to turn off sensors powered through the motor terminals
     // and stop their processes from triggering any further actions.
     for (uint8_t i = 0; i < PBIO_CONFIG_PORT_NUM_DEV; i++) {
-        pbio_port_t *port = &ports[i];
-        pbio_port_set_mode(port, PBIO_PORT_MODE_NONE);
+        // pbio_port_t *port = &ports[i];
+        // pbio_port_set_mode(port, PBIO_PORT_MODE_NONE);
     }
 
     // This turns off any sensor lights that run on VCC.