avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-12-14 01:44:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into issue918

Browse Source
This commit is contained in:
Stefan Rueger
2022-07-12 15:05:45 +01:00
committed by GitHub
parent 580c37fbfe 04f790ad85
commit 0edb77bdf8
23 changed files with 579 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.c
View File

@@ -1121,9 +1121,8 @@ int main(int argc, char * argv [])
usleep(waittime);
if (init_ok) {
rc = avr_signature(pgm, p);
if (rc != 0) {
// -68 == -(0x44) == -(RSP3_FAIL_OCD_LOCKED)
if ((rc == -68) && (p->flags & AVRPART_HAS_UPDI) && (attempt < 1)) {
if (rc != LIBAVRDUDE_SUCCESS) {
if ((rc == LIBAVRDUDE_SOFTFAIL) && (p->flags & AVRPART_HAS_UPDI) && (attempt < 1)) {
attempt++;
if (pgm->read_sib) {
// Read SIB and compare FamilyID