Bit of tidying

Author: SpenceKonde

megaavr/extras/Errata.md

@@ -51,8 +51,8 @@ Errata apply to a specific die. But the same die may be used on multiple parts,
   * all 16k - This is clearly what was used for development - it's at rev E!
   * all 32k
 
-## The grand combined table, now on google sheets
-[**The table is now in Google Sheets and publicly viewable - color coded too!**](https://docs.google.com/spreadsheets/d/1N-dDZ3WogEXRYcOip5kOREj_ExPQQRD1OrgMuywjXzw/edit?usp=sharing)
+## The grand combined table, now on Google Sheets
+[**The table is now in Google Sheets and publicly viewable - color coded too!**](https://docs.google.com/spreadsheets/d/1vRSt0s7Kpi_VehmFYBX8__OBbs7hbN87KwTNzwDcE2o/edit?usp=sharing)
 
 
 

megaavr/libraries/SPI/README.md

@@ -1,5 +1,5 @@
 # SPI for megaTinyCore
-The SPI library implements all of the standard functionality described in the [Arduino SPI library reference](https://docs.arduino.cc/language-reference/en/functions/communication/spi/) - with the exception of the specific pins, of course!). Also, like all of the "big three" third-party cores for post-2016 AVR devices, this version of SPI.h supports the `swap()` and `pins()` methods to make use of the PORTMUX feature of the chips. Aside from those extensions, and a few changes to rarelty used, ill-conceived methods relating to interrupts, and unimplemented methods (likely intended for slave mode which was never implemented, for reasons discussed below), it behaves in the same way as the official one.
+The SPI library implements all of the standard functionality described in the [Arduino SPI library reference](https://docs.arduino.cc/language-reference/en/functions/communication/SPI/) applies here. With the exceptionific pins, of course!). Also, like all of the "big three" third-party cores for post-2016 AVR devices, this version of SPI.h supports the `swap()` and `pins()` methods to make use of the PORTMUX feature of the chips. Aside from those extensions, and a few changes to rarelty used, ill-conceived methods relating to interrupts, and unimplemented methods (likely intended for slave mode which was never implemented, for reasons discussed below), it behaves in the same way as the official one.
 
 ## Pins
 | Pin Mapping   | Pins        | Parts           | Note                                                    |

megaavr/tools/libs/intelhex/__init__.py

@@ -144,7 +144,7 @@ def _decode_record(self, s, line=0):
                 if not self._buf.get(addr, None) is None:
                     raise AddressOverlapError(address=addr, line=line)
                 self._buf[addr] = bin[i]
-                addr += 1   # FIXME: addr should be wrapped 
+                addr += 1   # FIXME: addr should be wrapped
                             # BUT after 02 record (at 64K boundary)
                             # and after 04 record (at 4G boundary)
 
@@ -289,7 +289,7 @@ def frombytes(self, bytes, offset=0):
     def _get_start_end(self, start=None, end=None, size=None):
         """Return default values for start and end if they are None.
         If this IntelHex object is empty then it's error to
-        invoke this method with both start and end as None. 
+        invoke this method with both start and end as None.
         """
         if (start,end) == (None,None) and self._buf == {}:
             raise EmptyIntelHexError
@@ -316,7 +316,7 @@ def _get_start_end(self, start=None, end=None, size=None):
         return start, end
 
     def tobinarray(self, start=None, end=None, pad=_DEPRECATED, size=None):
-        ''' Convert this object to binary form as array. If start and end 
+        ''' Convert this object to binary form as array. If start and end
         unspecified, they will be inferred from the data.
         @param  start   start address of output bytes.
         @param  end     end address of output bytes (inclusive).
@@ -419,7 +419,7 @@ def todict(self):
 
     def addresses(self):
         '''Returns all used addresses in sorted order.
-        @return         list of occupied data addresses in sorted order. 
+        @return         list of occupied data addresses in sorted order.
         '''
         aa = dict_keys(self._buf)
         aa.sort()
@@ -746,7 +746,7 @@ def puts(self, addr, s):
             self._buf[addr+i] = a[i]
 
     def getsz(self, addr):
-        """Get zero-terminated bytes string from given address. Will raise 
+        """Get zero-terminated bytes string from given address. Will raise
         NotEnoughDataError exception if a hole is encountered before a 0.
         """
         i = 0
@@ -768,7 +768,7 @@ def putsz(self, addr, s):
     def find(self, sub, start=None, end=None):
         """Return the lowest index in self[start:end] where subsection sub is found.
         Optional arguments start and end are interpreted as in slice notation.
-        
+
         @param  sub     bytes-like subsection to find
         @param  start   start of section to search within (optional)
         @param  end     end of section to search within (optional)
@@ -798,7 +798,7 @@ def dump(self, tofile=None, width=16, withpadding=False):
         width = int(width)
         if tofile is None:
             tofile = sys.stdout
-            
+
         # start addr possibly
         if self.start_addr is not None:
             cs = self.start_addr.get('CS')
@@ -853,7 +853,7 @@ def merge(self, other, overlap='error'):
                                   in overlapping region.
 
         @raise  TypeError       if other is not instance of IntelHex
-        @raise  ValueError      if other is the same object as self 
+        @raise  ValueError      if other is the same object as self
                                 (it can't merge itself)
         @raise  ValueError      if overlap argument has incorrect value
         @raise  AddressOverlapError    on overlapped data
@@ -908,7 +908,7 @@ def segments(self, min_gap=1):
         beginnings = [addresses[b+1] for b in breaks]
         beginnings.insert(0, addresses[0])
         return [(a, b+1) for (a, b) in zip(beginnings, endings)]
-        
+
     def get_memory_size(self):
         """Returns the approximate memory footprint for data."""
         n = sys.getsizeof(self)
@@ -996,7 +996,7 @@ def minaddr(self):
     def maxaddr(self):
         '''Get maximal address of HEX content in 16-bit mode.
 
-        @return         maximal address used in this object 
+        @return         maximal address used in this object
         '''
         aa = dict_keys(self._buf)
         if aa == []:
@@ -1170,7 +1170,7 @@ def data(offset, bytes):
 
     def eof():
         """Return End of File record as a string.
-        @return         String representation of Intel Hex EOF record 
+        @return         String representation of Intel Hex EOF record
         """
         return ':00000001FF'
     eof = staticmethod(eof)

megaavr/tools/libs/intelhex/__version__.py

@@ -1,3 +1,3 @@
-# IntelHex library version information 
+# IntelHex library version information
 version_info = (2, 3, 0)
 version_str = '.'.join([str(i) for i in version_info])

megaavr/tools/libs/intelhex/test.py

@@ -765,7 +765,7 @@ def test__get_start_end(self):
         # normal object
         ih = IntelHex({1:2, 7:8, 10:0})
         self.assertEqual((1,10), ih._get_start_end())
-        self.assertEqual((1,10), ih._get_start_end(size=10))        
+        self.assertEqual((1,10), ih._get_start_end(size=10))
         self.assertEqual((0,9), ih._get_start_end(start=0, size=10))
         self.assertEqual((1,10), ih._get_start_end(end=10, size=10))
 
@@ -1092,7 +1092,7 @@ def test_simple_width3(self):
         self.assertEqual(
             '0000  12 34 --  |.4 |\n',
             sio.getvalue())
-            
+
         ih[16] = 0x56
         ih[30] = 0x98
         sio = StringIO()
@@ -1682,7 +1682,7 @@ def runProcessAndGetAsciiStdoutOrStderr(self, cmdline):
         if stdout:
             output = stdout.decode('ascii', 'replace')
         elif stderr:
-            output = stderr.decode('ascii', 'replace')        
+            output = stderr.decode('ascii', 'replace')
         output = output.replace('\r', '')
         return retcode, output
 
@@ -1756,7 +1756,7 @@ def test_write_hex_file_byte_count_13(self):
         s = sio.getvalue()
         # control written hex first line to check that byte count is 13
         sio.seek(0)
-        self.assertEqual(sio.readline(), 
+        self.assertEqual(sio.readline(),
             ':0D0000000205A2E576246AF8E6057622786E\n',
             "Written hex is not in byte count 13")
         sio.close()
@@ -1774,7 +1774,7 @@ def test_write_hex_file_byte_count_255(self):
         s = sio.getvalue()
         # control written hex first line to check that byte count is 255
         sio.seek(0)
-        self.assertEqual(sio.readline(), 
+        self.assertEqual(sio.readline(),
             (':FF0000000205A2E576246AF8E60576227867300702786AE475F0011204AD02'
               '04552000EB7F2ED2008018EF540F2490D43440D4FF30040BEF24BFB41A0050'
               '032461FFE57760021577057AE57A7002057930070D7867E475F0011204ADEF'

megaavr/tools/libs/pymcuprog/deviceinfo/harvest.py

@@ -63,7 +63,7 @@ def determine_write_size(memory_name, page_size, device_name):
     write_size = 1
     device_name = device_name.lower()
     if memory_name is 'flash':
-        if (device_name.find('avr') != -1 and ((device_name.find('da') != -1) or (device_name.find('db') != -1) or (device_name.find('dd') != -1))):
+        if (device_name.find('avr') != -1 and ((device_name.find('da') != -1) or (device_name.find('db') != -1) or (device_name.find('dd') != -1) or (device_name.find('du') != -1))):
             write_size = 2
         else:
             write_size = page_size

megaavr/tools/libs/pymcuprog/serialupdi/constants.py

@@ -62,6 +62,8 @@
 
 UPDI_KEY_NVM = b"NVMProg "
 UPDI_KEY_CHIPERASE = b"NVMErase"
+UPDI_KEY_UROWWRITE = b"NVMUs&te"
+UPDI_KEY_OCD       = b"OCD     "
 
 UPDI_ASI_STATUSA_REVID = 4
 UPDI_ASI_STATUSB_PESIG = 0

megaavr/tools/libs/pymcuprog/serialupdi/link.py

@@ -69,7 +69,7 @@ def _check_datalink(self):
                 self.logger.info("UPDI init OK")
                 return True
         except PymcuprogError:
-            self.logger.warning("UPDI init failed: Can't read CS register.")
+            self.logger.warning("UPDI init failed: Can't read CS register. likely wiring error.")
             return False
         self.logger.info("UPDI not OK - reinitialisation required")
         return False

megaavr/tools/libs/pymcuprog/serialupdi/nvm.py

@@ -144,7 +144,7 @@ def write_fuse(self, address, data, write_delay=1):
 
         # Check that NVM controller is ready
         if not self.wait_flash_ready():
-            raise PymcuprogError("Timeout waiting for flash ready before page buffer clear ")
+            raise PymcuprogError("Timeout waiting for flash ready before fuse write ")
 
         # Write address to NVMCTRL ADDR
         self.logger.debug("Load NVM address")
@@ -162,7 +162,7 @@ def write_fuse(self, address, data, write_delay=1):
         if write_delay > 0:
             pause_mod.milliseconds(write_delay)
         if not self.wait_flash_ready():
-            raise PymcuprogError("Timeout waiting for flash ready before page buffer clear ")
+            raise PymcuprogError("Timeout waiting for flash ready after fuse write ")
 
     def write_nvm(self, address, data, use_word_access, nvmcommand=constants.UPDI_V0_NVMCTRL_CTRLA_WRITE_PAGE, blocksize=2,  bulkwrite=0, pagewrite_delay=0):
         """
@@ -216,7 +216,7 @@ def write_nvm(self, address, data, use_word_access, nvmcommand=constants.UPDI_V0
             # do a final NVM status check only if not doing a bulk write, or after the last chunk (when bulkwrite = 2)
             # not doing this every page made uploads about 15% faster
             if not self.wait_flash_ready():
-                raise PymcuprogError("Timeout waiting for flash ready after page write ")
+                raise PymcuprogError("Timeout waiting for flash ready after write")
 
 
 class NvmUpdiAvrDx(NvmUpdi):
@@ -309,7 +309,7 @@ def write_nvm(self, address, data, use_word_access, blocksize=2, bulkwrite=0, pa
         if bulkwrite == 0 or (address & 32767) == 0:
             # Check that NVM controller is ready
             if not self.wait_flash_ready():
-                raise Exception("Timeout waiting for flash ready before page buffer clear ")
+                raise Exception("Timeout waiting for flash ready before nvm write ")
 
             # Write the command to the NVM controller
             self.logger.info("NVM write command")

megaavr/tools/libs/yaml/constructor.py

@@ -123,7 +123,7 @@ def construct_mapping(self, node, deep=False):
         mapping = {}
         for key_node, value_node in node.value:
             key = self.construct_object(key_node, deep=deep)
-            
+
             ## Version Check
             python_version = sys.version
             version = python_version.split()[0]