Mirrors/avrdude
1
0
Fork 0
mirror of https://github.com/avrdudes/avrdude.git synced 2026-07-21 08:55:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where programmers that can supply power couldn't read it using -x vtarg

Browse Source
This commit is contained in:
MCUdude
2026-04-15 12:30:50 +02:00
parent 5adce7f61d
commit 720722edae
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/jtag3.c
View File

@@ -1552,6 +1552,14 @@ static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
}
if(str_starts(extended_param, "vtarg")) {
if(pgm->extra_features & HAS_VTARG_READ) {
// Get target voltage
if(str_eq(extended_param, "vtarg")) {
my.vtarg_get = true;
continue;
}
}
if(pgm->extra_features & HAS_VTARG_ADJ) {
// Set target voltage
if(str_starts(extended_param, "vtarg=")) {
@@ -1567,19 +1575,12 @@ static int jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extparms) {
my.vtarg_set = true;
continue;
}
pmsg_error("invalid setting in -x %s; use or -x vtarg=<dbl>\n", extended_param);
rv = -1;
break;
}
if(pgm->extra_features & HAS_VTARG_READ) {
// Get target voltage
if(str_eq(extended_param, "vtarg")) {
my.vtarg_get = true;
continue;
}
pmsg_error("invalid setting in -x %s; use -x vtarg=<dbl>\n", extended_param);
rv = -1;
break;
}
rv = -1;
break;
}
if(str_starts(extended_param, "mode") && (str_starts(pgmid, "pickit4") || str_starts(pgmid, "snap"))) {

42
src/stk500v2.c
View File

@@ -1728,6 +1728,14 @@ static int stk500v2_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
const char *extended_param = ldata(ln);
if(str_starts(extended_param, "vtarg")) {
if(pgm->extra_features & HAS_VTARG_READ) {
// Get target voltage
if(str_eq(extended_param, "vtarg")) {
my.vtarg_get = true;
continue;
}
}
if(pgm->extra_features & HAS_VTARG_ADJ) {
// Set target voltage
if(str_starts(extended_param, "vtarg=")) {
@@ -1743,19 +1751,12 @@ static int stk500v2_parseextparms(const PROGRAMMER *pgm, const LISTID extparms)
my.vtarg_set = true;
continue;
}
pmsg_error("invalid setting in -x %s; use or -x vtarg=<dbl>\n", extended_param);
rv = -1;
break;
}
if(pgm->extra_features & HAS_VTARG_READ) {
// Get target voltage
if(str_eq(extended_param, "vtarg")) {
my.vtarg_get = true;
continue;
}
pmsg_error("invalid setting in -x %s; use -x vtarg=<dbl>\n", extended_param);
rv = -1;
break;
}
rv = -1;
break;
}
if(str_starts(extended_param, "varef")) {
@@ -1988,6 +1989,14 @@ static int stk500v2_jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extp
}
if(str_starts(extended_param, "vtarg")) {
if(pgm->extra_features & HAS_VTARG_READ) {
// Get target voltage
if(str_eq(extended_param, "vtarg")) {
my.vtarg_get = true;
continue;
}
}
if(pgm->extra_features & HAS_VTARG_ADJ) {
// Set target voltage
if(str_starts(extended_param, "vtarg=")) {
@@ -2003,19 +2012,12 @@ static int stk500v2_jtag3_parseextparms(const PROGRAMMER *pgm, const LISTID extp
my.vtarg_set = true;
continue;
}
pmsg_error("invalid setting in -x %s; use or -x vtarg=<dbl>\n", extended_param);
rv = -1;
break;
}
if(pgm->extra_features & HAS_VTARG_READ) {
// Get target voltage
if(str_eq(extended_param, "vtarg")) {
my.vtarg_get = true;
continue;
}
pmsg_error("invalid setting in -x %s; use -x vtarg=<dbl>\n", extended_param);
rv = -1;
break;
}
rv = -1;
break;
}
if(str_starts(extended_param, "mode") && (str_starts(pgmid, "pickit4") || str_starts(pgmid, "snap"))) {