Browse Source

Merge pull request #4355 from thinkyhead/rc_rename_ultralcd_files

Rename ultralcd implementation files for consistency
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
5d5affdfca
  1. 2
      Marlin/fonts/README.md
  2. 4
      Marlin/ultralcd.cpp
  3. 2
      Marlin/ultralcd_impl_DOGM.h
  4. 0
      Marlin/ultralcd_impl_HD44780.h

2
Marlin/fonts/README.md

@ -17,7 +17,7 @@ For the second half of the font we now support up to 11x11 pixel.
- Export as a `*.bdf` file
- Use `bdf2u8g.exe` to produce the `.h` file. Examples for the existing fonts are in `make_fonts.bat`.
- Edit the produced `.h` file to match our needs. Find hints in the `dogm_font_data_.h` files.
- Make a new entry in the font list in `dogm_lcd_implementation.h` before the `#else // fall-back` line:
- Make a new entry in the font list in `ultralcd_impl_DOGM.h` before the `#else // fall-back` line:
```cpp
#elif ENABLED(DISPLAY_CHARSET_NEWNAME)
#include "dogm_font_data_yourfont.h"

4
Marlin/ultralcd.cpp

@ -44,9 +44,9 @@ uint8_t lcd_status_message_level;
char lcd_status_message[3 * (LCD_WIDTH) + 1] = WELCOME_MSG; // worst case is kana with up to 3*LCD_WIDTH+1
#if ENABLED(DOGLCD)
#include "dogm_lcd_implementation.h"
#include "ultralcd_impl_DOGM.h"
#else
#include "ultralcd_implementation_hitachi_HD44780.h"
#include "ultralcd_impl_HD44780.h"
#endif
// The main status screen

2
Marlin/dogm_lcd_implementation.h → Marlin/ultralcd_impl_DOGM.h

@ -21,7 +21,7 @@
*/
/**
* dogm_lcd_implementation.h
* ultralcd_impl_DOGM.h
*
* Graphics LCD implementation for 128x64 pixel LCDs by STB for ErikZalm/Marlin
* Demonstrator: http://www.reprap.org/wiki/STB_Electronics

0
Marlin/ultralcd_implementation_hitachi_HD44780.h → Marlin/ultralcd_impl_HD44780.h

Loading…
Cancel
Save