From 591c81ed11d7cbd79fe3f4cf8dd9aaf41f947463 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, 28 May 2025 16:31:12 +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

---
 APP/multiCentral.c  | 2 +-
 bsp/inc/bsp_valve.h | 2 +-
 bsp/src/bsp_valve.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/APP/multiCentral.c b/APP/multiCentral.c
index de3dc11..3fbc312 100644
--- a/APP/multiCentral.c
+++ b/APP/multiCentral.c
@@ -827,7 +827,7 @@ static void centralEventCB(gapRoleEvent_t *pEvent)
                 valve_list.valve_data[0].valve_connct_status = FALSE;
                 valve_list.valve_data[0].valve_switch_status = FALSE;
                 valve_list.valve_data[0].valve_temp = FALSE;
-                BSP_Bt_Valve_Resp(kValveConncetStatus, valve_list.valve_data[0].valve_id, valve_list.valve_data[0].valve_mac, FALSE);//表示连接成功
+                BSP_Bt_Valve_Resp(kValveConncetStatus, valve_list.valve_data[0].valve_id, valve_list.valve_data[0].valve_mac, FALSE);//表示连接断开
             }
            
         }
diff --git a/bsp/inc/bsp_valve.h b/bsp/inc/bsp_valve.h
index 7f9896b..552650d 100644
--- a/bsp/inc/bsp_valve.h
+++ b/bsp/inc/bsp_valve.h
@@ -79,7 +79,7 @@ struct __attribute__((packed)) valve_data
     uint32_t valve_in_pressure;
     uint32_t valve_out_pressure;
     uint32_t valve_atm_pressure;
-    uint8_t valve_type;
+    uint8_t valve_voltage;//阀门电池电压
 };
 
 typedef struct valve_data_list
diff --git a/bsp/src/bsp_valve.c b/bsp/src/bsp_valve.c
index b8dfae6..4d18503 100644
--- a/bsp/src/bsp_valve.c
+++ b/bsp/src/bsp_valve.c
@@ -327,7 +327,7 @@ int BSP_Bt_Valve_Resp(uint8_t cmd, uint8_t id, uint8_t *mac_addr, uint8_t state)
             break;
         case kValveEventStatus:
             tmos_memcpy(&ptr->buf[0], &valve_list.valve_data[id - 1], sizeof(struct valve_data));
-            BT_GenerateRawFrame(&valve_frame_data, (uint8_t *)ptr, sizeof(struct valve_data));
+            BT_GenerateRawFrame(&valve_frame_data, (uint8_t *)ptr, sizeof(struct valve_data) + 1);
             break;
         case kValveConncetStatus:
             ptr->buf[0] = id;