0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4491 from thinkyhead/rc_fix_lcd_move_e

Browse source 
Use a default argument in _lcd_move_e
This commit is contained in:
Scott Lahteine 2016-08-01 16:45:25 -07:00 committed by GitHub
parent 7594138740 38af251b91
commit 34c60f1b55
2 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Marlin/pins_RAMBO.h
View file

@ -114,9 +114,6 @@
#if ENABLED(NEWPANEL)
// Beeper on AUX-4
#define BEEPER_PIN 79
#define LCD_PINS_RS 70
#define LCD_PINS_ENABLE 71
#define LCD_PINS_D4 72
@ -124,12 +121,36 @@
#define LCD_PINS_D6 74
#define LCD_PINS_D7 75
//buttons are directly attached using AUX-2
#define BTN_EN1 76
#define BTN_EN2 77
#define BTN_ENC 78
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 44
#define SD_DETECT_PIN 81 // Ramps doesn't use this
#define DOGLCD_A0 70
#define DOGLCD_CS 71
#define LCD_SCREEN_ROT_180
#define BTN_EN1 85
#define BTN_EN2 84
#define BTN_ENC 83
#define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
#if ENABLED(TEMP_STAT_LEDS)
#define STAT_LED_RED 22
#define STAT_LED_BLUE 32
#endif
#else
#define BEEPER_PIN 79 // AUX-4
// AUX-2
#define BTN_EN1 76
#define BTN_EN2 77
#define BTN_ENC 78
#define SD_DETECT_PIN 81
#endif // VIKI2/miniVIKI
#else //!NEWPANEL - old style panel with shift register
@ -154,23 +175,3 @@
#endif // ULTRA_LCD
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 44
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 70
#define DOGLCD_CS 71
#define LCD_SCREEN_ROT_180
//The encoder and click button
#define BTN_EN1 85
#define BTN_EN2 84
#define BTN_ENC 83
#define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
#if ENABLED(TEMP_STAT_LEDS)
#define STAT_LED_RED 22
#define STAT_LED_BLUE 32
#endif
#endif // VIKI2/miniVIKI

7
Marlin/ultralcd.cpp
View file

@ -1359,7 +1359,7 @@ void kill_screen(const char* lcd_msg) {
static void lcd_move_z() { _lcd_move_xyz(PSTR(MSG_MOVE_Z), Z_AXIS, sw_endstop_min[Z_AXIS], sw_endstop_max[Z_AXIS]); }
static void _lcd_move_e(
#if E_MANUAL > 1
int8_t eindex
int8_t eindex=-1
#endif
) {
if (LCD_CLICKED) { lcd_goto_previous_menu(true); return; }
@ -1437,9 +1437,8 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(gcode, MSG_SELECT MSG_E2, PSTR("T1"));
#endif
#if E_MANUAL == 1
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
#else
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
#if E_MANUAL > 1
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_e0);
MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E2, lcd_move_e1);
#if E_MANUAL > 2