From 80b303c5e3d0af9090daf235132f188027e3d81a 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: Thu, 12 Dec 2024 19:38:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BA=86=E5=92=8C=E4=BB=8E?= =?UTF-8?q?=E6=9C=BA=E7=9A=84=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/multiCentral.c | 2 +- bsp/inc/bsp_valve.h | 3 +++ bsp/src/bsp_valve.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/APP/multiCentral.c b/APP/multiCentral.c index 86bb642..96b9d63 100644 --- a/APP/multiCentral.c +++ b/APP/multiCentral.c @@ -1267,7 +1267,7 @@ int BSP_Master_Receive_Data(uint8_t task_id, uint8_t *data, uint16_t len) logDebug("BT 控制阀门响应包"); logHexDumpAll(&data[index], len); } - else if (data[index + 1] == kCmdData) // 这个是代表了其是心跳数据包 + else if (data[index + 1] == kValveCmdRep) // 这个是代表了其是心跳数据包 { logDebug("BT 心跳数据包"); logHexDumpAll(&data[index], len); diff --git a/bsp/inc/bsp_valve.h b/bsp/inc/bsp_valve.h index a2c614b..4a02b91 100644 --- a/bsp/inc/bsp_valve.h +++ b/bsp/inc/bsp_valve.h @@ -41,9 +41,12 @@ typedef enum typedef enum { kCmdCfg = 0X01, + kCmdCloseVavle, + kCmdOpenVavle, kCmdData, } TeFrameCmd; + typedef struct valve_data valve_data_t; /* diff --git a/bsp/src/bsp_valve.c b/bsp/src/bsp_valve.c index c5e6da8..12899cc 100644 --- a/bsp/src/bsp_valve.c +++ b/bsp/src/bsp_valve.c @@ -2,7 +2,7 @@ * @Author: mbw * @Date: 2024-12-09 11:40:10 * @LastEditors: mbw && 1600520629@qq.com - * @LastEditTime: 2024-12-12 18:34:45 + * @LastEditTime: 2024-12-12 19:35:56 * @FilePath: \ble_-tyq_-bjq_-ch584-m\bsp\src\bsp_valve.c * @Description: * @@ -61,7 +61,7 @@ int BSP_Valve_Close(uint8_t valve_id) logDebug("BSP_Valve_Close: valve id: %d", valve_id); // TODO:检查是否连接, 如果连接,则发送数据,将关闭阀门指令发送过去,然后等待数据接收响应,如果接收到响应是关闭状态0x01,则返回成功,否则失败 - Valve_GenerateRawFrame(&valve_frame_data, kValveCmdCtr, &valve_ctr_valve, 1); + Valve_GenerateRawFrame(&valve_frame_data, kCmdCloseVavle, &valve_ctr_valve, 1); return BSP_Master_Send(centralConnList, CONNECT0_ITEM, &valve_frame_data.buf[0], valve_frame_data.len); }