bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

More Advanced Pause options (#12984)

Browse Source
This commit is contained in:
InsanityAutomation
2019-02-06 07:39:42 -05:00
committed by Scott Lahteine
parent 19cf72e057
commit 413e303ad5
82 changed files with 188 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/language/language_de.h
View File

@ -394,7 +394,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Mehr entladen")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Druck weiter")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Düse: ")
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Auslaufsensor")
#define MSG_RUNOUT_SENSOR _UxGT("Auslaufsensor")
#define MSG_ERR_HOMING_FAILED _UxGT("Homing gescheitert")
#define MSG_ERR_PROBING_FAILED _UxGT("Probing gescheitert")
#define MSG_M600_TOO_COLD _UxGT("M600: zu kalt")

4
Marlin/src/lcd/language/language_en.h
View File

@ -1104,8 +1104,8 @@
#ifndef MSG_FILAMENT_CHANGE_NOZZLE
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Nozzle: ")
#endif
#ifndef MSG_RUNOUT_SENSOR_ENABLE
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Runout Sensor")
#ifndef MSG_RUNOUT_SENSOR
#define MSG_RUNOUT_SENSOR _UxGT("Runout Sensor")
#endif
#ifndef MSG_ERR_HOMING_FAILED
#define MSG_ERR_HOMING_FAILED _UxGT("Homing failed")

2
Marlin/src/lcd/language/language_it.h
View File

@ -390,7 +390,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Spurga di più")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Riprendi stampa")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Ugello: ")
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Sens.filo terminato")
#define MSG_RUNOUT_SENSOR _UxGT("Sens.filo terminato")
#define MSG_ERR_HOMING_FAILED _UxGT("Home fallito")
#define MSG_ERR_PROBING_FAILED _UxGT("Sondaggio fallito")
#define MSG_M600_TOO_COLD _UxGT("M600:Troppo freddo")

2
Marlin/src/lcd/language/language_ko_KR.h
View File

@ -372,7 +372,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Purge more")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Continue")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Nozzle: ")
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Runout Sensor")
#define MSG_RUNOUT_SENSOR _UxGT("Runout Sensor")
#define MSG_ERR_HOMING_FAILED _UxGT("Homing failed")
#define MSG_ERR_PROBING_FAILED _UxGT("Probing failed")
#define MSG_M600_TOO_COLD _UxGT("M600: Too cold")

2
Marlin/src/lcd/language/language_pt-br.h
View File

@ -396,7 +396,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Purgar mais")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Continuar Impressão")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Bocal: ")
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Sensor filamento")
#define MSG_RUNOUT_SENSOR _UxGT("Sensor filamento")
#define MSG_ERR_HOMING_FAILED _UxGT("Falha ao ir à origem")
#define MSG_ERR_PROBING_FAILED _UxGT("Falha ao sondar")
#define MSG_M600_TOO_COLD _UxGT("M600: Muito frio")

2
Marlin/src/lcd/language/language_sk.h
View File

@ -403,7 +403,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Vytlačiť viacej")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Obnoviť tlač")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Tryska: ")
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Senzor filamentu")
#define MSG_RUNOUT_SENSOR _UxGT("Senzor filamentu")
#define MSG_ERR_HOMING_FAILED _UxGT("Parkovanie zlyhalo")
#define MSG_ERR_PROBING_FAILED _UxGT("Kalibrácia zlyhala")
#define MSG_M600_TOO_COLD _UxGT("M600: Príliš studený")

2
Marlin/src/lcd/language/language_tr.h
View File

@ -388,7 +388,7 @@
#define MSG_FILAMENT_CHANGE_OPTION_PURGE _UxGT("Daha Fazla Tasviye")
#define MSG_FILAMENT_CHANGE_OPTION_RESUME _UxGT("Baskıyı sürdür")
#define MSG_FILAMENT_CHANGE_NOZZLE _UxGT(" Nozul: ")
#define MSG_RUNOUT_SENSOR_ENABLE _UxGT("Runout Sensörü")
#define MSG_RUNOUT_SENSOR _UxGT("Runout Sensörü")
#define MSG_ERR_HOMING_FAILED _UxGT("Sıfırlama Başarısız")
#define MSG_ERR_PROBING_FAILED _UxGT("Probing Başarısız")
#define MSG_M600_TOO_COLD _UxGT("M600: Çok Soğuk")

2
Marlin/src/lcd/menu/menu_configuration.cpp
View File

@ -313,7 +313,7 @@ void menu_configuration() {
#endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR_ENABLE, &runout.enabled, runout.reset);
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
#endif
#if ENABLED(POWER_LOSS_RECOVERY)

11
Marlin/src/lcd/menu/menu_filament.cpp
View File

@ -31,7 +31,9 @@
#include "menu.h"
#include "../../module/temperature.h"
#include "../../feature/pause.h"
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
#include "../../feature/runout.h"
#endif
//
// Change Filament > Change/Unload/Load Filament
//
@ -349,8 +351,13 @@ void menu_advanced_pause_option() {
#if LCD_HEIGHT > 2
STATIC_ITEM(MSG_FILAMENT_CHANGE_OPTION_HEADER, true, false);
#endif
MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_RESUME, lcd_advanced_pause_resume_print);
MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_PURGE, lcd_advanced_pause_extrude_more);
#if ENABLED(FILAMENT_RUNOUT_SENSOR)
if (runout.filament_ran_out)
MENU_ITEM_EDIT_CALLBACK(bool, MSG_RUNOUT_SENSOR, &runout.enabled, runout.reset);
else
#endif
MENU_ITEM(function, MSG_FILAMENT_CHANGE_OPTION_RESUME, lcd_advanced_pause_resume_print);
END_MENU();
}