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
9a9328d3
Commit
9a9328d3
authored
Jan 10, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix
parent
23f5f244
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
Hardware.md
Documentation/Hardware.md
+1
-0
boards.h
MarlinKimbra/boards.h
+2
-1
ultralcd.cpp
MarlinKimbra/ultralcd.cpp
+6
-8
No files found.
Documentation/Hardware.md
View file @
9a9328d3
...
@@ -108,6 +108,7 @@ http://reprap.org/wiki/RUMBA
...
@@ -108,6 +108,7 @@ http://reprap.org/wiki/RUMBA
#define BOARD_MEGATRONICS 70 // Megatronics
#define BOARD_MEGATRONICS 70 // Megatronics
#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0
#define BOARD_MEGATRONICS_2 701 // Megatronics v2.0
#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0
#define BOARD_MEGATRONICS_1 702 // Minitronics v1.0
#define BOARD_MEGATRONICS_3 703 // Megatronics v3.0
#define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA_A 90 // Alpha OMCA board
#define BOARD_OMCA 91 // Final OMCA board
#define BOARD_OMCA 91 // Final OMCA board
#define BOARD_RAMBO 301 // Rambo
#define BOARD_RAMBO 301 // Rambo
...
...
MarlinKimbra/boards.h
View file @
9a9328d3
...
@@ -48,7 +48,8 @@
...
@@ -48,7 +48,8 @@
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
#define BOARD_5DPRINT 88 // 5DPrint D8 Driver Board
#define BOARD_LEAPFROG 999 // Leapfrog
#define BOARD_LEAPFROG 999 // Leapfrog
#define BOARD_99 99 // This is in pins.h but...?
#define MB(board) (MOTHERBOARD==BOARD_##board)
#define MB(board) (MOTHERBOARD==BOARD_##board)
#define IS_RAMPS (MB(RAMPS_OLD) || MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF))
#define IS_RAMPS (MB(RAMPS_OLD) || MB(RAMPS_13_EFB) || MB(RAMPS_13_EEB) || MB(RAMPS_13_EFF) || MB(RAMPS_13_EEF))
...
...
MarlinKimbra/ultralcd.cpp
View file @
9a9328d3
...
@@ -244,11 +244,12 @@ static void lcd_status_screen()
...
@@ -244,11 +244,12 @@ static void lcd_status_screen()
lcd_status_update_delay
--
;
lcd_status_update_delay
--
;
else
else
lcdDrawUpdate
=
1
;
lcdDrawUpdate
=
1
;
if
(
lcdDrawUpdate
)
{
if
(
lcdDrawUpdate
)
{
lcd_implementation_status_screen
();
lcd_implementation_status_screen
();
lcd_status_update_delay
=
10
;
/* redraw the main screen every second. This is easier then trying keep track of all things that change on the screen */
lcd_status_update_delay
=
10
;
/* redraw the main screen every second. This is easier then trying keep track of all things that change on the screen */
}
}
#ifdef ULTIPANEL
#ifdef ULTIPANEL
bool
current_click
=
LCD_CLICKED
;
bool
current_click
=
LCD_CLICKED
;
...
@@ -273,7 +274,7 @@ static void lcd_status_screen()
...
@@ -273,7 +274,7 @@ static void lcd_status_screen()
{
{
lcd_goto_menu
(
lcd_main_menu
);
lcd_goto_menu
(
lcd_main_menu
);
lcd_implementation_init
(
// to maybe revive the LCD if static electricity killed it.
lcd_implementation_init
(
// to maybe revive the LCD if static electricity killed it.
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
&& !defined(DOGLCD)
currentMenu
==
lcd_status_screen
currentMenu
==
lcd_status_screen
#endif
#endif
);
);
...
@@ -1017,9 +1018,6 @@ static void lcd_control_temperature_menu()
...
@@ -1017,9 +1018,6 @@ static void lcd_control_temperature_menu()
// i is typically a small value so allows values below 1
// i is typically a small value so allows values below 1
MENU_ITEM_EDIT_CALLBACK
(
float52
,
MSG_PID_I
,
&
raw_Ki
,
0.01
,
9990
,
copy_and_scalePID_i
);
MENU_ITEM_EDIT_CALLBACK
(
float52
,
MSG_PID_I
,
&
raw_Ki
,
0.01
,
9990
,
copy_and_scalePID_i
);
MENU_ITEM_EDIT_CALLBACK
(
float52
,
MSG_PID_D
,
&
raw_Kd
,
1
,
9990
,
copy_and_scalePID_d
);
MENU_ITEM_EDIT_CALLBACK
(
float52
,
MSG_PID_D
,
&
raw_Kd
,
1
,
9990
,
copy_and_scalePID_d
);
# ifdef PID_ADD_EXTRUSION_RATE
MENU_ITEM_EDIT
(
float3
,
MSG_PID_C
,
&
Kc
,
1
,
9990
);
# endif//PID_ADD_EXTRUSION_RATE
#endif//PIDTEMP
#endif//PIDTEMP
MENU_ITEM
(
submenu
,
MSG_PREHEAT_PLA_SETTINGS
,
lcd_control_temperature_preheat_pla_settings_menu
);
MENU_ITEM
(
submenu
,
MSG_PREHEAT_PLA_SETTINGS
,
lcd_control_temperature_preheat_pla_settings_menu
);
MENU_ITEM
(
submenu
,
MSG_PREHEAT_ABS_SETTINGS
,
lcd_control_temperature_preheat_abs_settings_menu
);
MENU_ITEM
(
submenu
,
MSG_PREHEAT_ABS_SETTINGS
,
lcd_control_temperature_preheat_abs_settings_menu
);
...
@@ -1438,7 +1436,7 @@ void lcd_update()
...
@@ -1438,7 +1436,7 @@ void lcd_update()
lcdDrawUpdate
=
2
;
lcdDrawUpdate
=
2
;
lcd_oldcardstatus
=
IS_SD_INSERTED
;
lcd_oldcardstatus
=
IS_SD_INSERTED
;
lcd_implementation_init
(
// to maybe revive the LCD if static electricity killed it.
lcd_implementation_init
(
// to maybe revive the LCD if static electricity killed it.
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
&& !defined(DOGLCD)
currentMenu
==
lcd_status_screen
currentMenu
==
lcd_status_screen
#endif
#endif
);
);
...
@@ -1541,7 +1539,7 @@ void lcd_finishstatus() {
...
@@ -1541,7 +1539,7 @@ void lcd_finishstatus() {
}
}
}
}
lcd_status_message
[
LCD_WIDTH
]
=
'\0'
;
lcd_status_message
[
LCD_WIDTH
]
=
'\0'
;
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
#if defined(LCD_PROGRESS_BAR) && defined(SDSUPPORT)
&& !defined(DOGLCD)
#if PROGRESS_BAR_MSG_EXPIRE > 0
#if PROGRESS_BAR_MSG_EXPIRE > 0
messageTick
=
messageTick
=
#endif
#endif
...
...
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