Merge branch 'dev'

CMakeLists.txt

@@ -4,12 +4,19 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(blinky)
 
+list(APPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/modules/nanopb)
+include(nanopb)
+
 zephyr_include_directories(
   inc
   inc/events
 )
 add_subdirectory(drivers)
 
+zephyr_nanopb_sources(app
+  proto/device_comm.proto
+)
+
 target_sources(app PRIVATE
   src/main.c
   src/battery_module.c
@@ -23,8 +30,9 @@ target_sources(app PRIVATE
   src/hid_flowctrl_module.c
   src/keyboard_core_module.c
   src/ui/ui_main.c
+  src/cdc_wrapper_module.c
+  src/protocol_module.c
   src/usb_cdc_module.c
-  src/usb_cdc_test_module.c
   src/usb_device_module.c
   src/usb_hid_module.c
   src/events/bat_state_event.c