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
50ee7477
Commit
50ee7477
authored
Nov 20, 2018
by
Marcio Teixeira
Committed by
Scott Lahteine
Nov 20, 2018
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation errors. Followup to #12439 (#12481)
parent
90a58488
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Marlin/src/lcd/extensible_ui/ui_api.cpp
+0
-1
0 additions, 1 deletion
Marlin/src/lcd/extensible_ui/ui_api.cpp
Marlin/src/lcd/extensible_ui/ui_api.h
+1
-1
1 addition, 1 deletion
Marlin/src/lcd/extensible_ui/ui_api.h
Marlin/src/lcd/ultralcd.cpp
+20
-19
20 additions, 19 deletions
Marlin/src/lcd/ultralcd.cpp
with
21 additions
and
21 deletions
Marlin/src/lcd/extensible_ui/ui_api.cpp
+
0
−
1
View file @
50ee7477
...
@@ -134,7 +134,6 @@ namespace ExtUI {
...
@@ -134,7 +134,6 @@ namespace ExtUI {
// The ms count is
// The ms count is
return
(
uint32_t
)(
currTime
/
(
F_CPU
/
8000
));
return
(
uint32_t
)(
currTime
/
(
F_CPU
/
8000
));
}
}
#endif // __SAM3X8E__
#endif // __SAM3X8E__
void
delay_us
(
unsigned
long
us
)
{
void
delay_us
(
unsigned
long
us
)
{
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/lcd/extensible_ui/ui_api.h
+
1
−
1
View file @
50ee7477
...
@@ -179,7 +179,7 @@ namespace ExtUI {
...
@@ -179,7 +179,7 @@ namespace ExtUI {
#ifdef __SAM3X8E__
#ifdef __SAM3X8E__
uint32_t
safe_millis
();
uint32_t
safe_millis
();
#else
#else
#define
safe_millis() millis() // TODO: Implement for AVR
FORCE_INLINE
uint32_t
safe_millis
()
{
return
millis
()
;
}
// TODO: Implement for AVR
#endif
#endif
void
delay_us
(
unsigned
long
us
);
void
delay_us
(
unsigned
long
us
);
...
...
...
...
This diff is collapsed.
Click to expand it.
Marlin/src/lcd/ultralcd.cpp
+
20
−
19
View file @
50ee7477
...
@@ -29,12 +29,31 @@
...
@@ -29,12 +29,31 @@
#if ENABLED(SDSUPPORT)
#if ENABLED(SDSUPPORT)
#include
"../sd/cardreader.h"
#include
"../sd/cardreader.h"
#endif
#endif
#if ENABLED(EXTENSIBLE_UI)
#if ENABLED(EXTENSIBLE_UI)
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
#define START_OF_UTF8_CHAR(C) (((C) & 0xC0u) != 0x80u)
#endif
#endif
#endif
#endif
#if HAS_SPI_LCD
#if ENABLED(STATUS_MESSAGE_SCROLLING)
uint8_t
MarlinUI
::
status_scroll_offset
;
// = 0
#if LONG_FILENAME_LENGTH > CHARSIZE * 2 * (LCD_WIDTH)
#define MAX_MESSAGE_LENGTH LONG_FILENAME_LENGTH
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
#endif
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
#endif
#elif ENABLED(EXTENSIBLE_UI)
#define MAX_MESSAGE_LENGTH 63
#endif
#ifdef MAX_MESSAGE_LENGTH
uint8_t
MarlinUI
::
status_message_level
;
// = 0
char
MarlinUI
::
status_message
[
MAX_MESSAGE_LENGTH
+
1
];
#endif
#if HAS_SPI_LCD
#if HAS_SPI_LCD
#if HAS_GRAPHICAL_LCD
#if HAS_GRAPHICAL_LCD
...
@@ -75,24 +94,6 @@
...
@@ -75,24 +94,6 @@
uint8_t
lcd_sd_status
;
uint8_t
lcd_sd_status
;
#endif
#endif
#if ENABLED(STATUS_MESSAGE_SCROLLING)
uint8_t
MarlinUI
::
status_scroll_offset
;
// = 0
#if LONG_FILENAME_LENGTH > CHARSIZE * 2 * (LCD_WIDTH)
#define MAX_MESSAGE_LENGTH LONG_FILENAME_LENGTH
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * 2 * (LCD_WIDTH)
#endif
#elif ENABLED(EXTENSIBLE_UI)
#define MAX_MESSAGE_LENGTH 63
#else
#define MAX_MESSAGE_LENGTH CHARSIZE * (LCD_WIDTH)
#endif
#if HAS_SPI_LCD || ENABLED(EXTENSIBLE_UI)
uint8_t
MarlinUI
::
status_message_level
;
// = 0
char
MarlinUI
::
status_message
[
MAX_MESSAGE_LENGTH
+
1
];
#endif
#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
#if HAS_LCD_MENU && LCD_TIMEOUT_TO_STATUS
bool
MarlinUI
::
defer_return_to_status
;
bool
MarlinUI
::
defer_return_to_status
;
#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