From 58630a844ad1db7d30671a3cb18f433e015a40a3 Mon Sep 17 00:00:00 2001 From: Hierophect Date: Mon, 22 Jul 2019 12:58:28 -0400 Subject: Add feature conditionals and clean up --- shared-module/board/__init__.c | 16 +++++++++------- shared-module/usb_hid/Device.c | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'shared-module') diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c index b29e9df61..5a1dead78 100644 --- a/shared-module/board/__init__.c +++ b/shared-module/board/__init__.c @@ -24,18 +24,20 @@ * THE SOFTWARE. */ -// #include "shared-bindings/busio/I2C.h" -// #include "shared-bindings/busio/SPI.h" -// #include "shared-bindings/busio/UART.h" - #include "shared-bindings/microcontroller/Pin.h" #include "supervisor/shared/translate.h" #include "mpconfigboard.h" #include "py/runtime.h" -// #ifdef CIRCUITPY_DISPLAYIO -// #include "shared-module/displayio/__init__.h" -// #endif +#if CIRCUITPY_BUSIO +#include "shared-bindings/busio/I2C.h" +#include "shared-bindings/busio/SPI.h" +#include "shared-bindings/busio/UART.h" +#endif + +#if CIRCUITPY_DISPLAYIO +#include "shared-module/displayio/__init__.h" +#endif #if BOARD_I2C mp_obj_t common_hal_board_get_i2c(void) { diff --git a/shared-module/usb_hid/Device.c b/shared-module/usb_hid/Device.c index a2a4c30ac..0e256cb5e 100644 --- a/shared-module/usb_hid/Device.c +++ b/shared-module/usb_hid/Device.c @@ -47,7 +47,6 @@ void common_hal_usb_hid_device_send_report(usb_hid_device_obj_t *self, uint8_t* // Wait until interface is ready, timeout = 2 seconds uint64_t end_ticks = ticks_ms + 2000; - while ( (ticks_ms < end_ticks) && !tud_hid_generic_ready() ) { } if ( !tud_hid_generic_ready() ) { -- cgit v1.2.3