Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework TFT Color UI layout #26077

Merged
merged 22 commits into from
Jul 17, 2023
+23,068 −4,419
Merged

Rework TFT Color UI layout #26077

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5bd90e5
Rework TFT Color UI layout
jmz52 Jul 13, 2023
4d6ba3b
Fix include path
jmz52 Jul 13, 2023
e1f7db5
Fix compilation errors
jmz52 Jul 13, 2023
cf14bae
misc. cleanup
thinkyhead Jul 16, 2023
83d6deb
No HAS_EXTRA_PROGRESS with HAS_GRAPHICAL_TFT
thinkyhead Jul 16, 2023
93f8162
Add bigger fonts
jmz52 Jul 16, 2023
bbf2a00
Adjust "temperature" and 'fan" elements size for 320x480 Color_UI
jmz52 Jul 16, 2023
e999389
consistency
thinkyhead Jul 16, 2023
43e2dda
whitespace, etc.
thinkyhead Jul 16, 2023
b7eafd0
Rename Cyrillic fonts
thinkyhead Jul 16, 2023
3397e46
fix warning
thinkyhead Jul 16, 2023
c2e5d5f
common code
thinkyhead Jul 16, 2023
b6a4298
filter move_axis screens
thinkyhead Jul 16, 2023
29743af
ws
thinkyhead Jul 17, 2023
6277678
"height"
thinkyhead Jul 17, 2023
21bff0e
fontdata.h
thinkyhead Jul 17, 2023
f1d5db6
Filter font sizes
thinkyhead Jul 17, 2023
8cba089
Merge branch 'bugfix-2.1.x' into pr/26077
thinkyhead Jul 17, 2023
98c0eb5
"language"
thinkyhead Jul 17, 2023
f99c7df
comments
thinkyhead Jul 17, 2023
6c325f3
filter FONT_EXTRA
thinkyhead Jul 17, 2023
4d922f1
Anet ET Theme
thinkyhead Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
comments
@thinkyhead
thinkyhead committed Jul 17, 2023
commit f99c7dfed9a78cc184d69318f6df353ffc860466
44 changes: 22 additions & 22 deletions Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
View file
Original file line number Diff line number Diff line change
@@ -25,17 +25,17 @@
#if defined(__AVR__) && ENABLED(NOT_EXTENDED_ISO10646_1_5X7)
// reduced font (only symbols 1 - 127) - saves about 1278 bytes of FLASH

