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;