bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Change selection logic another time

Browse Source 
Automatic selection was to unflexible.

Updated documentation

Updated language files to new logic and documentation.

Updated bdf2u8g.exe
This commit is contained in:
AnHardt
2015-03-13 14:26:58 +01:00
parent 5bafb1fe1f
commit 96f8d20f2f
24 changed files with 194 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Marlin/dogm_lcd_implementation.h
View File

@ -35,10 +35,10 @@
#include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h"
#include "configuration.h"
#include "utf_mapper.h"
#include <utility/u8g.h>
#include "dogm_font_data_6x9_marlin.h" // Height of 'A' is only 5 pixel.
#include "dogm_font_data_6x9_marlin.h" // Height of 'A' is only 6 pixel.
#include "dogm_font_data_Marlin_symbols.h" // The Marlin special symbols
#define FONT_STATUSMENU_NAME u8g_font_6x9 // we don't have a small font for Cyrillic, Kana or Kanji
@ -50,38 +50,38 @@
#define USE_BIG_EDIT_FONT
#endif
#if defined( MAPPER_C2C3 )
#include <utility/u8g.h> // System font. This is ISO10646-1
#define FONT_MENU_NAME u8g_font_6x10
#elif defined( MAPPER_D0D1 )
#include "dogm_font_data_ISO10646_5_Cyrillic.h"
#define FONT_MENU_NAME ISO10646_5_Cyrillic_5x7
#elif defined( MAPPER_E382E383 )
#include "dogm_font_data_ISO10646_Kana.h"
#define FONT_MENU_NAME ISO10646_Kana_5x7
#elif defined( DISPLAY_CHARSET_KANJI ) && defined( MAPPER_NON )
#include "dogm_font_data_6x10_marlin_Kanji.h"
#define FONT_MENU_NAME u8g_font_6x10_marlin
#elif defined( DISPLAY_CHARSET_HD44780_JAPAN )
#include "dogm_font_data_HD44780_J.h"
#define FONT_MENU_NAME HD44780_J_5x7
#elif defined( DISPLAY_CHARSET_HD44780_WESTERN )
#include "dogm_font_data_HD44780_W.h"
#define FONT_MENU_NAME HD44780_W_5x7
#elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
#include "dogm_font_data_HD44780_C.h"
#define FONT_MENU_NAME HD44780_C_5x7
#else // #if defined( MAPPER_C2C3 ) // fall-back
#include <utility/u8g.h> // system font
#define FONT_MENU_NAME u8g_font_6x10
#endif
#ifndef SIMULATE_ROMFONT
#if defined( DISPLAY_CHARSET_ISO10646_1 )
#include <utility/u8g.h> // System font.
#define FONT_MENU_NAME u8g_font_6x10
#elif defined( DISPLAY_CHARSET_ISO10646_5 )
#include "dogm_font_data_ISO10646_5_Cyrillic.h"
#define FONT_MENU_NAME ISO10646_5_Cyrillic_5x7
#elif defined( DISPLAY_CHARSET_ISO10646_KANA )
#include "dogm_font_data_ISO10646_Kana.h"
#define FONT_MENU_NAME ISO10646_Kana_5x7
#elif defined( DISPLAY_CHARSET_KANJI )
#include "dogm_font_data_6x10_marlin_Kanji.h"
#define FONT_MENU_NAME u8g_font_6x10_marlin
#else // fall-back
#include <utility/u8g.h> // system font
#define FONT_MENU_NAME u8g_font_6x10
#endif
#else // SIMULATE_ROMFONT
#if defined( DISPLAY_CHARSET_HD44780_JAPAN )
#include "dogm_font_data_HD44780_J.h"
#define FONT_MENU_NAME HD44780_J_5x7
#elif defined( DISPLAY_CHARSET_HD44780_WESTERN )
#include "dogm_font_data_HD44780_W.h"
#define FONT_MENU_NAME HD44780_W_5x7
#elif defined( DISPLAY_CHARSET_HD44780_CYRILIC )
#include "dogm_font_data_HD44780_C.h"
#define FONT_MENU_NAME HD44780_C_5x7
#else // fall-back
#include <utility/u8g.h> // system font
#define FONT_MENU_NAME u8g_font_6x10
#endif
#endif // SIMULATE_ROMFONT
#define FONT_STATUSMENU 1
#define FONT_SPECIAL 2
@ -138,6 +138,8 @@ U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
#endif
#include "utf_mapper.h"
char currentfont = 0;
static void lcd_setFont(char font_nr) {