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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
24d23ce4
Commit
24d23ce4
authored
7 years ago
by
xC0000005
Committed by
Scott Lahteine
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix function definitions for Malyan LCD
parent
73022d31
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/src/lcd/ultralcd.h
+8
-6
8 additions, 6 deletions
Marlin/src/lcd/ultralcd.h
with
8 additions
and
6 deletions
Marlin/src/lcd/ultralcd.h
+
8
−
6
View file @
24d23ce4
...
@@ -28,6 +28,13 @@
...
@@ -28,6 +28,13 @@
#if ENABLED(ULTRA_LCD) || ENABLED(MALYAN_LCD)
#if ENABLED(ULTRA_LCD) || ENABLED(MALYAN_LCD)
void
lcd_init
();
void
lcd_init
();
bool
lcd_detected
();
bool
lcd_detected
();
void
lcd_update
();
void
lcd_setalertstatusPGM
(
const
char
*
message
);
#else
inline
void
lcd_init
()
{}
inline
bool
lcd_detected
()
{
return
true
;
}
inline
void
lcd_update
()
{}
inline
void
lcd_setalertstatusPGM
(
const
char
*
message
)
{
UNUSED
(
message
);
}
#endif
#endif
#if ENABLED(ULTRA_LCD)
#if ENABLED(ULTRA_LCD)
...
@@ -52,7 +59,6 @@
...
@@ -52,7 +59,6 @@
constexpr
bool
lcd_wait_for_move
=
false
;
constexpr
bool
lcd_wait_for_move
=
false
;
#endif
#endif
void
lcd_update
();
bool
lcd_hasstatus
();
bool
lcd_hasstatus
();
void
lcd_setstatus
(
const
char
*
message
,
const
bool
persist
=
false
);
void
lcd_setstatus
(
const
char
*
message
,
const
bool
persist
=
false
);
void
lcd_setstatusPGM
(
const
char
*
message
,
const
int8_t
level
=
0
);
void
lcd_setstatusPGM
(
const
char
*
message
,
const
int8_t
level
=
0
);
...
@@ -230,20 +236,16 @@
...
@@ -230,20 +236,16 @@
void
wait_for_release
();
void
wait_for_release
();
#endif
#endif
#else // no LCD
#else //
MALYAN_LCD or
no LCD
constexpr
bool
lcd_wait_for_move
=
false
;
constexpr
bool
lcd_wait_for_move
=
false
;
inline
void
lcd_init
()
{}
inline
bool
lcd_detected
()
{
return
true
;
}
inline
void
lcd_update
()
{}
inline
void
lcd_refresh
()
{}
inline
void
lcd_refresh
()
{}
inline
void
lcd_buttons_update
()
{}
inline
void
lcd_buttons_update
()
{}
inline
bool
lcd_hasstatus
()
{
return
false
;
}
inline
bool
lcd_hasstatus
()
{
return
false
;
}
inline
void
lcd_setstatus
(
const
char
*
const
message
,
const
bool
persist
=
false
)
{
UNUSED
(
message
);
UNUSED
(
persist
);
}
inline
void
lcd_setstatus
(
const
char
*
const
message
,
const
bool
persist
=
false
)
{
UNUSED
(
message
);
UNUSED
(
persist
);
}
inline
void
lcd_setstatusPGM
(
const
char
*
const
message
,
const
int8_t
level
=
0
)
{
UNUSED
(
message
);
UNUSED
(
level
);
}
inline
void
lcd_setstatusPGM
(
const
char
*
const
message
,
const
int8_t
level
=
0
)
{
UNUSED
(
message
);
UNUSED
(
level
);
}
inline
void
lcd_status_printf_P
(
const
uint8_t
level
,
const
char
*
const
fmt
,
...)
{
UNUSED
(
level
);
UNUSED
(
fmt
);
}
inline
void
lcd_status_printf_P
(
const
uint8_t
level
,
const
char
*
const
fmt
,
...)
{
UNUSED
(
level
);
UNUSED
(
fmt
);
}
inline
void
lcd_setalertstatusPGM
(
const
char
*
message
)
{
UNUSED
(
message
);
}
inline
void
lcd_reset_alert_level
()
{}
inline
void
lcd_reset_alert_level
()
{}
inline
void
lcd_reset_status
()
{}
inline
void
lcd_reset_status
()
{}
...
...
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