Skip to content

Commit

Permalink
Update symbols used
Browse files Browse the repository at this point in the history 
Regenerate fonts with symbols modification
Recreate docs with list of symbols
  • Loading branch information
@luc-github
luc-github committed Apr 26, 2024
1 parent 3ed9d65 commit 4f0ef28
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 125 deletions.
38 changes: 19 additions & 19 deletions components/lvgl/src/font/lv_symbol_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ extern "C" {
*-----------------------------*/

/*In the font converter use this list as range:
58728,62153,61642,63253,61458,62745,61452,58774,
58728,62153,61642,63253,61458,62745,61452,61470,
61453,61457,61480,61479,63145,61459,62161,57408,
62189,58287,61465,61473,62212,61512,61521,61515,
61516,61639,61664,61671,63343,61942,61475,62172,
61516,61639,63246,61556,63343,61942,61475,62172,
61517,61931,61553,61563,61787,61724,62810,63426,
61618,61559,61560,61523,61524,61728,63012,61867,
61618,61559,61560,61523,61524,62880,63012,61867,
63587,62603,63275,61829,62913,62973,58552,62683,
58557,61442,62679,62156,61758,61842,58563,62437,
62099,62087,61601,61525,61526,62038,62788
62099,62405,61601,61525,61526,62038,62788
*/

/* These symbols can be prefined in the lv_conf.h file.
Expand Down Expand Up @@ -63,8 +63,8 @@ extern "C" {
#define LV_SYMBOL_OK "\xEF\x80\x8C" /*61452, 0xF00C*/
#endif

#if !defined LV_SYMBOL_PROBE_CHECK
#define LV_SYMBOL_PROBE_CHECK "\xEE\x96\x96" /*58774, 0xE596*/
#if !defined LV_SYMBOL_RESET
#define LV_SYMBOL_RESET "\xEF\x80\x9E" /*61470, 0xF01E*/
#endif

#if !defined LV_SYMBOL_CLOSE
Expand Down Expand Up @@ -139,12 +139,12 @@ extern "C" {
#define LV_SYMBOL_SAVE "\xEF\x83\x87" /*61639, 0xF0C7*/
#endif

#if !defined LV_SYMBOL_MESSAGE
#define LV_SYMBOL_MESSAGE "\xEF\x83\xA0" /*61664, 0xF0E0*/
#if !defined LV_SYMBOL_MACRO
#define LV_SYMBOL_MACRO "\xEF\x9C\x8E" /*63246, 0xF70E*/
#endif

#if !defined LV_SYMBOL_LASER
#define LV_SYMBOL_LASER "\xEF\x83\xA7" /*61671, 0xF0E7*/
#if !defined LV_SYMBOL_SHUFFLE
#define LV_SYMBOL_SHUFFLE "\xEF\x81\xB4" /*61556, 0xF074*/
#endif

#if !defined LV_SYMBOL_VACCUM
Expand Down Expand Up @@ -215,8 +215,8 @@ extern "C" {
#define LV_SYMBOL_RIGHT "\xEF\x81\x94" /*61524, 0xF054*/
#endif

#if !defined LV_SYMBOL_COMMAND
#define LV_SYMBOL_COMMAND "\xEF\x84\xA0" /*61728, 0xF120*/
#if !defined LV_SYMBOL_W_POSITION
#define LV_SYMBOL_W_POSITION "\xEF\x96\xA0" /*62880, 0xF5A0*/
#endif

#if !defined LV_SYMBOL_GAUGE
Expand Down Expand Up @@ -295,8 +295,8 @@ extern "C" {
#define LV_SYMBOL_BLUETOOTH "\xEF\x8A\x93" /*62099, 0xF293*/
#endif

#if !defined LV_SYMBOL_USB
#define LV_SYMBOL_USB "\xEF\x8A\x87" /*62087, 0xF287*/
#if !defined LV_SYMBOL_M_POSITION
#define LV_SYMBOL_M_POSITION "\xEF\x8F\x85" /*62405, 0xF3C5*/
#endif

#if !defined LV_SYMBOL_MORE_INFO
Expand Down Expand Up @@ -332,7 +332,7 @@ enum {
_LV_STR_SYMBOL_STATION_MODE,
_LV_STR_SYMBOL_ACCESS_POINT,
_LV_STR_SYMBOL_OK,
_LV_STR_SYMBOL_PROBE_CHECK,
_LV_STR_SYMBOL_RESET,
_LV_STR_SYMBOL_CLOSE,
_LV_STR_SYMBOL_POWER,
_LV_STR_SYMBOL_VOLUME_HIGH,
Expand All @@ -351,8 +351,8 @@ enum {
_LV_STR_SYMBOL_PLAY,
_LV_STR_SYMBOL_PAUSE,
_LV_STR_SYMBOL_SAVE,
_LV_STR_SYMBOL_MESSAGE,
_LV_STR_SYMBOL_LASER,
_LV_STR_SYMBOL_MACRO,
_LV_STR_SYMBOL_SHUFFLE,
_LV_STR_SYMBOL_VACCUM,
_LV_STR_SYMBOL_DISABLE_ALERT,
_LV_STR_SYMBOL_LOCK,
Expand All @@ -370,7 +370,7 @@ enum {
_LV_STR_SYMBOL_DOWN,
_LV_STR_SYMBOL_LEFT,
_LV_STR_SYMBOL_RIGHT,
_LV_STR_SYMBOL_COMMAND,
_LV_STR_SYMBOL_W_POSITION,
_LV_STR_SYMBOL_GAUGE,
_LV_STR_SYMBOL_LANGUAGE,
_LV_STR_SYMBOL_FAN,
Expand All @@ -390,7 +390,7 @@ enum {
_LV_STR_SYMBOL_MILLING,
_LV_STR_SYMBOL_NEW_LINE,
_LV_STR_SYMBOL_BLUETOOTH,
_LV_STR_SYMBOL_USB,
_LV_STR_SYMBOL_M_POSITION,
_LV_STR_SYMBOL_MORE_INFO,
_LV_STR_SYMBOL_PLUS,
_LV_STR_SYMBOL_MINUS,
Expand Down
80 changes: 4 additions & 76 deletions docs/project-arch.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1030,82 +1030,10 @@ The scripts directory contains the scripts used to build the firmware. The scrip
* It use Montserrat-Medium.ttf as base font:
- Generic chars are from 0x20 to 0x7F and with 0xB0.
- French chars are 0xE0,0xE7,0xE8,0xE9,0xEA,0xF4
* I use also FreeSerifBold.ttf 0x2022 char
* I use also FreeSerifBold.ttf 0x2022 char (LV_SYMBOL_BULLET)
* for the symbols I use Font fa-solid-900 and fa-brands-400.ttf:
|code|SYMBOL|font|
|-|-|-|
|0xe568|HEAT_BED|fa-solid-900.ttf|
|0xf2c9|EXTRUDER|fa-solid-900.ttf|
|0xf0ca|LIST|fa-solid-900.ttf|
|0xf715|SLASH|fa-solid-900.ttf|
|0xf012|STATION_MODE|fa-solid-900.ttf|
|0xf519|ACCESS_POINT|fa-solid-900.ttf|
|0xf00c|OK|fa-solid-900.ttf|
|0xe596|PROBE_CHECK|fa-solid-900.ttf|
|0xf00d|CLOSE|fa-solid-900.ttf|
|0xf011|POWER|fa-solid-900.ttf|
|0xf028|VOLUME_HIGH|fa-solid-900.ttf|
|0xf027|VOLUME_LOW|fa-solid-900.ttf|
|0xf6a9|VOLUME_OFF|fa-solid-900.ttf|
|0xf013|SETTINGS|fa-solid-900.ttf|
|0xf2d1|NO_HEAT_BED|fa-solid-900.ttf|
|0xe040|HEAT_EXTRUDER|fa-solid-900.ttf|
|0xf2ed|TRASH|fa-solid-900.ttf|
|0xe3af|HOME|fa-solid-900.ttf|
|0xf019|DOWNLOAD|fa-solid-900.ttf|
|0xf021|REFRESH|fa-solid-900.ttf|
|0xf304|EDIT|fa-solid-900.ttf|
|0xf048|PREVIOUS|fa-solid-900.ttf|
|0xf051|NEXT|fa-solid-900.ttf|
|0xf04b|PLAY|fa-solid-900.ttf|
|0xf04c|PAUSE|fa-solid-900.ttf|
|0xf0c7|SAVE|fa-solid-900.ttf|
|0xf0e0|MESSAGE|fa-solid-900.ttf|
|0xf0e7|LASER|fa-solid-900.ttf|
|0xf76f|VACCUM|fa-solid-900.ttf|
|0xf1f6|DISABLE_ALERT|fa-solid-900.ttf|
|0xf023|LOCK|fa-solid-900.ttf|
|0xf2dc|COOLANT|fa-solid-900.ttf|
|0xf04d|STOP|fa-solid-900.ttf|
|0xf1eb|WIFI|fa-solid-900.ttf|
|0xf071|WARNING|fa-solid-900.ttf|
|0xf07b|FOLDER|fa-solid-900.ttf|
|0xf15b|FILE|fa-solid-900.ttf|
|0xf11c|KEYBOARD|fa-solid-900.ttf|
|0xf55a|BACKSPACE|fa-solid-900.ttf|
|0xf7c2|SD_CARD|fa-solid-900.ttf|
|0xf0b2|JOG|fa-solid-900.ttf|
|0xf077|UP|fa-solid-900.ttf|
|0xf078|DOWN|fa-solid-900.ttf|
|0xf053|LEFT|fa-solid-900.ttf|
|0xf054|RIGHT|fa-solid-900.ttf|
|0xf120|COMMAND|fa-solid-900.ttf|
|0xf624|GAUGE|fa-solid-900.ttf|
|0xf1ab|LANGUAGE|fa-solid-900.ttf|
|0xf863|FAN|fa-solid-900.ttf|
|0xf48b|SPEED|fa-solid-900.ttf|
|0xf72b|WIZARD|fa-solid-900.ttf|
|0xf185|LIGHT|fa-solid-900.ttf|
|0xf5c1|ENGINE|fa-solid-900.ttf|
|0xf5fd|LAYERS|fa-solid-900.ttf|
|0xe4b8|LEVELING|fa-solid-900.ttf|
|0xf4db|FILAMENT|fa-solid-900.ttf|
|0xe4bd|CENTER|fa-solid-900.ttf|
|0xf002|SEARCH|fa-solid-900.ttf|
|0xf4d7|FILAMENT_SENSOR|fa-solid-900.ttf|
|0xf2cc|MIST|fa-solid-900.ttf|
|0xf13e|UNLOCK|fa-solid-900.ttf|
|0xf192|LASER_2|fa-solid-900.ttf|
|0xe4c3|MILLING|fa-solid-900.ttf|
|0xf3e5|NEW_LINE|fa-solid-900.ttf|
|0xf293|BLUETOOTH|fa-brands-400.ttf|
|0xf287|USB|fa-brands-400.ttf|
|0xf0a1|MORE_INFO|fa-solid-900.ttf|
|0xf055|PLUS|fa-solid-900.ttf|
|0xf056|MINUS|fa-solid-900.ttf|
|0xf256|MANUAL|fa-solid-900.ttf|
|0xf544|AUTOMATIC|fa-solid-900.ttf|



![](symbols_1.png)
![](symbols_2.png)
![](symbols_2.png)
![](symbols_3.png)
Binary file modified docs/symbols_1.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/symbols_2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/symbols_3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions scripts/fonts_builder/build_defs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[0xf012,'STATION_MODE'],
[0xf519,'ACCESS_POINT'],
[0xf00c,'OK'],
[0xe596,'PROBE_CHECK'],
[0xf01e,'RESET'],
[0xf00d,'CLOSE'],
[0xf011,'POWER'],
[0xf028,'VOLUME_HIGH'],
Expand All @@ -29,8 +29,8 @@
[0xf04b,'PLAY'],
[0xf04c,'PAUSE'],
[0xf0c7,'SAVE'],
[0xf0e0,'MESSAGE'],
[0xf0e7,'LASER'],
[0xf70e,'MACRO'],
[0xf074,'SHUFFLE'],
[0xf76f,'VACCUM'],
[0xf1f6,'DISABLE_ALERT'],
[0xf023,'LOCK'],
Expand All @@ -48,7 +48,7 @@
[0xf078,'DOWN'],
[0xf053,'LEFT'],
[0xf054,'RIGHT'],
[0xf120,'COMMAND'],
[0xf5a0,'W_POSITION'],
[0xf624,'GAUGE'],
[0xf1ab,'LANGUAGE'],
[0xf863,'FAN'],
Expand All @@ -68,7 +68,7 @@
[0xe4c3,'MILLING'],
[0xf3e5,'NEW_LINE'],
[0xf293,'BLUETOOTH'],
[0xf287,'USB'],
[0xf3c5,'M_POSITION'],
[0xf0a1,'MORE_INFO'],
[0xf055,'PLUS'],
[0xf056,'MINUS'],
Expand Down
12 changes: 6 additions & 6 deletions scripts/fonts_builder/build_fonts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[0xf012,'STATION_MODE','fa-solid-900.ttf'],
[0xf519,'ACCESS_POINT','fa-solid-900.ttf'],
[0xf00c,'OK','fa-solid-900.ttf'],
[0xe596,'PROBE_CHECK','fa-solid-900.ttf'],
[0xf01e,'RESET','fa-solid-900.ttf'],
[0xf00d,'CLOSE','fa-solid-900.ttf'],
[0xf011,'POWER','fa-solid-900.ttf'],
[0xf028,'VOLUME_HIGH','fa-solid-900.ttf'],
Expand All @@ -30,8 +30,8 @@
[0xf04b,'PLAY','fa-solid-900.ttf'],
[0xf04c,'PAUSE','fa-solid-900.ttf'],
[0xf0c7,'SAVE','fa-solid-900.ttf'],
[0xf0e0,'MESSAGE','fa-solid-900.ttf'],
[0xf0e7,'LASER','fa-solid-900.ttf'],
[0xf70e,'MACRO','fa-solid-900.ttf'],
[0xf074,'SHUFFLE','fa-solid-900.ttf'],
[0xf76f,'VACCUM','fa-solid-900.ttf'],
[0xf1f6,'DISABLE_ALERT','fa-solid-900.ttf'],
[0xf023,'LOCK','fa-solid-900.ttf'],
Expand All @@ -49,7 +49,7 @@
[0xf078,'DOWN','fa-solid-900.ttf'],
[0xf053,'LEFT','fa-solid-900.ttf'],
[0xf054,'RIGHT','fa-solid-900.ttf'],
[0xf120,'COMMAND','fa-solid-900.ttf'],
[0xf5a0,'W_POSITION','fa-solid-900.ttf'],
[0xf624,'GAUGE','fa-solid-900.ttf'],
[0xf1ab,'LANGUAGE','fa-solid-900.ttf'],
[0xf863,'FAN','fa-solid-900.ttf'],
Expand All @@ -68,8 +68,8 @@
[0xf192,'LASER_2','fa-solid-900.ttf'],
[0xe4c3,'MILLING','fa-solid-900.ttf'],
[0xf3e5,'NEW_LINE','fa-solid-900.ttf'],
[0xf293,'BLUETOOTH','fa-brands-400.ttf'],
[0xf287,'USB','fa-brands-400.ttf'],
[0xf293,'BLUETOOTH','fa-solid-900.ttf'],
[0xf3c3,'M_POSITION','fa-solid-900.ttf'],
[0xf0a1,'MORE_INFO','fa-solid-900.ttf'],
[0xf055,'PLUS','fa-solid-900.ttf'],
[0xf056,'MINUS','fa-solid-900.ttf'],
Expand Down
38 changes: 19 additions & 19 deletions scripts/fonts_builder/fonts/lv_symbol_def.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ extern "C" {
*-----------------------------*/

/*In the font converter use this list as range:
58728,62153,61642,63253,61458,62745,61452,58774,
58728,62153,61642,63253,61458,62745,61452,61470,
61453,61457,61480,61479,63145,61459,62161,57408,
62189,58287,61465,61473,62212,61512,61521,61515,
61516,61639,61664,61671,63343,61942,61475,62172,
61516,61639,63246,61556,63343,61942,61475,62172,
61517,61931,61553,61563,61787,61724,62810,63426,
61618,61559,61560,61523,61524,61728,63012,61867,
61618,61559,61560,61523,61524,62880,63012,61867,
63587,62603,63275,61829,62913,62973,58552,62683,
58557,61442,62679,62156,61758,61842,58563,62437,
62099,62087,61601,61525,61526,62038,62788
62099,62405,61601,61525,61526,62038,62788
*/

/* These symbols can be prefined in the lv_conf.h file.
Expand Down Expand Up @@ -63,8 +63,8 @@ extern "C" {
#define LV_SYMBOL_OK "\xEF\x80\x8C" /*61452, 0xF00C*/
#endif

#if !defined LV_SYMBOL_PROBE_CHECK
#define LV_SYMBOL_PROBE_CHECK "\xEE\x96\x96" /*58774, 0xE596*/
#if !defined LV_SYMBOL_RESET
#define LV_SYMBOL_RESET "\xEF\x80\x9E" /*61470, 0xF01E*/
#endif

#if !defined LV_SYMBOL_CLOSE
Expand Down Expand Up @@ -139,12 +139,12 @@ extern "C" {
#define LV_SYMBOL_SAVE "\xEF\x83\x87" /*61639, 0xF0C7*/
#endif

#if !defined LV_SYMBOL_MESSAGE
#define LV_SYMBOL_MESSAGE "\xEF\x83\xA0" /*61664, 0xF0E0*/
#if !defined LV_SYMBOL_MACRO
#define LV_SYMBOL_MACRO "\xEF\x9C\x8E" /*63246, 0xF70E*/
#endif

#if !defined LV_SYMBOL_LASER
#define LV_SYMBOL_LASER "\xEF\x83\xA7" /*61671, 0xF0E7*/
#if !defined LV_SYMBOL_SHUFFLE
#define LV_SYMBOL_SHUFFLE "\xEF\x81\xB4" /*61556, 0xF074*/
#endif

#if !defined LV_SYMBOL_VACCUM
Expand Down Expand Up @@ -215,8 +215,8 @@ extern "C" {
#define LV_SYMBOL_RIGHT "\xEF\x81\x94" /*61524, 0xF054*/
#endif

#if !defined LV_SYMBOL_COMMAND
#define LV_SYMBOL_COMMAND "\xEF\x84\xA0" /*61728, 0xF120*/
#if !defined LV_SYMBOL_W_POSITION
#define LV_SYMBOL_W_POSITION "\xEF\x96\xA0" /*62880, 0xF5A0*/
#endif

#if !defined LV_SYMBOL_GAUGE
Expand Down Expand Up @@ -295,8 +295,8 @@ extern "C" {
#define LV_SYMBOL_BLUETOOTH "\xEF\x8A\x93" /*62099, 0xF293*/
#endif

#if !defined LV_SYMBOL_USB
#define LV_SYMBOL_USB "\xEF\x8A\x87" /*62087, 0xF287*/
#if !defined LV_SYMBOL_M_POSITION
#define LV_SYMBOL_M_POSITION "\xEF\x8F\x85" /*62405, 0xF3C5*/
#endif

#if !defined LV_SYMBOL_MORE_INFO
Expand Down Expand Up @@ -332,7 +332,7 @@ enum {
_LV_STR_SYMBOL_STATION_MODE,
_LV_STR_SYMBOL_ACCESS_POINT,
_LV_STR_SYMBOL_OK,
_LV_STR_SYMBOL_PROBE_CHECK,
_LV_STR_SYMBOL_RESET,
_LV_STR_SYMBOL_CLOSE,
_LV_STR_SYMBOL_POWER,
_LV_STR_SYMBOL_VOLUME_HIGH,
Expand All @@ -351,8 +351,8 @@ enum {
_LV_STR_SYMBOL_PLAY,
_LV_STR_SYMBOL_PAUSE,
_LV_STR_SYMBOL_SAVE,
_LV_STR_SYMBOL_MESSAGE,
_LV_STR_SYMBOL_LASER,
_LV_STR_SYMBOL_MACRO,
_LV_STR_SYMBOL_SHUFFLE,
_LV_STR_SYMBOL_VACCUM,
_LV_STR_SYMBOL_DISABLE_ALERT,
_LV_STR_SYMBOL_LOCK,
Expand All @@ -370,7 +370,7 @@ enum {
_LV_STR_SYMBOL_DOWN,
_LV_STR_SYMBOL_LEFT,
_LV_STR_SYMBOL_RIGHT,
_LV_STR_SYMBOL_COMMAND,
_LV_STR_SYMBOL_W_POSITION,
_LV_STR_SYMBOL_GAUGE,
_LV_STR_SYMBOL_LANGUAGE,
_LV_STR_SYMBOL_FAN,
Expand All @@ -390,7 +390,7 @@ enum {
_LV_STR_SYMBOL_MILLING,
_LV_STR_SYMBOL_NEW_LINE,
_LV_STR_SYMBOL_BLUETOOTH,
_LV_STR_SYMBOL_USB,
_LV_STR_SYMBOL_M_POSITION,
_LV_STR_SYMBOL_MORE_INFO,
_LV_STR_SYMBOL_PLUS,
_LV_STR_SYMBOL_MINUS,
Expand Down
Binary file modified scripts/fonts_builder/symbols.ods
View file
Binary file not shown.
Binary file added scripts/fonts_builder/symbols.pdf
View file
Binary file not shown.

0 comments on commit 4f0ef28

Please sign in to comment.