feat(events): 添加功能位图状态事件并移除旧的按键功能事件

- 添加新的 function_bitmap_state_event 事件类型用于跟踪功能键位图状态 - 移除已废弃的 key_function_event 事件及其相关文件 - 更新 CMakeLists.txt 中的源文件列表以包含新事件文件 - 修改协议定义文件 device_comm.options 和 device_comm.proto 以使用位图方式传输功能键状态而不是单独的按键事件 - 更新键盘核心模块中的位图处理逻辑，添加 usage_to_bitmap_pos 辅助函数来正确定位修饰键和普通按键的位置 - 修改报告构建逻辑以正确处理新的位图布局 - 更新协议模块以处理新的功能位图状态事件和 LED 状态事件 - 实现协议模块中的 ACK、错误响应和 LED 状态编码功能
2026-04-15 10:52:01 +08:00
parent bc42a4dd63
commit 79af0eb025
9 changed files with 341 additions and 127 deletions
--- a/src/protocol_module.c
+++ b/src/protocol_module.c
@@ -18,9 +18,14 @@

 #include <proto/device_comm.pb.h>

+#include "function_bitmap_state_event.h"
+#include "function_bitmap_update_event.h"
+#include "hid_led_event.h"
 #include "proto_rx_event.h"
 #include "proto_tx_event.h"
 #include "protocol_module.h"
+#include "theme_rgb_update_event.h"
+#include "time_sync_event.h"

 LOG_MODULE_REGISTER(MODULE, LOG_LEVEL_INF);

@@ -29,7 +34,7 @@ LOG_MODULE_REGISTER(MODULE, LOG_LEVEL_INF);
 #define PROTOCOL_PRODUCT_ID 0x52F0U
 #define PROTOCOL_FIRMWARE_MAJOR 0U
 #define PROTOCOL_FIRMWARE_MINOR 0U
-#define PROTOCOL_CAPABILITY_FLAGS 0U
+#define PROTOCOL_CAPABILITY_FLAGS (BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4))
 #define PROTOCOL_MAX_MSG_LEN 128U

 static bool initialized;
@@ -91,6 +96,59 @@ static int encode_hello_rsp(uint8_t *rsp_payload, size_t rsp_payload_buf_size,
 	return encode_body(&body, rsp_payload, rsp_payload_buf_size, rsp_payload_len);
 }

