From 07bda5e9139b9ec8dc43787dfddaef3d9bd58052 Mon Sep 17 00:00:00 2001 From: Stefan Rueger Date: Sat, 20 May 2023 21:16:12 +0100 Subject: [PATCH] Update NEWS --- NEWS | 2 ++ src/avrdude.conf.in | 20 ++++++++++---------- src/developer_opts.c | 8 ++++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS index f9ac1fe1..5a076454 100644 --- a/NEWS +++ b/NEWS @@ -97,6 +97,8 @@ Changes since version 7.1: - Add option -f to build.sh #1342 - Document -n behaviour wrt -U and terminal #1351 - Progressively shrink metadata for -c urclock #1357 + - Extend notion to files in terminal write #1358 + - Add fuse0 to ATxmega128A4U/64A4U/32A4U/16A4U #1360 * Internals: diff --git a/src/avrdude.conf.in b/src/avrdude.conf.in index 4ff46670..a23a5c2e 100644 --- a/src/avrdude.conf.in +++ b/src/avrdude.conf.in @@ -13235,7 +13235,7 @@ part parent "t44" "ATtiny44A-SSNR: SOIC14, Fmax=20 MHz, T=[-40 C, 105 C], Vcc=[1.8 V, 5.5 V]", "ATtiny44A-SSU: SOIC14, Fmax=20 MHz, T=[-40 C, 85 C], Vcc=[1.8 V, 5.5 V]", "ATtiny44A-SSUR: SOIC14N, Fmax=20 MHz, T=[-40 C, 85 C], Vcc=[1.8 V, 5.5 V]"; - mcuid = 21; + mcuid = XVII + IV; # 21; ; #------------------------------------------------------------ @@ -15786,7 +15786,7 @@ part parent "x16a4u" mcuid = 233; signature = 0x1e 0x94 0x43; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -15814,7 +15814,7 @@ part parent "x16a4u" n_interrupts = 91; signature = 0x1e 0x94 0x42; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -15930,7 +15930,7 @@ part parent "x32a4u" mcuid = 240; signature = 0x1e 0x95 0x44; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -15959,7 +15959,7 @@ part parent "x32a4u" n_interrupts = 91; signature = 0x1e 0x95 0x42; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -16073,7 +16073,7 @@ part parent "x32a4u" mcuid = 236; signature = 0x1e 0x95 0x49; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -16099,7 +16099,7 @@ part parent "x32a4u" n_interrupts = 114; signature = 0x1e 0x95 0x4a; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -16125,7 +16125,7 @@ part parent "x64a4u" signature = 0x1e 0x96 0x49; usbpid = 0x2fd6; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -16152,7 +16152,7 @@ part parent "x64a4u" n_interrupts = 114; signature = 0x1e 0x96 0x4a; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; @@ -16179,7 +16179,7 @@ part parent "x64a4u" n_interrupts = 91; signature = 0x1e 0x96 0x47; - memory "fuse0" = NULL; + memory "fuse0" = NULL; memory "fuse4" initval = 0xff; diff --git a/src/developer_opts.c b/src/developer_opts.c index 90520548..e1457463 100644 --- a/src/developer_opts.c +++ b/src/developer_opts.c @@ -690,7 +690,11 @@ static void dev_part_strct(const AVRPART *p, bool tsv, const AVRPART *base, bool _if_partout_str(strcmp, cfg_escape(p->family_id), family_id); _if_partout_str(intcmp, cfg_strdup("dev_part_strct()", prog_modes_str(p->prog_modes)), prog_modes); - _if_partout(intcmp, "%d", mcuid); + if(p->mcuid == 21) { + _if_partout_str(intcmp, cfg_strdup(__func__, "XVII + IV"), mcuid); + } else { + _if_partout(intcmp, "%d", mcuid); + } _if_partout(intcmp, "%d", n_interrupts); _if_partout(intcmp, "%d", n_page_erase); _if_partout(intcmp, "%d", n_boot_sections); @@ -796,7 +800,7 @@ static void dev_part_strct(const AVRPART *p, bool tsv, const AVRPART *base, bool bm = base? dev_locate_mem(base, avr_mem_order[mi]): NULL; if(!m && bm && !tsv) - dev_info("\n memory \"%s\" = NULL;\n", bm->desc); + dev_info("\n memory \"%s\" %*s= NULL;\n", bm->desc, 13 > strlen(bm->desc)? 13-strlen(bm->desc): 0, ""); if(!m) continue;