Merge branch 'avrdudes:main' into issue474

This commit is contained in:
Stefan Rueger 2022-06-26 23:54:43 +01:00 committed by GitHub
commit cef3abac14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 2 deletions

3
NEWS
View File

@ -18,6 +18,7 @@ Changes since version 7.0:
- Fix micronucleus bootloader to check for unresponsive USB - Fix micronucleus bootloader to check for unresponsive USB
devices #945 devices #945
- Fix src/CMakeLists.txt to honor CMAKE_INSTALL_LIBDIR #972 - Fix src/CMakeLists.txt to honor CMAKE_INSTALL_LIBDIR #972
- [bug #43898] atmega644p remains stopped after JTAG transaction #366
* Pull requests: * Pull requests:
@ -26,6 +27,8 @@ Changes since version 7.0:
- CMake Enhancements #962 - CMake Enhancements #962
- Reduce programmer desc string length in avrdude.conf - Reduce programmer desc string length in avrdude.conf
to < 80 characters #1000 to < 80 characters #1000
- Dragon JTAG fix #979
- adding support for all Linux baud rates v.2 #993
* Internals: * Internals:

View File

@ -1840,8 +1840,8 @@ void jtagmkII_close(PROGRAMMER * pgm)
avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close()\n", progname); avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close()\n", progname);
if (pgm->flag & PGM_FL_IS_PDI) { if (pgm->flag & (PGM_FL_IS_PDI | PGM_FL_IS_JTAG)) {
/* When in PDI mode, restart target. */ /* When in PDI or JTAG mode, restart target. */
buf[0] = CMND_GO; buf[0] = CMND_GO;
avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close(): Sending GO command: ", avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close(): Sending GO command: ",
progname); progname);

View File

@ -76,6 +76,45 @@ static struct baud_mapping baud_lookup_table [] = {
#endif #endif
#ifdef B230400 #ifdef B230400
{ 230400, B230400 }, { 230400, B230400 },
#endif
#ifdef B250000
{ 250000, B250000 },
#endif
#ifdef B460800
{ 460800, B460800 },
#endif
#ifdef B500000
{ 500000, B500000 },
#endif
#ifdef B576000
{ 576000, B576000 },
#endif
#ifdef B921600
{ 921600, B921600 },
#endif
#ifdef B1000000
{ 1000000, B1000000 },
#endif
#ifdef B1152000
{ 1152000, B1152000 },
#endif
#ifdef B1500000
{ 1500000, B1500000 },
#endif
#ifdef B2000000
{ 2000000, B2000000 },
#endif
#ifdef B2500000
{ 2500000, B2500000 },
#endif
#ifdef B3000000
{ 3000000, B3000000 },
#endif
#ifdef B3500000
{ 3500000, B3500000 },
#endif
#ifdef B4000000
{ 4000000, B4000000 },
#endif #endif
{ 0, 0 } /* Terminator. */ { 0, 0 } /* Terminator. */
}; };