CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1893 from thinkyhead/cold_extrude

Browse Source 
Fix doubled lcd_quick_feedback
This commit is contained in:
Scott Lahteine 2015-04-11 04:57:00 -07:00
commit b089eb42eb
1 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Marlin/ultralcd.cpp
View File

@ -248,10 +248,10 @@ menuFunc_t callbackFunc;
// place-holders for Ki and Kd edits // place-holders for Ki and Kd edits
float raw_Ki, raw_Kd; float raw_Ki, raw_Kd;
static void lcd_goto_menu(menuFunc_t menu, const uint32_t encoder=0, const bool feedback=true) { static void lcd_goto_menu(menuFunc_t menu, const bool feedback=false, const uint32_t encoder=0) {
if (currentMenu != menu) { if (currentMenu != menu) {
currentMenu = menu; currentMenu = menu;
#if defined(NEWPANEL) #ifdef NEWPANEL
encoderPosition = encoder; encoderPosition = encoder;
if (feedback) lcd_quick_feedback(); if (feedback) lcd_quick_feedback();
#endif #endif
@ -304,13 +304,11 @@ static void lcd_status_screen() {
if (ignore_click) { if (ignore_click) {
if (wait_for_unclick) { if (wait_for_unclick) {
if (!current_click) { if (!current_click)
ignore_click = wait_for_unclick = false; ignore_click = wait_for_unclick = false;
} else
else {
current_click = false; current_click = false;
} }
}
else if (current_click) { else if (current_click) {
lcd_quick_feedback(); lcd_quick_feedback();
wait_for_unclick = true; wait_for_unclick = true;
@ -318,9 +316,8 @@ static void lcd_status_screen() {
} }
} }
if (current_click) if (current_click) {
{ lcd_goto_menu(lcd_main_menu, true);
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.
#ifdef LCD_PROGRESS_BAR #ifdef LCD_PROGRESS_BAR
currentMenu == lcd_status_screen currentMenu == lcd_status_screen
@ -334,39 +331,34 @@ static void lcd_status_screen() {
#ifdef ULTIPANEL_FEEDMULTIPLY #ifdef ULTIPANEL_FEEDMULTIPLY
// Dead zone at 100% feedrate // Dead zone at 100% feedrate
if ((feedmultiply < 100 && (feedmultiply + int(encoderPosition)) > 100) || if ((feedmultiply < 100 && (feedmultiply + int(encoderPosition)) > 100) ||
(feedmultiply > 100 && (feedmultiply + int(encoderPosition)) < 100)) (feedmultiply > 100 && (feedmultiply + int(encoderPosition)) < 100)) {
{
encoderPosition = 0; encoderPosition = 0;
feedmultiply = 100; feedmultiply = 100;
} }
if (feedmultiply == 100) {
if (feedmultiply == 100 && int(encoderPosition) > ENCODER_FEEDRATE_DEADZONE) if (int(encoderPosition) > ENCODER_FEEDRATE_DEADZONE) {
{
feedmultiply += int(encoderPosition) - ENCODER_FEEDRATE_DEADZONE; feedmultiply += int(encoderPosition) - ENCODER_FEEDRATE_DEADZONE;
encoderPosition = 0; encoderPosition = 0;
} }
else if (feedmultiply == 100 && int(encoderPosition) < -ENCODER_FEEDRATE_DEADZONE) else if (int(encoderPosition) < -ENCODER_FEEDRATE_DEADZONE) {
{
feedmultiply += int(encoderPosition) + ENCODER_FEEDRATE_DEADZONE; feedmultiply += int(encoderPosition) + ENCODER_FEEDRATE_DEADZONE;
encoderPosition = 0; encoderPosition = 0;
} }
else if (feedmultiply != 100) }
{ else {
feedmultiply += int(encoderPosition); feedmultiply += int(encoderPosition);
encoderPosition = 0; encoderPosition = 0;
} }
#endif // ULTIPANEL_FEEDMULTIPLY #endif // ULTIPANEL_FEEDMULTIPLY
if (feedmultiply < 10) feedmultiply = constrain(feedmultiply, 10, 999);
feedmultiply = 10;
else if (feedmultiply > 999)
feedmultiply = 999;
#endif //ULTIPANEL #endif //ULTIPANEL
} }
#ifdef ULTIPANEL #ifdef ULTIPANEL
static void lcd_return_to_status() { lcd_goto_menu(lcd_status_screen, 0, false); } static void lcd_return_to_status() { lcd_goto_menu(lcd_status_screen); }
static void lcd_sdcard_pause() { card.pauseSDPrint(); } static void lcd_sdcard_pause() { card.pauseSDPrint(); }