diff --git a/.gitmodules b/.gitmodules index 3e5c6e8e..2f626332 100644 --- 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 index ba0f2241..6921c7d6 100644 --- 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 index 7f75c93c..f3a70949 100644 --- 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 deleted file mode 120000 index 060933c7..00000000 --- a/device/c2usb +++ /dev/null @@ -1 +0,0 @@ -../lib/c2usb \ No newline at end of file diff --git a/lib/c2usb b/lib/c2usb deleted file mode 160000 index db88eb05..00000000 --- a/lib/c2usb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit db88eb051cb0792f0296ce58357180029f3da5e2 diff --git a/west.yml b/west.yml index 85b68d06..90613a99 100644 --- 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