Michel2/pybricks-code
1
0
Fork 0
mirror of https://github.com/pybricks/pybricks-code.git synced 2026-09-12 01:23:52 +00:00
Code Issues Releases Activity

fix checksum verification

Browse Source 
the checksum returned by the hub is only one byte, so the 4-byte
checksum used in the firmware can't be used
This commit is contained in:
David Lechner
2021-01-23 15:28:38 -06:00
parent 5d1311216c
commit dcaf9f6ff4
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sagas/flash-firmware.test.ts
+5 -5
View File
@@ -184,7 +184,7 @@ describe('flashFirmware', () => {
// hub indicates success
saga.put(programResponse(0xffffff42, totalFirmwareSize));
saga.put(programResponse(0x62, totalFirmwareSize));
action = await saga.take();
expect(action).toEqual(didProgress(1));
@@ -1116,7 +1116,7 @@ describe('flashFirmware', () => {
// hub indicates incorrect size
saga.put(programResponse(0xffffff33, totalFirmwareSize - 1));
saga.put(programResponse(0x62, totalFirmwareSize - 1));
// should get a hub error
@@ -1266,7 +1266,7 @@ describe('flashFirmware', () => {
// hub indicates incorrect checksum
saga.put(programResponse(0xffffffff, totalFirmwareSize));
saga.put(programResponse(0x100, totalFirmwareSize));
// should get a hub error
@@ -1418,7 +1418,7 @@ describe('flashFirmware', () => {
// hub indicates success
saga.put(programResponse(0xffffff97, totalFirmwareSize));
saga.put(programResponse(0xf3, totalFirmwareSize));
action = await saga.take();
expect(action).toEqual(didProgress(1));
@@ -1947,7 +1947,7 @@ describe('flashFirmware', () => {
// hub indicates success
saga.put(programResponse(0xffffff33, totalFirmwareSize));
saga.put(programResponse(0x27, totalFirmwareSize));
action = await saga.take();
expect(action).toEqual(didProgress(1));
src/sagas/flash-firmware.ts
+13 -9
View File
@@ -155,7 +155,7 @@ function* firmwareIterator(data: DataView, maxSize: number): Generator<number> {
function* loadFirmware(
data: ArrayBuffer,
program: string | undefined,
): SagaGenerator<{ firmware: Uint8Array; deviceId: HubType; checksum: number }> {
): SagaGenerator<{ firmware: Uint8Array; deviceId: HubType }> {
const [reader, readerErr] = yield* call(() => maybe(FirmwareReader.load(data)));
if (readerErr) {
@@ -235,7 +235,7 @@ function* loadFirmware(
firmwareView.setUint32(checksumOffset, checksum, true);
return { firmware, deviceId: metadata['device-id'], checksum };
return { firmware, deviceId: metadata['device-id'] };
}
/**
@@ -246,7 +246,6 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator {
try {
let firmware: Uint8Array | undefined = undefined;
let deviceId: HubType | undefined = undefined;
let checksum: number | undefined = undefined;
let program: string | undefined = undefined;
@@ -267,10 +266,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator {
}
if (action.data !== undefined) {
({ firmware, deviceId, checksum } = yield* loadFirmware(
action.data,
program,
));
({ firmware, deviceId } = yield* loadFirmware(action.data, program));
}
yield* put(connect());
@@ -317,7 +313,7 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator {
}
const data = yield* call(() => response.arrayBuffer());
({ firmware, deviceId, checksum } = yield* loadFirmware(data, program));
({ firmware, deviceId } = yield* loadFirmware(data, program));
if (deviceId !== undefined && info.hubType !== deviceId) {
yield* put(didFailToFinish(FailToFinishReasonType.DeviceMismatch));
@@ -410,7 +406,15 @@ function* flashFirmware(action: FlashFirmwareFlashAction): Generator {
yield* disconnectAndCancel();
}
if (~flash.checksum !== checksum) {
const checksum = firmware.reduce((prev, curr) => prev ^ curr, 0xff);
if (flash.checksum !== checksum) {
if (process.env.NODE_ENV !== 'test') {
console.log(
'checksum:',
flash.checksum.toString(16).padStart(2, '0').padStart(4, '0x'),
checksum.toString(16).padStart(2, '0').padStart(4, '0x'),
);
}
yield* put(
didFailToFinish(
FailToFinishReasonType.HubError,