Merge lp:~w-uroda/python-msp430-tools/titextBlocks into lp:python-msp430-tools

[Wayne Uroda]

Added the ability to save titext with maximum block length

Unmerged revisions

488. By Wayne Uroda on 2014-08-17

Added support for saving titext files with a maximum block size.
Eg. output format "titext256" will generate a titext file where there are no more than 256 bytes in each section (sections starting with @address).

=== modified file 'msp430/memory/__init__.py'
--- msp430/memory/__init__.py	2012-12-07 13:56:26 +0000
+++ msp430/memory/__init__.py	2014-08-23 13:23:52 +0000
@@ -298,10 +298,13 @@
 def save(memory, fileobj, format='titext'):
     if format == 'titext':
         return titext.save(memory, fileobj)
+    elif format.startswith('titext') and format[6:].isdigit():
+        maxBlockLen = int(format[6:])
+        return titext.save(memory, fileobj, maxBlockLen)
     elif format == 'ihex':
         return intelhex.save(memory, fileobj)
-    elif format == 'elf':
-        return elf.save(memory, fileobj)
+#    elif format == 'elf':
+#        return elf.save(memory, fileobj)
     elif format == 'bin':
         return bin.save(memory, fileobj)
     elif format == 'hex':
@@ -309,5 +312,21 @@
     raise ValueError('unsupported file format %s' % (format,))
 
 
+class SaveFormats:
+    formatList = ['titext', 'ihex', 'bin', 'hex']
+    def __iter__(self):
+        return iter(SaveFormats.formatList)
+
+    def __contains__(self,item):
+        if item in SaveFormats.formatList:
+            return True
+
+        if item.startswith('titext'):
+            blockSize = item[6:]
+            if blockSize.isdigit() and int(blockSize) > 0:
+                return True
+        return False
+
 load_formats = ['titext', 'ihex', 'bin', 'hex', 'elf']
-save_formats = ['titext', 'ihex', 'bin', 'hex']
+save_formats = SaveFormats()
+

=== modified file 'msp430/memory/convert.py'
--- msp430/memory/convert.py	2011-02-19 19:51:27 +0000
+++ msp430/memory/convert.py	2014-08-23 13:23:52 +0000
@@ -45,7 +45,7 @@
 
     parser.add_option("-f", "--output-format",
             dest="output_format",
-            help="output format name (%s)" % (', '.join(memory.save_formats),),
+            help="output format name (%s) or titextN where N is a positive integer" % (', '.join(memory.save_formats),),
             default="titext",
             metavar="TYPE")
 

=== modified file 'msp430/memory/titext.py'
--- msp430/memory/titext.py	2012-07-04 22:44:58 +0000
+++ msp430/memory/titext.py	2014-08-23 13:23:52 +0000
@@ -11,6 +11,7 @@
 
 import msp430.memory
 import msp430.memory.error
+import sys
 
 def load(filelike):
     """load data from a (opened) file in TI-Text format"""
@@ -41,11 +42,15 @@
         memory.segments.append(msp430.memory.Segment(startAddr, segmentdata))
     return memory
 
-def save(memory, filelike):
+def save(memory, filelike, maxBlocklen = sys.maxint):
     """output TI-Text to given file object"""
     for segment in sorted(memory.segments):
-        filelike.write("@%04x\n" % segment.startaddress)
-        data = bytearray(segment.data)
-        for i in range(0, len(data), 16):
-            filelike.write("%s\n" % " ".join(["%02x" % x for x in data[i:i+16]]))
+        rawData = bytearray(segment.data)
+        rawLength = len(rawData)
+        for startAddr in range(0, rawLength, maxBlocklen):
+            filelike.write("@%04x\n" % (segment.startaddress + startAddr))
+            blockLen = min(maxBlocklen, rawLength - startAddr)
+            data = rawData[startAddr : (startAddr + blockLen)]
+            for i in range(0, len(data), 16):
+                filelike.write("%s\n" % " ".join(["%02x" % x for x in data[i:i+16]]))
     filelike.write("q\n")