faster verify, full signature, and UNO example

Author: ladyada

adafruit_avrprog.py

@@ -68,32 +68,34 @@ def init(self, sck_pin, mosi_pin, miso_pin, rst_pin):
         self._rst.value = True
 
 
-    def verify_sig(self, chip):
+    def verify_sig(self, chip, verbose=False):
         """
         Verify that the chip is connected properly, responds to commands,
         and has the correct signature. Returns True/False based on success
         """
         self.begin()
         sig = self.read_signature()
         self.end()
-        #print("Signature: ", [hex(i) for i in sig])
+        if verbose:
+            print("Found signature: %s" % [hex(i) for i in sig])
         if sig != chip['sig']:
             return False
         return True
 
-    def program_file(self, chip, file_name, verbose=False):
+    def program_file(self, chip, file_name, verbose=False, verify=True):
         """
         Perform a chip erase and program from a file that
-        contains Intel HEX data. Does not verify the memory post-write!
+        contains Intel HEX data. Returns true on verify-success, False on
+        verify-failure. If 'verify' is False, return will always be True
         """
         if not self.verify_sig(chip):
             raise RuntimeError("Signature read failure")
 
-        self.begin()
         if verbose:
             print("Erasing chip....")
         self.erase_chip()
 
+        self.begin()
         hexfile = open(file_name, 'r')
 
         page_size = chip['page_size']
@@ -114,8 +116,27 @@ def program_file(self, chip, file_name, verbose=False):
                 print("Programming page @ $%04X" % (page_addr))
             #print("From HEX file: ", page_buffer)
             self._flash_page(bytearray(page_buffer), page_addr, page_size)
+
+            if not verify:
+                continue
+
+            if verbose:
+                print("Verifying page @ $%04X" % page_addr)
+            read_buffer = bytearray(page_size)
+            self.read(page_addr, read_buffer)
+            #print("From memory: ", read_buffer)
+
+            if page_buffer != read_buffer:
+                if verbose:
+                    # pylint: disable=line-too-long
+                    print("Verify fail at address %04X\nPage should be: %s\nBut contains: %s" % (page_addr, page_buffer, read_buffer))
+                    # pylint: enable=line-too-long
+                self.end()
+                return False
+
         hexfile.close()
         self.end()
+        return True
 
     def verify_file(self, chip, file_name, verbose=False):
         """
@@ -195,6 +216,16 @@ def verify_fuses(self, chip, low=None, high=None, ext=None, lock=None):
                 return False
         return True
 
+
+    def erase_chip(self):
+        """
+        Fully erases the chip.
+        """
+        self.begin()
+        self._transaction((0xAC, 0x80, 0, 0))
+        self._busy_wait()
+        self.end()
+
     #################### Mid level
 
     def begin(self):
@@ -223,8 +254,9 @@ def read_signature(self):
         Requires calling begin() beforehand to put in programming mode.
         """
         # signature is last byte of two transactions:
-        sig = [self._transaction((0x30, 0, 0x01, 0))[2]]
-        sig.append(self._transaction((0x30, 0, 0x02, 0))[2])
+        sig = []
+        for i in range(3):
+            sig.append(self._transaction((0x30, 0, i, 0))[2])
         return sig
 
     def read(self, addr, read_buffer):
@@ -242,14 +274,6 @@ def read(self, addr, read_buffer):
             read_buffer[i*2] = low
             read_buffer[i*2+1] = high
 
-    def erase_chip(self):
-        """
-        Fully erases the chip.
-        Requires calling begin() beforehand to put in programming mode.
-        """
-        self._transaction((0xAC, 0x80, 0, 0))
-        self._busy_wait()
-
     #################### Low level
     def _flash_word(self, addr, low, high):
         self._transaction((0x40, addr >> 8, addr, low))

examples/trinket_programmer/trinket_prog.py

@@ -8,7 +8,7 @@
 
 # Each chip has to have a definition so the script knows how to find it
 attiny85 = {'name': "ATtiny85"}
-attiny85['sig'] = [0x93, 0x0b]
+attiny85['sig'] = [0x1E, 0x93, 0x0B]
 attiny85['flash_size'] = 8192
 attiny85['page_size'] = 64
 attiny85['fuse_mask'] = (0xFF, 0xFF, 0x07, 0x3F)
@@ -29,9 +29,6 @@ def error(err):
     error("Failure verifying fuses!")
 
 print("Programming flash from file")
