Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
94ccb491
Commit
94ccb491
authored
Mar 20, 2015
by
Simone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler error from lcd_level_bed
parent
11b16df5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+9
-11
No files found.
MarlinKimbra/ultralcd.cpp
View file @
94ccb491
...
...
@@ -34,7 +34,7 @@ int gumPreheatFanSpeed;
const
long
baudrates
[]
=
{
9600
,
14400
,
19200
,
28800
,
38400
,
56000
,
115200
,
250000
};
int
baudrate_position
=
-
1
;
#if
def FILAMENT_LCD_DISPLAY
#if
(defined(FILAMENT_SENSOR) && defined(FILWIDTH_PIN) && FILWIDTH_PIN >= 0) && defined(FILAMENT_LCD_DISPLAY) || (defined(POWER_CONSUMPTION) && defined(POWER_CONSUMPTION_PIN) && POWER_CONSUMPTION_PIN >= 0) && defined(POWER_CONSUMPTION_LCD_DISPLAY)
unsigned
long
message_millis
=
0
;
#endif
...
...
@@ -694,12 +694,11 @@ void config_lcd_level_bed()
void
lcd_level_bed
()
{
if
(
ChangeScreen
){
lcd
.
clear
();
switch
(
pageShowInfo
){
case
0
:
{
lcd
.
setCursor
(
0
,
1
);
u8g
.
setPrintPos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
MSG_LP_INTRO
));
currentMenu
=
lcd_level_bed
;
ChangeScreen
=
false
;
...
...
@@ -708,7 +707,7 @@ void lcd_level_bed()
case
1
:
{
lcd
.
setCursor
(
0
,
1
);
u8g
.
setPrintPos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
MSG_LP_1
));
currentMenu
=
lcd_level_bed
;
ChangeScreen
=
false
;
...
...
@@ -717,7 +716,7 @@ void lcd_level_bed()
break
;
case
2
:
{
lcd
.
setCursor
(
0
,
1
);
u8g
.
setPrintPos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
MSG_LP_2
));
currentMenu
=
lcd_level_bed
;
ChangeScreen
=
false
;
...
...
@@ -726,7 +725,7 @@ void lcd_level_bed()
break
;
case
3
:
{
lcd
.
setCursor
(
0
,
1
);
u8g
.
setPrintPos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
MSG_LP_3
));
currentMenu
=
lcd_level_bed
;
ChangeScreen
=
false
;
...
...
@@ -735,7 +734,7 @@ void lcd_level_bed()
break
;
case
4
:
{
lcd
.
setCursor
(
0
,
1
);
u8g
.
setPrintPos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
MSG_LP_4
));
currentMenu
=
lcd_level_bed
;
ChangeScreen
=
false
;
...
...
@@ -745,7 +744,7 @@ void lcd_level_bed()
case
5
:
{
lcd
.
setCursor
(
0
,
1
);
u8g
.
setPrintPos
(
0
,
1
);
lcd_printPGM
(
PSTR
(
MSG_LP_5
));
currentMenu
=
lcd_level_bed
;
ChangeScreen
=
false
;
...
...
@@ -755,14 +754,13 @@ void lcd_level_bed()
case
6
:
{
lcd
.
setCursor
(
2
,
2
);
u8g
.
setPrintPos
(
2
,
2
);
lcd_printPGM
(
PSTR
(
MSG_LP_6
));
ChangeScreen
=
false
;
delay
(
1200
);
encoderPosition
=
0
;
lcd
.
clear
();
currentMenu
=
lcd_status_screen
;
lcd_status_screen
();
pageShowInfo
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment