From 0a7706fff116adc9adbc35ae087aaed92a531112 Mon Sep 17 00:00:00 2001 From: stli Date: Sat, 11 Apr 2026 14:10:38 +0800 Subject: [PATCH] Stabilize firmware private transport --- CMakeLists.txt | 22 ---------------------- app.overlay | 7 ------- 2 files changed, 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b1a38e..5f9e57e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,17 +17,6 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(new_kbd) -if(NOT c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES) - list(APPEND CMAKE_C_COMPILE_FEATURES c_std_11) -endif() - -set(PROTOBUF_PROTOC_EXECUTABLE - "${CMAKE_CURRENT_SOURCE_DIR}/scripts/protoc_nanopb.bat" - CACHE FILEPATH "Project-local protoc wrapper for nanopb" FORCE) - -list(APPEND CMAKE_MODULE_PATH ${ZEPHYR_BASE}/modules/nanopb) -include(nanopb) - zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/inc) zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/events) zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/ui) @@ -44,19 +33,11 @@ target_compile_definitions(app PRIVATE APP_HID_KEYMAP_DEF_PATH=\"hid_keymap_def.h\" ) -zephyr_nanopb_sources(app - KeyBorad/proto/keyboard.proto -) - -target_link_libraries(app PRIVATE nanopb) - target_sources(app PRIVATE src/main.c src/events/battery_status_event.c src/events/config_event.c src/events/display_theme_event.c - src/events/function_bitmap_event.c - src/events/function_key_event.c src/events/hid_boot_event.c src/events/hid_host_ack_event.c src/events/hid_host_command_error_event.c @@ -78,16 +59,13 @@ target_sources(app PRIVATE src/modules/display_module.c src/modules/hid_host_command_module.c src/modules/hid_tx_manager_module.c - src/modules/keyboard_proto.c src/modules/keyboard_module.c src/modules/led_state_module.c src/modules/mode_switch_module.c src/modules/qdec_module.c src/modules/time_manager_module.c - src/modules/usb_cdc_proto_module.c src/modules/usb_hid_module.c src/modules/ble_hid_module.c - src/modules/ble_gatt_proto_module.c src/ui/display_ui.c src/ui/fonts/ui_font_keyboard_small_18.c src/ui/fonts/ui_font_keyboard_time_48.c diff --git a/app.overlay b/app.overlay index 3e0b9a2..8b7a48f 100644 --- a/app.overlay +++ b/app.overlay @@ -36,13 +36,6 @@ }; }; -&usbd { - cdc_acm_uart0: cdc_acm_uart0 { - compatible = "zephyr,cdc-acm-uart"; - label = "new_kbd CDC ACM"; - }; -}; - &gpregret1 { status = "okay";