me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed unnecessary variables

Browse Source 
Optimized build function.
Increased version string.
Set target name.
This commit is contained in:
cybernesto
2022-01-20 18:00:33 +01:00
parent 6fc81424a0
commit 83655d5532
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Bootup Logo/python_logo_converter/img2ts100.py
View File

@@ -12,7 +12,7 @@ except ImportError as error:
"management tool." "management tool."
.format(error, sys.argv[0])) .format(error, sys.argv[0]))
VERSION_STRING = '0.02' VERSION_STRING = '0.03'
LCD_WIDTH = 96 LCD_WIDTH = 96
LCD_HEIGHT = 16 LCD_HEIGHT = 16
@@ -29,7 +29,7 @@ DFU_PINECIL_ALT = 0
DFU_PINECIL_VENDOR = 0x28e9 DFU_PINECIL_VENDOR = 0x28e9
DFU_PINECIL_PRODUCT = 0x0189 DFU_PINECIL_PRODUCT = 0x0189
DFU_LOGO_ADDRESS = 0x0801F800 DFU_LOGO_ADDRESS = 0x0801F800
DFU_DEFAULT_NAME = b"ST..." DFU_TARGET_NAME = b"Pinecil"
DFU_PREFIX_SIZE = 11 DFU_PREFIX_SIZE = 11
DFU_SUFFIX_SIZE = 16 DFU_SUFFIX_SIZE = 16
@@ -37,9 +37,11 @@ def split16(word):
"""return high and low byte of 16-bit word value as tuple""" """return high and low byte of 16-bit word value as tuple"""
return (word >> 8) & 0xff, word & 0xff return (word >> 8) & 0xff, word & 0xff
def compute_crc(data): def compute_crc(data):
return 0xFFFFFFFF & -zlib.crc32(data) - 1 return 0xFFFFFFFF & -zlib.crc32(data) - 1
def intel_hex_line(record_type, offset, data): def intel_hex_line(record_type, offset, data):
"""generate a line of data in Intel hex format""" """generate a line of data in Intel hex format"""
# length, address offset, record type # length, address offset, record type
@@ -89,36 +91,24 @@ def intel_hex(file, bytes_, start_address=0x0):
write(intel_hex_line(INTELHEX_END_OF_FILE_RECORD, 0, ())) write(intel_hex_line(INTELHEX_END_OF_FILE_RECORD, 0, ()))
def build_dfu(file, indata):
target = []
bytes_ = b""
for byte in indata:
bytes_ += byte.to_bytes(1, byteorder="big")
target.append( def build_dfu(file, bytes_):
{
"address": DFU_LOGO_ADDRESS,
"alt": DFU_PINECIL_ALT,
"data": bytes_,
}
)
data = b"" data = b""
tdata = b"" for byte in bytes_:
for image in target: data += byte.to_bytes(1, byteorder="big")
tdata += (
struct.pack("<2I", image["address"], len(image["data"])) + image["data"] data = (
struct.pack("<2I", DFU_LOGO_ADDRESS, len(data)) + data
) )
ealt = image["alt"]
tdata = (
struct.pack(
"<6sBI255s2I", b"Target", ealt, 1, DFU_DEFAULT_NAME, len(tdata), len(target)
)
+ tdata
)
data += tdata
data = ( data = (
struct.pack( struct.pack(
"<5sBIB", b"DfuSe", 1, DFU_PREFIX_SIZE + len(data) + DFU_SUFFIX_SIZE, len(target) "<6sBI255s2I", b"Target", DFU_PINECIL_ALT, 1, DFU_TARGET_NAME, len(data), 1
)
+ data
)
data = (
struct.pack(
"<5sBIB", b"DfuSe", 1, DFU_PREFIX_SIZE + len(data) + DFU_SUFFIX_SIZE, 1
) )
+ data + data
) )
@@ -127,6 +117,7 @@ def build_dfu(file, indata):
data += struct.pack("<I", crc) data += struct.pack("<I", crc)
file.write(data) file.write(data)
def img2hex(input_filename, def img2hex(input_filename,
output_file, output_file,
preview_filename=None, preview_filename=None,