solve conflicts

Author: genan2003

.github/workflows/rust.yml

@@ -39,9 +39,9 @@ jobs:
       - name: Clippy Devices
         run: |
           cd device
-          echo Clippy $package
           for package in $(ls -d usb*); do
-            (cd $package && cargo clippy -- --Dwarnings)
+            echo Clippy $package
+            (cd $package && cargo clippy -- -Dwarnings)
           done
       - name: Clippy Rust Host
         run: |

.gitignore

@@ -1,17 +1,24 @@
-# Generated by Cargo
-# will have compiled files and executables
-debug/
-target/
+# MacOS
+#
+# Folder view configuration files
+.DS_Store
+Desktop.ini
 
-# These are backup files generated by rustfmt
-**/*.rs.bk
+# Thumbnail cache files
+._*
+Thumbs.db
 
-# MSVC Windows builds of rustc generate these, which store debugging information
-*.pdb
+# Files that might appear on external disks
+.Spotlight-V100
+.Trashes
 
-# RustRover
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+# Compiled Python files
+*.pyc
+
+# Compiled C++ files
+*.out
+
+# Application specific files
+venv
+node_modules
+.sass-cache

device/usb-bulk-stm32-nucleo-u545re/src/main.rs

@@ -45,10 +45,6 @@ async fn main(_spawner: Spawner) {
     // make sure you provide the `config` parameter here instead of `Default::default()`
     let peripherals = embassy_stm32::init(config);
 
-    // let mut config = embassy_stm32::usb::Config::default();
-
-    // config.vbus_detection = false;
-
     let driver = Driver::new(peripherals.USB, Irqs, peripherals.PA12, peripherals.PA11);
 
     // Create embassy-usb Config