Merge branch 'main' into jtagmkii-retry-attempts

This commit is contained in:
Hans 2022-01-21 13:28:20 +01:00 committed by GitHub
commit d401b2224e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

3
NEWS
View File

@ -101,6 +101,7 @@ Changes since version 6.4:
programmer #811
- Add missing tinyAVR-2, AVR DD and AVR EA targets #836
- Add a new programmer ft232h #842
- Reduce verbosity when setting fuses and uploading programs #845
* Internals:
@ -845,7 +846,7 @@ Version 4.3.0:
* Added "Troubleshooting"-Appendix to the manual.
* Add ATmega8515 support.
Contributed by: Matthias Weißer <matthias@matwei.de>
Contributed by: Matthias Weißer <matthias@matwei.de>
* Add ATmega64 support.
Contributed by: Erik Christiansen <erik@dd.nec.com.au>

View File

@ -330,7 +330,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, enum updateflags f
avrdude_message(MSG_INFO, "%s: verifying %s memory against %s:\n",
progname, mem->desc, upd->filename);
avrdude_message(MSG_INFO, "%s: load data %s data from input file %s:\n",
avrdude_message(MSG_NOTICE2, "%s: load data %s data from input file %s:\n",
progname, mem->desc, upd->filename);
}
@ -343,9 +343,9 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, enum updateflags f
v = avr_dup_part(p);
size = rc;
if (quell_progress < 2) {
avrdude_message(MSG_INFO, "%s: input file %s contains %d bytes\n",
avrdude_message(MSG_NOTICE2, "%s: input file %s contains %d bytes\n",
progname, upd->filename, size);
avrdude_message(MSG_INFO, "%s: reading on-chip %s data:\n",
avrdude_message(MSG_NOTICE2, "%s: reading on-chip %s data:\n",
progname, mem->desc);
}
@ -363,7 +363,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, enum updateflags f
if (quell_progress < 2) {
avrdude_message(MSG_INFO, "%s: verifying ...\n", progname);
avrdude_message(MSG_NOTICE2, "%s: verifying ...\n", progname);
}
rc = avr_verify(p, v, upd->memtype, size);
if (rc < 0) {