Add Pico 2 / Pico 2 W support and fix missing devices in UI

components/Flash.vue

@@ -10,7 +10,7 @@
       {{ $t('flash.title') }}
     </button>
     <button
-      v-show="['nrf52840', 'rp2040'].includes(deviceStore.selectedArchitecture)"
+      v-show="uf2Architectures.includes(deviceStore.selectedArchitecture)"
       data-tooltip-target="tooltip-erase"
       class="btn-icon mx-2"
       type="button"
@@ -56,7 +56,7 @@
               </video>
               <FlashHeader />
               <div class="flex-1 overflow-y-auto p-3 sm:p-4 relative z-10">
-                <TargetsUf2 v-if="['nrf52840', 'rp2040'].includes(deviceStore.selectedArchitecture)" />
+                <TargetsUf2 v-if="uf2Architectures.includes(deviceStore.selectedArchitecture)" />
                 <TargetsEsp32 v-if="deviceStore.selectedArchitecture.startsWith('esp32')" />
               </div>
             </div>
@@ -90,7 +90,7 @@
                 :title-override="`${$t('flash.erase_flash')} ${deviceStore.$state.selectedTarget?.displayName || ''}`"
               />
               <div class="flex-1 overflow-y-auto p-3 sm:p-4 relative z-10">
-                <TargetsEraseUf2 v-if="['nrf52840', 'rp2040'].includes(deviceStore.selectedArchitecture)" />
+                <TargetsEraseUf2 v-if="uf2Architectures.includes(deviceStore.selectedArchitecture)" />
               </div>
             </div>
           </div>
@@ -115,6 +115,7 @@ const deviceStore = useDeviceStore()
 const serialMonitorStore = useSerialMonitorStore()
 
 const fileExistsOnServer = ref(false)
+const uf2Architectures = ['nrf52840', 'rp2040', 'rp2350']
 
 watch(() => firmwareStore.$state.selectedFirmware, async () => {
   await preflightCheck()
@@ -137,7 +138,7 @@ const preflightCheck = async () => {
     return
   }
 
-  if (['nrf52840', 'rp2040'].includes(deviceStore.selectedArchitecture)) {
+  if (uf2Architectures.includes(deviceStore.selectedArchitecture)) {
     const firmwareVersion = firmwareStore.selectedFirmware!.id.replace('v', '')
     const firmwareFile = `firmware-${deviceStore.selectedTarget.platformioTarget}-${firmwareVersion}.uf2`
     fileExistsOnServer.value = await checkIfRemoteFileExists(firmwareStore.getReleaseFileUrl(firmwareFile))

public/data/hardware-list.json

@@ -482,6 +482,40 @@
       "rpipicow.svg"
     ]
   },
+  {
+    "hwModel": 113,
+    "hwModelSlug": "RPI_PICO2",
+    "platformioTarget": "pico2",
+    "architecture": "rp2350",
+    "activelySupported": true,
+    "supportLevel": 3,
+    "displayName": "Raspberry Pi Pico 2",
+    "tags": [
+      "RPi",
+      "DIY"
+    ],
+    "requiresDfu": true,
+    "images": [
+      "pico2.svg"
+    ]
+  },
+  {
+    "hwModel": 113,
+    "hwModelSlug": "RPI_PICO2",
+    "platformioTarget": "pico2w",
+    "architecture": "rp2350",
+    "activelySupported": true,
+    "supportLevel": 3,
+    "displayName": "Raspberry Pi Pico 2 W",
+    "tags": [
+      "RPi",
+      "DIY"
+    ],
+    "requiresDfu": true,
+    "images": [
+      "pico2w.svg"
+    ]
+  },
   {
     "hwModel": 48,
     "hwModelSlug": "HELTEC_WIRELESS_TRACKER",

stores/deviceStore.ts

@@ -95,28 +95,52 @@ export const useDeviceStore = defineStore('device', {
   },
   actions: {
     async fetchList() {
-      try {
-        // First try to fetch from the API
-        const targets = await firmwareApi.get<DeviceHardware[]>()
-        this.setTargetsList(targets)
+      const [apiResult, offlineResult] = await Promise.allSettled([
+        firmwareApi.get<DeviceHardware[]>(),
+        this.loadOfflineHardwareList(),
+      ])
+
+      const apiTargets = apiResult.status === 'fulfilled' ? apiResult.value : []
+      const offlineTargets = offlineResult.status === 'fulfilled' ? offlineResult.value : []
+
+      if (apiResult.status === 'rejected') {
+        console.error(apiResult.reason)
       }
-      catch (ex) {
-        console.error(ex)
-        // Fallback to offline list from the JSON file
-        try {
-          const response = await fetch('/data/hardware-list.json')
-          if (response.ok) {
-            const offlineHardwareList = await response.json()
-            this.setTargetsList(offlineHardwareList)
-          }
-          else {
-            console.error('Failed to load hardware list from JSON file')
-          }
-        }
-        catch (error) {
-          console.error('Error loading hardware list from JSON file:', error)
-        }
+      if (offlineResult.status === 'rejected') {
+        console.error('Error loading hardware list from JSON file:', offlineResult.reason)
+      }
+
+      const mergedTargets = this.mergeTargetsList(apiTargets, offlineTargets)
+
+      if (mergedTargets.length > 0) {
+        this.setTargetsList(mergedTargets)
+      }
+      else {
+        console.error('Failed to load hardware list from API and JSON file')
+      }
+    },
+    async loadOfflineHardwareList(): Promise<DeviceHardware[]> {
+      const response = await fetch('/data/hardware-list.json')
+      if (!response.ok) {
+        throw new Error('Failed to load hardware list from JSON file')
       }
+
+      return response.json()
+    },
+    mergeTargetsList(apiTargets: DeviceHardware[], offlineTargets: DeviceHardware[]): DeviceHardware[] {
+      const getTargetKey = (target: DeviceHardware) => target.key || target.platformioTarget || `${target.hwModelSlug}-${target.displayName}`
+      const merged = new Map<string, DeviceHardware>()
+
+      apiTargets.forEach((target) => {
+        merged.set(getTargetKey(target), target)
+      })
+
+      // Local list overrides API entries so critical board fixes are always present
+      offlineTargets.forEach((target) => {
+        merged.set(getTargetKey(target), target)
+      })
+
+      return Array.from(merged.values())
     },
     setTargetsList(targets: DeviceHardware[]) {
       if (vendorCobrandingTag.length > 0) {