Skip to content

Commit b864d7e

Browse files
committed
Update NEWS and resolve minor residual messaging issues
1 parent e172877 commit b864d7e

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

NEWS

+15-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ Changes since version 7.0:
5454
- Make flash writes work in terminal mode #1020
5555
- Add support for XMEGA specific AVR109 protocol extensions
5656
used by XBoot #200
57-
57+
- jtag2updi can not write EEPROM in terminal mode #1116
58+
- Make UPDI programmers less verbose during initialization
59+
#1084
60+
- Quell mode isn't handled systematically #1114
5861

5962
* Pull requests:
6063

@@ -140,8 +143,16 @@ Changes since version 7.0:
140143
- Provide cached byte-wise read/write API #1106
141144
- AVR109: support for prodsig read and usersig read/write #1108
142145
- Add missing AVR variants the original JTAG ICE supports #1109
143-
- Improve help message in terminal and provide new command pgerase #1113
146+
- Improve help message in terminal and provide new command
147+
pgerase #1113
144148
- Fix pointer truncation for Windows x64 #1119
149+
- Fix jtag3_page_erase for targets with UPDI #1112
150+
- Fix writing of last word on DWORD TPI parts #1115
151+
- Use byte-wise read/write when page size is 1 in terminal
152+
cache #1121
153+
- Suppress Teensy USB communication error message on reboot #1122
154+
- Fix UPDI erase when target is locked #1125
155+
- Review and overhaul AVRDUDE's messaging system #1126
145156

146157
* Internals:
147158

@@ -150,6 +161,8 @@ Changes since version 7.0:
150161
- Reviewed API for prgrammer functions: use const for
151162
programmer functions where useful; add second argument for
152163
void (*enable)(PROGRAMMER *pgm, const AVRPART *p) #1078
164+
- Reviewed messaging system making warnings and errors explicit
165+
and treat them systematically
153166

154167

155168
Changes in version 7.0:

src/avr.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -854,10 +854,9 @@ int avr_write_mem(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m, int
854854
* Ensure that we align our write size to this boundary.
855855
*/
856856
if (m->n_word_writes < 0 || m->n_word_writes > 4 || m->n_word_writes == 3) {
857-
avrdude_message(MSG_INFO, "\n%s: ERROR: Unsupported n_word_writes value of %d "
858-
"configured for %s memory\n"
859-
"%sAborting write\n",
860-
progname, m->n_word_writes, m->desc, progbuf);
857+
msg_error("\n");
858+
pmsg_error("unsupported n_word_writes value of %d for %s memory\n",
859+
m->n_word_writes, m->desc);
861860
return LIBAVRDUDE_GENERAL_FAILURE;
862861
}
863862
chunk = m->n_word_writes > 0 ? 2*m->n_word_writes : 2;

src/avrcache.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ static int cacheAddress(int addr, const AVR_Cache *cp, const AVRMEM *mem) {
222222
int cacheaddr = addr + (int) (mem->offset - cp->offset);
223223

224224
if(cacheaddr < 0 || cacheaddr >= cp->size) { // Should never happen (unless offsets wrong in avrdude.conf)
225-
pmsg_error("%s cache address 0x%04x out of range [0, 0x%04x]\n", mem->desc, cacheaddr, cp->size);
225+
pmsg_error("%s cache address 0x%04x out of range [0, 0x%04x]\n", mem->desc, cacheaddr, cp->size-1);
226226
return LIBAVRDUDE_GENERAL_FAILURE;
227227
}
228228

@@ -267,8 +267,8 @@ static int writeCachePage(AVR_Cache *cp, const PROGRAMMER *pgm, const AVRPART *p
267267
pgm->read_byte(pgm, p, mem, base+i, cp->copy+base+i) < 0) {
268268
report_progress(1, -1, NULL);
269269
if(nlOnErr && quell_progress)
270-
avrdude_message(MSG_INFO, "\n");
271-
avrdude_message(MSG_INFO, "%s: writeCachePage() %s access error at addr 0x%04x\n", progname, mem->desc, base+i);
270+
msg_info("\n");
271+
pmsg_error("writeCachePage() %s access error at addr 0x%04x\n", mem->desc, base+i);
272272
return LIBAVRDUDE_GENERAL_FAILURE;
273273
}
274274

src/jtag3.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1628,7 +1628,7 @@ static int jtag3_page_erase(const PROGRAMMER *pgm, const AVRPART *p, const AVRME
16281628
pmsg_notice2("jtag3_page_erase(.., %s, 0x%x)\n", m->desc, addr);
16291629

16301630
if (!(p->prog_modes & (PM_PDI | PM_UPDI))) {
1631-
avrdude_message(MSG_INFO, "%s: jtag3_page_erase: not supported\n", progname);
1631+
pmsg_error("page erase not supported\n");
16321632
return -1;
16331633
}
16341634

src/term.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ static int cmd_write(PROGRAMMER *pgm, AVRPART *p, int argc, char *argv[]) {
421421

422422
if (addr < 0 || addr >= maxsize) {
423423
terminal_message(MSG_INFO, "%s (write): %s address 0x%05x is out of range [0, 0x%05x]\n",
424-
progname, mem->desc, addr, maxsize);
424+
progname, mem->desc, addr, maxsize-1);
425425
return -1;
426426
}
427427

0 commit comments

Comments
 (0)