zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Move font data to a subfolder

Browse source
This commit is contained in:
Scott Lahteine 2018-10-24 03:38:13 -05:00
parent 774a6e8199
commit 8055ed24ff
34 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/core/language.h
View file

@ -264,7 +264,7 @@
// LCD Menu Messages // LCD Menu Messages
#define LANGUAGE_DATA_INCL_(M) STRINGIFY_(language_data_##M.h) #define LANGUAGE_DATA_INCL_(M) STRINGIFY_(fontdata/language_data_##M.h)
#define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M) #define LANGUAGE_DATA_INCL(M) LANGUAGE_DATA_INCL_(M)
#define INCLUDE_LANGUAGE_DATA LANGUAGE_DATA_INCL(LCD_LANGUAGE) #define INCLUDE_LANGUAGE_DATA LANGUAGE_DATA_INCL(LCD_LANGUAGE)

0
Marlin/src/lcd/dogm/dogm_font_data_6x9_marlin.h → Marlin/src/lcd/dogm/fontdata/fontdata_6x9_marlin.h
View file

0
Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h → Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
View file

0
Marlin/src/lcd/dogm/language_data_an.h → Marlin/src/lcd/dogm/fontdata/language_data_an.h
View file

0
Marlin/src/lcd/dogm/language_data_bg.h → Marlin/src/lcd/dogm/fontdata/language_data_bg.h
View file

0
Marlin/src/lcd/dogm/language_data_ca.h → Marlin/src/lcd/dogm/fontdata/language_data_ca.h
View file

0
Marlin/src/lcd/dogm/language_data_cz.h → Marlin/src/lcd/dogm/fontdata/language_data_cz.h
View file

0
Marlin/src/lcd/dogm/language_data_da.h → Marlin/src/lcd/dogm/fontdata/language_data_da.h
View file

0
Marlin/src/lcd/dogm/language_data_de.h → Marlin/src/lcd/dogm/fontdata/language_data_de.h
View file

0
Marlin/src/lcd/dogm/language_data_el-gr.h → Marlin/src/lcd/dogm/fontdata/language_data_el-gr.h
View file

0
Marlin/src/lcd/dogm/language_data_el.h → Marlin/src/lcd/dogm/fontdata/language_data_el.h
View file

0
Marlin/src/lcd/dogm/language_data_en.h → Marlin/src/lcd/dogm/fontdata/language_data_en.h
View file

0
Marlin/src/lcd/dogm/language_data_es.h → Marlin/src/lcd/dogm/fontdata/language_data_es.h
View file

0
Marlin/src/lcd/dogm/language_data_eu.h → Marlin/src/lcd/dogm/fontdata/language_data_eu.h
View file

0
Marlin/src/lcd/dogm/language_data_fi.h → Marlin/src/lcd/dogm/fontdata/language_data_fi.h
View file

0
Marlin/src/lcd/dogm/language_data_fr.h → Marlin/src/lcd/dogm/fontdata/language_data_fr.h
View file

0
Marlin/src/lcd/dogm/language_data_gl.h → Marlin/src/lcd/dogm/fontdata/language_data_gl.h
View file

0
Marlin/src/lcd/dogm/language_data_hr.h → Marlin/src/lcd/dogm/fontdata/language_data_hr.h
View file

0
Marlin/src/lcd/dogm/language_data_it.h → Marlin/src/lcd/dogm/fontdata/language_data_it.h
View file

0
Marlin/src/lcd/dogm/language_data_jp-kana.h → Marlin/src/lcd/dogm/fontdata/language_data_jp-kana.h
View file

0
Marlin/src/lcd/dogm/language_data_ko_KR.h → Marlin/src/lcd/dogm/fontdata/language_data_ko_KR.h
View file

0
Marlin/src/lcd/dogm/language_data_nl.h → Marlin/src/lcd/dogm/fontdata/language_data_nl.h
View file

0
Marlin/src/lcd/dogm/language_data_pl.h → Marlin/src/lcd/dogm/fontdata/language_data_pl.h
View file

0
Marlin/src/lcd/dogm/language_data_pt-br.h → Marlin/src/lcd/dogm/fontdata/language_data_pt-br.h
View file

0
Marlin/src/lcd/dogm/language_data_pt.h → Marlin/src/lcd/dogm/fontdata/language_data_pt.h
View file

0
Marlin/src/lcd/dogm/language_data_ru.h → Marlin/src/lcd/dogm/fontdata/language_data_ru.h
View file

0
Marlin/src/lcd/dogm/language_data_sk.h → Marlin/src/lcd/dogm/fontdata/language_data_sk.h
View file

