Skip to content

Commit e39183c

Browse files
authored
Merge pull request #390 from adafruit/fix-384
Fix undefined reference to `log_printf' when enable debug with native usb host
2 parents 9851a7d + 7be2c9a commit e39183c

File tree

34 files changed

+13
-9
lines changed

34 files changed

+13
-9
lines changed

.github/workflows/githubci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
- 'nrf52840'
5555
# RP2040
5656
- 'feather_rp2040_tinyusb'
57+
- 'pico_rp2040_tinyusb_host'
5758
# SAMD
5859
- 'metro_m0_tinyusb'
5960
- 'metro_m4_tinyusb'

examples/CDC/no_serial/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/Composite/mouse_external_flash/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/Composite/mouse_ramdisk/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/CDC/serial_host_bridge/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/HID/hid_device_report/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/HID/hid_mouse_log_filter/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/HID/hid_mouse_tremor_filter/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/HID/hid_remapper/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/MassStorage/msc_data_logger/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/MassStorage/msc_file_explorer/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/DualRole/Simple/device_info_max3421e/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_boot_keyboard/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_boot_mouse/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_composite/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_composite_joy_featherwing/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_dual_interfaces/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_gamepad/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/HID/hid_generic_inout/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/Host/Simple/host_device_info/.pico_rp2040_tinyusb_host.test.only

Whitespace-only changes.

examples/MIDI/midi_multi_ports/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MIDI/midi_test/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MassStorage/msc_external_flash/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MassStorage/msc_external_flash_sdcard/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MassStorage/msc_ramdisk/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MassStorage/msc_ramdisk_dual/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MassStorage/msc_sd/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/MassStorage/msc_sdfat/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/Vendor/i2c_tiny_usb_adapter/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/Video/video_capture/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/WebUSB/webusb_rgb/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

examples/WebUSB/webusb_serial/.pico_rp2040_tinyusb_host.test.skip

Whitespace-only changes.

src/arduino/Adafruit_TinyUSB_API.cpp

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,17 @@
2424

2525
#include "tusb_option.h"
2626

27-
#if CFG_TUD_ENABLED
27+
#if CFG_TUD_ENABLED || CFG_TUH_ENABLED
2828

2929
#include "Adafruit_TinyUSB.h"
3030
#include "Arduino.h"
3131

32-
//--------------------------------------------------------------------+
33-
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
34-
//--------------------------------------------------------------------+
3532
extern "C" {
3633

34+
//--------------------------------------------------------------------+
35+
// Device
36+
//--------------------------------------------------------------------+
37+
#if CFG_TUD_ENABLED
3738
void TinyUSB_Device_Init(uint8_t rhport) {
3839
// Init USB Device controller and stack
3940
TinyUSBDevice.begin(rhport);
@@ -54,9 +55,12 @@ void TinyUSB_Device_FlushCDC(void) {
5455
tud_cdc_n_write_flush(instance);
5556
}
5657
}
58+
#endif
59+
#endif // CFG_TUD_ENABLED
5760

58-
// Debug log with Serial1
59-
#if CFG_TUSB_DEBUG && defined(CFG_TUSB_DEBUG_PRINTF)
61+
//------------- Debug log with Serial1 -------------//
62+
#if CFG_TUSB_DEBUG && defined(CFG_TUSB_DEBUG_PRINTF) && \
63+
!defined(ARDUINO_ARCH_ESP32)
6064

6165
// #define USE_SEGGER_RTT
6266
#define SERIAL_TUSB_DEBUG Serial1
@@ -90,7 +94,6 @@ __attribute__((used)) int CFG_TUSB_DEBUG_PRINTF(const char *__restrict format,
9094
}
9195
#endif // CFG_TUSB_DEBUG
9296

93-
#endif // ARDUINO_ARCH_ESP32
94-
9597
} // extern C
96-
#endif
98+
99+
#endif // CFG_TUD_ENABLED || CFG_TUH_ENABLED

0 commit comments

Comments
 (0)