Skip to content

Commit 221ef2c

Browse files
hathachhathach
authored
Merge pull request #350 from adafruit/update-featherwing-host-rev
update featherwing host to new revision
2 parents ebbd30b + 0ff42ce commit 221ef2c

File tree

14 files changed

+16
-58
lines changed

14 files changed

+16
-58
lines changed

‎examples/DualRole/CDC/serial_host_bridge/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/HID/hid_device_report/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/HID/hid_mouse_log_filter/hid_mouse_log_filter.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ void setup() {
6161
// init host stack on controller (rhport) 1
6262
// For rp2040: this is called in core1's setup1()
6363
USBHost.begin(1);
64-
65-
// FeatherWing USB Host use MAX3421E's GPIO0 as VBUS enable (active high)
66-
USBHost.max3421_writeIOPINS1(0x01, false);
6764
#endif
6865

6966
//while ( !Serial ) delay(10); // wait for native usb

‎examples/DualRole/HID/hid_mouse_log_filter/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/HID/hid_mouse_tremor_filter/hid_mouse_tremor_filter.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ void setup() {
7272
// init host stack on controller (rhport) 1
7373
// For rp2040: this is called in core1's setup1()
7474
USBHost.begin(1);
75-
76-
// FeatherWing USB Host use MAX3421E's GPIO0 as VBUS enable (active high)
77-
USBHost.max3421_writeIOPINS1(0x01, false);
7875
#endif
7976

8077
//while ( !Serial ) delay(10); // wait for native usb

‎examples/DualRole/HID/hid_mouse_tremor_filter/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/HID/hid_remapper/hid_remapper.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ void setup() {
5555
// init host stack on controller (rhport) 1
5656
// For rp2040: this is called in core1's setup1()
5757
USBHost.begin(1);
58-
59-
// FeatherWing USB Host use MAX3421E's GPIO0 as VBUS enable (active high)
60-
USBHost.max3421_writeIOPINS1(0x01, false);
6158
#endif
6259

6360
//while ( !Serial ) delay(10); // wait for native usb

‎examples/DualRole/HID/hid_remapper/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/MassStorage/msc_data_logger/msc_data_logger.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,6 @@ void setup() {
118118
// init host stack on controller (rhport) 1
119119
// For rp2040: this is called in core1's setup1()
120120
USBHost.begin(1);
121-
122-
// FeatherWing USB Host use MAX3421E's GPIO0 as VBUS enable (active high)
123-
USBHost.max3421_writeIOPINS1(0x01, false);
124121
#endif
125122

126123
#ifdef USE_FREERTOS

‎examples/DualRole/MassStorage/msc_data_logger/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/MassStorage/msc_file_explorer/msc_file_explorer.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ void setup() {
4848
// init host stack on controller (rhport) 1
4949
// For rp2040: this is called in core1's setup1()
5050
USBHost.begin(1);
51-
52-
// FeatherWing USB Host use MAX3421E's GPIO0 as VBUS enable (active high)
53-
USBHost.max3421_writeIOPINS1(0x01, false);
5451
#endif
5552

5653
// while ( !Serial ) delay(10); // wait for native usb

‎examples/DualRole/MassStorage/msc_file_explorer/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

‎examples/DualRole/Simple/device_info/device_info.ino

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ void setup() {
7272
// init host stack on controller (rhport) 1
7373
// For rp2040: this is called in core1's setup1()
7474
USBHost.begin(1);
75-
76-
// FeatherWing USB Host use MAX3421E's GPIO0 as VBUS enable (active high)
77-
USBHost.max3421_writeIOPINS1(0x01, false);
7875
#endif
7976

8077
// while ( !Serial ) delay(10); // wait for native usb

‎examples/DualRole/Simple/device_info/usbh_helper.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,9 @@
4141
Adafruit_USBH_Host USBHost(&SPI, 15, 14);
4242
#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32_V2)
4343
Adafruit_USBH_Host USBHost(&SPI, 27, 33);
44-
#elif defined(ARDUINO_METRO_ESP32S3) || defined(ADAFRUIT_METRO_M4_EXPRESS) || defined(ADAFRUIT_METRO_M0_EXPRESS)
45-
// For Metro shape CS and INT are pin 10, 9 (host shield default)
46-
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
4744
#else
48-
// default to FeatherWing USB Host MAX3421E: CS and INT are pin D11, D10
49-
Adafruit_USBH_Host USBHost(&SPI, 11, 10);
45+
// Default CS and INT are pin 10, 9
46+
Adafruit_USBH_Host USBHost(&SPI, 10, 9);
5047
#endif
5148
#else
5249
// Native USB Host such as rp2040

0 commit comments

Comments
 (0)