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
54ec5528
Commit
54ec5528
authored
Nov 14, 2018
by
Scott Lahteine
Browse files
Options
Downloads
Patches
Plain Diff
hasstatus => has_status
parent
ebf585b6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/gcode/motion/G4.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/gcode/motion/G4.cpp
Marlin/src/lcd/ultralcd.cpp
+1
-1
1 addition, 1 deletion
Marlin/src/lcd/ultralcd.cpp
Marlin/src/lcd/ultralcd.h
+3
-3
3 additions, 3 deletions
Marlin/src/lcd/ultralcd.h
with
5 additions
and
5 deletions
Marlin/src/gcode/motion/G4.cpp
+
1
−
1
View file @
54ec5528
...
@@ -38,7 +38,7 @@ void GcodeSuite::G4() {
...
@@ -38,7 +38,7 @@ void GcodeSuite::G4() {
SERIAL_ECHOLNPGM
(
MSG_Z_MOVE_COMP
);
SERIAL_ECHOLNPGM
(
MSG_Z_MOVE_COMP
);
#endif
#endif
if
(
!
ui
.
hasstatus
())
LCD_MESSAGEPGM
(
MSG_DWELL
);
if
(
!
ui
.
has
_
status
())
LCD_MESSAGEPGM
(
MSG_DWELL
);
dwell
(
dwell_ms
);
dwell
(
dwell_ms
);
}
}
This diff is collapsed.
Click to expand it.
Marlin/src/lcd/ultralcd.cpp
+
1
−
1
View file @
54ec5528
...
@@ -1090,7 +1090,7 @@ void MarlinUI::finishstatus(const bool persist) {
...
@@ -1090,7 +1090,7 @@ void MarlinUI::finishstatus(const bool persist) {
refresh
();
refresh
();
}
}
bool
MarlinUI
::
hasstatus
()
{
return
(
status_message
[
0
]
!=
'\0'
);
}
bool
MarlinUI
::
has
_
status
()
{
return
(
status_message
[
0
]
!=
'\0'
);
}
void
MarlinUI
::
setstatus
(
const
char
*
const
message
,
const
bool
persist
)
{
void
MarlinUI
::
setstatus
(
const
char
*
const
message
,
const
bool
persist
)
{
if
(
status_message_level
>
0
)
return
;
if
(
status_message_level
>
0
)
return
;
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/lcd/ultralcd.h
+
3
−
3
View file @
54ec5528
...
@@ -303,7 +303,7 @@ public:
...
@@ -303,7 +303,7 @@ public:
#if ENABLED(STATUS_MESSAGE_SCROLLING)
#if ENABLED(STATUS_MESSAGE_SCROLLING)
static
uint8_t
status_scroll_offset
;
static
uint8_t
status_scroll_offset
;
#endif
#endif
static
bool
hasstatus
();
static
bool
has
_
status
();
static
uint8_t
lcd_status_update_delay
;
static
uint8_t
lcd_status_update_delay
;
static
uint8_t
status_message_level
;
// Higher levels block lower levels
static
uint8_t
status_message_level
;
// Higher levels block lower levels
...
@@ -346,7 +346,7 @@ public:
...
@@ -346,7 +346,7 @@ public:
static
void
refresh
()
{}
static
void
refresh
()
{}
static
inline
void
reset_alert_level
()
{}
static
inline
void
reset_alert_level
()
{}
static
constexpr
bool
hasstatus
()
{
return
true
;
}
static
constexpr
bool
has
_
status
()
{
return
true
;
}
#endif
#endif
...
@@ -366,7 +366,7 @@ public:
...
@@ -366,7 +366,7 @@ public:
static
inline
void
status_printf_P
(
const
uint8_t
level
,
PGM_P
const
fmt
,
...)
{
UNUSED
(
level
);
UNUSED
(
fmt
);
}
static
inline
void
status_printf_P
(
const
uint8_t
level
,
PGM_P
const
fmt
,
...)
{
UNUSED
(
level
);
UNUSED
(
fmt
);
}
static
inline
void
reset_status
()
{}
static
inline
void
reset_status
()
{}
static
inline
void
reset_alert_level
()
{}
static
inline
void
reset_alert_level
()
{}
static
constexpr
bool
hasstatus
()
{
return
false
;
}
static
constexpr
bool
has
_
status
()
{
return
false
;
}
#endif
#endif
...
...
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