Skip to content

Commit

Permalink
fosc / sck test for most stk500v2 based programmer (except mk3?)
Browse files Browse the repository at this point in the history
difficult to test w/o programmer HW (only orig STK500 (v2) and SMo)

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
  • Loading branch information
Ho-Ro committed Nov 22, 2023
1 parent ebd11f3 commit fd0c222
Show file tree
Hide file tree
Showing 2 changed files with 181 additions and 144 deletions.
25 changes: 13 additions & 12 deletions src/jtagmkI.c
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,15 @@ static int jtagmkI_get_sck_period(const PROGRAMMER *pgm, double *v) {
}


static int jtagmkI_get_vtarget(const PROGRAMMER *pgm, double *v) {
unsigned char vtarget = 0;
if (jtagmkI_getparm(pgm, PARM_OCD_VTARGET, &vtarget) < 0)
return - 1;
*v = 6.25 * (unsigned)vtarget / 255.0;
return 0;
}


/*
* Read an emulator parameter. The result is exactly one byte,
* multi-byte parameters get two different parameter names for
Expand Down Expand Up @@ -1188,7 +1197,8 @@ static void jtagmkI_display(const PROGRAMMER *pgm, const char *p) {


static void jtagmkI_print_parms1(const PROGRAMMER *pgm, const char *p, FILE *fp) {
unsigned char vtarget, jtag_clock;
unsigned char jtag_clock = 0;
double vtarget = 0;
const char *clkstr;
double clk;

Expand Down Expand Up @@ -1222,25 +1232,16 @@ static void jtagmkI_print_parms1(const PROGRAMMER *pgm, const char *p, FILE *fp)
}

if (pgm->extra_features & HAS_VTARG_READ) {
if (jtagmkI_getparm(pgm, PARM_OCD_VTARGET, &vtarget) < 0)
if (jtagmkI_get_vtarget(pgm, &vtarget) < 0)
return;
fmsg_out(fp, "%sVtarget : %.1f V\n", p, 6.25 * (unsigned)vtarget / 255.0);
fmsg_out(fp, "%sVtarget : %.1f V\n", p, vtarget);
}
fmsg_out(fp, "%sJTAG clock : %s (%.1f us)\n", p, clkstr, 1.0e6 / clk);

return;
}


static int jtagmkI_get_vtarget(const PROGRAMMER *pgm, double *v) {
unsigned char vtarget = 0;
if (jtagmkI_getparm(pgm, PARM_OCD_VTARGET, &vtarget) < 0)
return - 1;
*v = 6.25 * (unsigned)vtarget / 255.0;
return 0;
}


static void jtagmkI_print_parms(const PROGRAMMER *pgm, FILE *fp) {
jtagmkI_print_parms1(pgm, "", fp);
}
Expand Down
Loading

0 comments on commit fd0c222

Please sign in to comment.