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

TODOs removed 

git-svn-id: http://svn.nordicsemi.no/applications/mobile/android/DFULibrary/trunk@6049 94a72e49-5737-764a-8bf3-0d5ceb61e552
This commit is contained in:
alno 2014-06-30 11:51:04 +00:00
parent a1a2b28dfd
commit e212e3da61
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/no/nordicsemi/android/dfu/DfuBaseService.java
View File

@ -105,7 +105,6 @@ public abstract class DfuBaseService extends IntentService {
* <li>If the {@link #EXTRA_FILE_MIME_TYPE} field is <code>null</code> or is equal to {@value #MIME_TYPE_HEX} - the {@link #TYPE_APPLICATION} is assumed.</li> * <li>If the {@link #EXTRA_FILE_MIME_TYPE} field is <code>null</code> or is equal to {@value #MIME_TYPE_HEX} - the {@link #TYPE_APPLICATION} is assumed.</li>
* <li>If the {@link #EXTRA_FILE_MIME_TYPE} field is equal to {@value #MIME_TYPE_ZIP} - the {@link #TYPE_AUTO} is assumed.</li> * <li>If the {@link #EXTRA_FILE_MIME_TYPE} field is equal to {@value #MIME_TYPE_ZIP} - the {@link #TYPE_AUTO} is assumed.</li>
* </ol> * </ol>
* TODO czy nazwy plikow dobre?
*/ */
public static final String EXTRA_FILE_TYPE = "no.nordicsemi.android.dfu.extra.EXTRA_FILE_TYPE"; public static final String EXTRA_FILE_TYPE = "no.nordicsemi.android.dfu.extra.EXTRA_FILE_TYPE";
/** /**
@ -129,7 +128,7 @@ public abstract class DfuBaseService extends IntentService {
/** /**
* A ZIP file that combines more than 1 HEX file. The names of files in the ZIP must be: <b>softdevice.hex</b>, <b>bootloader.hex</b>, <b>application.hex</b> in order to be read correctly. In the * A ZIP file that combines more than 1 HEX file. The names of files in the ZIP must be: <b>softdevice.hex</b>, <b>bootloader.hex</b>, <b>application.hex</b> in order to be read correctly. In the
* DFU version 2 the Soft Device and Bootloader may be sent together. In case of additional application file included, the service will try to send Soft Device, Bootloader and Application together * DFU version 2 the Soft Device and Bootloader may be sent together. In case of additional application file included, the service will try to send Soft Device, Bootloader and Application together
* (not supported by DFU v.2) and if it fails, send first SD+BL, reconnect and send application. TODO czy nazwy plikow dobre? * (not supported by DFU v.2) and if it fails, send first SD+BL, reconnect and send application.
* *
* @see #EXTRA_FILE_TYPE * @see #EXTRA_FILE_TYPE
*/ */
@ -855,10 +854,6 @@ public abstract class DfuBaseService extends IntentService {
sendLogBroadcast(Level.INFO, "Responce received (Op Code: " + response[1] + " Status: " + status + ")"); sendLogBroadcast(Level.INFO, "Responce received (Op Code: " + response[1] + " Status: " + status + ")");
if (status != DFU_STATUS_SUCCESS) if (status != DFU_STATUS_SUCCESS)
throw new RemoteDfuException("Starting DFU failed", status); throw new RemoteDfuException("Starting DFU failed", status);
// TODO aplikcaja powinna sprobowac wyslac samo SD+BL, potem sie ponownie polaczyc i wyslac app
// Testowanie czy nowy SD sie wgral: nrfjprog --memrd 0x3000 --w 32 --n 16
// Nowy bedzie miec FFFFFFFE na koncu, stary FFFF004E
} else } else
throw e; throw e;
} catch (final RemoteDfuException e1) { } catch (final RemoteDfuException e1) {
@ -894,10 +889,15 @@ public abstract class DfuBaseService extends IntentService {
} }
if ((fileType & TYPE_SOFT_DEVICE) > 0) { if ((fileType & TYPE_SOFT_DEVICE) > 0) {
// TODO wywalic to oczekiwanie. Wymagane aby mozna bylo wyslac SoftDevice - bootloader musi wyczyscic przestrzen aplikacji aby moc tam wgrac nowe SD // In the current version of bootloader we must wait some time until we can proceed with Soft Device update. Bootloader must prepare the RAM for the new firmware.
int k = 0; // Most likely this step will not be needed in the future as the notification received a moment before will be postponed until Bootloader is ready.
for (long l = 0; l < 600000000L; l++) { // TODO remove this "if" when bootloader fixed:
k = (int) (l * k); synchronized (this) {
try {
wait(6000);
} catch (final InterruptedException e) {
// do nothing
}
} }
} }