[examples] Deduplicate USB examples

modm-io · Jan 6, 2024 · ca06286 · ca06286
1 parent 124c414
commit ca06286
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 291 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -92,15 +92,11 @@ jobs:
       - name: Examples SAMD Devices
         if: always()
         run: |
-          (cd examples && ../tools/scripts/examples_compile.py feather_m4 samd samd21_xplained_pro)
+          (cd examples && ../tools/scripts/examples_compile.py feather_m4 samd)
       - name: Examples SAMG Devices
         if: always()
         run: |
           (cd examples && ../tools/scripts/examples_compile.py samg55_xplained_pro)
-      - name: Examples SAME5x Devices
-        if: always()
-        run: |
-          (cd examples && ../tools/scripts/examples_compile.py same54_xplained_pro)
       - name: Examples SAME70 Devices
         if: always()
         run: |

diff --git a/examples/feather_m4/usbserial/main.cpp b/examples/feather_m4/usbserial/main.cpp
diff --git a/examples/feather_m4/usbserial/project.xml b/examples/feather_m4/usbserial/project.xml
diff --git a/examples/generic/usb/project.xml b/examples/generic/usb/project.xml
@@ -10,11 +10,16 @@
   <!-- <extends>modm:disco-f746ng</extends> -->
   <!-- <extends>modm:disco-l476vg</extends> -->
   <!-- <extends>modm:feather-m0</extends> -->
+  <!-- <extends>modm:feather-m4</extends> -->
   <!-- <extends>modm:nucleo-f429zi</extends> -->
   <!-- <extends>modm:nucleo-h723zg</extends> -->
   <!-- <extends>modm:nucleo-h743zi</extends> -->
   <!-- <extends>modm:rp-pico</extends> -->
   <!-- <extends>modm:samd21-mini</extends> -->
+  <!-- <extends>modm:samd21-xplained-pro</extends> -->
+  <!-- <extends>modm:same54-xplained-pro</extends> -->
+  <!-- <extends>modm:samg55-xplained-pro</extends> -->
+  <!-- <extends>modm:nucleo-f446ze</extends> -->
   <options>
     <option name="modm:build:build.path">../../../build/generic/usb</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
@@ -34,6 +39,7 @@
     <module>modm:io</module>
   </modules>
   <collectors>
+    <!-- Optional for modm:disco-f746ng -->
     <!-- <collect name="modm:build:cppdefines">CFG_TUSB_DEBUG=3</collect> -->
   </collectors>
 </library>
diff --git a/examples/nucleo_f446ze/usbserial/main.cpp b/examples/nucleo_f446ze/usbserial/main.cpp
diff --git a/examples/nucleo_f446ze/usbserial/project.xml b/examples/nucleo_f446ze/usbserial/project.xml
diff --git a/examples/samd21_xplained_pro/usbserial/main.cpp b/examples/samd21_xplained_pro/usbserial/main.cpp
diff --git a/examples/samd21_xplained_pro/usbserial/project.xml b/examples/samd21_xplained_pro/usbserial/project.xml
diff --git a/examples/same54_xplained_pro/usbserial/main.cpp b/examples/same54_xplained_pro/usbserial/main.cpp
diff --git a/examples/same54_xplained_pro/usbserial/project.xml b/examples/same54_xplained_pro/usbserial/project.xml
diff --git a/examples/samg55_xplained_pro/usbserial/main.cpp b/examples/samg55_xplained_pro/usbserial/main.cpp
diff --git a/examples/samg55_xplained_pro/usbserial/project.xml b/examples/samg55_xplained_pro/usbserial/project.xml
diff --git a/src/modm/board/samg55_xplained_pro/board.hpp b/src/modm/board/samg55_xplained_pro/board.hpp
@@ -89,6 +89,12 @@ initialize()
 inline void
 initializeUsbFs()
 {
+	// Pull DP low briefly on reset to make sure USB host disconnects/reconnects
+	MATRIX->CCFG_SYSIO |= (CCFG_SYSIO_SYSIO11 | CCFG_SYSIO_SYSIO10);
+	GpioA22::setOutput(false);
+	modm::delay_ms(5);
+	GpioA22::setInput();
+
 	SystemClock::enableUsb();
 	Usb::initialize<Board::SystemClock>();
 }