change USBHost declaration with spi pin for esp32

adafruit · Oct 26, 2023 · 9a83b0b · 9a83b0b
1 parent 1c5cb1d
commit 9a83b0b
Show file tree

Hide file tree

Showing 12 changed files with 305 additions and 361 deletions.
diff --git a/examples/DualRole/CDC/serial_host_bridge/usbh_helper.h b/examples/DualRole/CDC/serial_host_bridge/usbh_helper.h
@@ -1,67 +1,57 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 Ha Thach (tinyusb.org)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * This file is part of the TinyUSB stack.
- */
+/*********************************************************************
+ Adafruit invests time and resources providing this open source code,
+ please support Adafruit and open-source hardware by purchasing
+ products from Adafruit!
+
+ MIT license, check LICENSE for more information
+ Copyright (c) 2019 Ha Thach for Adafruit Industries
+ All text above, and the splash screen below must be included in
+ any redistribution
+*********************************************************************/
 
 #ifndef USBH_HELPER_H
 #define USBH_HELPER_H
 
 #ifdef ARDUINO_ARCH_RP2040
-// pio-usb is required for rp2040 host
-#include "pio_usb.h"
+  // pio-usb is required for rp2040 host
+  #include "pio_usb.h"
 
-// Pin D+ for host, D- = D+ + 1
-#ifndef PIN_USB_HOST_DP
-#define PIN_USB_HOST_DP       16
-#endif
+  // Pin D+ for host, D- = D+ + 1
+  #ifndef PIN_USB_HOST_DP
+  #define PIN_USB_HOST_DP  16
+  #endif
 
-// Pin for enabling Host VBUS. comment out if not used
-#ifndef PIN_5V_EN
-#define PIN_5V_EN        18
-#endif
+  // Pin for enabling Host VBUS. comment out if not used
+  #ifndef PIN_5V_EN
+  #define PIN_5V_EN        18
+  #endif
 
-#ifndef PIN_5V_EN_STATE
-#define PIN_5V_EN_STATE  1
-#endif
+  #ifndef PIN_5V_EN_STATE
+  #define PIN_5V_EN_STATE  1
+  #endif
 #endif // ARDUINO_ARCH_RP2040
 
 #include "Adafruit_TinyUSB.h"
 
 #if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
+  // USB Host using MAX3421E: SPI, CS, INT
   #include "SPI.h"
 
-  #ifdef ARDUINO_ARCH_ESP32
-  // ESP32 specify SCK, MOSI, MISO, CS, INT
-  Adafruit_USBH_Host USBHost(36, 35, 37, 15, 14);
+  #if defined(ARDUINO_METRO_ESP32S2)
+    Adafruit_USBH_Host USBHost(&SPI, 15, 14);
   #else
-  // USB Host using MAX3421E: SPI, CS, INT
-  Adafruit_USBH_Host USBHost(&SPI, 10, 9);
+    // Default use SPI and pin 10, 9 for CS and INT
+    Adafruit_USBH_Host USBHost(&SPI, 10, 9);
   #endif
 #else
+  // Native USB Host such as rp2040
   Adafruit_USBH_Host USBHost;
 #endif
 
