Merge pull request #3330 from thinkyhead/rc_mbl_lcdDrawUpdate
Improvements to MBL, general LCD menu handling
This commit is contained in:
commit
cf9a171aa9
@ -5589,7 +5589,7 @@ inline void gcode_M428() {
|
|||||||
memcpy(current_position, new_pos, sizeof(new_pos));
|
memcpy(current_position, new_pos, sizeof(new_pos));
|
||||||
memcpy(home_offset, new_offs, sizeof(new_offs));
|
memcpy(home_offset, new_offs, sizeof(new_offs));
|
||||||
sync_plan_position();
|
sync_plan_position();
|
||||||
LCD_ALERTMESSAGEPGM("Offset applied.");
|
LCD_ALERTMESSAGEPGM(MSG_HOME_OFFSETS_APPLIED);
|
||||||
#if HAS_BUZZER
|
#if HAS_BUZZER
|
||||||
buzz(200, 659);
|
buzz(200, 659);
|
||||||
buzz(200, 698);
|
buzz(200, 698);
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Amortar motors"
|
#define MSG_DISABLE_STEPPERS "Amortar motors"
|
||||||
#define MSG_AUTO_HOME "Levar a l'orichen"
|
#define MSG_AUTO_HOME "Levar a l'orichen"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Establir zero"
|
#define MSG_SET_ORIGIN "Establir zero"
|
||||||
#define MSG_PREHEAT_PLA "Precalentar PLA"
|
#define MSG_PREHEAT_PLA "Precalentar PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Precalentar PLA "
|
#define MSG_PREHEAT_PLA_N "Precalentar PLA "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Изкл. двигатели"
|
#define MSG_DISABLE_STEPPERS "Изкл. двигатели"
|
||||||
#define MSG_AUTO_HOME "Паркиране"
|
#define MSG_AUTO_HOME "Паркиране"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Задай Начало"
|
#define MSG_SET_HOME_OFFSETS "Задай Начало"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Изходна точка"
|
#define MSG_SET_ORIGIN "Изходна точка"
|
||||||
#define MSG_PREHEAT_PLA "Подгряване PLA"
|
#define MSG_PREHEAT_PLA "Подгряване PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Подгряване PLA"
|
#define MSG_PREHEAT_PLA_N "Подгряване PLA"
|
||||||
|
@ -44,7 +44,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Apagar motors"
|
#define MSG_DISABLE_STEPPERS "Apagar motors"
|
||||||
#define MSG_AUTO_HOME "Home global"
|
#define MSG_AUTO_HOME "Home global"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Establir origen"
|
#define MSG_SET_ORIGIN "Establir origen"
|
||||||
#define MSG_PREHEAT_PLA "Preescalfar PLA"
|
#define MSG_PREHEAT_PLA "Preescalfar PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Preescalfar PLA "
|
#define MSG_PREHEAT_PLA_N "Preescalfar PLA "
|
||||||
|
@ -41,7 +41,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "\xb5\xb6\xb7\xb8\xb9\xba"
|
#define MSG_DISABLE_STEPPERS "\xb5\xb6\xb7\xb8\xb9\xba"
|
||||||
#define MSG_AUTO_HOME "\xbb\xbc\xbd"
|
#define MSG_AUTO_HOME "\xbb\xbc\xbd"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
|
#define MSG_SET_HOME_OFFSETS "\xbe\xbf\xbb\xbc\xbd\xc0\xc1"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "\xbe\xbf\xbc\xbd"
|
#define MSG_SET_ORIGIN "\xbe\xbf\xbc\xbd"
|
||||||
#define MSG_PREHEAT_PLA "\xc3\xc4 PLA"
|
#define MSG_PREHEAT_PLA "\xc3\xc4 PLA"
|
||||||
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
||||||
|
@ -47,7 +47,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Uvolnit motory"
|
#define MSG_DISABLE_STEPPERS "Uvolnit motory"
|
||||||
#define MSG_AUTO_HOME "Domovska pozice"
|
#define MSG_AUTO_HOME "Domovska pozice"
|
||||||
#define MSG_LEVEL_BED_HOMING "Mereni podlozky"
|
#define MSG_LEVEL_BED_HOMING "Mereni podlozky"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Nastavit ofsety"
|
#define MSG_SET_HOME_OFFSETS "Nastavit ofsety"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Nastavit pocatek"
|
#define MSG_SET_ORIGIN "Nastavit pocatek"
|
||||||
#define MSG_PREHEAT_PLA "Zahrat PLA"
|
#define MSG_PREHEAT_PLA "Zahrat PLA"
|
||||||
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
||||||
|
@ -44,7 +44,10 @@
|
|||||||
#define MSG_COOLDOWN "Afkøl"
|
#define MSG_COOLDOWN "Afkøl"
|
||||||
#define MSG_DISABLE_STEPPERS "Slå stepper fra"
|
#define MSG_DISABLE_STEPPERS "Slå stepper fra"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Sæt home offsets"
|
#define MSG_SET_HOME_OFFSETS "Sæt home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Sæt origin"
|
#define MSG_SET_ORIGIN "Sæt origin"
|
||||||
#define MSG_SWITCH_PS_ON "Slå strøm til"
|
#define MSG_SWITCH_PS_ON "Slå strøm til"
|
||||||
#define MSG_SWITCH_PS_OFF "Slå strøm fra"
|
#define MSG_SWITCH_PS_OFF "Slå strøm fra"
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Motoren Aus" // M84
|
#define MSG_DISABLE_STEPPERS "Motoren Aus" // M84
|
||||||
#define MSG_AUTO_HOME "Home" // G28
|
#define MSG_AUTO_HOME "Home" // G28
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Setze Home hier"
|
#define MSG_SET_HOME_OFFSETS "Setze Home hier"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
|
#define MSG_SET_ORIGIN "Setze Null hier" //"G92 X0 Y0 Z0" commented out in ultralcd.cpp
|
||||||
#define MSG_PREHEAT_PLA "Vorwärmen PLA"
|
#define MSG_PREHEAT_PLA "Vorwärmen PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Vorwärmen PLA "
|
#define MSG_PREHEAT_PLA_N "Vorwärmen PLA "
|
||||||
|
@ -64,9 +64,18 @@
|
|||||||
#ifndef MSG_LEVEL_BED_HOMING
|
#ifndef MSG_LEVEL_BED_HOMING
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef MSG_LEVEL_BED_WAITING
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#endif
|
||||||
|
#ifndef MSG_LEVEL_BED_DONE
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
|
#endif
|
||||||
#ifndef MSG_SET_HOME_OFFSETS
|
#ifndef MSG_SET_HOME_OFFSETS
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
#endif
|
#endif
|
||||||
|
#ifndef MSG_HOME_OFFSETS_APPLIED
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
|
#endif
|
||||||
#ifndef MSG_SET_ORIGIN
|
#ifndef MSG_SET_ORIGIN
|
||||||
#define MSG_SET_ORIGIN "Set origin"
|
#define MSG_SET_ORIGIN "Set origin"
|
||||||
#endif
|
#endif
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Apagar motores"
|
#define MSG_DISABLE_STEPPERS "Apagar motores"
|
||||||
#define MSG_AUTO_HOME "Llevar al origen"
|
#define MSG_AUTO_HOME "Llevar al origen"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Ajustar offsets"
|
#define MSG_SET_HOME_OFFSETS "Ajustar offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Establecer cero"
|
#define MSG_SET_ORIGIN "Establecer cero"
|
||||||
#define MSG_PREHEAT_PLA "Precalentar PLA"
|
#define MSG_PREHEAT_PLA "Precalentar PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Precalentar PLA "
|
#define MSG_PREHEAT_PLA_N "Precalentar PLA "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Itzali motoreak"
|
#define MSG_DISABLE_STEPPERS "Itzali motoreak"
|
||||||
#define MSG_AUTO_HOME "Hasierara joan"
|
#define MSG_AUTO_HOME "Hasierara joan"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Hasiera ipini"
|
#define MSG_SET_ORIGIN "Hasiera ipini"
|
||||||
#define MSG_PREHEAT_PLA "Aurreberotu PLA"
|
#define MSG_PREHEAT_PLA "Aurreberotu PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Aurreberotu PLA "
|
#define MSG_PREHEAT_PLA_N "Aurreberotu PLA "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Vapauta moottorit"
|
#define MSG_DISABLE_STEPPERS "Vapauta moottorit"
|
||||||
#define MSG_AUTO_HOME "Aja referenssiin"
|
#define MSG_AUTO_HOME "Aja referenssiin"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Aseta origo"
|
#define MSG_SET_ORIGIN "Aseta origo"
|
||||||
#define MSG_PREHEAT_PLA "Esilämmitä PLA"
|
#define MSG_PREHEAT_PLA "Esilämmitä PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Esilämmitä PLA "
|
#define MSG_PREHEAT_PLA_N "Esilämmitä PLA "
|
||||||
|
@ -44,7 +44,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Arreter moteurs"
|
#define MSG_DISABLE_STEPPERS "Arreter moteurs"
|
||||||
#define MSG_AUTO_HOME "Home auto."
|
#define MSG_AUTO_HOME "Home auto."
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Regler origine"
|
#define MSG_SET_ORIGIN "Regler origine"
|
||||||
#define MSG_PREHEAT_PLA "Prechauffage PLA"
|
#define MSG_PREHEAT_PLA "Prechauffage PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Prechauff. PLA "
|
#define MSG_PREHEAT_PLA_N "Prechauff. PLA "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Disabilita Motori"
|
#define MSG_DISABLE_STEPPERS "Disabilita Motori"
|
||||||
#define MSG_AUTO_HOME "Auto Home"
|
#define MSG_AUTO_HOME "Auto Home"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Setta offset home"
|
#define MSG_SET_HOME_OFFSETS "Setta offset home"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Imposta Origine"
|
#define MSG_SET_ORIGIN "Imposta Origine"
|
||||||
#define MSG_PREHEAT_PLA "Preriscalda PLA"
|
#define MSG_PREHEAT_PLA "Preriscalda PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Preriscalda PLA "
|
#define MSG_PREHEAT_PLA_N "Preriscalda PLA "
|
||||||
|
@ -45,7 +45,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "\xd3\xb0\xc0\xb0\xc3\xde\xdd\xb9\xde\xdd\x20\xb5\xcc" // "Disable steppers"
|
#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_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 XYZ"
|
#define MSG_LEVEL_BED_HOMING "\xb9\xde\xdd\xc3\xdd\xc6\xb2\xc4\xde\xb3" // "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#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_HOME_OFFSETS "\xb7\xbc\xde\xad\xdd\xb5\xcc\xbe\xaf\xc4\xbe\xaf\xc3\xb2" // "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "Set origin"
|
#define MSG_SET_ORIGIN "\xb7\xbc\xde\xad\xdd\xbe\xaf\xc4" // "Set origin"
|
||||||
#define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2" // "Preheat PLA"
|
#define MSG_PREHEAT_PLA "PLA \xd6\xc8\xc2" // "Preheat PLA"
|
||||||
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
||||||
|
@ -49,7 +49,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "モーターデンゲン オフ" // "Disable steppers"
|
#define MSG_DISABLE_STEPPERS "モーターデンゲン オフ" // "Disable steppers"
|
||||||
#define MSG_AUTO_HOME "ゲンテンニイドウ" // "Auto home"
|
#define MSG_AUTO_HOME "ゲンテンニイドウ" // "Auto home"
|
||||||
#define MSG_LEVEL_BED_HOMING "ゲンテンニイドウ" // "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "ゲンテンニイドウ" // "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "キジュンオフセットセッテイ" // "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "キジュンオフセットセッテイ" // "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "キジュンセット" // "Set origin"
|
#define MSG_SET_ORIGIN "キジュンセット" // "Set origin"
|
||||||
#define MSG_PREHEAT_PLA "PLA ヨネツ" // "Preheat PLA"
|
#define MSG_PREHEAT_PLA "PLA ヨネツ" // "Preheat PLA"
|
||||||
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
#define MSG_PREHEAT_PLA_N MSG_PREHEAT_PLA " "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Motoren uit"
|
#define MSG_DISABLE_STEPPERS "Motoren uit"
|
||||||
#define MSG_AUTO_HOME "Auto home"
|
#define MSG_AUTO_HOME "Auto home"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Nulpunt instellen"
|
#define MSG_SET_ORIGIN "Nulpunt instellen"
|
||||||
#define MSG_PREHEAT_PLA "PLA voorverwarmen"
|
#define MSG_PREHEAT_PLA "PLA voorverwarmen"
|
||||||
#define MSG_PREHEAT_PLA_N "PLA voorverw. "
|
#define MSG_PREHEAT_PLA_N "PLA voorverw. "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Wylacz silniki"
|
#define MSG_DISABLE_STEPPERS "Wylacz silniki"
|
||||||
#define MSG_AUTO_HOME "Auto. poz. zerowa"
|
#define MSG_AUTO_HOME "Auto. poz. zerowa"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
#define MSG_SET_HOME_OFFSETS "Set home offsets"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Ustaw punkt zero"
|
#define MSG_SET_ORIGIN "Ustaw punkt zero"
|
||||||
#define MSG_PREHEAT_PLA "Rozgrzej PLA"
|
#define MSG_PREHEAT_PLA "Rozgrzej PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Rozgrzej PLA "
|
#define MSG_PREHEAT_PLA_N "Rozgrzej PLA "
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Desabi. motores"
|
#define MSG_DISABLE_STEPPERS "Desabi. motores"
|
||||||
#define MSG_AUTO_HOME "Ir para origen"
|
#define MSG_AUTO_HOME "Ir para origen"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
|
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Ajustar orig."
|
#define MSG_SET_ORIGIN "Ajustar orig."
|
||||||
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Desabi. motores"
|
#define MSG_DISABLE_STEPPERS "Desabi. motores"
|
||||||
#define MSG_AUTO_HOME "Ir para origen"
|
#define MSG_AUTO_HOME "Ir para origen"
|
||||||
#define MSG_LEVEL_BED_HOMING "Indo para origem"
|
#define MSG_LEVEL_BED_HOMING "Indo para origem"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
|
#define MSG_SET_HOME_OFFSETS "Ajustar Jogo"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Ajustar orig."
|
#define MSG_SET_ORIGIN "Ajustar orig."
|
||||||
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Desactivar motores"
|
#define MSG_DISABLE_STEPPERS "Desactivar motores"
|
||||||
#define MSG_AUTO_HOME "Ir para origem"
|
#define MSG_AUTO_HOME "Ir para origem"
|
||||||
#define MSG_LEVEL_BED_HOMING "Indo para origem"
|
#define MSG_LEVEL_BED_HOMING "Indo para origem"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Definir desvio"
|
#define MSG_SET_HOME_OFFSETS "Definir desvio"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Definir origem"
|
#define MSG_SET_ORIGIN "Definir origem"
|
||||||
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Desactivar motores"
|
#define MSG_DISABLE_STEPPERS "Desactivar motores"
|
||||||
#define MSG_AUTO_HOME "Ir para origem"
|
#define MSG_AUTO_HOME "Ir para origem"
|
||||||
#define MSG_LEVEL_BED_HOMING "Indo para origem"
|
#define MSG_LEVEL_BED_HOMING "Indo para origem"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Definir desvio"
|
#define MSG_SET_HOME_OFFSETS "Definir desvio"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Definir origem"
|
#define MSG_SET_ORIGIN "Definir origem"
|
||||||
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA "Pre-aquecer PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
#define MSG_PREHEAT_PLA_N "Pre-aquecer PLA"
|
||||||
|
@ -43,7 +43,10 @@
|
|||||||
#define MSG_DISABLE_STEPPERS "Выкл. двигатели"
|
#define MSG_DISABLE_STEPPERS "Выкл. двигатели"
|
||||||
#define MSG_AUTO_HOME "Парковка"
|
#define MSG_AUTO_HOME "Парковка"
|
||||||
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
#define MSG_LEVEL_BED_HOMING "Homing XYZ"
|
||||||
|
#define MSG_LEVEL_BED_WAITING "Click to Begin"
|
||||||
|
#define MSG_LEVEL_BED_DONE "Leveling Done!"
|
||||||
#define MSG_SET_HOME_OFFSETS "Запомнить парковку"
|
#define MSG_SET_HOME_OFFSETS "Запомнить парковку"
|
||||||
|
#define MSG_HOME_OFFSETS_APPLIED "Offsets applied"
|
||||||
#define MSG_SET_ORIGIN "Запомнить ноль"
|
#define MSG_SET_ORIGIN "Запомнить ноль"
|
||||||
#define MSG_PREHEAT_PLA "Преднагрев PLA"
|
#define MSG_PREHEAT_PLA "Преднагрев PLA"
|
||||||
#define MSG_PREHEAT_PLA_N "Греть PLA Сопло "
|
#define MSG_PREHEAT_PLA_N "Греть PLA Сопло "
|
||||||
|
@ -252,7 +252,7 @@ static void lcd_status_screen();
|
|||||||
#endif //!ENCODER_RATE_MULTIPLIER
|
#endif //!ENCODER_RATE_MULTIPLIER
|
||||||
#define END_MENU() \
|
#define END_MENU() \
|
||||||
if (encoderLine >= _menuItemNr) { encoderPosition = _menuItemNr * (ENCODER_STEPS_PER_MENU_ITEM) - 1; encoderLine = _menuItemNr - 1; }\
|
if (encoderLine >= _menuItemNr) { encoderPosition = _menuItemNr * (ENCODER_STEPS_PER_MENU_ITEM) - 1; encoderLine = _menuItemNr - 1; }\
|
||||||
if (encoderLine >= currentMenuViewOffset + LCD_HEIGHT) { currentMenuViewOffset = encoderLine - (LCD_HEIGHT) + 1; lcdDrawUpdate = 1; _lineNr = currentMenuViewOffset - 1; _drawLineNr = -1; } \
|
if (encoderLine >= currentMenuViewOffset + LCD_HEIGHT) { currentMenuViewOffset = encoderLine - (LCD_HEIGHT) + 1; lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW; _lineNr = currentMenuViewOffset - 1; _drawLineNr = -1; } \
|
||||||
} } while(0)
|
} } while(0)
|
||||||
|
|
||||||
/** Used variables to keep track of the menu */
|
/** Used variables to keep track of the menu */
|
||||||
@ -280,7 +280,15 @@ uint8_t lcd_status_update_delay;
|
|||||||
bool ignore_click = false;
|
bool ignore_click = false;
|
||||||
bool wait_for_unclick;
|
bool wait_for_unclick;
|
||||||
bool defer_return_to_status = false;
|
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) */
|
|
||||||
|
enum LCDHandlerAction {
|
||||||
|
LCD_DRAW_UPDATE_NONE,
|
||||||
|
LCD_DRAW_UPDATE_CALL_REDRAW,
|
||||||
|
LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW,
|
||||||
|
LCD_DRAW_UPDATE_CALL_NO_REDRAW,
|
||||||
|
};
|
||||||
|
|
||||||
|
uint8_t lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW; // Set 1 or 2 when the LCD needs to draw, decrements 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.
|
// Variables used when editing values.
|
||||||
const char* editLabel;
|
const char* editLabel;
|
||||||
@ -298,7 +306,7 @@ float raw_Ki, raw_Kd;
|
|||||||
static void lcd_goto_menu(menuFunc_t menu, const bool feedback = false, const uint32_t encoder = 0) {
|
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;
|
||||||
lcdDrawUpdate = 2;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW;
|
||||||
#if ENABLED(NEWPANEL)
|
#if ENABLED(NEWPANEL)
|
||||||
encoderPosition = encoder;
|
encoderPosition = encoder;
|
||||||
if (feedback) lcd_quick_feedback();
|
if (feedback) lcd_quick_feedback();
|
||||||
@ -524,7 +532,7 @@ void lcd_set_home_offsets() {
|
|||||||
if (encoderPosition != 0) {
|
if (encoderPosition != 0) {
|
||||||
int distance = (int)encoderPosition * BABYSTEP_MULTIPLICATOR;
|
int distance = (int)encoderPosition * BABYSTEP_MULTIPLICATOR;
|
||||||
encoderPosition = 0;
|
encoderPosition = 0;
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
#if ENABLED(COREXY) || ENABLED(COREXZ)
|
#if ENABLED(COREXY) || ENABLED(COREXZ)
|
||||||
#if ENABLED(BABYSTEP_XY)
|
#if ENABLED(BABYSTEP_XY)
|
||||||
switch(axis) {
|
switch(axis) {
|
||||||
@ -948,7 +956,7 @@ static void _lcd_move(const char* name, AxisEnum axis, int min, int max) {
|
|||||||
if (max_software_endstops) NOMORE(current_position[axis], max);
|
if (max_software_endstops) NOMORE(current_position[axis], max);
|
||||||
encoderPosition = 0;
|
encoderPosition = 0;
|
||||||
line_to_current(axis);
|
line_to_current(axis);
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
}
|
}
|
||||||
if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis]));
|
if (lcdDrawUpdate) lcd_implementation_drawedit(name, ftostr31(current_position[axis]));
|
||||||
if (LCD_CLICKED) lcd_goto_previous_menu();
|
if (LCD_CLICKED) lcd_goto_previous_menu();
|
||||||
@ -977,7 +985,7 @@ static void lcd_move_e(
|
|||||||
current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
|
current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
|
||||||
encoderPosition = 0;
|
encoderPosition = 0;
|
||||||
line_to_current(E_AXIS);
|
line_to_current(E_AXIS);
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
}
|
}
|
||||||
if (lcdDrawUpdate) {
|
if (lcdDrawUpdate) {
|
||||||
PGM_P pos_label;
|
PGM_P pos_label;
|
||||||
@ -1449,7 +1457,7 @@ static void lcd_control_volumetric_menu() {
|
|||||||
lcd_contrast &= 0x3F;
|
lcd_contrast &= 0x3F;
|
||||||
#endif
|
#endif
|
||||||
encoderPosition = 0;
|
encoderPosition = 0;
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
u8g.setContrast(lcd_contrast);
|
u8g.setContrast(lcd_contrast);
|
||||||
}
|
}
|
||||||
if (lcdDrawUpdate) {
|
if (lcdDrawUpdate) {
|
||||||
@ -1590,7 +1598,7 @@ static void lcd_control_volumetric_menu() {
|
|||||||
static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
|
static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
|
||||||
lcd_save_previous_menu(); \
|
lcd_save_previous_menu(); \
|
||||||
\
|
\
|
||||||
lcdDrawUpdate = 2; \
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW; \
|
||||||
currentMenu = menu_edit_ ## _name; \
|
currentMenu = menu_edit_ ## _name; \
|
||||||
\
|
\
|
||||||
editLabel = pstr; \
|
editLabel = pstr; \
|
||||||
@ -1672,7 +1680,7 @@ menu_edit_type(unsigned long, long5, ftostr5, 0.01)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
void lcd_quick_feedback() {
|
void lcd_quick_feedback() {
|
||||||
lcdDrawUpdate = 2;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW;
|
||||||
next_button_update_ms = millis() + 500;
|
next_button_update_ms = millis() + 500;
|
||||||
|
|
||||||
#if ENABLED(LCD_USE_I2C_BUZZER)
|
#if ENABLED(LCD_USE_I2C_BUZZER)
|
||||||
@ -1837,11 +1845,27 @@ bool lcd_blink() {
|
|||||||
* - Act on RepRap World keypad input
|
* - Act on RepRap World keypad input
|
||||||
* - Update the encoder position
|
* - Update the encoder position
|
||||||
* - Apply acceleration to the encoder position
|
* - Apply acceleration to the encoder position
|
||||||
|
* - Set lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW on controller events
|
||||||
* - Reset the Info Screen timeout if there's any input
|
* - Reset the Info Screen timeout if there's any input
|
||||||
* - Update status indicators, if any
|
* - Update status indicators, if any
|
||||||
* - Clear the LCD if lcdDrawUpdate == 2
|
|
||||||
*
|
*
|
||||||
* Warning: This function is called from interrupt context!
|
* Run the current LCD menu handler callback function:
|
||||||
|
* - Call the handler only if lcdDrawUpdate != LCD_DRAW_UPDATE_NONE
|
||||||
|
* - Before calling the handler, LCD_DRAW_UPDATE_CALL_NO_REDRAW => LCD_DRAW_UPDATE_NONE
|
||||||
|
* - Call the menu handler. Menu handlers should do the following:
|
||||||
|
* - If a value changes, set lcdDrawUpdate to LCD_DRAW_UPDATE_CALL_REDRAW
|
||||||
|
* - if (lcdDrawUpdate) { redraw }
|
||||||
|
* - Before exiting the handler set lcdDrawUpdate to:
|
||||||
|
* - LCD_DRAW_UPDATE_CALL_REDRAW or LCD_DRAW_UPDATE_NONE for no callbacks until the next controller event.
|
||||||
|
* - LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW to clear screen, LCD_DRAW_UPDATE_CALL_REDRAW on the next loop.
|
||||||
|
* - LCD_DRAW_UPDATE_CALL_NO_REDRAW for a callback with no forced redraw on the next loop.
|
||||||
|
* - NOTE: For some displays, the menu handler may be called 2 or more times per loop.
|
||||||
|
*
|
||||||
|
* After the menu handler callback runs (or not):
|
||||||
|
* - Clear the LCD if lcdDrawUpdate == LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW
|
||||||
|
* - Update lcdDrawUpdate for the next loop (i.e., move one state down, usually)
|
||||||
|
*
|
||||||
|
* No worries. This function is only called from the main thread.
|
||||||
*/
|
*/
|
||||||
void lcd_update() {
|
void lcd_update() {
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
@ -1854,7 +1878,7 @@ void lcd_update() {
|
|||||||
|
|
||||||
bool sd_status = IS_SD_INSERTED;
|
bool sd_status = IS_SD_INSERTED;
|
||||||
if (sd_status != lcd_sd_status && lcd_detected()) {
|
if (sd_status != lcd_sd_status && lcd_detected()) {
|
||||||
lcdDrawUpdate = 2;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW;
|
||||||
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.
|
||||||
#if ENABLED(LCD_PROGRESS_BAR)
|
#if ENABLED(LCD_PROGRESS_BAR)
|
||||||
currentMenu == lcd_status_screen
|
currentMenu == lcd_status_screen
|
||||||
@ -1933,13 +1957,13 @@ void lcd_update() {
|
|||||||
encoderDiff = 0;
|
encoderDiff = 0;
|
||||||
}
|
}
|
||||||
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
|
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
}
|
}
|
||||||
#endif //ULTIPANEL
|
#endif //ULTIPANEL
|
||||||
|
|
||||||
if (currentMenu == lcd_status_screen) {
|
if (currentMenu == lcd_status_screen) {
|
||||||
if (!lcd_status_update_delay) {
|
if (!lcd_status_update_delay) {
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
lcd_status_update_delay = 10; /* redraw the main screen every second. This is easier then trying keep track of all things that change on the screen */
|
lcd_status_update_delay = 10; /* redraw the main screen every second. This is easier then trying keep track of all things that change on the screen */
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -1948,6 +1972,9 @@ void lcd_update() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (lcdDrawUpdate) {
|
if (lcdDrawUpdate) {
|
||||||
|
|
||||||
|
if (lcdDrawUpdate == LCD_DRAW_UPDATE_CALL_NO_REDRAW) lcdDrawUpdate = LCD_DRAW_UPDATE_NONE;
|
||||||
|
|
||||||
#if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display
|
#if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display
|
||||||
bool blink = lcd_blink();
|
bool blink = lcd_blink();
|
||||||
u8g.firstPage();
|
u8g.firstPage();
|
||||||
@ -1971,14 +1998,29 @@ void lcd_update() {
|
|||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
|
|
||||||
// Return to Status Screen after a timeout
|
// Return to Status Screen after a timeout
|
||||||
if (!defer_return_to_status && currentMenu != lcd_status_screen && millis() > return_to_status_ms) {
|
if (defer_return_to_status)
|
||||||
|
return_to_status_ms = ms + LCD_TIMEOUT_TO_STATUS;
|
||||||
|
else if (currentMenu != lcd_status_screen && millis() > return_to_status_ms) {
|
||||||
lcd_return_to_status();
|
lcd_return_to_status();
|
||||||
lcdDrawUpdate = 2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // ULTIPANEL
|
#endif // ULTIPANEL
|
||||||
|
|
||||||
if (lcdDrawUpdate && --lcdDrawUpdate) lcd_implementation_clear();
|
switch (lcdDrawUpdate) {
|
||||||
|
case LCD_DRAW_UPDATE_NONE:
|
||||||
|
// do nothing
|
||||||
|
case LCD_DRAW_UPDATE_CALL_NO_REDRAW:
|
||||||
|
// changes to LCD_DRAW_UPDATE_NONE before call
|
||||||
|
break;
|
||||||
|
case LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW:
|
||||||
|
lcd_implementation_clear();
|
||||||
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_REDRAW;
|
||||||
|
break;
|
||||||
|
case LCD_DRAW_UPDATE_CALL_REDRAW:
|
||||||
|
lcdDrawUpdate = LCD_DRAW_UPDATE_NONE;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
|
next_lcd_update_ms = ms + LCD_UPDATE_INTERVAL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1995,7 +2037,7 @@ void lcd_finishstatus(bool persist=false) {
|
|||||||
expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
|
expire_status_ms = persist ? 0 : progress_bar_ms + PROGRESS_MSG_EXPIRE;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
lcdDrawUpdate = 2;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CLEAR_CALL_REDRAW;
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_LCD_DISPLAY)
|
#if ENABLED(FILAMENT_LCD_DISPLAY)
|
||||||
previous_lcd_status_ms = millis(); //get status message to show up for a while
|
previous_lcd_status_ms = millis(); //get status message to show up for a while
|
||||||
@ -2223,13 +2265,13 @@ char *ftostr32(const float& x) {
|
|||||||
return conv;
|
return conv;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert signed float to string (len 5 or 6) with 1.234 / -1.234 format
|
// Convert signed float to string (6 digit) with -1.234 / _0.000 / +1.234 format
|
||||||
char* ftostr43(const float& x) {
|
char* ftostr43(const float& x, char plus/*=' '*/) {
|
||||||
long xx = x * 1000;
|
long xx = x * 1000;
|
||||||
char *conv_ptr = conv;
|
if (xx == 0)
|
||||||
if (xx >= 0) {
|
conv[0] = ' ';
|
||||||
conv_ptr++;
|
else if (xx > 0)
|
||||||
}
|
conv[0] = plus;
|
||||||
else {
|
else {
|
||||||
xx = -xx;
|
xx = -xx;
|
||||||
conv[0] = '-';
|
conv[0] = '-';
|
||||||
@ -2240,7 +2282,7 @@ char* ftostr43(const float& x) {
|
|||||||
conv[4] = (xx / 10) % 10 + '0';
|
conv[4] = (xx / 10) % 10 + '0';
|
||||||
conv[5] = (xx) % 10 + '0';
|
conv[5] = (xx) % 10 + '0';
|
||||||
conv[6] = 0;
|
conv[6] = 0;
|
||||||
return conv_ptr;
|
return conv;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Convert unsigned float to string with 1.23 format
|
// Convert unsigned float to string with 1.23 format
|
||||||
@ -2440,25 +2482,44 @@ char* ftostr52(const float& x) {
|
|||||||
* - Movement adjusts the Z axis
|
* - Movement adjusts the Z axis
|
||||||
* - Click saves the Z and goes to the next mesh point
|
* - Click saves the Z and goes to the next mesh point
|
||||||
*/
|
*/
|
||||||
static void _lcd_level_bed() {
|
static void _lcd_level_bed_procedure() {
|
||||||
|
static bool mbl_wait_for_move = false;
|
||||||
|
// Menu handlers may be called in a re-entrant fashion
|
||||||
|
// if they call st_synchronize or plan_buffer_line. So
|
||||||
|
// while waiting for a move we just ignore new input.
|
||||||
|
if (mbl_wait_for_move) {
|
||||||
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_NO_REDRAW;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ENCODER_DIRECTION_NORMAL();
|
ENCODER_DIRECTION_NORMAL();
|
||||||
if ((encoderPosition != 0) && (movesplanned() <= 3)) {
|
|
||||||
|
// Encoder wheel adjusts the Z position
|
||||||
|
if (encoderPosition != 0 && movesplanned() <= 3) {
|
||||||
refresh_cmd_timeout();
|
refresh_cmd_timeout();
|
||||||
current_position[Z_AXIS] += float((int)encoderPosition) * (MBL_Z_STEP);
|
current_position[Z_AXIS] += float((int)encoderPosition) * (MBL_Z_STEP);
|
||||||
if (min_software_endstops) NOLESS(current_position[Z_AXIS], Z_MIN_POS);
|
if (min_software_endstops) NOLESS(current_position[Z_AXIS], Z_MIN_POS);
|
||||||
if (max_software_endstops) NOMORE(current_position[Z_AXIS], Z_MAX_POS);
|
if (max_software_endstops) NOMORE(current_position[Z_AXIS], Z_MAX_POS);
|
||||||
encoderPosition = 0;
|
encoderPosition = 0;
|
||||||
line_to_current(Z_AXIS);
|
line_to_current(Z_AXIS);
|
||||||
lcdDrawUpdate = 1;
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_NO_REDRAW;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update on first display, then only on updates to Z position
|
||||||
if (lcdDrawUpdate) {
|
if (lcdDrawUpdate) {
|
||||||
float v = current_position[Z_AXIS] - MESH_HOME_SEARCH_Z;
|
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)));
|
lcd_implementation_drawedit(PSTR(MSG_MOVE_Z), ftostr43(v + (v < 0 ? -0.0001 : 0.0001), '+'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// We want subsequent calls, but don't force redraw
|
||||||
|
// Set here so it can be overridden by lcd_return_to_status below
|
||||||
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_NO_REDRAW;
|
||||||
|
|
||||||
|
// Click sets the current Z and moves to the next position
|
||||||
static bool debounce_click = false;
|
static bool debounce_click = false;
|
||||||
if (LCD_CLICKED) {
|
if (LCD_CLICKED) {
|
||||||
if (!debounce_click) {
|
if (!debounce_click) {
|
||||||
debounce_click = true;
|
debounce_click = true; // ignore multiple "clicks" in a row
|
||||||
int ix = _lcd_level_bed_position % (MESH_NUM_X_POINTS),
|
int ix = _lcd_level_bed_position % (MESH_NUM_X_POINTS),
|
||||||
iy = _lcd_level_bed_position / (MESH_NUM_X_POINTS);
|
iy = _lcd_level_bed_position / (MESH_NUM_X_POINTS);
|
||||||
if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag
|
if (iy & 1) ix = (MESH_NUM_X_POINTS - 1) - ix; // Zig zag
|
||||||
@ -2466,11 +2527,21 @@ char* ftostr52(const float& x) {
|
|||||||
_lcd_level_bed_position++;
|
_lcd_level_bed_position++;
|
||||||
if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) {
|
if (_lcd_level_bed_position == (MESH_NUM_X_POINTS) * (MESH_NUM_Y_POINTS)) {
|
||||||
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
|
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
|
||||||
|
mbl_wait_for_move = true;
|
||||||
line_to_current(Z_AXIS);
|
line_to_current(Z_AXIS);
|
||||||
st_synchronize();
|
st_synchronize();
|
||||||
mbl.active = 1;
|
mbl.active = 1;
|
||||||
enqueue_and_echo_commands_P(PSTR("G28"));
|
enqueue_and_echo_commands_P(PSTR("G28"));
|
||||||
|
mbl_wait_for_move = false;
|
||||||
lcd_return_to_status();
|
lcd_return_to_status();
|
||||||
|
#if ENABLED(NEWPANEL)
|
||||||
|
lcd_quick_feedback();
|
||||||
|
#endif
|
||||||
|
LCD_ALERTMESSAGEPGM(MSG_LEVEL_BED_DONE);
|
||||||
|
#if HAS_BUZZER
|
||||||
|
buzz(200, 659);
|
||||||
|
buzz(200, 698);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
|
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
|
||||||
@ -2481,7 +2552,6 @@ char* ftostr52(const float& x) {
|
|||||||
current_position[X_AXIS] = mbl.get_x(ix);
|
current_position[X_AXIS] = mbl.get_x(ix);
|
||||||
current_position[Y_AXIS] = mbl.get_y(iy);
|
current_position[Y_AXIS] = mbl.get_y(iy);
|
||||||
line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
|
line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
|
||||||
lcdDrawUpdate = 1;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -2490,32 +2560,49 @@ char* ftostr52(const float& x) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
static void _lcd_level_bed_homing_done() {
|
||||||
* MBL Move to mesh starting point
|
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_WAITING), NULL);
|
||||||
*/
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_NO_REDRAW;
|
||||||
static void _lcd_level_bed_homing() {
|
if (LCD_CLICKED) {
|
||||||
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;
|
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]);
|
plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
|
||||||
current_position[X_AXIS] = MESH_MIN_X;
|
current_position[X_AXIS] = MESH_MIN_X;
|
||||||
current_position[Y_AXIS] = MESH_MIN_Y;
|
current_position[Y_AXIS] = MESH_MIN_Y;
|
||||||
line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
|
line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
|
||||||
_lcd_level_bed_position = 0;
|
_lcd_level_bed_position = 0;
|
||||||
lcd_goto_menu(_lcd_level_bed);
|
lcd_goto_menu(_lcd_level_bed_procedure, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MBL Move to mesh starting point
|
||||||
|
*/
|
||||||
|
static void _lcd_level_bed_homing() {
|
||||||
|
if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR(MSG_LEVEL_BED_HOMING), NULL);
|
||||||
|
lcdDrawUpdate = LCD_DRAW_UPDATE_CALL_NO_REDRAW;
|
||||||
|
if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS])
|
||||||
|
lcd_goto_menu(_lcd_level_bed_homing_done);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MBL Continue Bed Leveling...
|
||||||
|
*/
|
||||||
|
static void _lcd_level_bed_continue() {
|
||||||
|
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"));
|
||||||
|
lcd_goto_menu(_lcd_level_bed_homing, true);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MBL entry-point
|
* MBL entry-point
|
||||||
*/
|
*/
|
||||||
static void lcd_level_bed() {
|
static void lcd_level_bed() {
|
||||||
defer_return_to_status = true;
|
START_MENU();
|
||||||
axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false;
|
MENU_ITEM(back, "Cancel", lcd_prepare_menu);
|
||||||
mbl.reset();
|
MENU_ITEM(submenu, MSG_LEVEL_BED, _lcd_level_bed_continue);
|
||||||
enqueue_and_echo_commands_P(PSTR("G28"));
|
END_MENU();
|
||||||
lcd_goto_menu(_lcd_level_bed_homing);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // MANUAL_BED_LEVELING
|
#endif // MANUAL_BED_LEVELING
|
||||||
|
@ -156,7 +156,7 @@ char* ftostr4sign(const float& x);
|
|||||||
char* ftostr31ns(const float& x); // float to string without sign character
|
char* ftostr31ns(const float& x); // float to string without sign character
|
||||||
char* ftostr31(const float& x);
|
char* ftostr31(const float& x);
|
||||||
char* ftostr32(const float& x);
|
char* ftostr32(const float& x);
|
||||||
char* ftostr43(const float& x);
|
char* ftostr43(const float& x, char plus=' ');
|
||||||
char* ftostr12ns(const float& x);
|
char* ftostr12ns(const float& x);
|
||||||
char* ftostr32sp(const float& x); // remove zero-padding from ftostr32
|
char* ftostr32sp(const float& x); // remove zero-padding from ftostr32
|
||||||
char* ftostr5(const float& x);
|
char* ftostr5(const float& x);
|
||||||
|
Loading…
Reference in New Issue
Block a user