|
|
|
|
83
|
#define BLEN_REPRAPWORLD_KEYPAD_DOWN 6
|
83
|
#define BLEN_REPRAPWORLD_KEYPAD_DOWN 6
|
84
|
#define BLEN_REPRAPWORLD_KEYPAD_LEFT 7
|
84
|
#define BLEN_REPRAPWORLD_KEYPAD_LEFT 7
|
85
|
|
85
|
|
86
|
- #define REPRAPWORLD_BTN_OFFSET 3 // bit offset into buttons for shift register values
|
|
|
|
|
86
|
+ #define REPRAPWORLD_BTN_OFFSET 0 // bit offset into buttons for shift register values
|
87
|
|
87
|
|
88
|
#define EN_REPRAPWORLD_KEYPAD_F3 BIT((BLEN_REPRAPWORLD_KEYPAD_F3+REPRAPWORLD_BTN_OFFSET))
|
88
|
#define EN_REPRAPWORLD_KEYPAD_F3 BIT((BLEN_REPRAPWORLD_KEYPAD_F3+REPRAPWORLD_BTN_OFFSET))
|
89
|
#define EN_REPRAPWORLD_KEYPAD_F2 BIT((BLEN_REPRAPWORLD_KEYPAD_F2+REPRAPWORLD_BTN_OFFSET))
|
89
|
#define EN_REPRAPWORLD_KEYPAD_F2 BIT((BLEN_REPRAPWORLD_KEYPAD_F2+REPRAPWORLD_BTN_OFFSET))
|
|
|
|
|
94
|
#define EN_REPRAPWORLD_KEYPAD_DOWN BIT((BLEN_REPRAPWORLD_KEYPAD_DOWN+REPRAPWORLD_BTN_OFFSET))
|
94
|
#define EN_REPRAPWORLD_KEYPAD_DOWN BIT((BLEN_REPRAPWORLD_KEYPAD_DOWN+REPRAPWORLD_BTN_OFFSET))
|
95
|
#define EN_REPRAPWORLD_KEYPAD_LEFT BIT((BLEN_REPRAPWORLD_KEYPAD_LEFT+REPRAPWORLD_BTN_OFFSET))
|
95
|
#define EN_REPRAPWORLD_KEYPAD_LEFT BIT((BLEN_REPRAPWORLD_KEYPAD_LEFT+REPRAPWORLD_BTN_OFFSET))
|
96
|
|
96
|
|
97
|
- #define LCD_CLICKED ((buttons&EN_C) || (buttons&EN_REPRAPWORLD_KEYPAD_F1))
|
|
|
98
|
- #define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons&EN_REPRAPWORLD_KEYPAD_DOWN)
|
|
|
99
|
- #define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons&EN_REPRAPWORLD_KEYPAD_UP)
|
|
|
100
|
- #define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons&EN_REPRAPWORLD_KEYPAD_MIDDLE)
|
|
|
|
|
97
|
+ //#define LCD_CLICKED ((buttons&EN_C) || (buttons&EN_REPRAPWORLD_KEYPAD_F1))
|
|
|
98
|
+ //#define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons&EN_REPRAPWORLD_KEYPAD_DOWN)
|
|
|
99
|
+ //#define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons&EN_REPRAPWORLD_KEYPAD_UP)
|
|
|
100
|
+ //#define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons&EN_REPRAPWORLD_KEYPAD_MIDDLE)
|
101
|
|
101
|
|
102
|
#elif defined(NEWPANEL)
|
102
|
#elif defined(NEWPANEL)
|
103
|
#define LCD_CLICKED (buttons&EN_C)
|
103
|
#define LCD_CLICKED (buttons&EN_C)
|