Merge pull request #1907 from stefanrueger/familyid

Improve messaging around locked UPDI parts
avrdudes · Aug 23, 2024 · 53cf5f2 · 53cf5f2
2 parents 5b1b544 + 173c3d4
commit 53cf5f2
Showing 1 changed file with 2 additions and 13 deletions.
diff --git a/src/main.c b/src/main.c
@@ -1623,27 +1623,16 @@ int main(int argc, char *argv[]) {
       if(rc != LIBAVRDUDE_SUCCESS) {
         if(rc == LIBAVRDUDE_SOFTFAIL && is_updi(p) && attempt < 1) {
           attempt++;
-          if(pgm->read_sib) {
-            // Read SIB and compare FamilyID
-            char sib[AVR_SIBLEN + 1];
-
-            pgm->read_sib(pgm, p, sib);
-            pmsg_notice("System Information Block: %s\n", sib);
-            if(strncmp(p->family_id, sib, AVR_FAMILYIDLEN)) {
-              pmsg_warning("received FamilyID: \"%.*s\"\n", AVR_FAMILYIDLEN, sib);
-              imsg_warning("expected FamilyID: \"%s\"\n", p->family_id);
-            } else
-              pmsg_notice("received FamilyID: \"%.*s\"\n", AVR_FAMILYIDLEN, sib);
-          }
           if(erase) {
             erase = 0;
             if(uflags & UF_NOWRITE) {
               pmsg_warning("conflicting -e and -n options specified, NOT erasing chip\n");
             } else {
-              pmsg_notice("trying to unlock the chip\n");
+              pmsg_info("unlocking the chip");
               exitrc = avr_unlock(pgm, p);
               if(exitrc)
                 goto main_exit;
+              msg_info(" and trying again\n");
               goto sig_again;
             }
           }