import c2usb not as submodule, but as zephyr module

UltimateHackingKeyboard · Nov 20, 2024 · e8ed467 · e8ed467
1 parent 3e632c5
commit e8ed467
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 18 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,6 +13,3 @@
 [submodule "lib/SDK_2.8.0_MKL17Z32xxx4"]
 	path = lib/SDK_2.8.0_MKL17Z32xxx4
 	url = https://github.com/UltimateHackingKeyboard/SDK_2.8.0_MKL17Z32xxx4.git
-[submodule "lib/c2usb"]
-	path = lib/c2usb
-	url = https://github.com/IntergatedCircuits/c2usb.git
diff --git a/device/CMakeLists.txt b/device/CMakeLists.txt
@@ -41,10 +41,6 @@ if(NOT BOARD STREQUAL "uhk-60-right")
     # C headers compiled with C++ give pointer conversion errors, turn them to warnings
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 
-    set(C2USB_PATH "c2usb")
-
-    add_subdirectory(${C2USB_PATH})
-
     # Link app to c2usb
     target_link_libraries(app PRIVATE
         c2usb

diff --git a/device/Kconfig b/device/Kconfig
@@ -73,5 +73,3 @@ configdefault BT_DEVICE_APPEARANCE
 # to these application-specific defaults instead of the unconditional default in the Zephyr Kconfig tree.
 # https://github.com/nrfconnect/sdk-nrf/blob/4b9841a28e97e9d61b93f8981375d644b9d04ea0/samples/bluetooth/mesh/light/Kconfig#L11C1-L13C30
 source "Kconfig.zephyr"
-
-rsource "c2usb/c2usb/port/zephyr/Kconfig"
diff --git a/device/c2usb b/device/c2usb
diff --git a/device/prj.conf.overlays/c2usb.conf b/device/prj.conf.overlays/c2usb.conf
@@ -1,9 +1,3 @@
-CONFIG_CPP=y
-CONFIG_STD_CPP20=y
-CONFIG_NEWLIB_LIBC=y
-CONFIG_GLIBCXX_LIBCPP=y
-
-# CONFIG_UDC_DRIVER=y
 CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y
 CONFIG_WARN_EXPERIMENTAL=n
 

diff --git a/lib/c2usb b/lib/c2usb
diff --git a/west.yml b/west.yml
@@ -7,6 +7,8 @@ manifest:
       url-base: https://github.com/nrfconnect
     - name: zephyr
       url-base: https://github.com/zephyrproject-rtos
+    - name: IntergatedCircuits
+      url-base: https://github.com/IntergatedCircuits
 
   projects:
     - name: sdk-nrf
@@ -30,5 +32,9 @@ manifest:
 
     - name: hal_nxp
       remote: zephyr
-      path: nrfconnect/zephyr-hal-nxp
+      clone-depth: 1
+
+    - name: c2usb
+      remote: IntergatedCircuits
+      revision: 19551fec19680cfe759bb3a8dced914233e4ddd1
       clone-depth: 1