Fix for USB host (#1404)

arntsonl · web-flow · commit 28377cf7aea8 · 2025-06-22T15:52:04.000-04:00
Fixes the USB host not working by reverting the tinyusb and pico-pio-usb libraries to jfedor's branch. There are several issues that make these libraries not work in SDK 2.1.1, but jfedor's dev branch on pico-pio-usb fixes the issues we were having.

I2C breaks on web config in this build, but I will be investigating i2c hal implementation which reverts some of the i2c functionality. If that works, we can add that as a patch as well.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "lib/pico_pio_usb"]
-	path = lib/pico_pio_usb
-	url = https://github.com/sekigon-gonnoc/Pico-PIO-USB
 [submodule "lib/tinyusb"]
 	path = lib/tinyusb
-	url = https://github.com/hathach/tinyusb/
+	url = https://github.com/jfedor2/tinyusb.git
+[submodule "lib/pico_pio_usb"]
+	path = lib/pico_pio_usb
+	url = https://github.com/jfedor2/Pico-PIO-USB.git
diff --git a/headers/tusb_config.h b/headers/tusb_config.h
@@ -153,7 +153,7 @@
 // max device support (excluding hub device)
 #define CFG_TUH_DEVICE_MAX          (CFG_TUH_HUB ? 4 : 1) // hub typically has 4 ports
 
-#define CFG_TUH_HID                  4
+#define CFG_TUH_HID 4
 #define CFG_TUH_HID_EPIN_BUFSIZE    64
 #define CFG_TUH_HID_EPOUT_BUFSIZE   64
 
diff --git a/lib/NeoPico/src/NeoPico.cpp b/lib/NeoPico/src/NeoPico.cpp
@@ -34,11 +34,11 @@ void NeoPico::PutPixel(uint32_t pixelData) {
   }
 }
 
-void NeoPico::Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio){
+void NeoPico::Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio, int inState){
   format = inFormat;
   pio = inPio;
   numPixels = inNumPixels;
-  stateMachine = 0;
+  stateMachine = inState;
   uint offset = pio_add_program(pio, &ws2812_program);
   bool rgbw = (format == LED_FORMAT_GRBW) || (format == LED_FORMAT_RGBW);
   ws2812_program_init(pio, stateMachine, offset, ledPin, 800000, rgbw);
diff --git a/lib/NeoPico/src/NeoPico.h b/lib/NeoPico/src/NeoPico.h
@@ -16,7 +16,7 @@ class NeoPico
 {
 public:
   NeoPico();
-  void Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio);
+  void Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio, int inState);
   void Show();
   void Clear();
   void Off();
