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
20ce0344
Commit
20ce0344
authored
Mar 19, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update
parent
fccc4b9a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
19 deletions
+20
-19
language_an.h
MarlinKimbra/language_an.h
+1
-0
ultralcd.h
MarlinKimbra/ultralcd.h
+19
-19
No files found.
MarlinKimbra/language_an.h
View file @
20ce0344
...
@@ -168,6 +168,7 @@
...
@@ -168,6 +168,7 @@
#define MSG_FWTEST_03 "Start check ENDSTOP"
#define MSG_FWTEST_03 "Start check ENDSTOP"
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_04 "Start check MOTOR"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_ATTENTION "ATTENTION! Check that the three axes are more than 5 mm from the endstop!"
#define MSG_FWTEST_END "Finish Test. Disable FIRMWARE_TEST and recompile."
#endif // FIRMWARE_TEST
#endif // FIRMWARE_TEST
#endif // LANGUAGE_AN_H
#endif // LANGUAGE_AN_H
MarlinKimbra/ultralcd.h
View file @
20ce0344
...
@@ -66,20 +66,20 @@
...
@@ -66,20 +66,20 @@
void
lcd_ignore_click
(
bool
b
=
true
);
void
lcd_ignore_click
(
bool
b
=
true
);
#ifdef NEWPANEL
#ifdef NEWPANEL
#define EN_C
(1<<
BLEN_C)
#define EN_C
BIT(
BLEN_C)
#define EN_B
(1<<
BLEN_B)
#define EN_B
BIT(
BLEN_B)
#define EN_A
(1<<
BLEN_A)
#define EN_A
BIT(
BLEN_A)
#define LCD_CLICKED (buttons&EN_C)
#define LCD_CLICKED (buttons&EN_C)
#ifdef REPRAPWORLD_KEYPAD
#ifdef REPRAPWORLD_KEYPAD
#define EN_REPRAPWORLD_KEYPAD_F3
(1<<
BLEN_REPRAPWORLD_KEYPAD_F3)
#define EN_REPRAPWORLD_KEYPAD_F3
BIT(
BLEN_REPRAPWORLD_KEYPAD_F3)
#define EN_REPRAPWORLD_KEYPAD_F2
(1<<
BLEN_REPRAPWORLD_KEYPAD_F2)
#define EN_REPRAPWORLD_KEYPAD_F2
BIT(
BLEN_REPRAPWORLD_KEYPAD_F2)
#define EN_REPRAPWORLD_KEYPAD_F1
(1<<
BLEN_REPRAPWORLD_KEYPAD_F1)
#define EN_REPRAPWORLD_KEYPAD_F1
BIT(
BLEN_REPRAPWORLD_KEYPAD_F1)
#define EN_REPRAPWORLD_KEYPAD_UP
(1<<
BLEN_REPRAPWORLD_KEYPAD_UP)
#define EN_REPRAPWORLD_KEYPAD_UP
BIT(
BLEN_REPRAPWORLD_KEYPAD_UP)
#define EN_REPRAPWORLD_KEYPAD_RIGHT
(1<<
BLEN_REPRAPWORLD_KEYPAD_RIGHT)
#define EN_REPRAPWORLD_KEYPAD_RIGHT
BIT(
BLEN_REPRAPWORLD_KEYPAD_RIGHT)
#define EN_REPRAPWORLD_KEYPAD_MIDDLE
(1<<
BLEN_REPRAPWORLD_KEYPAD_MIDDLE)
#define EN_REPRAPWORLD_KEYPAD_MIDDLE
BIT(
BLEN_REPRAPWORLD_KEYPAD_MIDDLE)
#define EN_REPRAPWORLD_KEYPAD_DOWN
(1<<
BLEN_REPRAPWORLD_KEYPAD_DOWN)
#define EN_REPRAPWORLD_KEYPAD_DOWN
BIT(
BLEN_REPRAPWORLD_KEYPAD_DOWN)
#define EN_REPRAPWORLD_KEYPAD_LEFT
(1<<
BLEN_REPRAPWORLD_KEYPAD_LEFT)
#define EN_REPRAPWORLD_KEYPAD_LEFT
BIT(
BLEN_REPRAPWORLD_KEYPAD_LEFT)
#define LCD_CLICKED ((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
#define LCD_CLICKED ((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
#define REPRAPWORLD_KEYPAD_MOVE_Z_UP (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F2)
#define REPRAPWORLD_KEYPAD_MOVE_Z_UP (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F2)
...
@@ -92,14 +92,14 @@
...
@@ -92,14 +92,14 @@
#endif //REPRAPWORLD_KEYPAD
#endif //REPRAPWORLD_KEYPAD
#else
#else
//atomic, do not change
//atomic, do not change
#define B_LE
(1<<
BL_LE)
#define B_LE
BIT(
BL_LE)
#define B_UP
(1<<
BL_UP)
#define B_UP
BIT(
BL_UP)
#define B_MI
(1<<
BL_MI)
#define B_MI
BIT(
BL_MI)
#define B_DW
(1<<
BL_DW)
#define B_DW
BIT(
BL_DW)
#define B_RI
(1<<
BL_RI)
#define B_RI
BIT(
BL_RI)
#define B_ST
(1<<
BL_ST)
#define B_ST
BIT(
BL_ST)
#define EN_B
(1<<
BLEN_B)
#define EN_B
BIT(
BLEN_B)
#define EN_A
(1<<
BLEN_A)
#define EN_A
BIT(
BLEN_A)
#define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
#define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
#endif//NEWPANEL
#endif//NEWPANEL
...
...
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