increase firmware flashing packet size

This commit is contained in:
David Lechner
2020-07-02 21:37:00 -05:00
committed by David Lechner
parent c3037a56e6
commit 0944a27eb9
2 changed files with 19 additions and 4 deletions
+12 -2
View File
@@ -63,8 +63,19 @@ export enum Result {
/**
* The largest allowable size for the payload of the ProgramFlash command.
*
* Theoretically, this is MTU - 9. However, City hub and Control+ hub report
* MTU of 158 but don't seem to be able to handle receiving that much data.
* Anything larger than 32 causes the bootloader to lock up.
*/
export const MaxProgramFlashSize = 14;
export const MaxProgramFlashSize: ReadonlyMap<HubType, number> = new Map<
HubType,
number
>([
[HubType.MoveHub, 14],
[HubType.CityHub, 32],
[HubType.CPlusHub, 32],
]);
/**
* Flash memory protection level.
@@ -111,7 +122,6 @@ export function createProgramFlashRequest(
payload: ArrayBuffer,
): Uint8Array {
const size = payload.byteLength;
assert(size <= MaxProgramFlashSize, 'payload is bigger than MaxProgramFlashSize');
const msg = new Uint8Array(size + 6);
const view = new DataView(msg.buffer);
view.setUint8(0, Command.ProgramFlash);
+7 -2
View File
@@ -303,9 +303,14 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator {
}
let count = 0;
const maxDataSize = MaxProgramFlashSize.get(info[0].hubType);
if (maxDataSize === undefined) {
// istanbul ignore next: indicates programmer error if reached
throw Error('Missing hub type in MaxProgramFlashSize');
}
for (let offset = 0; offset < firmware.length; offset += MaxProgramFlashSize) {
const payload = firmware.slice(offset, offset + MaxProgramFlashSize);
for (let offset = 0; offset < firmware.length; offset += maxDataSize) {
const payload = firmware.slice(offset, offset + maxDataSize);
const programAction = (yield put(
programRequest(info[0].startAddress + offset, payload.buffer),
)) as BootloaderProgramRequestAction;