diff --git a/lib/PicoPeripherals/CMakeLists.txt b/lib/PicoPeripherals/CMakeLists.txt
@@ -1,7 +1,14 @@
-add_library(PicoPeripherals peripheral_i2c.cpp peripheral_spi.cpp peripheral_usb.cpp)
+add_library(PicoPeripherals
+interval_override.cpp
+peripheral_i2c.cpp
+peripheral_spi.cpp
+peripheral_usb.cpp
+)
+target_include_directories(PicoPeripherals PRIVATE .)
 target_include_directories(PicoPeripherals INTERFACE .)
 target_link_libraries(PicoPeripherals 
 pico_stdlib
+hardware_dma
 hardware_gpio
 hardware_i2c
 hardware_spi
diff --git a/lib/PicoPeripherals/interval_override.cpp b/lib/PicoPeripherals/interval_override.cpp
@@ -0,0 +1,3 @@
+#include "interval_override.h"
+
+volatile uint8_t interval_override = 0;
diff --git a/lib/PicoPeripherals/interval_override.h b/lib/PicoPeripherals/interval_override.h
@@ -0,0 +1,8 @@
+#ifndef _INTERVAL_OVERRIDE_H_
+#define _INTERVAL_OVERRIDE_H_
+
+#include <stdint.h>
+
+extern volatile uint8_t interval_override;
+
+#endif
diff --git a/lib/PicoPeripherals/peripheral_i2c.cpp b/lib/PicoPeripherals/peripheral_i2c.cpp
@@ -89,7 +89,11 @@ int16_t PeripheralI2C::write(uint8_t address, uint8_t *data, uint16_t len, bool
 
 uint8_t PeripheralI2C::test(uint8_t address) {
     uint8_t data;
-    int16_t ret = i2c_read_blocking(_I2C, address, &data, 1, false);
+    
+    // TODO: Revert to i2c_read_blocking when we have I2C resolved
+    // int16_t ret = i2c_read_blocking(_I2C, address, &data, 1, false);
+    absolute_time_t test_timeout = make_timeout_time_ms(100);
+    int16_t ret = i2c_read_blocking_until(_I2C, address, &data, 1, false, test_timeout);
     return (ret >= 0);
 }
 
diff --git a/lib/PicoPeripherals/peripheral_usb.cpp b/lib/PicoPeripherals/peripheral_usb.cpp
@@ -29,5 +29,7 @@ void PeripheralUSB::setup() {
 
         pio_cfg.pin_dp = _DP;
         pio_cfg.pinout = (_Order == 0 ? PIO_USB_PINOUT_DPDM : PIO_USB_PINOUT_DMDP);
+        pio_cfg.sm_tx = 1; // Move TX to PIO0:1, NeoPico is in PIO0:0
+        // RX and EOP are PIO1:0, PIO1:1
     }
 }
diff --git a/lib/pico_pio_usb b/lib/pico_pio_usb
@@ -1 +1 @@
-Subproject commit 3c1eec341a5232640e4c00628b889b641af34b28
+Subproject commit 37965f8895fffb4ffacace86e1f731f908dc18e0
diff --git a/lib/tinyusb b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 86ad6e56c1700e85f1c5678607a762cfe3aa2f47
+Subproject commit f77793517e3b016a89f75f3a5ad0bee57f0ad554
diff --git a/src/addons/neopicoleds.cpp b/src/addons/neopicoleds.cpp
@@ -250,7 +250,7 @@ void NeoPicoLEDAddon::setup() {
     }
 
 	// Setup NeoPico ws2812 PIO
-	neopico.Setup(ledOptions.dataPin, ledCount, static_cast<LEDFormat>(ledOptions.ledFormat), pio1);
+	neopico.Setup(ledOptions.dataPin, ledCount, static_cast<LEDFormat>(ledOptions.ledFormat), pio0, 0);
 	neopico.Off(); // turn off everything
 
 	// Rewrite this
diff --git a/src/gp2040.cpp b/src/gp2040.cpp
@@ -51,15 +51,16 @@ static absolute_time_t rebootDelayTimeout = nil_time;
 void GP2040::setup() {
 	Storage::getInstance().init();
 
-	PeripheralManager::getInstance().initI2C();
-	PeripheralManager::getInstance().initSPI();
-	PeripheralManager::getInstance().initUSB();
-
 	// Reduce CPU if USB host is enabled
+	PeripheralManager::getInstance().initUSB();
 	if ( PeripheralManager::getInstance().isUSBEnabled(0) ) {
 		set_sys_clock_khz(120000, true); // Set Clock to 120MHz to avoid potential USB timing issues
 	}
 
+	// I2C & SPI rely on the system clock
+	PeripheralManager::getInstance().initSPI();
+	PeripheralManager::getInstance().initI2C();
+
 	Gamepad * gamepad = new Gamepad();
 	Gamepad * processedGamepad = new Gamepad();
 	Storage::getInstance().SetGamepad(gamepad);
@@ -268,6 +269,9 @@ void GP2040::run() {
     // Start the TinyUSB Device functionality
     tud_init(TUD_OPT_RHPORT);
 
+	// Initialize our USB manager
+	USBHostManager::getInstance().start();
+
 	while (1) { // LOOP
 		this->getReinitGamepad(gamepad);
 
@@ -280,6 +284,9 @@ void GP2040::run() {
 
 		checkRawState(prevState, gamepad->state);
 
+		// Process USB Host on Core0
+		USBHostManager::getInstance().process();
+
 		// Config Loop (Web-Config skips Core0 add-ons)
 		if (configMode == true) {
 			inputDriver->process(gamepad);
@@ -288,9 +295,6 @@ void GP2040::run() {
 			continue;
 		}
 
-		// Process USB Host on Core0
-		USBHostManager::getInstance().process();
-
 		// Pre-Process add-ons for MPGS
 		addons.PreprocessAddons();
 
diff --git a/src/gp2040aux.cpp b/src/gp2040aux.cpp
@@ -25,10 +25,6 @@ GP2040Aux::~GP2040Aux() {
 // GP2040Aux will always come after GP2040 setup(), so we can rely on the
 // GP2040 setup function for certain setup functions.
 void GP2040Aux::setup() {
-	PeripheralManager::getInstance().initI2C();
-	PeripheralManager::getInstance().initSPI();
-	PeripheralManager::getInstance().initUSB();
-
 	// Initialize our input driver's auxilliary functions
 	inputDriver = DriverManager::getInstance().getDriver();
 	if ( inputDriver != nullptr ) {
@@ -50,9 +46,6 @@ void GP2040Aux::setup() {
 	addons.LoadAddon(new DRV8833RumbleAddon());
 	addons.LoadAddon(new ReactiveLEDAddon());
 
-	// Initialize our USB manager
-	USBHostManager::getInstance().start();
-
 	// Ready to sync Core0 and Core1
 	isReady = true;
 }

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ void NeoPico::PutPixel(uint32_t pixelData) {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-void NeoPico::Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio){`
	`37`	`+void NeoPico::Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio, int inState){`
`38`	`38`	`format = inFormat;`
`39`	`39`	`pio = inPio;`
`40`	`40`	`numPixels = inNumPixels;`
`41`		`- stateMachine = 0;`
	`41`	`+ stateMachine = inState;`
`42`	`42`	`uint offset = pio_add_program(pio, &ws2812_program);`
`43`	`43`	`bool rgbw = (format == LED_FORMAT_GRBW) \|\| (format == LED_FORMAT_RGBW);`
`44`	`44`	`ws2812_program_init(pio, stateMachine, offset, ledPin, 800000, rgbw);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class NeoPico`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`	`18`	`NeoPico();`
`19`		`- void Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio);`
	`19`	`+ void Setup(int ledPin, int inNumPixels, LEDFormat inFormat, PIO inPio, int inState);`
`20`	`20`	`void Show();`
`21`	`21`	`void Clear();`
`22`	`22`	`void Off();`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "interval_override.h"`
	`2`	`+`
	`3`	`+volatile uint8_t interval_override = 0;`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,7 @@ void PeripheralUSB::setup() {`
`29`	`29`
`30`	`30`	`pio_cfg.pin_dp = _DP;`
`31`	`31`	`pio_cfg.pinout = (_Order == 0 ? PIO_USB_PINOUT_DPDM : PIO_USB_PINOUT_DMDP);`
	`32`	`+ pio_cfg.sm_tx = 1; // Move TX to PIO0:1, NeoPico is in PIO0:0`
	`33`	`+ // RX and EOP are PIO1:0, PIO1:1`
`32`	`34`	`}`
`33`	`35`	`}`