From e9a4bda8877417a1668de853ee989c635e9f5bc0 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 2 Jul 2024 19:21:52 +0800 Subject: [PATCH] update --- app/src/acid_dispenser_ble_slave_main.c | 2 +- app/src/ble_data_processer_utils.c | 8 +++++--- libznordic | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/acid_dispenser_ble_slave_main.c b/app/src/acid_dispenser_ble_slave_main.c index 6eefa86..ea5286f 100644 --- a/app/src/acid_dispenser_ble_slave_main.c +++ b/app/src/acid_dispenser_ble_slave_main.c @@ -70,7 +70,7 @@ void one_conduction_process_rx_packet(uint8_t* rx, int len) { hand_acid_ble_proto_t* txheader = bletxbuf_get(); hand_acid_ble_proto_cmd_t cmd = (hand_acid_ble_proto_cmd_t)rxheader->cmd; - if (len < sizeof(hand_acid_ble_proto_t)) { + if (len < HAND_ACID_BLE_BASE_SIZE) { ZLOGI("rx len error:%d", len); return; } diff --git a/app/src/ble_data_processer_utils.c b/app/src/ble_data_processer_utils.c index 503a5fa..1fdac4a 100644 --- a/app/src/ble_data_processer_utils.c +++ b/app/src/ble_data_processer_utils.c @@ -38,7 +38,7 @@ void send_error_receipt(hand_acid_ble_proto_t* rxpacket, int32_t errorcode) { void send_success_receipt(hand_acid_ble_proto_t* rxpacket) { hand_acid_ble_proto_t* txheader = (hand_acid_ble_proto_t*)_bletxbuf; - uint16_t sendlen = HAND_ACID_BLE_BASE_SIZE; + uint16_t sendlen = HAND_ACID_BLE_BASE_SIZE + 2; txheader->h1 = PACKET_H1; txheader->h2 = PACKET_H2; txheader->cmd = rxpacket->cmd; @@ -49,6 +49,8 @@ void send_success_receipt(hand_acid_ble_proto_t* rxpacket) { sendlen = HAND_ACID_BLE_BASE_SIZE + sizeof(txheader->data.read_power) + 2; } else if (txheader->cmd == kproto_cmd_read_version) { sendlen = HAND_ACID_BLE_BASE_SIZE + sizeof(txheader->data.read_version) + 2; + } else { + sendlen = HAND_ACID_BLE_BASE_SIZE + 2; } txheader->packetlen = sendlen; @@ -72,8 +74,8 @@ void send_key_event(uint8_t keyid, uint8_t keyevent) { reportpacket->cmd = kproto_report_key_event; reportpacket->data.key_event.keyid = keyid; reportpacket->data.key_event.keyevent = keyevent; - blereportbuf[sendlen - 2] = compute_sum(blereportbuf, sendlen - 2); - blereportbuf[sendlen - 1] = PACKET_TAIL; + blereportbuf[sendlen - 2] = compute_sum(blereportbuf, sendlen - 2); + blereportbuf[sendlen - 1] = PACKET_TAIL; zdatachannel_data_send2(blereportbuf, sendlen); } diff --git a/libznordic b/libznordic index 580f3fa..52c03bd 160000 --- a/libznordic +++ b/libznordic @@ -1 +1 @@ -Subproject commit 580f3fa2c782904ac2e26dfa73db6f7134fd8eb3 +Subproject commit 52c03bdf1b92ff025c07a42c3ac85f539f128c5c