rename loader.py -> keyplus_flasher.py

* Add qicod4.dll for *.ico files * rename loader.py -> keyplus_flasher.py
ahtn · Jan 27, 2018 · 899eb0e · 899eb0e
1 parent 30609e2
commit 899eb0e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/host-software/build.bat b/host-software/build.bat
@@ -0,0 +1 @@
+C:\Python27\Scripts\pyinstaller -w --onefile --add-data="hidapi.dll;." --icon keyplus.ico keyplus_flasher.py
diff --git a/host-software/imageformats/qicod4.dll b/host-software/imageformats/qicod4.dll
diff --git a/host-software/favicon.ico → host-software/keyplus.ico b/host-software/favicon.ico → host-software/keyplus.ico
diff --git a/host-software/keyplus_all.spec b/host-software/keyplus_all.spec
@@ -14,7 +14,7 @@ cli_a = Analysis(['keyplus_cli.py'],
              win_private_assemblies=False,
              cipher=block_cipher)
 
-loader_a = Analysis(['loader.spec'],
+flasher_a = Analysis(['flasher.spec'],
              pathex=['C:\\Users\\user\\code\\keyplus\\host-software'],
              binaries=[],
              datas=[],
@@ -27,7 +27,7 @@ loader_a = Analysis(['loader.spec'],
              cipher=block_cipher)
 
 merged = MERGE( (cli_a, "keyplus_cli", "keyplus_cli"),
-                (loader_a, "keyplus_loader", "keyplus_loader") )
+                (flasher_a, "keyplus_flasher", "keyplus_flasher") )
 
 
 cli_pyz = PYZ(cli_a.pure, cli_a.zipped_data,
@@ -48,23 +48,23 @@ cli_coll = COLLECT(cli_exe,
                upx=True,
                name='keyplus_cli')
 
-loader_pyz = PYZ(loader_a.pure, loader_a.zipped_data,
+flasher_pyz = PYZ(flasher_a.pure, flasher_a.zipped_data,
              cipher=block_cipher)
-loader_exe = EXE(loader_pyz,
-          loader_a.scripts,
+flasher_exe = EXE(flasher_pyz,
+          flasher_a.scripts,
           exclude_binaries=True,
-          name='loader',
+          name='flasher',
           debug=False,
           strip=False,
           upx=True,
           console=True )
 
 
 
-loader_coll = COLLECT(loader_exe,
-               loader_a.binaries,
-               loader_a.zipfiles,
-               loader_a.datas,
+flasher_coll = COLLECT(flasher_exe,
+               flasher_a.binaries,
+               flasher_a.zipfiles,
+               flasher_a.datas,
                strip=False,
                upx=True,
-               name='loader')
+               name='flasher')
diff --git a/host-software/loader.py → host-software/keyplus_flasher.py b/host-software/loader.py → host-software/keyplus_flasher.py
@@ -779,6 +779,7 @@ def initUI(self):
 
         self.setGeometry(300, 300, 350, 250)
         self.setWindowTitle('keyplus layout and firmware loader')
+        self.setWindowIcon(QIcon('keyplus.ico'))
         self.show()
 
     def process_layout(self, layout_json_obj, layout_file, device_id):

diff --git a/host-software/loader.spec → host-software/keyplus_flasher.spec b/host-software/loader.spec → host-software/keyplus_flasher.spec
@@ -3,7 +3,7 @@
 block_cipher = None
 
 
-a = Analysis(['loader.py'],
+a = Analysis(['keyplus_flasher.py'],
              pathex=['C:\\Users\\user\\code\\keyplus\\host-software'],
              binaries=[],
              datas=[('hidapi.dll', '.')],
@@ -21,8 +21,8 @@ exe = EXE(pyz,
           a.binaries,
           a.zipfiles,
           a.datas,
-          name='loader',
+          name='keyplus_flasher',
           debug=False,
           strip=False,
           upx=True,
-          console=False , icon='favicon.ico')
+          console=False , icon='keyplus.ico')
diff --git a/host-software/uniflash/__init__.py b/host-software/uniflash/__init__.py
diff --git a/host-software/uniflash/crc16.py b/host-software/uniflash/crc16.py
@@ -3,6 +3,8 @@
 # Copyright 2017 jem@seethis.link
 # Licensed under the MIT license (http://opensource.org/licenses/MIT)
 
+from __future__ import absolute_import, division, print_function, unicode_literals
+
 def u16(x):
     return x & 0xffff