Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions src/firmware/sagas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,32 +351,20 @@ function* loadFirmware(
'Expected metadata to be v2.x',
);

const firmware = new Uint8Array(firmwareBase.length + 4);
const firmwareView = new DataView(firmware.buffer);

firmware.set(firmwareBase);

// empty string means use default name (don't write over firmware)
if (hubName) {
firmware.set(encodeHubName(hubName, metadata), metadata['hub-name-offset']);
}

const checksum = (function () {
const [checksumFunc, checksumExtraLength] = (() => {
switch (metadata['checksum-type']) {
case 'sum':
return sumComplement32(
firmwareIterator(firmwareView, metadata['checksum-size']),
);
return [sumComplement32, 4];
case 'crc32':
return crc32(firmwareIterator(firmwareView, metadata['checksum-size']));
return [crc32, 4];
case 'none':
return null;
return [null, 0];
default:
return undefined;
return [undefined, 0];
}
})();

if (checksum === undefined) {
if (checksumFunc === undefined) {
// FIXME: we should return error/throw instead
yield* put(
didFailToFinish(
Expand All @@ -391,8 +379,22 @@ function* loadFirmware(
throw new Error('unreachable');
}

if (checksum !== null) {
firmwareView.setUint32(firmwareBase.length, checksum, true);
const firmware = new Uint8Array(firmwareBase.length + checksumExtraLength);
const firmwareView = new DataView(firmware.buffer);

firmware.set(firmwareBase);

// empty string means use default name (don't write over firmware)
if (hubName) {
firmware.set(encodeHubName(hubName, metadata), metadata['hub-name-offset']);
}

if (checksumFunc !== null) {
firmwareView.setUint32(
firmwareBase.length,
checksumFunc(firmwareIterator(firmwareView, metadata['checksum-size'])),
true,
);
}

return { firmware, deviceId: metadata['device-id'] };
Expand Down