From bdb4128de3f63a1fb4abc208ec9bfa90ef3dd676 Mon Sep 17 00:00:00 2001 From: MCUdude Date: Sun, 29 May 2022 13:12:50 +0200 Subject: [PATCH 1/4] Fix JTAG transaction close issue Fixes issue #366 --- src/jtagmkII.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jtagmkII.c b/src/jtagmkII.c index fc06301c..b1024b53 100644 --- a/src/jtagmkII.c +++ b/src/jtagmkII.c @@ -1840,8 +1840,8 @@ void jtagmkII_close(PROGRAMMER * pgm) avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close()\n", progname); - if (pgm->flag & PGM_FL_IS_PDI) { - /* When in PDI mode, restart target. */ + if (pgm->flag & (PGM_FL_IS_PDI | PGM_FL_IS_JTAG)) { + /* When in PDI or JTAG mode, restart target. */ buf[0] = CMND_GO; avrdude_message(MSG_NOTICE2, "%s: jtagmkII_close(): Sending GO command: ", progname); From bd8c17b35f772978dd12f866e4de569963f27162 Mon Sep 17 00:00:00 2001 From: prchal Date: Tue, 7 Jun 2022 11:50:03 +0200 Subject: [PATCH 2/4] adding support for all Linux baud rates v.2 If optiboot can work at higher bauds, why not avrdude. Versoin 2 of #985. Linux uses the old-style bitmapped version of the Bxxxx macros. --- src/ser_posix.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/ser_posix.c b/src/ser_posix.c index 2c5d45b5..53d8cd15 100644 --- a/src/ser_posix.c +++ b/src/ser_posix.c @@ -76,6 +76,45 @@ static struct baud_mapping baud_lookup_table [] = { #endif #ifdef 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 { 0, 0 } /* Terminator. */ }; From 1b997968a526c630a45ba8c705162140f86a7419 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sun, 26 Jun 2022 22:58:25 +0200 Subject: [PATCH 3/4] Closing PR 979 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 888796ca..16fef572 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,7 @@ Changes since version 7.0: - Fix micronucleus bootloader to check for unresponsive USB devices #945 - Fix src/CMakeLists.txt to honor CMAKE_INSTALL_LIBDIR #972 + - [bug #43898] atmega644p remains stopped after JTAG transaction #366 * Pull requests: @@ -26,6 +27,7 @@ Changes since version 7.0: - CMake Enhancements #962 - Reduce programmer desc string length in avrdude.conf to < 80 characters #1000 + - Dragon JTAG fix #979 * Internals: From 362e6993acc863c282a16fd4d3642ebbeab4eae7 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Sun, 26 Jun 2022 23:00:32 +0200 Subject: [PATCH 4/4] PR 993 done --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 16fef572..da4e42d0 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,7 @@ Changes since version 7.0: - Reduce programmer desc string length in avrdude.conf to < 80 characters #1000 - Dragon JTAG fix #979 + - adding support for all Linux baud rates v.2 #993 * Internals: