melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4357 from thinkyhead/rc_fix_keypad_issues

Browse Source 
Fix some Reprapworld Keypad issues
This commit is contained in:
Scott Lahteine 2016-07-19 17:31:37 -07:00 committed by GitHub
commit e6e4d4062d
21 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration.h
View File

@ -1160,7 +1160,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/Felix/Configuration.h
View File

@ -1143,7 +1143,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/Felix/DUAL/Configuration.h
View File

@ -1141,7 +1141,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/Hephestos/Configuration.h
View File

@ -1152,7 +1152,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/Hephestos_2/Configuration.h
View File

@ -1154,7 +1154,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/K8200/Configuration.h
View File

@ -1177,7 +1177,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View File

@ -1160,7 +1160,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
#define REPRAPWORLD_KEYPAD #define REPRAPWORLD_KEYPAD
#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 #define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/RigidBot/Configuration.h
View File

@ -1160,7 +1160,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/SCARA/Configuration.h
View File

@ -1168,7 +1168,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/TAZ4/Configuration.h
View File

@ -1181,7 +1181,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/WITBOX/Configuration.h
View File

@ -1152,7 +1152,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/adafruit/ST7565/Configuration.h
View File

@ -1160,7 +1160,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/delta/biv2.5/Configuration.h
View File

@ -1255,7 +1255,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/delta/generic/Configuration.h
View File

@ -1249,7 +1249,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/delta/kossel_mini/Configuration.h
View File

@ -1252,7 +1252,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/delta/kossel_pro/Configuration.h
View File

@ -1252,7 +1252,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/delta/kossel_xl/Configuration.h
View File

@ -1254,7 +1254,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/makibox/Configuration.h
View File

@ -1163,7 +1163,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

2
Marlin/example_configurations/tvrrug/Round2/Configuration.h
View File

@ -1154,7 +1154,7 @@
// is pressed, a value of 10.0 means 10mm per click. // is pressed, a value of 10.0 means 10mm per click.
// //
//#define REPRAPWORLD_KEYPAD //#define REPRAPWORLD_KEYPAD
//#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 //#define REPRAPWORLD_KEYPAD_MOVE_STEP 1.0
// //
// RigidBot Panel V1.0 // RigidBot Panel V1.0

73
Marlin/ultralcd.cpp
View File

