Skip to content

Commit

Permalink
usb: switch to adafrut's usb stack due to some odd conflict with wifi…
Browse files Browse the repository at this point in the history
… irq/task
  • Loading branch information
erichelgeson committed Nov 17, 2024
1 parent ff78647 commit b0432fe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 4 additions & 4 deletions lib/BlueSCSI_platform_RP2040/BlueSCSI_platform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#endif

#ifndef __MBED__
# include <SerialUSB.h>
#include <Adafruit_TinyUSB.h>
# include <class/cdc/cdc_device.h>
#else
# include <platform/mbed_error.h>
Expand Down Expand Up @@ -126,6 +126,9 @@ void platform_init()
{
// Make sure second core is stopped
multicore_reset_core1();
#ifndef __MBED__
Serial.begin(115200);
#endif // __MBED__

// Default debug logging to disabled
g_log_debug = false;
Expand Down Expand Up @@ -290,9 +293,6 @@ void platform_late_init()
gpio_conf(scsi_pins.IN_RST, GPIO_FUNC_SIO, true, false, false, true, false);


#ifndef __MBED__
Serial.begin();
#endif // __MBED__

#ifdef ENABLE_AUDIO_OUTPUT
// one-time control setup for DMA channels and second core
Expand Down
2 changes: 2 additions & 0 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ build_flags =
-DPICO_DEFAULT_I2C_SDA_PIN=16
-DPICO_DEFAULT_I2C_SCL_PIN=17
-DBLUESCSI_NETWORK=1
; Arduino's default USB task/irq is conflicting with WiFi somehow
-DUSE_TINYUSB
; build flags mirroring the framework-arduinopico#v4.1.1-DaynaPORT static library build
-DPICO_CYW43_ARCH_POLL=1
-DCYW43_LWIP=0
Expand Down

0 comments on commit b0432fe

Please sign in to comment.