Browse Source

update

hardware_test_b
zhaohe 1 year ago
parent
commit
e9a4bda887
  1. 2
      app/src/acid_dispenser_ble_slave_main.c
  2. 8
      app/src/ble_data_processer_utils.c
  3. 2
      libznordic

2
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;
}

8
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);
}

2
libznordic

@ -1 +1 @@
Subproject commit 580f3fa2c782904ac2e26dfa73db6f7134fd8eb3
Subproject commit 52c03bdf1b92ff025c07a42c3ac85f539f128c5c
Loading…
Cancel
Save