From 6fc81424a0afa520238c0c1de9e15825dbda4ac3 Mon Sep 17 00:00:00 2001 From: cybernesto Date: Thu, 20 Jan 2022 17:31:23 +0100 Subject: [PATCH 1/4] Convert logo to DFU Works but still has some unnecessary parts of dfuse-pack. --- .../python_logo_converter/img2ts100.py | 54 +++++++++++++++++-- 1 file changed, 49 insertions(+), 5 deletions(-) diff --git a/Bootup Logo/python_logo_converter/img2ts100.py b/Bootup Logo/python_logo_converter/img2ts100.py index 3759c15317..721dda9fa5 100644 --- a/Bootup Logo/python_logo_converter/img2ts100.py +++ b/Bootup Logo/python_logo_converter/img2ts100.py @@ -1,8 +1,7 @@ #!/usr/bin/env python # coding=utf-8 from __future__ import division -import os -import sys +import os, sys, struct, zlib try: @@ -26,11 +25,20 @@ INTELHEX_BYTES_PER_LINE = 16 INTELHEX_MINIMUM_SIZE = 4096 +DFU_PINECIL_ALT = 0 +DFU_PINECIL_VENDOR = 0x28e9 +DFU_PINECIL_PRODUCT = 0x0189 +DFU_LOGO_ADDRESS = 0x0801F800 +DFU_DEFAULT_NAME = b"ST..." +DFU_PREFIX_SIZE = 11 +DFU_SUFFIX_SIZE = 16 def split16(word): """return high and low byte of 16-bit word value as tuple""" return (word >> 8) & 0xff, word & 0xff +def compute_crc(data): + return 0xFFFFFFFF & -zlib.crc32(data) - 1 def intel_hex_line(record_type, offset, data): """generate a line of data in Intel hex format""" @@ -81,6 +89,43 @@ def write(generator): 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( + { + "address": DFU_LOGO_ADDRESS, + "alt": DFU_PINECIL_ALT, + "data": bytes_, + } + ) + data = b"" + tdata = b"" + for image in target: + tdata += ( + struct.pack("<2I", image["address"], len(image["data"])) + image["data"] + ) + ealt = image["alt"] + tdata = ( + struct.pack( + "<6sBI255s2I", b"Target", ealt, 1, DFU_DEFAULT_NAME, len(tdata), len(target) + ) + + tdata + ) + data += tdata + data = ( + struct.pack( + "<5sBIB", b"DfuSe", 1, DFU_PREFIX_SIZE + len(data) + DFU_SUFFIX_SIZE, len(target) + ) + + data + ) + data += struct.pack("<4H3sB", 0, DFU_PINECIL_PRODUCT, DFU_PINECIL_VENDOR, 0x011A, b"UFD", DFU_SUFFIX_SIZE) + crc = compute_crc(data) + data += struct.pack(" Date: Thu, 20 Jan 2022 18:00:33 +0100 Subject: [PATCH 2/4] Removed unnecessary variables Optimized build function. Increased version string. Set target name. --- .../python_logo_converter/img2ts100.py | 43 ++++++++----------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/Bootup Logo/python_logo_converter/img2ts100.py b/Bootup Logo/python_logo_converter/img2ts100.py index 721dda9fa5..51a7b37b2d 100644 --- a/Bootup Logo/python_logo_converter/img2ts100.py +++ b/Bootup Logo/python_logo_converter/img2ts100.py @@ -12,7 +12,7 @@ "management tool." .format(error, sys.argv[0])) -VERSION_STRING = '0.02' +VERSION_STRING = '0.03' LCD_WIDTH = 96 LCD_HEIGHT = 16 @@ -29,7 +29,7 @@ DFU_PINECIL_VENDOR = 0x28e9 DFU_PINECIL_PRODUCT = 0x0189 DFU_LOGO_ADDRESS = 0x0801F800 -DFU_DEFAULT_NAME = b"ST..." +DFU_TARGET_NAME = b"Pinecil" DFU_PREFIX_SIZE = 11 DFU_SUFFIX_SIZE = 16 @@ -37,9 +37,11 @@ def split16(word): """return high and low byte of 16-bit word value as tuple""" return (word >> 8) & 0xff, word & 0xff + def compute_crc(data): return 0xFFFFFFFF & -zlib.crc32(data) - 1 + def intel_hex_line(record_type, offset, data): """generate a line of data in Intel hex format""" # length, address offset, record type @@ -89,36 +91,24 @@ def write(generator): 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( - { - "address": DFU_LOGO_ADDRESS, - "alt": DFU_PINECIL_ALT, - "data": bytes_, - } - ) + +def build_dfu(file, bytes_): data = b"" - tdata = b"" - for image in target: - tdata += ( - struct.pack("<2I", image["address"], len(image["data"])) + image["data"] - ) - ealt = image["alt"] - tdata = ( + for byte in bytes_: + data += byte.to_bytes(1, byteorder="big") + + data = ( + struct.pack("<2I", DFU_LOGO_ADDRESS, len(data)) + data + ) + data = ( struct.pack( - "<6sBI255s2I", b"Target", ealt, 1, DFU_DEFAULT_NAME, len(tdata), len(target) + "<6sBI255s2I", b"Target", DFU_PINECIL_ALT, 1, DFU_TARGET_NAME, len(data), 1 ) - + tdata + + data ) - data += tdata data = ( struct.pack( - "<5sBIB", b"DfuSe", 1, DFU_PREFIX_SIZE + len(data) + DFU_SUFFIX_SIZE, len(target) + "<5sBIB", b"DfuSe", 1, DFU_PREFIX_SIZE + len(data) + DFU_SUFFIX_SIZE, 1 ) + data ) @@ -127,6 +117,7 @@ def build_dfu(file, indata): data += struct.pack(" Date: Thu, 20 Jan 2022 18:12:06 +0100 Subject: [PATCH 3/4] Documentation and Logos updated Adapted the instructions for DFU file usage. Removed .bin and .hex Pinecil logos. --- .../Logos/{Pinecil.bin => Pinecil.dfu} | Bin 1024 -> 1333 bytes Bootup Logo/Logos/Pinecil.hex | 258 ------------------ .../Logos/{Pinecil_L.bin => Pinecil_L.dfu} | Bin 1024 -> 1333 bytes Bootup Logo/Logos/Pinecil_L.hex | 258 ------------------ .../python_logo_converter/img2ts100.py | 2 +- Documentation/Logo.md | 8 +- 6 files changed, 5 insertions(+), 521 deletions(-) rename Bootup Logo/Logos/{Pinecil.bin => Pinecil.dfu} (66%) delete mode 100644 Bootup Logo/Logos/Pinecil.hex rename Bootup Logo/Logos/{Pinecil_L.bin => Pinecil_L.dfu} (69%) delete mode 100644 Bootup Logo/Logos/Pinecil_L.hex diff --git a/Bootup Logo/Logos/Pinecil.bin b/Bootup Logo/Logos/Pinecil.dfu similarity index 66% rename from Bootup Logo/Logos/Pinecil.bin rename to Bootup Logo/Logos/Pinecil.dfu index 5d3834a67c816d01cebf09191f6d2bb289653c0a..bfa0f10a6a8d1266467b87034dfadeb3897c4012 100644 GIT binary patch delta 73 zcmZqR*vcjAl2#g=%4o{Uz`z)iSd^Yx!obMDzz~p`mztcJGx6dN0S*?R6i|ra2O|dq ZkiCFKfPtZt@uh|oW2l>pfST}!ZUBgv5iI}! delta 8 PcmdnW)xfb>m5~Ji3?Bj& diff --git a/Bootup Logo/Logos/Pinecil.hex b/Bootup Logo/Logos/Pinecil.hex deleted file mode 100644 index 6800e49ffd..0000000000 --- a/Bootup Logo/Logos/Pinecil.hex +++ /dev/null @@ -1,258 +0,0 @@ -:020000040800F2 -:10F8000055AA0DF0CF061B3F00010080808080804C -:10F810008080808080808080808080800080000068 -:10F820000000000000000000C080C0C060C0B0B098 -:10F83000F000B0B0B0B0B0B0B0B0B0B0B0B0F0B0F8 -:10F84000B000A8B0B0A86078B8D8B8B8B8B8B8B8A0 -:10F85000B8B8B8B8B0B8A8A8D8B0F8E0F8F0F8F8D8 -:10F86000F8F8F0F8020205020503000B090F09037E -:10F870000903090309030902090209020702050035 -:10F880000503050305030503110A611F254E250B1A -:10F890003F00250B250B250B250B250B250B3F0BBF -:10F8A0002500250B250B270B260A260A260A260AE1 -:10F8B000260A260A260A260A260A260A260A260AC8 -:10F8C000260A1F0A000000000000000000000000DF -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:10F8000055AA0DF0CF061B3F00010080808080804C -:10F810008080808080808080808080800080000068 -:10F820000000000000000000C080C0C060C0B0B098 -:10F83000F000B0B0B0B0B0B0B0B0B0B0B0B0F0B0F8 -:10F84000B000A8B0B0A86078B8D8B8B8B8B8B8B8A0 -:10F85000B8B8B8B8B0B8A8A8D8B0F8E0F8F0F8F8D8 -:10F86000F8F8F0F8020205020503000B090F09037E -:10F870000903090309030902090209020702050035 -:10F880000503050305030503110A611F254E250B1A -:10F890003F00250B250B250B250B250B250B3F0BBF -:10F8A0002500250B250B270B260A260A260A260AE1 -:10F8B000260A260A260A260A260A260A260A260AC8 -:10F8C000260A1F0A000000000000000000000000DF -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:10F8000055AA0DF0CF061B3F00010080808080804C -:10F810008080808080808080808080800080000068 -:10F820000000000000000000C080C0C060C0B0B098 -:10F83000F000B0B0B0B0B0B0B0B0B0B0B0B0F0B0F8 -:10F84000B000A8B0B0A86078B8D8B8B8B8B8B8B8A0 -:10F85000B8B8B8B8B0B8A8A8D8B0F8E0F8F0F8F8D8 -:10F86000F8F8F0F8020205020503000B090F09037E -:10F870000903090309030902090209020702050035 -:10F880000503050305030503110A611F254E250B1A -:10F890003F00250B250B250B250B250B250B3F0BBF -:10F8A0002500250B250B270B260A260A260A260AE1 -:10F8B000260A260A260A260A260A260A260A260AC8 -:10F8C000260A1F0A000000000000000000000000DF -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:10F8000055AA0DF0CF061B3F00010080808080804C -:10F810008080808080808080808080800080000068 -:10F820000000000000000000C080C0C060C0B0B098 -:10F83000F000B0B0B0B0B0B0B0B0B0B0B0B0F0B0F8 -:10F84000B000A8B0B0A86078B8D8B8B8B8B8B8B8A0 -:10F85000B8B8B8B8B0B8A8A8D8B0F8E0F8F0F8F8D8 -:10F86000F8F8F0F8020205020503000B090F09037E -:10F870000903090309030902090209020702050035 -:10F880000503050305030503110A611F254E250B1A -:10F890003F00250B250B250B250B250B250B3F0BBF -:10F8A0002500250B250B270B260A260A260A260AE1 -:10F8B000260A260A260A260A260A260A260A260AC8 -:10F8C000260A1F0A000000000000000000000000DF -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:00000001FF diff --git a/Bootup Logo/Logos/Pinecil_L.bin b/Bootup Logo/Logos/Pinecil_L.dfu similarity index 69% rename from Bootup Logo/Logos/Pinecil_L.bin rename to Bootup Logo/Logos/Pinecil_L.dfu index f6e4ec0099ddad86095eb2c4e25a0d0e981bda92..5142a4e286b7d753e741552fef94c1eb8a1b74eb 100644 GIT binary patch delta 73 zcmZqR*vcjAl2#g=%4o{Uz`z)iSd^Yx!obMDzz~p`mztcJGx6dN0S*?R6i|ra2O|dq ZkiCFKfPtZt@uh|oW2l>p!18BeQUHqY5jFq- delta 8 PcmdnW)xfb>m5~Ji3?Bj& diff --git a/Bootup Logo/Logos/Pinecil_L.hex b/Bootup Logo/Logos/Pinecil_L.hex deleted file mode 100644 index 6eed28a9fd..0000000000 --- a/Bootup Logo/Logos/Pinecil_L.hex +++ /dev/null @@ -1,258 +0,0 @@ -:020000040800F2 -:10F8000055AA0DF0F8F0F8F8F8F8F0F8E0F8B0D8EC -:10F81000A8A8B8B0B8B8B8B8B8B8B8B8B8B8D8B870 -:10F820007860A8B0B0A800B0B0F0B0B0B0B0B0B0E0 -:10F83000B0B0B0B0B0B000F0B0B0C060C0C080C078 -:10F840000000000000000000000080008080808038 -:10F850008080808080808080808080808000010027 -:10F860003F1B06CF0A1F0A260A260A260A260A2650 -:10F870000A260A260A260A260A260A260A260A2608 -:10F880000B270B250B2500250B3F0B250B250B25E7 -:10F890000B250B250B25003F0B254E251F610A115B -:10F8A0000305030503050305000502070209020914 -:10F8B000020903090309030903090F090B000305E2 -:10F8C000020502020000000000000000000000002D -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:10F8000055AA0DF0F8F0F8F8F8F8F0F8E0F8B0D8EC -:10F81000A8A8B8B0B8B8B8B8B8B8B8B8B8B8D8B870 -:10F820007860A8B0B0A800B0B0F0B0B0B0B0B0B0E0 -:10F83000B0B0B0B0B0B000F0B0B0C060C0C080C078 -:10F840000000000000000000000080008080808038 -:10F850008080808080808080808080808000010027 -:10F860003F1B06CF0A1F0A260A260A260A260A2650 -:10F870000A260A260A260A260A260A260A260A2608 -:10F880000B270B250B2500250B3F0B250B250B25E7 -:10F890000B250B250B25003F0B254E251F610A115B -:10F8A0000305030503050305000502070209020914 -:10F8B000020903090309030903090F090B000305E2 -:10F8C000020502020000000000000000000000002D -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:10F8000055AA0DF0F8F0F8F8F8F8F0F8E0F8B0D8EC -:10F81000A8A8B8B0B8B8B8B8B8B8B8B8B8B8D8B870 -:10F820007860A8B0B0A800B0B0F0B0B0B0B0B0B0E0 -:10F83000B0B0B0B0B0B000F0B0B0C060C0C080C078 -:10F840000000000000000000000080008080808038 -:10F850008080808080808080808080808000010027 -:10F860003F1B06CF0A1F0A260A260A260A260A2650 -:10F870000A260A260A260A260A260A260A260A2608 -:10F880000B270B250B2500250B3F0B250B250B25E7 -:10F890000B250B250B25003F0B254E251F610A115B -:10F8A0000305030503050305000502070209020914 -:10F8B000020903090309030903090F090B000305E2 -:10F8C000020502020000000000000000000000002D -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:10F8000055AA0DF0F8F0F8F8F8F8F0F8E0F8B0D8EC -:10F81000A8A8B8B0B8B8B8B8B8B8B8B8B8B8D8B870 -:10F820007860A8B0B0A800B0B0F0B0B0B0B0B0B0E0 -:10F83000B0B0B0B0B0B000F0B0B0C060C0C080C078 -:10F840000000000000000000000080008080808038 -:10F850008080808080808080808080808000010027 -:10F860003F1B06CF0A1F0A260A260A260A260A2650 -:10F870000A260A260A260A260A260A260A260A2608 -:10F880000B270B250B2500250B3F0B250B250B25E7 -:10F890000B250B250B25003F0B254E251F610A115B -:10F8A0000305030503050305000502070209020914 -:10F8B000020903090309030903090F090B000305E2 -:10F8C000020502020000000000000000000000002D -:10F8D0000000000000000000000000000000000028 -:10F8E0000000000000000000000000000000000018 -:10F8F0000000000000000000000000000000000008 -:10F9000000000000000000000000000000000000F7 -:10F9100000000000000000000000000000000000E7 -:10F9200000000000000000000000000000000000D7 -:10F9300000000000000000000000000000000000C7 -:10F9400000000000000000000000000000000000B7 -:10F9500000000000000000000000000000000000A7 -:10F960000000000000000000000000000000000097 -:10F970000000000000000000000000000000000087 -:10F980000000000000000000000000000000000077 -:10F990000000000000000000000000000000000067 -:10F9A0000000000000000000000000000000000057 -:10F9B0000000000000000000000000000000000047 -:10F9C0000000000000000000000000000000000037 -:10F9D0000000000000000000000000000000000027 -:10F9E0000000000000000000000000000000000017 -:10F9F0000000000000000000000000000000000007 -:10FA000000000000000000000000000000000000F6 -:10FA100000000000000000000000000000000000E6 -:10FA200000000000000000000000000000000000D6 -:10FA300000000000000000000000000000000000C6 -:10FA400000000000000000000000000000000000B6 -:10FA500000000000000000000000000000000000A6 -:10FA60000000000000000000000000000000000096 -:10FA70000000000000000000000000000000000086 -:10FA80000000000000000000000000000000000076 -:10FA90000000000000000000000000000000000066 -:10FAA0000000000000000000000000000000000056 -:10FAB0000000000000000000000000000000000046 -:10FAC0000000000000000000000000000000000036 -:10FAD0000000000000000000000000000000000026 -:10FAE0000000000000000000000000000000000016 -:10FAF0000000000000000000000000000000000006 -:10FB000000000000000000000000000000000000F5 -:10FB100000000000000000000000000000000000E5 -:10FB200000000000000000000000000000000000D5 -:10FB300000000000000000000000000000000000C5 -:10FB400000000000000000000000000000000000B5 -:10FB500000000000000000000000000000000000A5 -:10FB60000000000000000000000000000000000095 -:10FB70000000000000000000000000000000000085 -:10FB80000000000000000000000000000000000075 -:10FB90000000000000000000000000000000000065 -:10FBA0000000000000000000000000000000000055 -:10FBB0000000000000000000000000000000000045 -:10FBC0000000000000000000000000000000000035 -:10FBD0000000000000000000000000000000000025 -:10FBE0000000000000000000000000000000000015 -:10FBF0000000000000000000000000000000000005 -:00000001FF diff --git a/Bootup Logo/python_logo_converter/img2ts100.py b/Bootup Logo/python_logo_converter/img2ts100.py index 51a7b37b2d..3e5239fbe3 100644 --- a/Bootup Logo/python_logo_converter/img2ts100.py +++ b/Bootup Logo/python_logo_converter/img2ts100.py @@ -29,7 +29,7 @@ DFU_PINECIL_VENDOR = 0x28e9 DFU_PINECIL_PRODUCT = 0x0189 DFU_LOGO_ADDRESS = 0x0801F800 -DFU_TARGET_NAME = b"Pinecil" +DFU_TARGET_NAME = b"Pinecil" DFU_PREFIX_SIZE = 11 DFU_SUFFIX_SIZE = 16 diff --git a/Documentation/Logo.md b/Documentation/Logo.md index e1cfda7808..52af863dd3 100644 --- a/Documentation/Logo.md +++ b/Documentation/Logo.md @@ -28,10 +28,10 @@ You perform this the same way as if you were flashing a new firmware, and all of ### Pinecil -For the Pinecil, we require to flash the logo using dfu-util instead, which will only take `.bin` files rather than `.hex`. +For the Pinecil, we require to flash the logo using dfu-util instead. To flash the logo, use the following steps: - - `python3 img2ts100.py input.png logo.bin` - - `dfu-util -d 28e9:0189 -a 0 -D logo.bin -s 0x0801F800` + - `python3 img2ts100.py input.png logo.dfu` + - `dfu-util -D logo.dfu` - The converter will create a binary file if the .bin extension is used. Use dfu-util to flash it in the right location. \ No newline at end of file + The converter will create a DFU instead of a HEX file if the .dfu extension is used. \ No newline at end of file From b9faa443bb4de04c62cfd98e12d0f9862eb34bd9 Mon Sep 17 00:00:00 2001 From: cybernesto Date: Mon, 24 Jan 2022 17:23:26 +0100 Subject: [PATCH 4/4] Added IronOS in DFU format --- Bootup Logo/Logos/IronOS.dfu | Bin 0 -> 1333 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Bootup Logo/Logos/IronOS.dfu diff --git a/Bootup Logo/Logos/IronOS.dfu b/Bootup Logo/Logos/IronOS.dfu new file mode 100644 index 0000000000000000000000000000000000000000..cc41cce2babc40f1e5c4b13d2e022549864d7b66 GIT binary patch literal 1333 zcmZ=sD-BL%G-YLAU<^qtN>43eU}Rum2*}J!P0q{#vPLA}U;zdP$mc&8IT(QK&{e!2 zPy^xz!xt8oFE3tb0KthDCj>NrtQQ&_CtkdmaDqeN#S0dWt|p#G69k@|SX3h8$=>&n zS?Gg^=ob-=Ctp&g0D+4L!wysvQF-zV`U(pA`uc*3ih_Fj>IxeA8bG9=4ir&P6V}&v zR#?~@GDF!}NR)+>k%^x{T>z#6