Skip to content

Commit 344a0cc

Browse files
committed
better fallback serial selection
1 parent d5d89b6 commit 344a0cc

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

src/renderer/src/components/SetupMethodSelector.vue

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ const selectedPort = ref('')
106106
async function scanPorts() {
107107
try {
108108
const result = await window.api.serialPorts()
109+
console.log('raw serialPorts', result)
109110
// Group ports by serial number
110111
const portsBySerial = result.reduce((acc, port) => {
111112
if (port.serialNumber) {
@@ -116,27 +117,27 @@ async function scanPorts() {
116117
}
117118
return acc
118119
}, {} as Record<string, SerialPort[]>)
119-
120+
console.log('portsBySerial', portsBySerial)
120121
// Sort ports within each group and take only the first port (lower number)
121-
ports.value = Object.entries(portsBySerial)
122-
.map(([serialNumber, ports]) => {
123-
ports.sort((a, b) => a.port.localeCompare(b.port))
124-
// Store both ports in the keyboard store
125-
if (ports.length >= 2) {
126-
const keyboard = {
127-
serialNumber,
128-
serialPortA: ports[0].port,
129-
serialPortB: ports[1].port,
130-
manufacturer: ports[0].manufacturer,
131-
port: ports[0].port, // Keep the first port as the main port for backwards compatibility
132-
hasDataSerial: ports.length >= 2
133-
}
134-
return keyboard
122+
ports.value = Object.entries(portsBySerial).map(([serialNumber, ports]) => {
123+
ports.sort((a, b) => a.port.localeCompare(b.port))
124+
// Store both ports in the keyboard store
125+
if (ports.length >= 2) {
126+
const keyboard = {
127+
serialNumber,
128+
serialPortA: ports[0].port,
129+
serialPortB: ports[1].port,
130+
manufacturer: ports[0].manufacturer,
131+
port: ports[0].port, // Keep the first port as the main port for backwards compatibility
132+
hasDataSerial: ports.length >= 2
135133
}
136-
// return ports[0]
137-
return false
138-
})
139-
.filter((port) => port !== false)
134+
return keyboard
135+
}
136+
return ports[0]
137+
// return false
138+
})
139+
// .filter((port) => port !== false)
140+
console.log('ports', ports.value)
140141
141142
// Auto-select recommended port if available
142143
const recommended = ports.value.find((port) => isRecommendedPort(port))
@@ -177,7 +178,7 @@ onMounted(() => {
177178
scanPorts()
178179
// flash the firmware
179180
window.api.flashDetectionFirmware({
180-
drivePath: keyboardStore.path || '',
181+
drivePath: keyboardStore.path || ''
181182
// serialNumber: keyboardStore.serialNumber
182183
})
183184
})

0 commit comments

Comments
 (0)