From 1abbba14f7427b876b1ec9526df478be0b9b42ad Mon Sep 17 00:00:00 2001 From: keeramis Date: Thu, 16 May 2024 08:35:25 -0700 Subject: [PATCH] Accommodate gen4 as well --- src/lib/device-specs.js | 2 +- src/lib/flash-helper.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/device-specs.js b/src/lib/device-specs.js index 9895acc6c..7a46d2c2c 100644 --- a/src/lib/device-specs.js +++ b/src/lib/device-specs.js @@ -173,7 +173,7 @@ function generateDeviceSpecs() { knownApps: knownAppsForPlatform(device.name), // add the offsets to server and device keys in DCT - ...(device.generation === 1 ? keysDctOffsets.generation1 : keysDctOffsets.laterGenerations), + ...(device.generation <= 1 ? keysDctOffsets.generation1 : keysDctOffsets.laterGenerations), // add the segments where DFU can read/write ...device.dfu.segments, diff --git a/src/lib/flash-helper.js b/src/lib/flash-helper.js index de20b3274..bcd0db498 100644 --- a/src/lib/flash-helper.js +++ b/src/lib/flash-helper.js @@ -349,7 +349,7 @@ function _get256Hash(module) { function validateDFUSupport({ device, ui }) { const platform = platformForId(device.platformId); - if (!device.isInDfuMode && (!semver.valid(device.firmwareVersion) || semver.lt(device.firmwareVersion, '2.0.0')) && platform.generation === 2) { + if (!device.isInDfuMode && (!semver.valid(device.firmwareVersion) || semver.lt(device.firmwareVersion, '2.0.0')) && platform.generation <= 2) { ui.logDFUModeRequired({ showVersionWarning: true }); throw new Error('Put the device in DFU mode and try again'); }