Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,11 @@ script:
- opt_set MOTHERBOARD BOARD_MINIRAMBO
- build_marlin
#
# Test FILAMENT_CHANGE_FEATURE and LCD_INFO_MENU
# Test FILAMENTCHANGEENABLE, MANUAL_FILAMENT_CHANGE, and LCD_INFO_MENU
#
- restore_configs
- opt_enable ULTIMAKERCONTROLLER
- opt_enable_adv FILAMENT_CHANGE_FEATURE LCD_INFO_MENU
- opt_enable_adv FILAMENTCHANGEENABLE MANUAL_FILAMENT_CHANGE LCD_INFO_MENU
- build_marlin
#
# Enable filament sensor
Expand Down
13 changes: 11 additions & 2 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
15 changes: 12 additions & 3 deletions Marlin/example_configurations/Cartesio/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ const unsigned int dropsegments = 5; //everything with less than this number of
#define FILAMENT_CHANGE_RETRACT_LENGTH 1 // Initial retract in mm
// It is a short retract used immediately after print interrupt before move to filament exchange position
#define FILAMENT_CHANGE_RETRACT_FEEDRATE 60 // Initial retract feedrate in mm/s
//#define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // Unload filament length from hotend in mm
#define FILAMENT_CHANGE_UNLOAD_LENGTH 100 // Unload filament length from hotend in mm
// Longer length for bowden printers to unload filament from whole bowden tube,
// shorter lenght for printers without bowden to unload filament from extruder only,
// 0 to disable unloading for manual unloading
Expand All @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/Felix/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/Hephestos/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/Hephestos_2/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/K8200/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,17 @@ const unsigned int dropsegments = 2; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/RigidBot/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/SCARA/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/WITBOX/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/delta/generic/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -577,8 +577,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/makibox/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
13 changes: 11 additions & 2 deletions Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,17 @@ const unsigned int dropsegments = 5; //everything with less than this number of
// Filament can be extruded repeatedly from the filament exchange menu to fill the hotend,
// or until outcoming filament color is not clear for filament color change
#define FILAMENT_CHANGE_EXTRUDE_FEEDRATE 3 // Extrude filament feedrate in mm/s - must be slower than load feedrate
#endif
#endif

//#define MANUAL_FILAMENT_CHANGE // Add Manual Filament Change to the LCD Menus
#if ENABLED(MANUAL_FILAMENT_CHANGE)
#define MFC_LOAD_LENGTH_CM 55
#define MFC_NORMAL_SPEED 100
#define MFC_SLOW_SPEED 3.5
#endif

#endif // FILAMENT_CHANGE_FEATURE

#endif // ULTIPANEL

/******************************************************************************\
* enable this section if you have TMC26X motor drivers.
Expand Down
19 changes: 19 additions & 0 deletions Marlin/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -651,4 +651,23 @@
#endif
#endif // LCD_HEIGHT < 4

#ifndef MSG_CHANGE_FILAMENT
#define MSG_CHANGE_FILAMENT "Filament"
#endif
#ifndef MSG_EJECT_FILAMENT
#define MSG_EJECT_FILAMENT "Eject"
#endif
#ifndef MSG_INSERT_FILAMENT
#define MSG_INSERT_FILAMENT "Insert"
#endif
#ifndef MSG_INSERT_FILAMENT_SLOW
#define MSG_INSERT_FILAMENT_SLOW "Slow Insert"
#endif
#ifndef MSG_STOP_EJECT
#define MSG_STOP_EJECT "Stop " MSG_EJECT_FILAMENT
#endif
#ifndef MSG_STOP_INSERT
#define MSG_STOP_INSERT "Stop " MSG_INSERT_FILAMENT
#endif

#endif // LANGUAGE_EN_H
5 changes: 5 additions & 0 deletions Marlin/language_pt-br.h
Original file line number Diff line number Diff line change
Expand Up @@ -170,4 +170,9 @@
#define MSG_DELTA_CALIBRATE_Z "Calibrar Z"
#define MSG_DELTA_CALIBRATE_CENTER "Calibrar Centro"

#define MSG_CHANGE_FILAMENT "Filamento"
#define MSG_EJECT_FILAMENT "Retirar"
#define MSG_INSERT_FILAMENT "Inserir"
#define MSG_INSERT_FILAMENT_SLOW "Lentamente"

#endif // LANGUAGE_PT_BR_H
Loading