Merge pull request #29 from toniebox-reverse-engineering/develop

Develop

Author: SciLor

README.md

@@ -1,4 +1,4 @@
-# CC3200 Tool v1.2.3
+# CC3200 Tool v1.2.4
 
 A small tool to read and write files in TI's CC3200 SimpleLink (TM) filesystem.
 Partial support for the CC32XX (CC3230/CC3235) series (via flash image)

cc3200tool/cc.py

@@ -331,8 +331,22 @@ def __call__(self, string):
         "--no-verify", type=bool, default=False,
         help="do not perform a read of the written data to verify")
 
+parser_dll_data_test = subparsers.add_parser(
+        "dll_data_test",
+        help="Tests the dll_data function")
+
 def dll_data(fname):
-    return get_data('cc3200tool', os.path.join('dll', fname))
+    data = None
+    path = os.path.join(os.path.dirname(__file__), os.path.join('dll', fname))
+    if os.path.exists(path):
+        log.info("Reading %s from file %s" % (fname, path))
+        data = open(path, 'rb').read()
+    if data is None:
+        log.info("Reading %s from package" % fname)
+        data = get_data('cc3200tool', os.path.join('dll', fname))
+    if data is None:
+        raise CC3200Error("could not find dll file %s" % fname)
+    return data
 
 
 class CC3200Error(Exception):
@@ -1572,6 +1586,9 @@ def main():
                 cc.copy_input_file_to_output_file()
             cc.write_all_files(command.local_dir, command.simulate, use_api, command.no_verify)
             check_fat = True
+        
+        if command.cmd == "dll_data_test":
+            dll_data('rbtl3100s.dll')
 
 
     if check_fat:

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="cc3200tool",
-    version="1.2.3",
+    version="1.2.4",
     description="A tool to down-/upload files form/to TI CC3200",
     author="Kiril Zyapkov, 0xbadbee",
     author_email="k.zyapkov@allterco.com",