lfg2025/archy
1
0
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects Releases 61 Wiki Activity

fix(mesh): board auto-detect used the wrong signal, false-flagged Heltec V3

Browse Source 
The "couldn't confirm the board automatically" warning was checking the
display label text (/v3/i, /v4/i) instead of the same vid:pid table the
backend actually uses to resolve the board. A Heltec V3's CP2102 bridge
chip reports "CP2102 USB to UART Bridge Controller" in its USB strings, not
"Heltec", so meshDeviceImages.ts's fallback label ("LoRa radio (CP2102
serial)") never matched the regex — showing the low-confidence warning (and
leaving the board picker empty) even though the backend's
resolve_flash_board can safely auto-detect V3 via vid:pid 10c4:ea60.

Now checks the same vid:pid directly from detected_device_info, matching
mesh::flash::resolve_flash_board exactly. V4 still has no auto-match entry,
same as the backend — its vid:pid (303a:1001) is the ESP32-S3's generic
native-USB descriptor, not V4-specific, so manual selection is still
required there.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
ssmithx 2026-07-23 02:31:46 +00:00
parent beff5dd577
commit 992bf636e0
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
neode-ui/src/components/mesh/MeshDeviceSetupModal.vue
View File

@ -453,10 +453,27 @@ const starting = ref(false)
const flashJob = ref<FlashJobStatus | null>(null) const flashJob = ref<FlashJobStatus | null>(null)
let flashPollTimer: ReturnType<typeof setInterval> | null = null let flashPollTimer: ReturnType<typeof setInterval> | null = null
// Best-effort guess from the already-resolved board image label — the user const detectedInfo = computed(() =>
// can always override; a wrong guess just means the checkbox below draws mesh.status?.detected_device_info?.find(d => d.path === devicePath.value)
// their attention to the warning before anything destructive happens. )
const boardAutoDetected = computed(() => /v4/i.test(deviceImage.value.label) || /v3/i.test(deviceImage.value.label))
// Mirrors mesh::flash::resolve_flash_board (core/archipelago/src/mesh/flash.rs)
// exactly — matching on the display label was wrong: a Heltec V3's CP2102
// bridge chip reports "CP2102 USB to UART Bridge Controller" in its USB
// strings, not "Heltec", so meshDeviceImages.ts falls back to a generic
// "LoRa radio (CP2102 serial)" label that never matched /v3/i, showing the
// "couldn't confirm automatically" warning even though the backend CAN
// safely auto-detect V3 via vid:pid. Heltec V4 deliberately has no entry
// here, same reasoning as the backend: its vid:pid (303a:1001) is the
// ESP32-S3's generic native-USB descriptor, not V4-specific, so it can't be
// safely auto-matched and always requires manual selection.
const resolvedFlashBoard = computed<FlashBoard | ''>(() => {
const info = detectedInfo.value
if (info?.vid?.toLowerCase() === '10c4' && info?.pid?.toLowerCase() === 'ea60') return 'heltec-v3'
return ''
})
const boardAutoDetected = computed(() => !!resolvedFlashBoard.value)
const flashStageLabel = computed(() => { const flashStageLabel = computed(() => {
switch (flashJob.value?.stage) { switch (flashJob.value?.stage) {
@ -472,7 +489,7 @@ const flashStageLabel = computed(() => {
function openFlashStep() { function openFlashStep() {
flashFamily.value = (probe.value?.kind as FlashFirmwareFamily) ?? '' flashFamily.value = (probe.value?.kind as FlashFirmwareFamily) ?? ''
flashBoard.value = /v4/i.test(deviceImage.value.label) ? 'heltec-v4' : /v3/i.test(deviceImage.value.label) ? 'heltec-v3' : '' flashBoard.value = resolvedFlashBoard.value
flashConfirmed.value = false flashConfirmed.value = false
flashJob.value = null flashJob.value = null
error.value = '' error.value = ''