From e3ed160f42401bd6523beda7b067274af7a8eaa2 Mon Sep 17 00:00:00 2001
From: Robofish <1683502971@qq.com>
Date: Tue, 30 Sep 2025 06:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dr16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/User_code/device/dr16.c |  6 ++---
 assets/User_code/device/dr16.h | 48 +++++++++++++++++-----------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/assets/User_code/device/dr16.c b/assets/User_code/device/dr16.c
index 929e4b5..120997b 100644
--- a/assets/User_code/device/dr16.c
+++ b/assets/User_code/device/dr16.c
@@ -141,13 +141,13 @@ int8_t DR16_ParseData(DR16_t *dr16){
   uint16_t key_value = dr16->raw_data.key;
   
   // 解析键盘位映射（W-B键，位0-15）
-  for (int i = CMD_KEY_W; i <= CMD_KEY_B; i++) {
+  for (int i = DR16_KEY_W; i <= DR16_KEY_B; i++) {
     dr16->data.keyboard.key[i] = (key_value & (1 << i)) != 0;
   }
 
   // 解析鼠标点击
-  dr16->data.keyboard.key[CMD_L_CLICK] = dr16->data.mouse.l_click;
-  dr16->data.keyboard.key[CMD_R_CLICK] = dr16->data.mouse.r_click;
+  dr16->data.keyboard.key[DR16_L_CLICK] = dr16->data.mouse.l_click;
+  dr16->data.keyboard.key[DR16_R_CLICK] = dr16->data.mouse.r_click;
 
   // 解析第五通道
   dr16->data.ch_res = 2.0f * ((float)dr16->raw_data.res - DR16_CH_VALUE_MID) / full_range;
diff --git a/assets/User_code/device/dr16.h b/assets/User_code/device/dr16.h
index 6e40c94..03fa526 100644
--- a/assets/User_code/device/dr16.h
+++ b/assets/User_code/device/dr16.h
@@ -38,33 +38,33 @@ typedef struct __packed {
 } DR16_RawData_t;
 
 typedef enum {
-  CMD_SW_ERR = 0,
-  CMD_SW_UP = 1,
-  CMD_SW_MID = 3,
-  CMD_SW_DOWN = 2,
+  DR16_SW_ERR = 0,
+  DR16_SW_UP = 1,
+  DR16_SW_MID = 3,
+  DR16_SW_DOWN = 2,
 } DR16_SwitchPos_t;
 
 /* 键盘按键值 */
 typedef enum {
-  CMD_KEY_W = 0,
-  CMD_KEY_S,
-  CMD_KEY_A,
-  CMD_KEY_D,
-  CMD_KEY_SHIFT,
-  CMD_KEY_CTRL,
-  CMD_KEY_Q,
-  CMD_KEY_E,
-  CMD_KEY_R,
-  CMD_KEY_F,
-  CMD_KEY_G,
-  CMD_KEY_Z,
-  CMD_KEY_X,
-  CMD_KEY_C,
-  CMD_KEY_V,
-  CMD_KEY_B,
-  CMD_L_CLICK,
-  CMD_R_CLICK,
-  CMD_KEY_NUM,
+  DR16_KEY_W = 0,
+  DR16_KEY_S,
+  DR16_KEY_A,
+  DR16_KEY_D,
+  DR16_KEY_SHIFT,
+  DR16_KEY_CTRL,
+  DR16_KEY_Q,
+  DR16_KEY_E,
+  DR16_KEY_R,
+  DR16_KEY_F,
+  DR16_KEY_G,
+  DR16_KEY_Z,
+  DR16_KEY_X,
+  DR16_KEY_C,
+  DR16_KEY_V,
+  DR16_KEY_B,
+  DR16_L_CLICK,
+  DR16_R_CLICK,
+  DR16_KEY_NUM,
 } DR16_Key_t;
 
 typedef struct {
@@ -87,7 +87,7 @@ typedef struct {
   } mouse;        /* 鼠标值 */
 
   union {
-    bool key[CMD_KEY_NUM]; /* 键盘按键值 */
+    bool key[DR16_KEY_NUM]; /* 键盘按键值 */
     uint16_t value;        /* 键盘按键值的位映射 */
   } keyboard;