@ -2295,6 +2295,7 @@ void kill_screen(const char* lcd_msg) {
currentScreen = menu_edit_callback_ ## _name; \ currentScreen = menu_edit_callback_ ## _name; \
callbackFunc = callback; \ callbackFunc = callback; \
} }
menu_edit_type(int, int3, itostr3, 1); menu_edit_type(int, int3, itostr3, 1);
menu_edit_type(float, float3, ftostr3, 1); menu_edit_type(float, float3, ftostr3, 1);
menu_edit_type(float, float32, ftostr32, 100); menu_edit_type(float, float32, ftostr32, 100);
@ -2310,42 +2311,25 @@ void kill_screen(const char* lcd_msg) {
* *
*/ */
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
static void reprapworld_keypad_move_z_up() { static void _reprapworld_keypad_move(AxisEnum axis, int dir) {
encoderPosition = 1;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP; move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_z(); encoderPosition = dir;
switch (axis) {
case X_AXIS: lcd_move_x(); break;
case Y_AXIS: lcd_move_y(); break;
case Z_AXIS: lcd_move_z();
} }
static void reprapworld_keypad_move_z_down() {
encoderPosition = -1;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_z();
}
static void reprapworld_keypad_move_x_left() {
encoderPosition = -1;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_x();
}
static void reprapworld_keypad_move_x_right() {
encoderPosition = 1;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_x();
}
static void reprapworld_keypad_move_y_down() {
encoderPosition = 1;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_y();
}
static void reprapworld_keypad_move_y_up() {
encoderPosition = -1;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_y();
}
static void reprapworld_keypad_move_home() {
enqueue_and_echo_commands_P(PSTR("G28")); // move all axes home
} }
static void reprapworld_keypad_move_z_up() { _reprapworld_keypad_move(Z_AXIS, 1); }
static void reprapworld_keypad_move_z_down() { _reprapworld_keypad_move(Z_AXIS, -1); }
static void reprapworld_keypad_move_x_left() { _reprapworld_keypad_move(X_AXIS, -1); }
static void reprapworld_keypad_move_x_right() { _reprapworld_keypad_move(X_AXIS, 1); }
static void reprapworld_keypad_move_y_up() { _reprapworld_keypad_move(Y_AXIS, -1); }
static void reprapworld_keypad_move_y_down() { _reprapworld_keypad_move(Y_AXIS, 1); }
static void reprapworld_keypad_move_home() { enqueue_and_echo_commands_P(PSTR("G28")); } // move all axes home and wait
static void reprapworld_keypad_move_menu() { lcd_goto_screen(lcd_move_menu); }
#endif // REPRAPWORLD_KEYPAD #endif // REPRAPWORLD_KEYPAD
/** /**
* *
* Audio feedback for controller clicks * Audio feedback for controller clicks
@ -2602,22 +2586,35 @@ void lcd_update() {
#if ENABLED(REPRAPWORLD_KEYPAD) #if ENABLED(REPRAPWORLD_KEYPAD)
#if ENABLED(DELTA) || ENABLED(SCARA) static uint8_t keypad_debounce = 0;
#define _KEYPAD_MOVE_ALLOWED (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
#else if (!REPRAPWORLD_KEYPAD_PRESSED) {
#define _KEYPAD_MOVE_ALLOWED true if (keypad_debounce > 0) keypad_debounce--;
}
else if (!keypad_debounce) {
keypad_debounce = 2;
if (REPRAPWORLD_KEYPAD_MOVE_MENU) reprapworld_keypad_move_menu();
#if DISABLED(DELTA) && Z_HOME_DIR == -1
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up();
#endif #endif
if (REPRAPWORLD_KEYPAD_MOVE_HOME) reprapworld_keypad_move_home(); if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS]) {
if (_KEYPAD_MOVE_ALLOWED) { #if ENABLED(DELTA) || Z_HOME_DIR != -1
if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up(); if (REPRAPWORLD_KEYPAD_MOVE_Z_UP) reprapworld_keypad_move_z_up();
#endif
if (REPRAPWORLD_KEYPAD_MOVE_Z_DOWN) reprapworld_keypad_move_z_down(); if (REPRAPWORLD_KEYPAD_MOVE_Z_DOWN) reprapworld_keypad_move_z_down();
if (REPRAPWORLD_KEYPAD_MOVE_X_LEFT) reprapworld_keypad_move_x_left(); if (REPRAPWORLD_KEYPAD_MOVE_X_LEFT) reprapworld_keypad_move_x_left();
if (REPRAPWORLD_KEYPAD_MOVE_X_RIGHT) reprapworld_keypad_move_x_right(); if (REPRAPWORLD_KEYPAD_MOVE_X_RIGHT) reprapworld_keypad_move_x_right();
if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) reprapworld_keypad_move_y_down(); if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) reprapworld_keypad_move_y_down();
if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) reprapworld_keypad_move_y_up(); if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) reprapworld_keypad_move_y_up();
} }
#endif else {
if (REPRAPWORLD_KEYPAD_MOVE_HOME) reprapworld_keypad_move_home();
}
}
#endif // REPRAPWORLD_KEYPAD
bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP); bool encoderPastThreshold = (abs(encoderDiff) >= ENCODER_PULSES_PER_STEP);
if (encoderPastThreshold || LCD_CLICKED) { if (encoderPastThreshold || LCD_CLICKED) {

12
Marlin/ultralcd.h
View File

@ -117,12 +117,24 @@
#define REPRAPWORLD_KEYPAD_MOVE_Z_DOWN (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F3) #define REPRAPWORLD_KEYPAD_MOVE_Z_DOWN (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F3)
#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)
#define REPRAPWORLD_KEYPAD_MOVE_MENU (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1)
#define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN) #define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN)
#define REPRAPWORLD_KEYPAD_MOVE_X_RIGHT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT) #define REPRAPWORLD_KEYPAD_MOVE_X_RIGHT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT)
#define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_MIDDLE) #define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_MIDDLE)
#define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP) #define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
#define REPRAPWORLD_KEYPAD_MOVE_X_LEFT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT) #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
#define REPRAPWORLD_KEYPAD_PRESSED (buttons_reprapworld_keypad & ( \
EN_REPRAPWORLD_KEYPAD_F3 | \
EN_REPRAPWORLD_KEYPAD_F2 | \
EN_REPRAPWORLD_KEYPAD_F1 | \
EN_REPRAPWORLD_KEYPAD_DOWN | \
EN_REPRAPWORLD_KEYPAD_RIGHT | \
EN_REPRAPWORLD_KEYPAD_MIDDLE | \
EN_REPRAPWORLD_KEYPAD_UP | \
EN_REPRAPWORLD_KEYPAD_LEFT) \
)
#endif // REPRAPWORLD_KEYPAD #endif // REPRAPWORLD_KEYPAD
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)