update c2usb to use CPM and west for dependency management

Author: benedekkupper

CMakeLists.txt

@@ -3,4 +3,7 @@ if(NOT CONFIG_DEBUG)
     add_definitions(-DNDEBUG)
 endif()
 
+# Use a shared CPM cache for the west workspace
+set(CPM_SOURCE_CACHE "${CMAKE_CURRENT_LIST_DIR}/../modules/cpm" PARENT_SCOPE)
+
 add_subdirectory(lib)

ble-keyboard/src/main.cpp

@@ -12,9 +12,9 @@
 #include "simple_keyboard.hpp"
 #include <port/zephyr/bluetooth/hid.hpp>
 #include <port/zephyr/bluetooth/le.hpp>
-#include <port/zephyr/message_queue.hpp>
 #include <raw_to_hex_string.hpp>
 #include <usb/df/message.hpp>
+#include <zephyr/message_queue.hpp>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
@@ -53,7 +53,7 @@ static int advertise(void)
 
 auto& pairing_msgq()
 {
-    static os::zephyr::message_queue_instance<::bt_conn*, CONFIG_BT_MAX_CONN> msgq;
+    static zephyr::message_queue_instance<::bt_conn*, CONFIG_BT_MAX_CONN> msgq;
     return msgq;
 }
 
@@ -232,7 +232,7 @@ static auto& hog_service()
 
 auto& kb_msgq()
 {
-    static os::zephyr::message_queue_instance<input_event, 2> msgq;
+    static zephyr::message_queue_instance<input_event, 2> msgq;
     return msgq;
 }
 

patches/zephyr/0001-west-sysbuild-allows-using-application-cmake-presets.patch

@@ -0,0 +1,2 @@
+west
+GitPython

scripts/requirements.txt

@@ -3,19 +3,19 @@
 #include <zephyr/input/input.h>
 #include <zephyr/logging/log.h>
 
-#include <port/zephyr/message_queue.hpp>
 #include <port/zephyr/udc_mac.hpp>
 #include <simple_keyboard.hpp>
 #include <usb/df/class/hid.hpp>
 #include <usb/df/device.hpp>
+#include <zephyr/message_queue.hpp>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
 using namespace magic_enum::bitwise_operators;
 
 auto& kb_msgq()
 {
-    static os::zephyr::message_queue_instance<input_event, 2> msgq;
+    static zephyr::message_queue_instance<input_event, 2> msgq;
     return msgq;
 }
 

usb-keyboard/src/main.cpp

@@ -5,10 +5,10 @@
 
 #include <high_resolution_mouse.hpp>
 #include <magic_enum.hpp>
-#include <port/zephyr/message_queue.hpp>
 #include <port/zephyr/udc_mac.hpp>
 #include <usb/df/class/hid.hpp>
 #include <usb/df/device.hpp>
+#include <zephyr/message_queue.hpp>
 
 LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
 
@@ -20,7 +20,7 @@ struct kb_event
 
 auto& kb_msgq()
 {
-    static os::zephyr::message_queue_instance<kb_event, 2> msgq;
+    static zephyr::message_queue_instance<kb_event, 2> msgq;
     return msgq;
 }
 

usb-mouse/src/main.cpp

@@ -5,7 +5,6 @@
 #include <hid/app/mouse.hpp>
 #include <hid/application.hpp>
 #include <magic_enum.hpp>
-#include <port/zephyr/message_queue.hpp>
 #include <port/zephyr/udc_mac.hpp>
 #include <port/zephyr/usb_shell.hpp>
 #include <usb/df/device.hpp>

usb-shell/src/main.cpp

@@ -16,12 +16,13 @@ manifest:
   projects:
     - name: c2usb
       remote: IntergatedCircuits
-      revision: 988d8ad7fc615d9f9d3d73c9af60fa8c0410480e
-      submodules: true
+      revision: 6874aa02d3a45cdc3b0ceec7ed312f12a8e85a12
+      import: true
+
     - name: nrf
       repo-path: sdk-nrf
       remote: nrfconnect
-      revision: v3.1.0
+      revision: v3.2.1
       clone-depth: 1
       import:
         # By using name-allowlist we can clone only the modules that are