neil/blisp
1
0
Fork 0
mirror of https://github.com/pine64/blisp.git synced 2024-12-22 22:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect git-merge

Browse Source
This commit is contained in:
Pavel Zakopaylo 2023-11-30 15:48:47 +11:00
parent d278063472
commit c30287e49d
No known key found for this signature in database
GPG Key ID: 9D4130BD5891F5CB
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/blisp.c
View File

@ -216,30 +216,16 @@ blisp_return_t blisp_device_handshake(struct blisp_device* device,
sp_flush(serial_port, SP_BUF_INPUT); // Flush garbage out of RX sp_flush(serial_port, SP_BUF_INPUT); // Flush garbage out of RX
} }
uint32_t bytes_count = device->chip->handshake_byte_multiplier * (float)device->current_baud_rate / 10.0f;
if (bytes_count > 600) bytes_count = 600;
memset(handshake_buffer, 'U', bytes_count);
// sp_flush(serial_port, SP_BUF_BOTH);
for (uint8_t i = 0; i < 5; i++) {
if (!in_ef_loader) {
if (device->is_usb) {
sp_blocking_write(serial_port, "BOUFFALOLAB5555RESET\0\0", 22,
100); // TODO: Error handling
}
}
ret = sp_blocking_write(serial_port, handshake_buffer, bytes_count,
500);
if (ret < 0) {
return -1;
}
if (device->chip->type == BLISP_CHIP_BL808) { if (device->chip->type == BLISP_CHIP_BL808) {
sleep_ms(300); sleep_ms(300);
const uint8_t second_handshake[] = { 0x50, 0x00, 0x08, 0x00, 0x38, 0xF0, 0x00, 0x20, 0x00, 0x00, 0x00, 0x18 }; const uint8_t second_handshake[] = { 0x50, 0x00, 0x08, 0x00, 0x38, 0xF0, 0x00, 0x20, 0x00, 0x00, 0x00, 0x18 };
sp_blocking_write(serial_port, second_handshake, sizeof(second_handshake), 300); // TODO: Error handling ret = sp_blocking_write(serial_port, second_handshake, sizeof(second_handshake), 300);
if (ret < 0) {
blisp_dlog("Second handshake write failed, ret %d", ret);
return BLISP_ERR_API_ERROR;
} }
}
ret = sp_blocking_read(serial_port, device->rx_buffer, 20, 50); ret = sp_blocking_read(serial_port, device->rx_buffer, 20, 50);
if (ret >= 2) { if (ret >= 2) {
for (uint8_t j = 0; j < (ret - 1); j++) { for (uint8_t j = 0; j < (ret - 1); j++) {
@ -249,7 +235,6 @@ blisp_return_t blisp_device_handshake(struct blisp_device* device,
} }
} }
} }
}
blisp_dlog("Received no response from chip."); blisp_dlog("Received no response from chip.");
return BLISP_ERR_NO_RESPONSE; return BLISP_ERR_NO_RESPONSE;
} }