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

New error reading method

This commit is contained in:
Aleksander Nowakowski 2016-06-23 11:10:16 +02:00
parent 841a3abda4
commit 9bf61f81b2
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java
View File

@ -769,13 +769,13 @@ public abstract class DfuBaseService extends IntentService implements DfuProgres
if ((fileType & ~(TYPE_SOFT_DEVICE | TYPE_BOOTLOADER | TYPE_APPLICATION)) > 0 || !(MIME_TYPE_ZIP.equals(mimeType) || MIME_TYPE_OCTET_STREAM.equals(mimeType))) {
logw("File type or file mime-type not supported");
sendLogBroadcast(LOG_LEVEL_WARNING, "File type or file mime-type not supported");
sendErrorBroadcast(ERROR_FILE_TYPE_UNSUPPORTED);
report(ERROR_FILE_TYPE_UNSUPPORTED);
return;
}
if (MIME_TYPE_OCTET_STREAM.equals(mimeType) && fileType != TYPE_SOFT_DEVICE && fileType != TYPE_BOOTLOADER && fileType != TYPE_APPLICATION) {
logw("Unable to determine file type");
sendLogBroadcast(LOG_LEVEL_WARNING, "Unable to determine file type");
sendErrorBroadcast(ERROR_FILE_TYPE_UNSUPPORTED);
report(ERROR_FILE_TYPE_UNSUPPORTED);
return;
}
@ -862,22 +862,27 @@ public abstract class DfuBaseService extends IntentService implements DfuProgres
sendLogBroadcast(LOG_LEVEL_INFO, "Image file opened (" + imageSizeInBytes + " bytes in total)");
} catch (final SecurityException e) {
loge("A security exception occurred while opening file", e);
sendLogBroadcast(LOG_LEVEL_ERROR, "Opening file failed: Permission required");
report(ERROR_FILE_NOT_FOUND);
return;
} catch (final FileNotFoundException e) {
loge("An exception occurred while opening file", e);
sendLogBroadcast(LOG_LEVEL_ERROR, "Opening file failed: File not found");
report(ERROR_FILE_NOT_FOUND);
return;
} catch (final SizeValidationException e) {
loge("Firmware not word-aligned", e);
sendLogBroadcast(LOG_LEVEL_ERROR, "Opening file failed: Firmware size must be word-aligned");
report(ERROR_FILE_SIZE_INVALID);
return;
} catch (final IOException e) {
loge("An exception occurred while calculating file size", e);
sendLogBroadcast(LOG_LEVEL_ERROR, "Opening file failed: " + e.getLocalizedMessage());
report(ERROR_FILE_ERROR);
return;
} catch (final Exception e) {
loge("An exception occurred while opening files. Did you set the firmware file?", e);
sendLogBroadcast(LOG_LEVEL_ERROR, "Opening file failed: " + e.getLocalizedMessage());
report(ERROR_FILE_ERROR);
return;
}

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

@ -72,8 +72,6 @@ import no.nordicsemi.android.error.SecureDfuError;
private BluetoothGattCharacteristic mControlPointCharacteristic;
private BluetoothGattCharacteristic mPacketCharacteristic;
/** The error details may come in more than one packet. Only the first one has the Response Op Code and status. Others contain just UTF-8 text. */
private boolean mReceivingErrorDetailsInProgress = false;
private final SecureBluetoothCallback mBluetoothCallback = new SecureBluetoothCallback();
@ -81,13 +79,6 @@ import no.nordicsemi.android.error.SecureDfuError;
@Override
public void onCharacteristicChanged(final BluetoothGatt gatt, final BluetoothGattCharacteristic characteristic) {
if (mReceivingErrorDetailsInProgress) {
mReceivingErrorDetailsInProgress = false;
handleNotification(gatt, characteristic);
notifyLock();
return;
}
if (characteristic.getValue() == null || characteristic.getValue().length < 3) {
loge("Empty response: " + parse(characteristic));
mError = DfuBaseService.ERROR_INVALID_RESPONSE;
@ -229,7 +220,7 @@ import no.nordicsemi.android.error.SecureDfuError;
// For the Extended Error more details can be obtained on some devices.
if (e.getErrorNumber() == SecureDfuError.EXTENDED_ERROR) {
try {
final ErrorMessage details = readLastError();
final ErrorMessage details = readExtendedError();
if (details != null) {
logi("Error details: " + details.message + " (Code = " + details.code + ")");
mService.sendLogBroadcast(DfuBaseService.LOG_LEVEL_ERROR, "Details: " + details.message + " (Code = " + details.code + ")");
@ -682,7 +673,8 @@ import no.nordicsemi.android.error.SecureDfuError;
}
/**
* Reads the last error message from the device.
* Reads the last error message from the device. This can be executed after a {@link SecureDfuError#EXTENDED_ERROR} status is received
* from any Execute operation.
*
* @return the error details or null if this feature is not supported
* @throws DeviceDisconnectedException
@ -690,27 +682,30 @@ import no.nordicsemi.android.error.SecureDfuError;
* @throws UploadAbortedException
* @throws RemoteDfuException thrown when the returned status code is not equal to {@link #DFU_STATUS_SUCCESS}
*/
private ErrorMessage readLastError() throws DeviceDisconnectedException, DfuException, UploadAbortedException, RemoteDfuException, UnknownResponseException {
private ErrorMessage readExtendedError() throws DeviceDisconnectedException, DfuException, UploadAbortedException, RemoteDfuException, UnknownResponseException {
if (!mConnected)
throw new DeviceDisconnectedException("Unable to read object info: device disconnected");
mRemoteErrorOccurred = false;
final BluetoothGattCharacteristic characteristic = mControlPointCharacteristic;
writeOpCode(characteristic, OP_CODE_READ_ERROR);
mReceivingErrorDetailsInProgress = true;
final byte[] response = readNotificationResponse();
final int status = getStatusCode(response, OP_CODE_READ_ERROR_KEY);
if (status == DFU_STATUS_SUCCESS) {
final int code = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, 3);
int length = characteristic.getIntValue(BluetoothGattCharacteristic.FORMAT_UINT16, 5);
if (code == 0 && length == 0)
return null;
final StringBuilder builder = new StringBuilder();
builder.append(characteristic.getStringValue(7));
while (length - builder.length() > 0) {
mReceivedData = null;
mReceivingErrorDetailsInProgress = true;
writeOpCode(characteristic, OP_CODE_READ_ERROR);
readNotificationResponse();
builder.append(characteristic.getStringValue(0));
builder.append(characteristic.getStringValue(3));
// Finish if byte 0 is received at the end
if (characteristic.getValue()[characteristic.getValue().length - 1] == 0)