Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
8a2efd11
Commit
8a2efd11
authored
Jul 19, 2016
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
Rename ultralcd implementation files for consistency
parent
6c899bb5
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Marlin/fonts/README.md
+1
-1
1 addition, 1 deletion
Marlin/fonts/README.md
Marlin/ultralcd.cpp
+2
-2
2 additions, 2 deletions
Marlin/ultralcd.cpp
Marlin/ultralcd_impl_DOGM.h
+1
-1
1 addition, 1 deletion
Marlin/ultralcd_impl_DOGM.h
Marlin/ultralcd_impl_HD44780.h
+0
-0
0 additions, 0 deletions
Marlin/ultralcd_impl_HD44780.h
with
4 additions
and
4 deletions
Marlin/fonts/README.md
+
1
−
1
View file @
8a2efd11
...
@@ -17,7 +17,7 @@ For the second half of the font we now support up to 11x11 pixel.
...
@@ -17,7 +17,7 @@ For the second half of the font we now support up to 11x11 pixel.
-
Export as a
`*.bdf`
file
-
Export as a
`*.bdf`
file
-
Use
`bdf2u8g.exe`
to produce the
`.h`
file. Examples for the existing fonts are in
`make_fonts.bat`
.
-
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.
-
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_impl
ementation
.h`
before the
`#else // fall-back`
line:
-
Make a new entry in the font list in
`
ultra
lcd_impl
_DOGM
.h`
before the
`#else // fall-back`
line:
```
cpp
```
cpp
#elif ENABLED(DISPLAY_CHARSET_NEWNAME)
#elif ENABLED(DISPLAY_CHARSET_NEWNAME)
#include
"dogm_font_data_yourfont.h"
#include
"dogm_font_data_yourfont.h"
...
...
This diff is collapsed.
Click to expand it.
Marlin/ultralcd.cpp
+
2
−
2
View file @
8a2efd11
...
@@ -44,9 +44,9 @@ uint8_t lcd_status_message_level;
...
@@ -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
char
lcd_status_message
[
3
*
(
LCD_WIDTH
)
+
1
]
=
WELCOME_MSG
;
// worst case is kana with up to 3*LCD_WIDTH+1
#if ENABLED(DOGLCD)
#if ENABLED(DOGLCD)
#include
"
dogm_
lcd_impl
ementation
.h"
#include
"
ultra
lcd_impl
_DOGM
.h"
#else
#else
#include
"ultralcd_impl
ementation_hitachi
_HD44780.h"
#include
"ultralcd_impl_HD44780.h"
#endif
#endif
// The main status screen
// The main status screen
...
...
This diff is collapsed.
Click to expand it.
Marlin/
dogm_
lcd_impl
ementation
.h
→
Marlin/
ultra
lcd_impl
_DOGM
.h
+
1
−
1
View file @
8a2efd11
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
*/
*/
/**
/**
*
dogm_
lcd_impl
ementation
.h
*
ultra
lcd_impl
_DOGM
.h
*
*
* Graphics LCD implementation for 128x64 pixel LCDs by STB for ErikZalm/Marlin
* Graphics LCD implementation for 128x64 pixel LCDs by STB for ErikZalm/Marlin
* Demonstrator: http://www.reprap.org/wiki/STB_Electronics
* Demonstrator: http://www.reprap.org/wiki/STB_Electronics
...
...
This diff is collapsed.
Click to expand it.
Marlin/ultralcd_impl
ementation_hitachi
_HD44780.h
→
Marlin/ultralcd_impl_HD44780.h
+
0
−
0
View file @
8a2efd11
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment