From e05aa16510424bad720034d7bff7bc7e7f2283d8 Mon Sep 17 00:00:00 2001
From: MCUdude <hansibull@gmail.com>
Date: Sat, 1 Oct 2022 20:50:51 +0200
Subject: [PATCH] use pgm->id to identify Power Debugger instead of USB PID

---
 src/jtag3.c    | 3 +--
 src/stk500v2.c | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/jtag3.c b/src/jtag3.c
index 175e0e47..739c5a17 100644
--- a/src/jtag3.c
+++ b/src/jtag3.c
@@ -2416,8 +2416,7 @@ void jtag3_print_parms1(const PROGRAMMER *pgm, const char *p) {
     verbose ? "" : "             ", b2_to_u16(buf) / 1000.0);
 
   // Print features unique to the Power Debugger
-  //if (strncmp("powerdebugger", ldata(lfirst(pgm->id)), strlen("powerdebugger")) == 0)
-  if (*(int *)(ldata(lfirst(pgm->usbpid))) == 0x2144){
+  if (strncmp("powerdebugger", ldata(lfirst(pgm->id)), strlen("powerdebugger")) == 0) {
     short analog_raw_data;
 
     // Read generator set voltage value (VOUT)
diff --git a/src/stk500v2.c b/src/stk500v2.c
index 09f4a4ca..656b7ef0 100644
--- a/src/stk500v2.c
+++ b/src/stk500v2.c
@@ -3226,6 +3226,10 @@ static void stk500v2_print_parms1(const PROGRAMMER *pgm, const char *p) {
   } else if (PDATA(pgm)->pgmtype == PGMTYPE_JTAGICE3) {
     PROGRAMMER *pgmcp = pgm_dup(pgm);
     pgmcp->cookie = PDATA(pgm)->chained_pdata;
+    pgmcp->id = lcreat(NULL, 0);
+    // Copy pgm->id contents over to pgmcp->id
+    for(LNODEID ln=lfirst(pgm->id); ln; ln=lnext(ln))
+      ladd(pgmcp->id, cfg_strdup("stk500v2_print_parms1()", ldata(ln)));
     jtag3_print_parms1(pgmcp, p);
     pgm_free(pgmcp);
   } else {