Air quality DFU match with RangerEdge HW type

Author: tjvandam

dfu/dfu.js

@@ -47,6 +47,20 @@ const FwTypeEnum = {
   default: 0,
 };
 
+function normalizeHwTypeName(name) {
+  if (name === 'rangeredge_airq_nrf52840') {
+    return 'rangeredge_nrf52840';
+  }
+  return name;
+}
+
+function formatHwTypeLabel(name) {
+  if (name === 'rangeredge_airq_nrf52840') {
+    return 'rangeredge_nrf52840 (AirQ)';
+  }
+  return name;
+}
+
 const dfuCheckMessages = {
   [DfuFileCheckResult.ok]: 'DFU file looks good for this device.',
   [DfuFileCheckResult.warnOlderFirmware]: 'Selected firmware is older than the current device firmware. You can continue, but downgrading may not be supported.',
@@ -179,7 +193,8 @@ function setBundledStatus(message) {
 
 function buildBundledLabel(entry) {
   const release = entry.releaseId || entry.firmwareVersion || 'unknown';
-  const hw = entry.hwType ? `${entry.hwType}@${entry.hwVersion || '?'}` : 'unknown hardware';
+  const hwTypeLabel = entry.hwType ? formatHwTypeLabel(entry.hwType) : 'unknown hardware';
+  const hw = entry.hwType ? `${hwTypeLabel}@${entry.hwVersion || '?'}` : 'unknown hardware';
   return `${release} • ${hw}`;
 }
 
@@ -246,7 +261,10 @@ function shouldIncludeBundledEntry(entry) {
   const deviceHwVersion = normalizeVersionString(dfuState.deviceInfo?.hwVersion || '');
   const deviceFwVersion = normalizeVersionString(dfuState.deviceInfo?.fwVersion || '');
 
-  if (deviceHwTypeName && entry.hwType && entry.hwType !== deviceHwTypeName) {
+  const normalizedEntryHwType = entry.hwType ? normalizeHwTypeName(entry.hwType) : '';
+  const normalizedDeviceHwType = deviceHwTypeName ? normalizeHwTypeName(deviceHwTypeName) : '';
+
+  if (normalizedDeviceHwType && normalizedEntryHwType && normalizedEntryHwType !== normalizedDeviceHwType) {
     return false;
   }
 
@@ -543,7 +561,9 @@ function checkDfuFileName(fileName, deviceType, deviceFwVersion, deviceHwType, d
 
   if (deviceHwType !== HwTypeEnum.unknown) {
     const hwTypeString = FileNameHwEnum[deviceHwType];
-    if (hwTypeString !== fileHwType) {
+    const normalizedDeviceHw = normalizeHwTypeName(hwTypeString);
+    const normalizedFileHw = normalizeHwTypeName(fileHwType);
+    if (normalizedDeviceHw !== normalizedFileHw) {
       return DfuFileCheckResult.deviceHwTypeMismatch;
     }
 

hardware-types.js

@@ -17,6 +17,13 @@ const HW_DFU_MANIFEST_URL = 'assets/dfu/manifest.json';
 let cachedManifest = null;
 let cachedHwVersionsByType = null;
 
+function normalizeHwTypeName(name) {
+  if (name === 'rangeredge_airq_nrf52840') {
+    return 'rangeredge_nrf52840';
+  }
+  return name;
+}
+
 function getHwTypeLabel(hwType) {
   if (Number.isFinite(hwType) && HW_TYPES.byId[hwType]) {
     return HW_TYPES.byId[hwType].label;
@@ -52,10 +59,11 @@ function buildHwVersionsByType(manifest) {
       if (!file?.hwType || !file?.hwVersion) {
         return;
       }
-      if (!map.has(file.hwType)) {
-        map.set(file.hwType, new Set());
+      const normalizedHwType = normalizeHwTypeName(file.hwType);
+      if (!map.has(normalizedHwType)) {
+        map.set(normalizedHwType, new Set());
       }
-      map.get(file.hwType).add(file.hwVersion);
+      map.get(normalizedHwType).add(file.hwVersion);
     });
   });
   return map;

to-do.md

@@ -4,8 +4,8 @@
 2. Decide if we should auto-generate `assets/dfu/manifest.json` from `assets/dfu/releases/` (script or manual). (Done: manifest regenerated from releases)
 3. Add device-aware filtering so the bundled selector only shows matching `hwType` + `hwVersion`. (Done, includes v5 migration gating for v6+)
 4. Update DFU UI copy if needed (hint text currently says `.bin or .zip` but bundled flow is `.bin`). (Partially done: “bundled” wording updated to “built‑in update”; hint still says `.bin or .zip`)
-5. Test service worker caching with offline mode and verify bundled DFU selection works end-to-end. (Pending)
-6. Add `rangeredge_airq_nrf52840` hardware type mapping (need numeric hwType ID from device firmware). (Pending)
+5. Test service worker caching with offline mode and verify bundled DFU selection works end-to-end. (Done)
+6. Treat `rangeredge_airq_nrf52840` as `rangeredge_nrf52840` for DFU selection and file checks. (Done)
 
 Additional changes completed:
 - Single source of truth for hardware types and versions via `hardware-types.js`.