Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-09-28 03:56:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix messaging when no matching device found

Browse Source
This commit is contained in:
Stefan Rueger
2026-06-17 18:42:31 +01:00
parent 180c084e9c
commit 3fedd530ce
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/jtag3.c
View File

@@ -1698,6 +1698,7 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port, int mode_switch) {
if(rv < 0) {
// Check if SNAP or PICkit4 are in PIC mode
unsigned short vidbak = pinfo.usbinfo.vid; // Save vid
for(LNODEID ln = lfirst(pgm->id); ln; ln = lnext(ln)) {
if(str_starts(ldata(ln), "snap") || str_starts(ldata(ln), "pickit4")) {
bool is_snap_pgm = str_starts(ldata(ln), "snap");
@@ -1763,20 +1764,19 @@ int jtag3_open_common(PROGRAMMER *pgm, const char *port, int mode_switch) {
}
}
}
pinfo.usbinfo.vid = vidbak; // Restore vid
pmsg_error("no device found matching VID 0x%04x and PID list: ", (unsigned) pinfo.usbinfo.vid);
int notfirst = 0;
for(usbpid = lfirst(pgm->usbpid); usbpid; usbpid = lnext(usbpid)) {
if(notfirst)
msg_error(", ");
msg_error("0x%04x", (unsigned int) *(int *) ldata(usbpid));
notfirst = 1;
}
char *serno;
if((serno = strchr(port, ':')))
msg_error(" with SN %s", ++serno);
char serno[64] = {0};
if(str_set_vid_pid_serno(port, NULL, NULL, 0, serno, sizeof serno) >= 0 && *serno)
msg_error(" with SN %s", serno);
msg_error("\n");
return -1;