-avrprog.program_file(attiny85, "trinket.hex", verbose=True)
-
-print("Verifying flash vs file")
-avrprog.verify_file(attiny85, "trinket.hex", verbose=True)
+avrprog.program_file(attiny85, "trinket.hex", verbose=True, verify=True)
 
 print("Done!")

examples/uno_optiboot/optiboot_atmega328.hex

@@ -0,0 +1,35 @@
+:107E0000112484B714BE81FFF0D085E080938100F7
+:107E100082E08093C00088E18093C10086E0809377
+:107E2000C20080E18093C4008EE0C9D0259A86E02C
+:107E300020E33CEF91E0309385002093840096BBD3
+:107E4000B09BFECF1D9AA8958150A9F7CC24DD24C4
+:107E500088248394B5E0AB2EA1E19A2EF3E0BF2EE7
+:107E6000A2D0813461F49FD0082FAFD0023811F036
+:107E7000013811F484E001C083E08DD089C08234E0
+:107E800011F484E103C0853419F485E0A6D080C0E4
+:107E9000853579F488D0E82EFF2485D0082F10E0AE
+:107EA000102F00270E291F29000F111F8ED06801E7
+:107EB0006FC0863521F484E090D080E0DECF843638
+:107EC00009F040C070D06FD0082F6DD080E0C81688
+:107ED00080E7D80618F4F601B7BEE895C0E0D1E017
+:107EE00062D089930C17E1F7F0E0CF16F0E7DF06D8
+:107EF00018F0F601B7BEE89568D007B600FCFDCFD4
+:107F0000A601A0E0B1E02C9130E011968C91119780
+:107F100090E0982F8827822B932B1296FA010C0160
+:107F200087BEE89511244E5F5F4FF1E0A038BF0790
+:107F300051F7F601A7BEE89507B600FCFDCF97BE46
+:107F4000E89526C08437B1F42ED02DD0F82E2BD052
+:107F50003CD0F601EF2C8F010F5F1F4F84911BD097
+:107F6000EA94F801C1F70894C11CD11CFA94CF0C13
+:107F7000D11C0EC0853739F428D08EE10CD085E9AC
+:107F80000AD08FE07ACF813511F488E018D01DD067
+:107F900080E101D065CF982F8091C00085FFFCCF94
+:107FA0009093C60008958091C00087FFFCCF809118
+:107FB000C00084FD01C0A8958091C6000895E0E648
+:107FC000F0E098E1908380830895EDDF803219F02E
+:107FD00088E0F5DFFFCF84E1DECF1F93182FE3DFCA
+:107FE0001150E9F7F2DF1F91089580E0E8DFEE27F6
+:047FF000FF270994CA
+:027FFE00040479
+:0400000300007E007B
+:00000001FF

examples/uno_optiboot/program_uno.py

@@ -0,0 +1,41 @@
+# UNO Optiboot programming example
+
+import board
+import adafruit_avrprog
+
+avrprog = adafruit_avrprog.AVRprog()
+avrprog.init(board.SCK, board.MOSI, board.MISO, board.D5)
+
+# Each chip has to have a definition so the script knows how to find it
+atmega328p = {'name': "ATmega328P"}
+atmega328p['sig'] = [0x1E, 0x95, 0x0F]
+atmega328p['flash_size'] = 32768
+atmega328p['page_size'] = 128
+atmega328p['fuse_mask'] = (0xFF, 0xFF, 0x07, 0x3F)
+
+# Helper to print out errors for us
+def error(err):
+    print("ERROR: "+err)
+    avrprog.end()
+    while True:
+        pass
+
+if not avrprog.verify_sig(atmega328p, verbose=True):
+    error("Signature read failure")
+print("Found", atmega328p['name'])
+
+# Since we are unsetting the lock fuse, an erase is required!
+avrprog.erase_chip()
+
+avrprog.write_fuses(atmega328p, low=0xFF, high=0xDE, ext=0x05, lock=0x3F)
+if not avrprog.verify_fuses(atmega328p, low=0xFF, high=0xDE, ext=0x05, lock=0x3F):
+    error("Failure programming fuses: "+str([hex(i) for i in avrprog.read_fuses(atmega328p)]))
+
+print("Programming flash from file")
+avrprog.program_file(atmega328p, "optiboot_atmega328.hex", verbose=True, verify=True)
+
+avrprog.write_fuses(atmega328p, lock=0x0F)
+if not avrprog.verify_fuses(atmega328p,lock=0x0F):
+    error("Failure verifying fuses!")
+
+print("Done!")