rusefi
/
Android-DFU-Library
mirror of https://github.com/rusefi/Android-DFU-Library.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Validating CRC in PRNs

This commit is contained in:
Aleksander Nowakowski 2017-10-20 17:07:39 +02:00
parent ff73f661eb
commit 61c7c45335
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dfu/src/main/java/no/nordicsemi/android/dfu/BaseCustomDfuImpl.java
View File

@ -47,11 +47,11 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException;
/**
* Flag indicating whether the firmware is being transmitted or not.
*/
private boolean mFirmwareUploadInProgress;
protected boolean mFirmwareUploadInProgress;
/**
* The number of packets of firmware data to be send before receiving a new Packets receipt notification. 0 disables the packets notifications.
*/
protected final int mPacketsBeforeNotification;
protected int mPacketsBeforeNotification;
/**
* The number of packets sent since last notification.
*/

19
dfu/src/main/java/no/nordicsemi/android/dfu/SecureDfuImpl.java
View File

@ -98,8 +98,21 @@ import no.nordicsemi.android.error.SecureDfuError;
switch (requestType) {
case OP_CODE_CALCULATE_CHECKSUM_KEY: {
mProgressInfo.setBytesReceived(characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, 3));
// TODO check CRC?
final int offset = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, 3);
final int remoteCrc = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT32, 3 + 4);
final int localCrc = (int) (((ArchiveInputStream) mFirmwareStream).getCrc32() & 0xFFFFFFFFL);
// Check whether local and remote CRC match
if (localCrc == remoteCrc) {
// If so, update the number of bytes received
mProgressInfo.setBytesReceived(offset);
} else {
// Else, and only in case it was a PRN received, not the response for Calculate Checksum Request, stop sending data
if (mFirmwareUploadInProgress) {
mFirmwareUploadInProgress = false;
notifyLock();
return;
} // else will be handled by sendFirmware(gatt) below
}
handlePacketReceiptNotification(gatt, characteristic);
break;
}
@ -405,7 +418,7 @@ import no.nordicsemi.android.error.SecureDfuError;
*/
private void sendFirmware(final BluetoothGatt gatt) throws RemoteDfuException, DeviceDisconnectedException, DfuException, UploadAbortedException, UnknownResponseException {
// Send the number of packets of firmware before receiving a receipt notification
final int numberOfPacketsBeforeNotification = mPacketsBeforeNotification;
int numberOfPacketsBeforeNotification = mPacketsBeforeNotification;
if (numberOfPacketsBeforeNotification > 0) {
setPacketReceiptNotifications(numberOfPacketsBeforeNotification);
mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_APPLICATION, "Packet Receipt Notif Req (Op Code = 2) sent (Value = " + numberOfPacketsBeforeNotification + ")");