0
Marlin/src/lcd/dogm/language_data_test.h → Marlin/src/lcd/dogm/fontdata/language_data_test.h
View file

0
Marlin/src/lcd/dogm/language_data_tr.h → Marlin/src/lcd/dogm/fontdata/language_data_tr.h
View file

0
Marlin/src/lcd/dogm/language_data_uk.h → Marlin/src/lcd/dogm/fontdata/language_data_uk.h
View file

0
Marlin/src/lcd/dogm/language_data_zh_CN.h → Marlin/src/lcd/dogm/fontdata/language_data_zh_CN.h
View file

0
Marlin/src/lcd/dogm/language_data_zh_TW.h → Marlin/src/lcd/dogm/fontdata/language_data_zh_TW.h
View file

6
Marlin/src/lcd/dogm/ultralcd_impl_DOGM.cpp
View file

@ -60,7 +60,7 @@
#include "../../feature/bedlevel/ubl/ubl.h" #include "../../feature/bedlevel/ubl/ubl.h"
#endif #endif
// The Marlin special symbols is now in the dogm_font_data_ISO10646_1.h // The Marlin special symbols is now in the fontdata_ISO10646_1.h
#define FONT_SPECIAL_NAME ISO10646_1_5x7 #define FONT_SPECIAL_NAME ISO10646_1_5x7
// Only Western languages support big / small fonts // Only Western languages support big / small fonts
@ -70,7 +70,7 @@
#endif #endif
#if ENABLED(USE_SMALL_INFOFONT) #if ENABLED(USE_SMALL_INFOFONT)
#include "dogm_font_data_6x9_marlin.h" #include "fontdata/fontdata_6x9_marlin.h"
#define FONT_STATUSMENU_NAME u8g_font_6x9 #define FONT_STATUSMENU_NAME u8g_font_6x9
#define INFO_FONT_HEIGHT 7 #define INFO_FONT_HEIGHT 7
#else #else
@ -80,7 +80,7 @@
#include LANGUAGE_DATA_INCL(LCD_LANGUAGE) #include LANGUAGE_DATA_INCL(LCD_LANGUAGE)
#include "dogm_font_data_ISO10646_1.h" #include "fontdata/fontdata_ISO10646_1.h"
#define FONT_MENU_NAME ISO10646_1_5x7 #define FONT_MENU_NAME ISO10646_1_5x7
// DOGM parameters (size in pixels) // DOGM parameters (size in pixels)

6
buildroot/share/fonts/genallfont.sh
View file

@ -64,13 +64,13 @@ for LANG in ${MARLIN_LANGS:=$LANGS_DEFAULT} ; do
${EXEC_WXGGEN} "${FN_FONT}" ${EXEC_WXGGEN} "${FN_FONT}"
sed -i fontutf8-data.h -e 's|fonts//|fonts/|g' -e 's|fonts//|fonts/|g' -e 's|[/0-9a-zA-Z_\-]*buildroot/share/fonts|buildroot/share/fonts|' 2>/dev/null sed -i fontutf8-data.h -e 's|fonts//|fonts/|g' -e 's|fonts//|fonts/|g' -e 's|[/0-9a-zA-Z_\-]*buildroot/share/fonts|buildroot/share/fonts|' 2>/dev/null
cd ../ cd ../
mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/language_data_${LANG}.h mv ${DN_WORK}/fontutf8-data.h src/lcd/dogm/fontdata/language_data_${LANG}.h
rm -rf ${DN_WORK}/ rm -rf ${DN_WORK}/
done done
# #
# Generate default ASCII font (char range 0-255): # Generate default ASCII font (char range 0-255):
# Marlin/src/lcd/dogm/dogm_font_data_ISO10646_1.h # Marlin/src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
# #
#if [ "${MARLIN_LANGS}" == "${LANGS_DEFAULT}" ]; then #if [ "${MARLIN_LANGS}" == "${LANGS_DEFAULT}" ]; then
if [ 1 = 1 ]; then if [ 1 = 1 ]; then
@ -82,7 +82,7 @@ if [ 1 = 1 ]; then
TMP1=$(cat tmp1.h) ; rm tmp1.h TMP1=$(cat tmp1.h) ; rm tmp1.h
TMP2=$(cat tmp2.h) ; rm tmp2.h TMP2=$(cat tmp2.h) ; rm tmp2.h
cat <<EOF >../src/lcd/dogm/dogm_font_data_ISO10646_1.h cat <<EOF >../src/lcd/dogm/fontdata/fontdata_ISO10646_1.h
/** /**
* Marlin 3D Printer Firmware * Marlin 3D Printer Firmware
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]