From 162da033c79085504ed322e12c089b2e82173eb6 Mon Sep 17 00:00:00 2001 From: stefanrueger Date: Wed, 12 Feb 2025 16:37:51 +0100 Subject: [PATCH 1/2] Correct PICkit5 programmer type entries --- src/avrdude.conf.in | 23 ++++++++++++++--------- src/pgm_type.c | 7 +------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in index bd2984a6..199b3bfa 100644 --- a/src/avrdude.conf.in +++ b/src/avrdude.conf.in @@ -3090,13 +3090,13 @@ programmer # pickit4_tpi # interface for simple serial debugging. #------------------------------------------------------------ -# pickit5 /pickit5_jtag +# pickit5 / pickit5_jtag #------------------------------------------------------------ -programmer # pickit5_jtag +programmer # pickit5 id = "pickit5", "pickit5_jtag"; desc = "MPLAB(R) PICkit 5, PICkit 4 and SNAP (PIC) in JTAG Mode"; - type = "pickit5_jtag"; + type = "pickit5"; prog_modes = PM_JTAG | PM_XMEGAJTAG; extra_features = HAS_VTARG_READ; connection_type = usb; @@ -3108,10 +3108,11 @@ programmer # pickit5_jtag #------------------------------------------------------------ # pickit5_updi #------------------------------------------------------------ + programmer # pickit5_updi id = "pickit5_updi"; desc = "MPLAB(R) PICkit 5, PICkit 4 and SNAP (PIC) in UPDI Mode"; - type = "pickit5_updi"; + type = "pickit5"; prog_modes = PM_UPDI; extra_features = HAS_VTARG_READ; connection_type = usb; @@ -3123,10 +3124,11 @@ programmer # pickit5_updi #------------------------------------------------------------ # pickit5_isp #------------------------------------------------------------ + programmer # pickit5_isp id = "pickit5_isp"; desc = "MPLAB(R) PICkit 5, PICkit 4 and SNAP (PIC) in ISP Mode"; - type = "pickit5_isp"; + type = "pickit5"; prog_modes = PM_ISP; extra_features = HAS_VTARG_READ; connection_type = usb; @@ -3137,10 +3139,11 @@ programmer # pickit5_isp #------------------------------------------------------------ # pickit5_dw #------------------------------------------------------------ + programmer # pickit5_dw id = "pickit5_dw"; desc = "MPLAB(R) PICkit 5, PICkit 4 and SNAP (PIC) in dW Mode"; - type = "pickit5_dw"; + type = "pickit5"; prog_modes = PM_debugWIRE; extra_features = HAS_VTARG_READ; connection_type = usb; @@ -3151,10 +3154,11 @@ programmer # pickit5_dw #------------------------------------------------------------ # pickit5_tpi #------------------------------------------------------------ + programmer # pickit5_tpi id = "pickit5_tpi"; desc = "MPLAB(R) PICkit 5, PICkit 4 and SNAP (PIC) in TPI Mode"; - type = "pickit5_tpi"; + type = "pickit5"; prog_modes = PM_TPI; extra_features = HAS_VTARG_READ; connection_type = usb; @@ -3165,10 +3169,11 @@ programmer # pickit5_tpi #------------------------------------------------------------ # pickit5_pdi #------------------------------------------------------------ -programmer # pickit5_tpi + +programmer # pickit5_pdi id = "pickit5_pdi"; desc = "MPLAB(R) PICkit 5, PICkit 4 and SNAP (PIC) in PDI Mode"; - type = "pickit5_pdi"; + type = "pickit5"; prog_modes = PM_PDI; extra_features = HAS_VTARG_READ; connection_type = usb; diff --git a/src/pgm_type.c b/src/pgm_type.c index 5b555d31..ef37071a 100644 --- a/src/pgm_type.c +++ b/src/pgm_type.c @@ -97,12 +97,7 @@ const PROGRAMMER_TYPE programmers_types[] = { // Name(s) the programmers call {"micronucleus", micronucleus_initpgm, micronucleus_desc}, // "micronucleus" or "Micronucleus V2.0" {"par", par_initpgm, par_desc}, // "PPI" {"pickit2", pickit2_initpgm, pickit2_desc}, // "pickit2" - {"pickit5_dw", pickit5_initpgm, pickit5_desc}, // "pickit5" - {"pickit5_isp", pickit5_initpgm, pickit5_desc}, // "pickit5" - {"pickit5_jtag", pickit5_initpgm, pickit5_desc}, // "pickit5" - {"pickit5_pdi", pickit5_initpgm, pickit5_desc}, // "pickit5" - {"pickit5_tpi", pickit5_initpgm, pickit5_desc}, // "pickit5" - {"pickit5_updi", pickit5_initpgm, pickit5_desc}, // "pickit5" + {"pickit5", pickit5_initpgm, pickit5_desc}, // "pickit5" {"serbb", serbb_initpgm, serbb_desc}, // "SERBB" {"serialupdi", serialupdi_initpgm, serialupdi_desc}, // "serialupdi" {"serprog", serprog_initpgm, serprog_desc}, // "serprog" From b8493a76be62659ad2803deca151edb81e9a57e6 Mon Sep 17 00:00:00 2001 From: stefanrueger Date: Wed, 12 Feb 2025 16:50:28 +0100 Subject: [PATCH 2/2] Align comment --- src/pgm_type.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pgm_type.c b/src/pgm_type.c index ef37071a..7d4b587a 100644 --- a/src/pgm_type.c +++ b/src/pgm_type.c @@ -97,7 +97,7 @@ const PROGRAMMER_TYPE programmers_types[] = { // Name(s) the programmers call {"micronucleus", micronucleus_initpgm, micronucleus_desc}, // "micronucleus" or "Micronucleus V2.0" {"par", par_initpgm, par_desc}, // "PPI" {"pickit2", pickit2_initpgm, pickit2_desc}, // "pickit2" - {"pickit5", pickit5_initpgm, pickit5_desc}, // "pickit5" + {"pickit5", pickit5_initpgm, pickit5_desc}, // "pickit5" {"serbb", serbb_initpgm, serbb_desc}, // "SERBB" {"serialupdi", serialupdi_initpgm, serialupdi_desc}, // "serialupdi" {"serprog", serprog_initpgm, serprog_desc}, // "serprog"