From 0114cf110150139a91785f479aae52838d2697b1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:06:19 -0700 Subject: [PATCH 01/11] RCBugFix version string --- Marlin/Default_Version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Default_Version.h b/Marlin/Default_Version.h index ccae5eec2..3722cdf44 100644 --- a/Marlin/Default_Version.h +++ b/Marlin/Default_Version.h @@ -28,9 +28,9 @@ // #error "You must specify the following parameters related to your distribution" #if true -#define SHORT_BUILD_VERSION "1.1.0-RC4" -#define DETAILED_BUILD_VERSION "1.1.0-RC4 From Archive" -#define STRING_DISTRIBUTION_DATE "2016-03-24 12:00" +#define SHORT_BUILD_VERSION "1.1.0-RCBugFix" +#define DETAILED_BUILD_VERSION "1.1.0-RCBugFix From Archive" +#define STRING_DISTRIBUTION_DATE "2016-04-01 12:00" // It might also be appropriate to define a location where additional information can be found // #define SOURCE_CODE_URL "http:// ..." #endif From 92882fcc51f1397fe88252e192a3814b636393c1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:10:04 -0700 Subject: [PATCH 02/11] Allow lcd_implementation_drawedit to draw a message --- Marlin/dogm_lcd_implementation.h | 8 +++++--- Marlin/ultralcd.cpp | 4 ++-- Marlin/ultralcd_implementation_hitachi_HD44780.h | 8 +++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 25d573d82..5aa4cb70d 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -562,9 +562,11 @@ void lcd_implementation_drawedit(const char* pstr, const char* value) { u8g.setPrintPos(0, rowHeight + kHalfChar); lcd_printPGM(pstr); - lcd_print(':'); - u8g.setPrintPos((lcd_width - 1 - vallen) * char_width, rows * rowHeight + kHalfChar); - lcd_print(value); + if (value != NULL) { + lcd_print(':'); + u8g.setPrintPos((lcd_width - 1 - vallen) * char_width, rows * rowHeight + kHalfChar); + lcd_print(value); + } } #if ENABLED(SDSUPPORT) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 51c0e1253..5b83f48d2 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -536,7 +536,7 @@ void lcd_set_home_offsets() { babystepsTodo[axis] += distance; #endif } - if (lcdDrawUpdate) lcd_implementation_drawedit(msg, ""); + if (lcdDrawUpdate) lcd_implementation_drawedit(msg, NULL); if (LCD_CLICKED) lcd_goto_previous_menu(); } @@ -2482,7 +2482,7 @@ char* ftostr52(const float& x) { * MBL Move to mesh starting point */ static void _lcd_level_bed_homing() { - if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ"), MSG_LEVEL_BED_HOMING); + if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ " MSG_LEVEL_BED_HOMING), NULL); if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) { current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h index a8221d3a8..9d10bce99 100644 --- a/Marlin/ultralcd_implementation_hitachi_HD44780.h +++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h @@ -863,9 +863,11 @@ static void lcd_implementation_drawmenu_setting_edit_generic_P(bool sel, uint8_t void lcd_implementation_drawedit(const char* pstr, const char* value) { lcd.setCursor(1, 1); lcd_printPGM(pstr); - lcd.print(':'); - lcd.setCursor(LCD_WIDTH - lcd_strlen(value), 1); - lcd_print(value); + if (value != NULL) { + lcd.print(':'); + lcd.setCursor(LCD_WIDTH - lcd_strlen(value), 1); + lcd_print(value); + } } #if ENABLED(SDSUPPORT) From 41aa4bdf1fbcb642669b060b93189ad8c44e3f69 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:16:12 -0700 Subject: [PATCH 03/11] Use XYZ translated strings in dogm --- Marlin/dogm_lcd_implementation.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 5aa4cb70d..9b5f0c6f4 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -378,7 +378,7 @@ static void lcd_implementation_status_screen() { u8g.setColorIndex(0); // white on black u8g.setPrintPos(2, XYZ_BASELINE); if (blink) - lcd_printPGM(PSTR("X")); + lcd_printPGM(PSTR(MSG_X)); else { if (!axis_homed[X_AXIS]) lcd_printPGM(PSTR("?")); @@ -388,7 +388,7 @@ static void lcd_implementation_status_screen() { lcd_printPGM(PSTR(" ")); else #endif - lcd_printPGM(PSTR("X")); + lcd_printPGM(PSTR(MSG_X)); } } u8g.drawPixel(8, XYZ_BASELINE - 5); @@ -398,7 +398,7 @@ static void lcd_implementation_status_screen() { u8g.setPrintPos(43, XYZ_BASELINE); if (blink) - lcd_printPGM(PSTR("Y")); + lcd_printPGM(PSTR(MSG_Y)); else { if (!axis_homed[Y_AXIS]) lcd_printPGM(PSTR("?")); @@ -408,7 +408,7 @@ static void lcd_implementation_status_screen() { lcd_printPGM(PSTR(" ")); else #endif - lcd_printPGM(PSTR("Y")); + lcd_printPGM(PSTR(MSG_Y)); } } u8g.drawPixel(49, XYZ_BASELINE - 5); @@ -418,7 +418,7 @@ static void lcd_implementation_status_screen() { u8g.setPrintPos(83, XYZ_BASELINE); if (blink) - lcd_printPGM(PSTR("Z")); + lcd_printPGM(PSTR(MSG_Z)); else { if (!axis_homed[Z_AXIS]) lcd_printPGM(PSTR("?")); @@ -428,7 +428,7 @@ static void lcd_implementation_status_screen() { lcd_printPGM(PSTR(" ")); else #endif - lcd_printPGM(PSTR("Z")); + lcd_printPGM(PSTR(MSG_Z)); } } u8g.drawPixel(89, XYZ_BASELINE - 5); From 641b30217e48435114c4bb81215bc08ffacfbbec Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:16:53 -0700 Subject: [PATCH 04/11] Patch prevEncoderPosition compile issue Thanks to @jbrazio #3301 --- Marlin/ultralcd.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 5b83f48d2..1a644022b 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -267,7 +267,7 @@ static void lcd_status_screen(); uint8_t currentMenuViewOffset; /* scroll offset in the current menu */ millis_t next_button_update_ms; uint8_t lastEncoderBits; - uint32_t encoderPosition; + uint32_t encoderPosition, prevEncoderPosition; #if PIN_EXISTS(SD_DETECT) uint8_t lcd_sd_status; #endif @@ -281,14 +281,12 @@ bool ignore_click = false; bool wait_for_unclick; uint8_t lcdDrawUpdate = 2; /* Set to none-zero when the LCD needs to draw, decreased after every draw. Set to 2 in LCD routines so the LCD gets at least 1 full redraw (first redraw is partial) */ -//prevMenu and prevEncoderPosition are used to store the previous menu location when editing settings. -menuFunc_t prevMenu = NULL; -uint16_t prevEncoderPosition; -//Variables used when editing values. +// Variables used when editing values. const char* editLabel; void* editValue; int32_t minEditValue, maxEditValue; -menuFunc_t callbackFunc; +menuFunc_t prevMenu = NULL; // return here after editing (also prevEncoderPosition) +menuFunc_t callbackFunc; // call this after editing // place-holders for Ki and Kd edits float raw_Ki, raw_Kd; @@ -310,9 +308,20 @@ static void lcd_goto_menu(menuFunc_t menu, const bool feedback = false, const ui } } -inline void lcd_save_previous_menu() { prevMenu = currentMenu; prevEncoderPosition = encoderPosition; } +inline void lcd_save_previous_menu() { + prevMenu = currentMenu; + #if ENABLED(ULTIPANEL) + prevEncoderPosition = encoderPosition; + #endif +} -static void lcd_goto_previous_menu() { lcd_goto_menu(prevMenu, true, prevEncoderPosition); } +static void lcd_goto_previous_menu() { + lcd_goto_menu(prevMenu, true + #if ENABLED(ULTIPANEL) + , prevEncoderPosition + #endif + ); +} /** * From af89ccf96a3bc29c83e1ca64ec12fd1a385887bf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:17:59 -0700 Subject: [PATCH 05/11] Use flag to defer lcd return-to-status --- Marlin/ultralcd.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 1a644022b..ee058c180 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -279,6 +279,7 @@ millis_t next_lcd_update_ms; uint8_t lcd_status_update_delay; bool ignore_click = false; bool wait_for_unclick; +bool defer_return_to_status = false; uint8_t lcdDrawUpdate = 2; /* Set to none-zero when the LCD needs to draw, decreased after every draw. Set to 2 in LCD routines so the LCD gets at least 1 full redraw (first redraw is partial) */ // Variables used when editing values. @@ -429,7 +430,10 @@ static void lcd_status_screen() { #if ENABLED(ULTIPANEL) -static void lcd_return_to_status() { lcd_goto_menu(lcd_status_screen); } +static void lcd_return_to_status() { + defer_return_to_status = false; + lcd_goto_menu(lcd_status_screen); +} #if ENABLED(SDSUPPORT) @@ -1965,13 +1969,7 @@ void lcd_update() { #if ENABLED(ULTIPANEL) // Return to Status Screen after a timeout - if (currentMenu != lcd_status_screen && - #if ENABLED(MANUAL_BED_LEVELING) - currentMenu != _lcd_level_bed && - currentMenu != _lcd_level_bed_homing && - #endif - millis() > return_to_status_ms - ) { + if (!defer_return_to_status && currentMenu != lcd_status_screen && millis() > return_to_status_ms) { lcd_return_to_status(); lcdDrawUpdate = 2; } @@ -2508,6 +2506,7 @@ char* ftostr52(const float& x) { * MBL entry-point */ static void lcd_level_bed() { + defer_return_to_status = true; axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false; mbl.reset(); enqueue_and_echo_commands_P(PSTR("G28")); From 0d6609c3c5335eeefd1506b48e7687826a4d70f2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:20:15 -0700 Subject: [PATCH 06/11] lcd_goto_menu should set lcdDrawUpdate to 2 --- Marlin/ultralcd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index ee058c180..cd143a180 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -298,6 +298,7 @@ float raw_Ki, raw_Kd; static void lcd_goto_menu(menuFunc_t menu, const bool feedback = false, const uint32_t encoder = 0) { if (currentMenu != menu) { currentMenu = menu; + lcdDrawUpdate = 2; #if ENABLED(NEWPANEL) encoderPosition = encoder; if (feedback) lcd_quick_feedback(); @@ -2476,7 +2477,7 @@ char* ftostr52(const float& x) { current_position[X_AXIS] = mbl.get_x(ix); current_position[Y_AXIS] = mbl.get_y(iy); line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS); - lcdDrawUpdate = 2; + lcdDrawUpdate = 1; } } } @@ -2490,6 +2491,7 @@ char* ftostr52(const float& x) { */ static void _lcd_level_bed_homing() { if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ " MSG_LEVEL_BED_HOMING), NULL); + lcdDrawUpdate = 1; if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) { current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]); @@ -2499,7 +2501,6 @@ char* ftostr52(const float& x) { _lcd_level_bed_position = 0; lcd_goto_menu(_lcd_level_bed); } - lcdDrawUpdate = 2; } /** @@ -2510,7 +2511,6 @@ char* ftostr52(const float& x) { axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false; mbl.reset(); enqueue_and_echo_commands_P(PSTR("G28")); - lcdDrawUpdate = 2; lcd_goto_menu(_lcd_level_bed_homing); } From 0b4f65dca83d2e87a758c59953354cf6367247eb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:20:47 -0700 Subject: [PATCH 07/11] Always limit blink to ~1 second intervals --- Marlin/ultralcd.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index cd143a180..141187dcb 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1822,9 +1822,10 @@ int lcd_strlen_P(const char* s) { bool lcd_blink() { static uint8_t blink = 0; static millis_t next_blink_ms = 0; - if (millis() >= next_blink_ms) { + millis_t ms = millis(); + if (ms >= next_blink_ms) { blink ^= 0xFF; - next_blink_ms = millis() + LCD_UPDATE_INTERVAL - 50; + next_blink_ms = ms + 1000 - LCD_UPDATE_INTERVAL / 2; } return blink != 0; } From 1e1a18e091b1d951b01c1ae9adf8e088e62b28bf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:21:46 -0700 Subject: [PATCH 08/11] Remove extra semicolon in ultralcd.cpp --- Marlin/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 141187dcb..15885be41 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -1154,7 +1154,7 @@ static void lcd_control_menu() { _PIDTEMP_BASE_FUNCTIONS(eindex); \ void lcd_autotune_callback_E ## eindex() { _lcd_autotune(eindex); } #else - #define _PIDTEMP_FUNCTIONS(eindex) _PIDTEMP_BASE_FUNCTIONS(eindex); + #define _PIDTEMP_FUNCTIONS(eindex) _PIDTEMP_BASE_FUNCTIONS(eindex) #endif _PIDTEMP_FUNCTIONS(0); From 097cc75ba8b5a3f34464e60afad58e6ba0913b3c Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 14:14:51 -0700 Subject: [PATCH 09/11] Patch _lcd_level_bed draw to fix flicker, show proper offset --- Marlin/ultralcd.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 15885be41..22e3f5e05 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2449,9 +2449,12 @@ char* ftostr52(const float& x) { if (max_software_endstops) NOMORE(current_position[Z_AXIS], Z_MAX_POS); encoderPosition = 0; line_to_current(Z_AXIS); - lcdDrawUpdate = 2; + lcdDrawUpdate = 1; + } + if (lcdDrawUpdate) { + float v = current_position[Z_AXIS] - MESH_HOME_SEARCH_Z; + lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43(v + (v < 0 ? -0.0001 : 0.0001))); } - if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("Z"), ftostr43(current_position[Z_AXIS])); static bool debounce_click = false; if (LCD_CLICKED) { if (!debounce_click) { From a393941d2dc0bb5573ce33487cf7ebe3c26f6de6 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 17:43:04 -0700 Subject: [PATCH 10/11] Combine "XYZ" with MSG_LEVEL_BED_HOMING --- Marlin/language_an.h | 2 +- Marlin/language_bg.h | 2 +- Marlin/language_ca.h | 2 +- Marlin/language_cn.h | 2 +- Marlin/language_da.h | 2 +- Marlin/language_de.h | 2 +- Marlin/language_en.h | 2 +- Marlin/language_es.h | 2 +- Marlin/language_eu.h | 2 +- Marlin/language_fi.h | 2 +- Marlin/language_fr.h | 2 +- Marlin/language_it.h | 2 +- Marlin/language_kana.h | 2 +- Marlin/language_nl.h | 2 +- Marlin/language_pl.h | 2 +- Marlin/language_pt-br.h | 2 +- Marlin/language_ru.h | 2 +- Marlin/ultralcd.cpp | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Marlin/language_an.h b/Marlin/language_an.h index 59678c0e3..71e917435 100644 --- a/Marlin/language_an.h +++ b/Marlin/language_an.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART " Autostart" #define MSG_DISABLE_STEPPERS "Amortar motors" #define MSG_AUTO_HOME "Levar a l'orichen" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Establir zero" #define MSG_PREHEAT_PLA "Precalentar PLA" diff --git a/Marlin/language_bg.h b/Marlin/language_bg.h index f13b46e9a..ba63e4983 100644 --- a/Marlin/language_bg.h +++ b/Marlin/language_bg.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Автостарт" #define MSG_DISABLE_STEPPERS "Изкл. двигатели" #define MSG_AUTO_HOME "Паркиране" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Задай Начало" #define MSG_SET_ORIGIN "Изходна точка" #define MSG_PREHEAT_PLA "Подгряване PLA" diff --git a/Marlin/language_ca.h b/Marlin/language_ca.h index 248af1f67..a037425d5 100644 --- a/Marlin/language_ca.h +++ b/Marlin/language_ca.h @@ -43,7 +43,7 @@ #define MSG_AUTOSTART "Inici automatic" #define MSG_DISABLE_STEPPERS "Apagar motors" #define MSG_AUTO_HOME "Home global" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Establir origen" #define MSG_PREHEAT_PLA "Preescalfar PLA" diff --git a/Marlin/language_cn.h b/Marlin/language_cn.h index 0e4589fda..c5bfa9de7 100644 --- a/Marlin/language_cn.h +++ b/Marlin/language_cn.h @@ -40,7 +40,7 @@ #define MSG_AUTOSTART "\xb1\xb2\xb3\xb4" #define MSG_DISABLE_STEPPERS "\xb5\xb6\xb7\xb8\xb9\xba" #define MSG_AUTO_HOME "\xbb\xbc\xbd" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "\xbe\xbf\xbb\xbc\xbd\xc0\xc1" #define MSG_SET_ORIGIN "\xbe\xbf\xbc\xbd" #define MSG_PREHEAT_PLA "\xc3\xc4 PLA" diff --git a/Marlin/language_da.h b/Marlin/language_da.h index e05eb6433..fb6982bcd 100644 --- a/Marlin/language_da.h +++ b/Marlin/language_da.h @@ -43,7 +43,7 @@ #define MSG_AUTO_HOME "Home" // G28 #define MSG_COOLDOWN "Afkøl" #define MSG_DISABLE_STEPPERS "Slå stepper fra" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Sæt home offsets" #define MSG_SET_ORIGIN "Sæt origin" #define MSG_SWITCH_PS_ON "Slå strøm til" diff --git a/Marlin/language_de.h b/Marlin/language_de.h index 0f8298b5b..188466a1d 100644 --- a/Marlin/language_de.h +++ b/Marlin/language_de.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Motoren Aus" // M84 #define MSG_AUTO_HOME "Home" // G28 -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Setze Home hier" #define MSG_SET_ORIGIN "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp #define MSG_PREHEAT_PLA "Vorwärmen PLA" diff --git a/Marlin/language_en.h b/Marlin/language_en.h index facb98f39..6b5b79f2b 100644 --- a/Marlin/language_en.h +++ b/Marlin/language_en.h @@ -62,7 +62,7 @@ #define MSG_AUTO_HOME "Auto home" #endif #ifndef MSG_LEVEL_BED_HOMING - #define MSG_LEVEL_BED_HOMING "Homing" + #define MSG_LEVEL_BED_HOMING "Homing XYZ" #endif #ifndef MSG_SET_HOME_OFFSETS #define MSG_SET_HOME_OFFSETS "Set home offsets" diff --git a/Marlin/language_es.h b/Marlin/language_es.h index 54351176f..b21dcdcae 100644 --- a/Marlin/language_es.h +++ b/Marlin/language_es.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Apagar motores" #define MSG_AUTO_HOME "Llevar al origen" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Ajustar offsets" #define MSG_SET_ORIGIN "Establecer cero" #define MSG_PREHEAT_PLA "Precalentar PLA" diff --git a/Marlin/language_eu.h b/Marlin/language_eu.h index 19ed22581..219e82b80 100644 --- a/Marlin/language_eu.h +++ b/Marlin/language_eu.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Auto hasiera" #define MSG_DISABLE_STEPPERS "Itzali motoreak" #define MSG_AUTO_HOME "Hasierara joan" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Hasiera ipini" #define MSG_PREHEAT_PLA "Aurreberotu PLA" diff --git a/Marlin/language_fi.h b/Marlin/language_fi.h index 73aba64fe..b2e5b5860 100644 --- a/Marlin/language_fi.h +++ b/Marlin/language_fi.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Automaatti" #define MSG_DISABLE_STEPPERS "Vapauta moottorit" #define MSG_AUTO_HOME "Aja referenssiin" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Aseta origo" #define MSG_PREHEAT_PLA "Esilämmitä PLA" diff --git a/Marlin/language_fr.h b/Marlin/language_fr.h index 3524c05ee..21b0ccd14 100644 --- a/Marlin/language_fr.h +++ b/Marlin/language_fr.h @@ -43,7 +43,7 @@ #define MSG_AUTOSTART "Demarrage auto" #define MSG_DISABLE_STEPPERS "Arreter moteurs" #define MSG_AUTO_HOME "Home auto." -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Regler origine" #define MSG_PREHEAT_PLA "Prechauffage PLA" diff --git a/Marlin/language_it.h b/Marlin/language_it.h index 32526cba1..acd654ee1 100644 --- a/Marlin/language_it.h +++ b/Marlin/language_it.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Disabilita Motori" #define MSG_AUTO_HOME "Auto Home" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Setta offset home" #define MSG_SET_ORIGIN "Imposta Origine" #define MSG_PREHEAT_PLA "Preriscalda PLA" diff --git a/Marlin/language_kana.h b/Marlin/language_kana.h index 0cae34f61..d612d863e 100644 --- a/Marlin/language_kana.h +++ b/Marlin/language_kana.h @@ -44,7 +44,7 @@ #define MSG_AUTOSTART "\xbc\xde\xc4\xde\xb3\xb6\xb2\xbc" // "Autostart" #define MSG_DISABLE_STEPPERS "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc" // "Disable steppers" #define MSG_AUTO_HOME "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3" // "Auto home" -#define MSG_LEVEL_BED_HOMING "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3" // "Homing" +#define MSG_LEVEL_BED_HOMING "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3" // "Homing XYZ" #define MSG_SET_HOME_OFFSETS "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2" // "Set home offsets" #define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "Set origin" #define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2" // "Preheat PLA" diff --git a/Marlin/language_nl.h b/Marlin/language_nl.h index a7304da1f..76c8af52b 100644 --- a/Marlin/language_nl.h +++ b/Marlin/language_nl.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Motoren uit" #define MSG_AUTO_HOME "Auto home" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Nulpunt instellen" #define MSG_PREHEAT_PLA "PLA voorverwarmen" diff --git a/Marlin/language_pl.h b/Marlin/language_pl.h index 8ee914c99..592044759 100644 --- a/Marlin/language_pl.h +++ b/Marlin/language_pl.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Wylacz silniki" #define MSG_AUTO_HOME "Auto. poz. zerowa" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Set home offsets" #define MSG_SET_ORIGIN "Ustaw punkt zero" #define MSG_PREHEAT_PLA "Rozgrzej PLA" diff --git a/Marlin/language_pt-br.h b/Marlin/language_pt-br.h index 8a3fed350..a906ee4fc 100644 --- a/Marlin/language_pt-br.h +++ b/Marlin/language_pt-br.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Autostart" #define MSG_DISABLE_STEPPERS "Desabi. motores" #define MSG_AUTO_HOME "Ir para origen" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Ajustar Jogo" #define MSG_SET_ORIGIN "Ajustar orig." #define MSG_PREHEAT_PLA "Pre-aquecer PLA" diff --git a/Marlin/language_ru.h b/Marlin/language_ru.h index 39692d8b3..5ed4690cb 100644 --- a/Marlin/language_ru.h +++ b/Marlin/language_ru.h @@ -42,7 +42,7 @@ #define MSG_AUTOSTART "Автостарт" #define MSG_DISABLE_STEPPERS "Выкл. двигатели" #define MSG_AUTO_HOME "Парковка" -#define MSG_LEVEL_BED_HOMING "Homing" +#define MSG_LEVEL_BED_HOMING "Homing XYZ" #define MSG_SET_HOME_OFFSETS "Запомнить парковку" #define MSG_SET_ORIGIN "Запомнить ноль" #define MSG_PREHEAT_PLA "Преднагрев PLA" diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 22e3f5e05..af9c154dc 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2494,7 +2494,7 @@ char* ftostr52(const float& x) { * MBL Move to mesh starting point */ static void _lcd_level_bed_homing() { - if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ " MSG_LEVEL_BED_HOMING), NULL); + if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL); lcdDrawUpdate = 1; if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) { current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; From b98f72b48339f138e314137628d7603bc1e9423f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 1 Apr 2016 17:54:16 -0700 Subject: [PATCH 11/11] Small optimization for ftostr43 --- Marlin/ultralcd.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index af9c154dc..4edfc9391 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -2228,11 +2228,11 @@ char* ftostr43(const float& x) { long xx = x * 1000; char *conv_ptr = conv; if (xx >= 0) { - *conv_ptr++ = ' '; + conv_ptr++; } else { - conv[0] = '-'; xx = -xx; + conv[0] = '-'; } conv[1] = (xx / 1000) % 10 + '0'; conv[2] = '.';