/*
Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
Copyright: Public domain terminal emulator font. Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 7 h=10 x= 5 y= 5 dx= 7 dy= 0 ascent= 8 len=10
Font Bounding box w=12 h=15 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
Pure Font ascent = 7 descent=-2
X Font ascent = 8 descent=-2
Max Font ascent = 8 descent=-2
*/
/**
* Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
* Copyright: Public domain terminal emulator font. Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
* Capital A Height: 7, '1' Height: 7
* Calculated Max Values w= 7 h=10 x= 5 y= 5 dx= 7 dy= 0 ascent= 8 len=10
* Font Bounding box w=12 h=15 x= 0 y=-2
* Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
* Pure Font ascent = 7 descent=-2
* X Font ascent = 8 descent=-2
* Max Font ascent = 8 descent=-2
*/
const u8g_fntpgm_uint8_t ISO10646_1_5x7[1324] U8G_FONT_SECTION("ISO10646_1_5x7") = {
0x00,0x0C,0x0F,0x00,0xFE,0x07,0x02,0x25,0x03,0xBB,0x01,0x7F,0xFE,0x08,0xFE,0x08,
0xFE,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xF0,0xC8,0x88,0x88,0x98,0x78,0x10,0x05,
@@ -123,17 +123,17 @@ const u8g_fntpgm_uint8_t ISO10646_1_5x7[1324] U8G_FONT_SECTION("ISO10646_1_5x7")
#else
// extended (original) font (symbols 1 - 255)

/*
Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
Copyright: Public domain terminal emulator font. Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
Capital A Height: 7, '1' Height: 7
Calculated Max Values w= 7 h=10 x= 5 y= 7 dx= 7 dy= 0 ascent=10 len=10
Font Bounding box w=12 h=15 x= 0 y=-2
Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
Pure Font ascent = 7 descent=-2
X Font ascent = 8 descent=-2
Max Font ascent =10 descent=-2
*/
/**
* Fontname: -Marlin6x12-Fixed-Medium-R-SemiCondensed--12-90-100-100-C-111-ISO10646-1
* Copyright: Public domain terminal emulator font. Share and enjoy. original font -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-ISO10646-1
* Capital A Height: 7, '1' Height: 7
* Calculated Max Values w= 7 h=10 x= 5 y= 7 dx= 7 dy= 0 ascent=10 len=10
* Font Bounding box w=12 h=15 x= 0 y=-2
* Calculated Min Values x= 0 y=-2 dx= 0 dy= 0
* Pure Font ascent = 7 descent=-2
* X Font ascent = 8 descent=-2
* Max Font ascent =10 descent=-2
*/
const u8g_fntpgm_uint8_t ISO10646_1_5x7[2647] U8G_FONT_SECTION("ISO10646_1_5x7") = {
0x00,0x0C,0x0F,0x00,0xFE,0x07,0x02,0x25,0x03,0xBB,0x01,0xFF,0xFE,0x0A,0xFE,0x08,
0xFE,0x05,0x08,0x08,0x06,0x00,0x00,0x40,0xF0,0xC8,0x88,0x88,0x98,0x78,0x10,0x05,
22 changes: 11 additions & 11 deletions Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_14.cpp
View file
Original file line number Diff line number Diff line change
@@ -20,17 +20,17 @@
*
*/

/*
Fontname: Helvetica
Copyright: Copyright (c) 1984, 1987 Adobe Systems Incorporated. All Rights Reserved. Copyright (c) 1988, 1991 Digital Equipment Corporation. All Rights Reserved.
Capital A Height: 14, '1' Height: 13
Calculated Max Values w=16 h=18 x= 2 y=12 dx=18 dy= 0 ascent=16 len=36
Font Bounding box w=18 h=19 x= 0 y=-4
Calculated Min Values x= 0 y=-4 dx= 0 dy= 0
Pure Font ascent =14 descent=-4
X Font ascent =14 descent=-4
Max Font ascent =16 descent=-4
*/
/**
* Fontname: Helvetica
* Copyright: Copyright (c) 1984, 1987 Adobe Systems Incorporated. All Rights Reserved. Copyright (c) 1988, 1991 Digital Equipment Corporation. All Rights Reserved.
* Capital A Height: 14, '1' Height: 13
* Calculated Max Values w=16 h=18 x= 2 y=12 dx=18 dy= 0 ascent=16 len=36
* Font Bounding box w=18 h=19 x= 0 y=-4
* Calculated Min Values x= 0 y=-4 dx= 0 dy= 0
* Pure Font ascent =14 descent=-4
* X Font ascent =14 descent=-4
* Max Font ascent =16 descent=-4
*/

#include "../fontdata.h"

22 changes: 11 additions & 11 deletions Marlin/src/lcd/tft/fontdata/Helvetica/Helvetica_19.cpp
View file
Original file line number Diff line number Diff line change
@@ -20,17 +20,17 @@
*
*/

/*
Fontname: -Adobe-Helvetica-Medium-R-Normal--25-180-100-100-P-130-ISO10646-1
Copyright: Copyright (c) 1984, 1987 Adobe Systems Incorporated. All Rights Reserved. Copyright (c) 1988, 1991 Digital Equipment Corporation. All Rights Reserved.
Capital A Height: 19, '1' Height: 18
Calculated Max Values w=22 h=24 x= 3 y=16 dx=25 dy= 0 ascent=24 len=69
Font Bounding box w=28 h=37 x=-3 y=-8
Calculated Min Values x=-1 y=-5 dx= 0 dy= 0
Pure Font ascent =19 descent=-5
X Font ascent =19 descent=-5
Max Font ascent =24 descent=-5
*/
/**
* Fontname: -Adobe-Helvetica-Medium-R-Normal--25-180-100-100-P-130-ISO10646-1
* Copyright: Copyright (c) 1984, 1987 Adobe Systems Incorporated. All Rights Reserved. Copyright (c) 1988, 1991 Digital Equipment Corporation. All Rights Reserved.
* Capital A Height: 19, '1' Height: 18
* Calculated Max Values w=22 h=24 x= 3 y=16 dx=25 dy= 0 ascent=24 len=69
* Font Bounding box w=28 h=37 x=-3 y=-8
* Calculated Min Values x=-1 y=-5 dx= 0 dy= 0
* Pure Font ascent =19 descent=-5
* X Font ascent =19 descent=-5
* Max Font ascent =24 descent=-5
*/

#include "../fontdata.h"