+static int encode_ack(uint8_t acked_type, uint8_t *rsp_payload,
+		      size_t rsp_payload_buf_size, size_t *rsp_payload_len)
+{
+	CdcPacketBody body = CdcPacketBody_init_zero;
+
+	body.which_body = CdcPacketBody_ack_tag;
+	body.body.ack.acked_type = acked_type;
+
+	return encode_body(&body, rsp_payload, rsp_payload_buf_size, rsp_payload_len);
+}
+
+static int encode_error(uint8_t error_type, ErrorCode error_code,
+			uint8_t *rsp_payload, size_t rsp_payload_buf_size,
+			size_t *rsp_payload_len)
+{
+	CdcPacketBody body = CdcPacketBody_init_zero;
+
+	body.which_body = CdcPacketBody_error_tag;
+	body.body.error.error_type = error_type;
+	body.body.error.error_code = error_code;
+
+	return encode_body(&body, rsp_payload, rsp_payload_buf_size, rsp_payload_len);
+}
+
+static int encode_led_state(uint32_t led_mask, uint8_t *payload,
+			    size_t payload_buf_size, size_t *payload_len)
+{
+	CdcPacketBody body = CdcPacketBody_init_zero;
+
+	body.which_body = CdcPacketBody_led_state_tag;
+	body.body.led_state.led_mask = led_mask;
+
+	return encode_body(&body, payload, payload_buf_size, payload_len);
+}
+
+static int encode_function_bitmap_state(const uint8_t *bitmap, uint8_t *payload,
+					size_t payload_buf_size,
+					size_t *payload_len)
+{
+	CdcPacketBody body = CdcPacketBody_init_zero;
+
+	if (bitmap == NULL) {
+		return -EINVAL;
+	}
+
+	body.which_body = CdcPacketBody_function_key_event_tag;
+	body.body.function_key_event.usage_bitmap.size = KEYBOARD_PROTOCOL_BITMAP_BYTES;
+	memcpy(body.body.function_key_event.usage_bitmap.bytes, bitmap,
+	       KEYBOARD_PROTOCOL_BITMAP_BYTES);
+
+	return encode_body(&body, payload, payload_buf_size, payload_len);
+}
+
 static int module_init(void)
 {
 	for (size_t i = 0; i < ARRAY_SIZE(hello_done); i++) {
@@ -156,21 +214,98 @@ int protocol_module_process_message(enum proto_transport transport,
 		return err;
 	}

-	if (body.which_body != CdcPacketBody_hello_req_tag) {
+	switch (body.which_body) {
+	case CdcPacketBody_hello_req_tag:
+		LOG_INF("HelloReq transport:%u protocol_version:%u",
+			transport, body.body.hello_req.protocol_version);
+
+		if (body.body.hello_req.protocol_version != PROTOCOL_VERSION) {
+			LOG_WRN("Unexpected protocol version:%u",
+				body.body.hello_req.protocol_version);
+		}
+
+		hello_done[transport] = true;
+		return encode_hello_rsp(rsp_payload, rsp_payload_buf_size, rsp_payload_len);
+
+	case CdcPacketBody_bitmap_tag:
+		if (!hello_done[transport]) {
+			return encode_error(CdcPacketBody_bitmap_tag,
+					    ErrorCode_ERROR_CODE_NOT_READY,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		if (body.body.bitmap.usage_bitmap.size != KEYBOARD_PROTOCOL_BITMAP_BYTES) {
+			return encode_error(CdcPacketBody_bitmap_tag,
+					    ErrorCode_ERROR_CODE_INVALID_LENGTH,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		err = submit_function_bitmap_update_event(
+			body.body.bitmap.usage_bitmap.bytes);
+		if (err) {
+			return encode_error(CdcPacketBody_bitmap_tag,
+					    ErrorCode_ERROR_CODE_INVALID_PARAM,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		return encode_ack(CdcPacketBody_bitmap_tag, rsp_payload,
+				  rsp_payload_buf_size, rsp_payload_len);
+
+	case CdcPacketBody_time_sync_tag:
+		if (!hello_done[transport]) {
+			return encode_error(CdcPacketBody_time_sync_tag,
+					    ErrorCode_ERROR_CODE_NOT_READY,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		if (body.body.time_sync.version != 1U) {
+			return encode_error(CdcPacketBody_time_sync_tag,
+					    ErrorCode_ERROR_CODE_INVALID_PARAM,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		submit_time_sync_event(body.body.time_sync.version,
+				       body.body.time_sync.flags,
+				       body.body.time_sync.timezone_min,
+				       body.body.time_sync.utc_ms,
+				       body.body.time_sync.accuracy_ms);
+		return encode_ack(CdcPacketBody_time_sync_tag, rsp_payload,
+				  rsp_payload_buf_size, rsp_payload_len);
+
+	case CdcPacketBody_theme_rgb_tag:
+		if (!hello_done[transport]) {
+			return encode_error(CdcPacketBody_theme_rgb_tag,
+					    ErrorCode_ERROR_CODE_NOT_READY,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		if ((body.body.theme_rgb.red > 255U) ||
+		    (body.body.theme_rgb.green > 255U) ||
+		    (body.body.theme_rgb.blue > 255U)) {
+			return encode_error(CdcPacketBody_theme_rgb_tag,
+					    ErrorCode_ERROR_CODE_INVALID_PARAM,
+					    rsp_payload, rsp_payload_buf_size,
+					    rsp_payload_len);
+		}
+
+		submit_theme_rgb_update_event((struct theme_rgb) {
+			.r = (uint8_t)body.body.theme_rgb.red,
+			.g = (uint8_t)body.body.theme_rgb.green,
+			.b = (uint8_t)body.body.theme_rgb.blue,
+		});
+		return encode_ack(CdcPacketBody_theme_rgb_tag, rsp_payload,
+				  rsp_payload_buf_size, rsp_payload_len);
+
+	default:
 		LOG_WRN("Unsupported protobuf body case %d", body.which_body);
 		return -ENOTSUP;
 	}
-
-	LOG_INF("HelloReq transport:%u protocol_version:%u",
-		transport, body.body.hello_req.protocol_version);
-
-	if (body.body.hello_req.protocol_version != PROTOCOL_VERSION) {
-		LOG_WRN("Unexpected protocol version:%u",
-			body.body.hello_req.protocol_version);
-	}
-
-	hello_done[transport] = true;
-	return encode_hello_rsp(rsp_payload, rsp_payload_buf_size, rsp_payload_len);
 }

 static bool handle_proto_rx_event(const struct proto_rx_event *event)
@@ -205,12 +340,87 @@ static bool handle_proto_rx_event(const struct proto_rx_event *event)
 	return false;
 }

+static bool handle_function_bitmap_state_event(
+	const struct function_bitmap_state_event *event)
+{
+	uint8_t payload[PROTOCOL_MAX_MSG_LEN];
+	size_t payload_len;
+	int err;
+
+	if (!running) {
+		return false;
+	}
+
+	for (enum proto_transport transport = 0; transport < PROTO_TRANSPORT_COUNT;
+	     transport++) {
+		if (!hello_done[transport]) {
+			continue;
+		}
+
+		err = encode_function_bitmap_state(event->bitmap, payload,
+						   sizeof(payload), &payload_len);
+		if (err) {
+			LOG_WRN("FunctionKeyEvent encode failed (%d)", err);
+			return false;
+		}
+
+		err = submit_proto_tx_event(transport, payload, payload_len);
+		if (err) {
+			LOG_WRN("FunctionKeyEvent submit failed (%d)", err);
+		}
+	}
+
+	return false;
+}
+
+static bool handle_hid_led_event(const struct hid_led_event *event)
+{
+	uint8_t payload[PROTOCOL_MAX_MSG_LEN];
+	size_t payload_len;
+	int err;
+	enum proto_transport transport;
+
+	if (!running) {
+		return false;
+	}
+
+	transport = (event->transport == HID_TRANSPORT_USB) ?
+			    PROTO_TRANSPORT_USB_CDC :
+			    PROTO_TRANSPORT_BLE_NUS;
+
+	if (!hello_done[transport]) {
+		return false;
+	}
+
+	err = encode_led_state(event->led_bm, payload, sizeof(payload), &payload_len);
+	if (err) {
+		LOG_WRN("LedState encode failed (%d)", err);
+		return false;
+	}
+
+	err = submit_proto_tx_event(transport, payload, payload_len);
+	if (err) {
+		LOG_WRN("LedState submit failed (%d)", err);
+	}
+
+	return false;
+}
+
 static bool app_event_handler(const struct app_event_header *aeh)
 {
 	if (is_proto_rx_event(aeh)) {
 		return handle_proto_rx_event(cast_proto_rx_event(aeh));
 	}

+	if (is_function_bitmap_state_event(aeh)) {
+		return handle_function_bitmap_state_event(
+			cast_function_bitmap_state_event(aeh));
+	}
+
+	if (is_hid_led_event(aeh)) {
+		return handle_hid_led_event(cast_hid_led_event(aeh));
+	}
+
 	if (is_module_state_event(aeh)) {
 		const struct module_state_event *event = cast_module_state_event(aeh);
 		int err;
@@ -266,6 +476,8 @@ static bool app_event_handler(const struct app_event_header *aeh)
 }

 APP_EVENT_LISTENER(MODULE, app_event_handler);
+APP_EVENT_SUBSCRIBE(MODULE, function_bitmap_state_event);
+APP_EVENT_SUBSCRIBE(MODULE, hid_led_event);
 APP_EVENT_SUBSCRIBE(MODULE, module_state_event);
 APP_EVENT_SUBSCRIBE(MODULE, proto_rx_event);
 APP_EVENT_SUBSCRIBE_EARLY(MODULE, power_down_event);