+//--------------------------------------------------------------------+
+// Helper Functions
+//--------------------------------------------------------------------+
+
 #ifdef ARDUINO_ARCH_RP2040
 static void rp2040_configure_pio_usb(void) {
   //while ( !Serial ) delay(10);   // wait for native usb

diff --git a/examples/DualRole/HID/hid_device_report/usbh_helper.h b/examples/DualRole/HID/hid_device_report/usbh_helper.h
@@ -1,67 +1,57 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 Ha Thach (tinyusb.org)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * This file is part of the TinyUSB stack.
- */
+/*********************************************************************
+ Adafruit invests time and resources providing this open source code,
+ please support Adafruit and open-source hardware by purchasing
+ products from Adafruit!
+
+ MIT license, check LICENSE for more information
+ Copyright (c) 2019 Ha Thach for Adafruit Industries
+ All text above, and the splash screen below must be included in
+ any redistribution
+*********************************************************************/
 
 #ifndef USBH_HELPER_H
 #define USBH_HELPER_H
 
 #ifdef ARDUINO_ARCH_RP2040
-// pio-usb is required for rp2040 host
-#include "pio_usb.h"
+  // pio-usb is required for rp2040 host
+  #include "pio_usb.h"
 
-// Pin D+ for host, D- = D+ + 1
-#ifndef PIN_USB_HOST_DP
-#define PIN_USB_HOST_DP       16
-#endif
+  // Pin D+ for host, D- = D+ + 1
+  #ifndef PIN_USB_HOST_DP
+  #define PIN_USB_HOST_DP  16
+  #endif
 
-// Pin for enabling Host VBUS. comment out if not used
-#ifndef PIN_5V_EN
-#define PIN_5V_EN        18
-#endif
+  // Pin for enabling Host VBUS. comment out if not used
+  #ifndef PIN_5V_EN
+  #define PIN_5V_EN        18
+  #endif
 
-#ifndef PIN_5V_EN_STATE
-#define PIN_5V_EN_STATE  1
-#endif
+  #ifndef PIN_5V_EN_STATE
+  #define PIN_5V_EN_STATE  1
+  #endif
 #endif // ARDUINO_ARCH_RP2040
 
 #include "Adafruit_TinyUSB.h"
 
 #if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
+  // USB Host using MAX3421E: SPI, CS, INT
   #include "SPI.h"
 
-  #ifdef ARDUINO_ARCH_ESP32
-  // ESP32 specify SCK, MOSI, MISO, CS, INT
-  Adafruit_USBH_Host USBHost(36, 35, 37, 15, 14);
+  #if defined(ARDUINO_METRO_ESP32S2)
+    Adafruit_USBH_Host USBHost(&SPI, 15, 14);
   #else
-  // USB Host using MAX3421E: SPI, CS, INT
-  Adafruit_USBH_Host USBHost(&SPI, 10, 9);
+    // Default use SPI and pin 10, 9 for CS and INT
+    Adafruit_USBH_Host USBHost(&SPI, 10, 9);
   #endif
 #else
+  // Native USB Host such as rp2040
   Adafruit_USBH_Host USBHost;
 #endif
 
+//--------------------------------------------------------------------+
+// Helper Functions
+//--------------------------------------------------------------------+
+
 #ifdef ARDUINO_ARCH_RP2040
 static void rp2040_configure_pio_usb(void) {
   //while ( !Serial ) delay(10);   // wait for native usb

diff --git a/examples/DualRole/HID/hid_mouse_log_filter/usbh_helper.h b/examples/DualRole/HID/hid_mouse_log_filter/usbh_helper.h
@@ -1,67 +1,57 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2023 Ha Thach (tinyusb.org)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
- * This file is part of the TinyUSB stack.
- */
+/*********************************************************************
+ Adafruit invests time and resources providing this open source code,
+ please support Adafruit and open-source hardware by purchasing
+ products from Adafruit!
+
+ MIT license, check LICENSE for more information
+ Copyright (c) 2019 Ha Thach for Adafruit Industries
+ All text above, and the splash screen below must be included in
+ any redistribution
+*********************************************************************/
 
 #ifndef USBH_HELPER_H
 #define USBH_HELPER_H
 
 #ifdef ARDUINO_ARCH_RP2040
-// pio-usb is required for rp2040 host
-#include "pio_usb.h"
+  // pio-usb is required for rp2040 host
+  #include "pio_usb.h"
 
-// Pin D+ for host, D- = D+ + 1
-#ifndef PIN_USB_HOST_DP
-#define PIN_USB_HOST_DP       16
-#endif
+  // Pin D+ for host, D- = D+ + 1
+  #ifndef PIN_USB_HOST_DP
+  #define PIN_USB_HOST_DP  16
+  #endif
 
-// Pin for enabling Host VBUS. comment out if not used
-#ifndef PIN_5V_EN
-#define PIN_5V_EN        18
-#endif
+  // Pin for enabling Host VBUS. comment out if not used
+  #ifndef PIN_5V_EN
+  #define PIN_5V_EN        18
+  #endif
 
-#ifndef PIN_5V_EN_STATE
-#define PIN_5V_EN_STATE  1
-#endif
+  #ifndef PIN_5V_EN_STATE
+  #define PIN_5V_EN_STATE  1
+  #endif
 #endif // ARDUINO_ARCH_RP2040
 
 #include "Adafruit_TinyUSB.h"
 
 #if defined(CFG_TUH_MAX3421) && CFG_TUH_MAX3421
+  // USB Host using MAX3421E: SPI, CS, INT
   #include "SPI.h"
 
-  #ifdef ARDUINO_ARCH_ESP32
-  // ESP32 specify SCK, MOSI, MISO, CS, INT
-  Adafruit_USBH_Host USBHost(36, 35, 37, 15, 14);
+  #if defined(ARDUINO_METRO_ESP32S2)
+    Adafruit_USBH_Host USBHost(&SPI, 15, 14);
   #else
-  // USB Host using MAX3421E: SPI, CS, INT
-  Adafruit_USBH_Host USBHost(&SPI, 10, 9);
+    // Default use SPI and pin 10, 9 for CS and INT
+    Adafruit_USBH_Host USBHost(&SPI, 10, 9);
   #endif
 #else
+  // Native USB Host such as rp2040
   Adafruit_USBH_Host USBHost;
 #endif
 
+//--------------------------------------------------------------------+
+// Helper Functions
+//--------------------------------------------------------------------+
+
 #ifdef ARDUINO_ARCH_RP2040
 static void rp2040_configure_pio_usb(void) {
   //while ( !Serial ) delay(10);   // wait for native usb