From b598b0693829d9d351c965a1bbf2582038f44545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=5F666?=
 <13089258+pony-six-hundred-and-sixty-six@user.noreply.gitee.com>
Date: Wed, 4 Jun 2025 14:09:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bsp/src/bsp_ml307.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/bsp/src/bsp_ml307.c b/bsp/src/bsp_ml307.c
index 31cd14a..da72de1 100644
--- a/bsp/src/bsp_ml307.c
+++ b/bsp/src/bsp_ml307.c
@@ -310,11 +310,6 @@ uint8_t dec_to_bcd(uint8_t dec)
     return ((dec / 10) << 4) | (dec % 10);
 }
 
-// 将BCD格式转换为十进制（可选）
-uint8_t bcd_to_dec(uint8_t bcd)
-{
-    return ((bcd >> 4) * 10) + (bcd & 0x0F);
-}
 
 int test(int argc, char **argv)
 {
@@ -332,8 +327,6 @@ MSH_CMD_EXPORT(test, "test");
 
 int _Update_Valve_Data (struct Ml307_Ops *ops)
 {
-    uint8_t valtage = 0;
-
     ops->body->valve_num = Flash_Get_Valve_Num();
     if (ops->body->valve_num == 0)  // 确保至少有一个阀门数据体
     {
@@ -345,8 +338,7 @@ int _Update_Valve_Data (struct Ml307_Ops *ops)
         LOG_D ("valve_num: %d", ops->body->valve_num);
         rt_memcpy (&ops->body->valve_data[0], &valve[0], sizeof (struct valve_t));
         // rt_memset(&valve[0].valve_connct_status, 0, (sizeof(struct valve_t) - 7)); // 清空阀门包数据，等待下次更新,如果没更新说明断开了
-        valtage = ops->body->valve_data[0].valve_voltage; //将十六进制转为十进制
-         ops->body->valve_data[0].valve_voltage = (valtage >> 4) * 16 +  (valtage & 0x0F);
+         ops->body->valve_data[0].valve_voltage = dec_to_bcd(ops->body->valve_data[0].valve_voltage);
     }
     return RT_EOK;
 }