Merge upstream changes from Marlin 2.1.2.1

This commit is contained in:
Stefan Kalscheuer
2023-05-26 18:48:34 +02:00
parent 22dedaeb81
commit f92a587638
620 changed files with 41015 additions and 28889 deletions

View File

@@ -4,7 +4,7 @@ Tools for processing `.ICO` files used by DWIN displays.
## Introduction
The DWIN LCDs that come with the Creality Ender 3 v2 and other 3D printers contain image and container files stored on them which are used to draw various the UI elements.
The DWIN LCDs that come with the Creality Ender-3 v2 and other 3D printers contain image and container files stored on them which are used to draw various the UI elements.
Standard `.JPG` files can be installed for things like the boot screen, and `.ICO` files can contain several images within a structured file format.
@@ -42,15 +42,15 @@ These tools must be run from a terminal with access to an installed Python 3 and
Pillow is most easily installed with pip:
python3 -m pip install pillow
python3 -m pip install pillow
## Examples
These tools process an `.ICO` file that you specify. The safest method is to create a folder and copy your `.ICO` file there. For example:
$ mkdir hackicons
$ cp 9.ICO hackicons
$ cd hackicons
$ mkdir hackicons
$ cp 9.ICO hackicons
$ cd hackicons
The following explanations will refer back to this layout.
@@ -64,19 +64,19 @@ If you want to edit the individual icons stored in an ICO file (or add more imag
In this example we're extracting the constituent JPEG files from `9.ICO` and storing them in a folder named `icons`. As each file is extracted the script reports its index number, byte offset, size, dimensions, and filename:
$ cd buildroot/share/dwin
$ ./bin/splitIco.py 9.ICO icons-9
Splitting 9.ICO into dir icons
Splitting Entry Data...
00: offset: 0x001000 len: 0x10a2 width: 130 height: 17
Wrote 4258 bytes to icons/000-ICON_LOGO.jpg
01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100
Wrote 3756 bytes to icons/001-ICON_Print_0.jpg
02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100
Wrote 3754 bytes to icons/002-ICON_Print_1.jpg
...
91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100
Wrote 3465 bytes to icons/091-ICON_Info_1.jpg
$ cd buildroot/share/dwin
$ ./bin/splitIco.py 9.ICO icons-9
Splitting 9.ICO into dir icons
Splitting Entry Data...
00: offset: 0x001000 len: 0x10a2 width: 130 height: 17
Wrote 4258 bytes to icons/000-ICON_LOGO.jpg
01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100
Wrote 3756 bytes to icons/001-ICON_Print_0.jpg
02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100
Wrote 3754 bytes to icons/002-ICON_Print_1.jpg
...
91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100
Wrote 3465 bytes to icons/091-ICON_Info_1.jpg
Once the individual JPEG files have been saved they can be edited using common graphics applications like Photoshop. JPEG files are inherently lossy and will usually contain ugly artifacts, so cleanup may be needed before they are re-exported. Keep the limits of bank size in mind when exporting images and try to find the best balance between compressed size and image quality.
@@ -84,9 +84,9 @@ Once the individual JPEG files have been saved they can be edited using common g
After editing images you'll create a new `9.ICO` archive with `makeIco.py` like so:
$ cd buildroot/share/dwin
$ ./bin/makeIco.py icons-3 3.ICO
Making .ico file '3.ICO' from contents of 'icons-3'
Scanning icon directory icons-3
...Scanned 16 icon files
Scanning done. 16 icons included.
$ cd buildroot/share/dwin
$ ./bin/makeIco.py icons-3 3.ICO
Making .ico file '3.ICO' from contents of 'icons-3'
Scanning icon directory icons-3
...Scanned 16 icon files
Scanning done. 16 icons included.