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
5256f4c8
Commit
5256f4c8
authored
Mar 17, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9 from simone97/patch-4
Update ultralcd.cpp
parents
0842d004
f754b62b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+6
-5
No files found.
MarlinKimbra/ultralcd.cpp
View file @
5256f4c8
...
@@ -74,7 +74,7 @@ static void lcd_control_temperature_preheat_abs_settings_menu();
...
@@ -74,7 +74,7 @@ static void lcd_control_temperature_preheat_abs_settings_menu();
static
void
lcd_control_temperature_preheat_gum_settings_menu
();
static
void
lcd_control_temperature_preheat_gum_settings_menu
();
static
void
lcd_control_motion_menu
();
static
void
lcd_control_motion_menu
();
static
void
lcd_control_volumetric_menu
();
static
void
lcd_control_volumetric_menu
();
#if
def DOGLCD
#if
defined(DOGLCD) && LCD_CONTRAST >= 0
static
void
lcd_set_contrast
();
static
void
lcd_set_contrast
();
#endif
#endif
static
void
lcd_control_retract_menu
();
static
void
lcd_control_retract_menu
();
...
@@ -898,8 +898,8 @@ static void lcd_control_menu() {
...
@@ -898,8 +898,8 @@ static void lcd_control_menu() {
MENU_ITEM
(
submenu
,
MSG_TEMPERATURE
,
lcd_control_temperature_menu
);
MENU_ITEM
(
submenu
,
MSG_TEMPERATURE
,
lcd_control_temperature_menu
);
MENU_ITEM
(
submenu
,
MSG_MOTION
,
lcd_control_motion_menu
);
MENU_ITEM
(
submenu
,
MSG_MOTION
,
lcd_control_motion_menu
);
MENU_ITEM
(
submenu
,
MSG_VOLUMETRIC
,
lcd_control_volumetric_menu
);
MENU_ITEM
(
submenu
,
MSG_VOLUMETRIC
,
lcd_control_volumetric_menu
);
#if
def DOGLCD
#if
defined(DOGLCD) && LCD_CONTRAST >= 0
//MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);
//MENU_ITEM_EDIT(int3, MSG_CONTRAST, &lcd_contrast, 0, 63);
MENU_ITEM
(
submenu
,
MSG_CONTRAST
,
lcd_set_contrast
);
MENU_ITEM
(
submenu
,
MSG_CONTRAST
,
lcd_set_contrast
);
#endif
#endif
...
@@ -1139,7 +1139,7 @@ static void lcd_control_volumetric_menu() {
...
@@ -1139,7 +1139,7 @@ static void lcd_control_volumetric_menu() {
END_MENU
();
END_MENU
();
}
}
#if
def DOGLCD
#if
defined(DOGLCD) && LCD_CONTRAST >= 0
static
void
lcd_set_contrast
()
{
static
void
lcd_set_contrast
()
{
if
(
encoderPosition
!=
0
)
{
if
(
encoderPosition
!=
0
)
{
...
@@ -1585,7 +1585,7 @@ void lcd_setalertstatuspgm(const char* message) {
...
@@ -1585,7 +1585,7 @@ void lcd_setalertstatuspgm(const char* message) {
void
lcd_reset_alert_level
()
{
lcd_status_message_level
=
0
;
}
void
lcd_reset_alert_level
()
{
lcd_status_message_level
=
0
;
}
#if
def DOGLCD
#if
defined(DOGLCD) && LCD_CONTRAST >= 0
void
lcd_setcontrast
(
uint8_t
value
)
{
void
lcd_setcontrast
(
uint8_t
value
)
{
lcd_contrast
=
value
&
63
;
lcd_contrast
=
value
&
63
;
u8g
.
setContrast
(
lcd_contrast
);
u8g
.
setContrast
(
lcd_contrast
);
...
@@ -2013,3 +2013,4 @@ void copy_and_scalePID_d()
...
@@ -2013,3 +2013,4 @@ void copy_and_scalePID_d()
}
}
#endif //ULTRA_LCD
#endif //ULTRA_LCD
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