Skip to content

Manual Filament Change feature #3601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
schirrel wants to merge 9 commits into from
Closed

Manual Filament Change feature #3601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8439b97
Change filament add to the menu
Apr 23, 2016
87cf0bd
Remove spaces in marlin main
Apr 23, 2016
3c62e76
Moving variable to marlin main
Apr 23, 2016
16c17e4
Fixing Issues. Moving functionatilies to ultralcd and restoring confi…
Apr 23, 2016
1099896
reset configuration
Apr 23, 2016
4d4cf08
Everything working from ultralcd
Apr 23, 2016
09b2db4
CREATE CONFIGURABLE VARIABLES
Apr 24, 2016
2340f07
CREATE ifndef in language_en and change the local of filamentchanges …
Apr 24, 2016
21fc34c
fix all configuration files
Apr 25, 2016
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
8 changes: 8 additions & 0 deletions Marlin/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1060,6 +1060,14 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
//define BlinkM/CyzRgb Support
//#define BLINKM



/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
3 changes: 2 additions & 1 deletion Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,8 @@ void setup() {
* - Call LCD update
*/
void loop() {
if (commands_in_queue < BUFSIZE) get_available_commands();

if (commands_in_queue < BUFSIZE) get_available_commands();

#if ENABLED(SDSUPPORT)
card.checkautostart(false);
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/Felix/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,7 +1041,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/Hephestos/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/Hephestos_2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/K8200/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/RigidBot/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/SCARA/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,7 +1066,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/TAZ4/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/WITBOX/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/adafruit/ST7565/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/delta/biv2.5/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/delta/generic/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/delta/kossel_mini/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/delta/kossel_pro/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/delta/kossel_xl/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/makibox/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
7 changes: 6 additions & 1 deletion Marlin/example_configurations/tvrrug/Round2/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,7 +1052,12 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo

//define BlinkM/CyzRgb Support
//#define BLINKM

/*
* Define the size of the full retract and insert filament. The feed rate for the complete insertion/retract and the feedrate for the slow inserction
*/
#define FILAMENTCOMPLETCHANGE_SIZE 75
#define FILAMENTCOMPLETCHANGE_FAST_FEEDRATE 100
#define FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE 1.5
/*********************************************************************\
* R/C SERVO support
* Sponsored by TrinityLabs, Reworked by codexmas
Expand Down
13 changes: 12 additions & 1 deletion Marlin/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,5 +508,16 @@
#ifndef MSG_DELTA_CALIBRATE_CENTER
#define MSG_DELTA_CALIBRATE_CENTER "Calibrate Center"
#endif

#ifndef MSG_CHANGE_FILAMENT
#define MSG_CHANGE_FILAMENT "Filament"
#endif
#ifndef MSG_REMOVE_FILAMENT
#define MSG_REMOVE_FILAMENT "Remove"
#endif
#ifndef MSG_INSERT_FILAMENT
#define MSG_INSERT_FILAMENT "Insert"
#endif
#ifndef MSG_INSERT_FILAMENT_SLOW
#define MSG_INSERT_FILAMENT_SLOW "Slow Insert"
#endif
#endif // LANGUAGE_EN_H
Copy link
Contributor

@Blue-Marlin Blue-Marlin Apr 23, 2016 •
edited by thinkyhead
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we have that strange #ifndef #endif structures around the definitions in the English language file?
Do you see any warnings about redefined strings?
What language do you see for the new entries on your display if you set the language to pt-br?

Copy link
Member

@thinkyhead thinkyhead Apr 24, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these rhetorical questions you are asking? Your sarcasm doesn't necessarily translate. (But the contempt is loud and clear.)

Simple
straightforwardness
is
better.

Even better: just patch it up and submit a PR to his branch.

Copy link
Author

@schirrel schirrel Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Blue-Marlin i only have pasted my 4 variables at the end of the file i havent done any ifndef. ALso o see no warnings and i have done this 4 lines in pt-br file also, so i see it at my language.

@thinkyhead it was for me or for @Blue-Marlin? The question about sacarsm

Copy link
Contributor

@Blue-Marlin Blue-Marlin Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes " rhetorical questions" and "sarcasm" have been addressed to me.

Ehhh, 'variables'?
No warnings?

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:511:0: warning: "MSG_CHANGE_FILAMENT" redefined [enabled by default]

 #define MSG_CHANGE_FILAMENT                 "Filament"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:174:0: note: this is the location of the previous definition

 #define MSG_CHANGE_FILAMENT                 "Filamento"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:512:0: warning: "MSG_REMOVE_FILAMENT" redefined [enabled by default]

 #define MSG_REMOVE_FILAMENT                 "Remove"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:175:0: note: this is the location of the previous definition

 #define MSG_REMOVE_FILAMENT                 "Retirar"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:513:0: warning: "MSG_INSERT_FILAMENT" redefined [enabled by default]

 #define MSG_INSERT_FILAMENT                 "Insert"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:176:0: note: this is the location of the previous definition

 #define MSG_INSERT_FILAMENT                 "Inserir"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:514:0: warning: "MSG_INSERT_FILAMENT_SLOW" redefined [enabled by default]

 #define MSG_INSERT_FILAMENT_SLOW            "Slow Insert"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\temperature.cpp:46:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:177:0: note: this is the location of the previous definition

 #define MSG_INSERT_FILAMENT_SLOW            "Lentamente"

 ^

"C:\Program Files (x86)\Arduino\hardware\tools\avr/bin/avr-g++" -c -g -Os -Wall -Wextra -std=gnu++11 -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=10608 -DARDUINO_AVR_MEGA2560 -DARDUINO_ARCH_AVR -fverbose-asm -save-temps  "-IC:\Users\ah\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.10\cores\arduino" "-IC:\Users\ah\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.10\variants\mega" "-IC:\Users\ah\Documents\Arduino\libraries\U8glib\src" "C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\twibus.cpp" -o "C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\twibus.cpp.o"
"C:\Program Files (x86)\Arduino\hardware\tools\avr/bin/avr-g++" -c -g -Os -Wall -Wextra -std=gnu++11 -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -mmcu=atmega2560 -DF_CPU=16000000L -DARDUINO=10608 -DARDUINO_AVR_MEGA2560 -DARDUINO_ARCH_AVR -fverbose-asm -save-temps  "-IC:\Users\ah\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.10\cores\arduino" "-IC:\Users\ah\AppData\Local\Arduino15\packages\arduino\hardware\avr\1.6.10\variants\mega" "-IC:\Users\ah\Documents\Arduino\libraries\U8glib\src" "C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp" -o "C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp.o"
In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:511:0: warning: "MSG_CHANGE_FILAMENT" redefined [enabled by default]

 #define MSG_CHANGE_FILAMENT                 "Filament"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:174:0: note: this is the location of the previous definition

 #define MSG_CHANGE_FILAMENT                 "Filamento"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:512:0: warning: "MSG_REMOVE_FILAMENT" redefined [enabled by default]

 #define MSG_REMOVE_FILAMENT                 "Remove"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:175:0: note: this is the location of the previous definition

 #define MSG_REMOVE_FILAMENT                 "Retirar"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:513:0: warning: "MSG_INSERT_FILAMENT" redefined [enabled by default]

 #define MSG_INSERT_FILAMENT                 "Insert"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:176:0: note: this is the location of the previous definition

 #define MSG_INSERT_FILAMENT                 "Inserir"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:251:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_en.h:514:0: warning: "MSG_INSERT_FILAMENT_SLOW" redefined [enabled by default]

 #define MSG_INSERT_FILAMENT_SLOW            "Slow Insert"

 ^

In file included from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language.h:250:0,

                 from C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\ultralcd.cpp:26:

C:\Users\ah\AppData\Local\Temp\build0ca64bc2097fb2df5a6ea132866e93fd.tmp\sketch\language_pt-br.h:177:0: note: this is the location of the previous definition

 #define MSG_INSERT_FILAMENT_SLOW            "Lentamente"

 ^

Copy link
Author

@schirrel schirrel Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, no warnings as you can see here

Copy link
Contributor

@Blue-Marlin Blue-Marlin Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to return to my first (rhetorical) question or do you want fotos from your pt-br - en mix?

Copy link
Author

@schirrel schirrel Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay i have to make the "ifndef" in english file, got it.

Copy link
Contributor

@Blue-Marlin Blue-Marlin Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

Copy link
Author

@schirrel schirrel Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😄
also, the travis check has failed at scara configuration :s
Could u help me?

5 changes: 5 additions & 0 deletions Marlin/language_pt-br.h
View file
Open in desktop
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_REMOVE_FILAMENT "Retirar"
#define MSG_INSERT_FILAMENT "Inserir"
#define MSG_INSERT_FILAMENT_SLOW "Lentamente"
#endif // LANGUAGE_PT_BR_H
56 changes: 55 additions & 1 deletion Marlin/ultralcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ int absPreheatHotendTemp;
int absPreheatHPBTemp;
int absPreheatFanSpeed;

bool filamentInsert;
bool filamentSlowInsert;
bool filamentRemove;

#if ENABLED(FILAMENT_LCD_DISPLAY)
millis_t previous_lcd_status_ms = 0;
#endif
Expand Down Expand Up @@ -96,7 +100,11 @@ static void lcd_status_screen();
static void lcd_control_temperature_preheat_abs_settings_menu();
static void lcd_control_motion_menu();
static void lcd_control_volumetric_menu();

static void lcd_change_filament_menu();
static void lcd_retract_filament();
static void lcd_insert_filament_menu();
static void lcd_insert_filament();
static void lcd_insert_filament_slow();
#if ENABLED(HAS_LCD_CONTRAST)
static void lcd_set_contrast();
#endif
Expand Down Expand Up @@ -495,6 +503,7 @@ inline void line_to_current(AxisEnum axis) {
static void lcd_main_menu() {
START_MENU();
MENU_ITEM(back, MSG_WATCH);
MENU_ITEM(submenu, MSG_CHANGE_FILAMENT, lcd_change_filament_menu);
if (movesplanned() || IS_SD_PRINTING) {
MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
}
Expand Down Expand Up @@ -1081,6 +1090,51 @@ void lcd_cooldown() {

#endif // MANUAL_BED_LEVELING

/**
*
* "Change Filament" submenu
*
*/
static void lcd_change_filament_menu() {
START_MENU();
MENU_ITEM(back, MSG_MAIN);
MENU_ITEM(function, MSG_REMOVE_FILAMENT , lcd_retract_filament);
MENU_ITEM(submenu, MSG_INSERT_FILAMENT , lcd_insert_filament_menu);
END_MENU();
}

static void lcd_insert_filament_menu() {
START_MENU();
MENU_ITEM(back, MSG_CHANGE_FILAMENT);
MENU_ITEM_EDIT_CALLBACK(bool, MSG_INSERT_FILAMENT_SLOW ,&filamentSlowInsert ,lcd_insert_filament_slow);
if(!filamentSlowInsert)
MENU_ITEM(function, MSG_INSERT_FILAMENT , lcd_insert_filament);
END_MENU();
}

static void lcd_insert_filament_slow(){
while (filamentSlowInsert) {
Copy link
Member

@thinkyhead thinkyhead Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This while loop will work because st_synchronize keeps the lcd active. But I'm not sure if it's the best approach here. I will have to try it out and see how it behaves.

Copy link
Author

@schirrel schirrel Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes i have trouble doing this work ate ultralcp.cpp, i'd rather write this piece at marlin_main, because there i saw less problem at it. But as @jbrazio told me that is better to make it here. This was a thing i was about to ask.

Copy link
Member

@thinkyhead thinkyhead Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After mulling it over, I think recursing into the menus isn't so bad. It eats 2 bytes of stack space, but otherwise it's not problematic. The only danger is accidentally making some code that could keep recursing and blow the stack. Not a problem with your code here at all.

I did a patch-up of this PR to illustrate the "Marlin way" to put together all the bits that you're bringing together. Check out #3605 and see if it makes sense to you how I've reworked the code to be more in the idiom that (for better or worse) has been established for lcd menus and optional features.

Copy link
Author

@schirrel schirrel Apr 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes i'm looking there. Thanks, i just have one thing to say.
I saw that you make it something like "eject/insert while click". I just want to kno if its the best way to make it. Because my first approach was for printer that have bowden, that have that tube long way from the extruder, this way its size should be pre-settle-up and so, once setted and the eject/insert opction is chosed the filament will "walk" tru it itself, with no need of the user to keep pressed, and it would be really fast. The reason why i made the slow insert is just because if the insert start the fast one, the "feeder" may not catch the filament and end up not working, so slow would be to be used ultil the feed catch the filament and once it is ok, the user switch to the fast insertion.
I just said it because the while click approach, at least to me, seemes to be focused to the printer who have direct.
Or maybe shall we have obtions for both?
LIke in configuration have a subsection of manual_filament_change where the user says if its using bowden or direct?

Copy link
Member

@thinkyhead thinkyhead Apr 25, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see. I had been thinking of the slow-insert as being useful, after initial quick insertion, to purge filament. But a slow option to align the filament with the nozzle and get the gear to catch it is also useful.

I also think the SLOW option should be available for eject, actually. This can work a lot better for a cooled-down (~170°) extruder, because at first the filament just stretches before it starts to eject from the hot end. The nozzle will be cooled down sometimes, when users want to do a "cold pull" to clean the nozzle or see the shape of the interior in the filament they pull out.

On my own printer I just use SD Card files for eject or insert. This has some advantages, such as using M117 to print the number of millimeters remaining. The MFC feature should do something like that too, so you know how much is left to go.

The other thing my GCode does is start the eject slow and then it gradually speeds up. For a direct-drive extruder, this is less important, and it doesn't end up moving very fast. With a Bowden, it would be possible to eject a nozzle's length of filament at one speed, then the rest of the filament at maximum speed.

I have some thoughts on the speed of "slow" where it might be based on the user's settings. The speed you're setting is based on percentage, but I think it should probably be based on mm/s instead. In other words, first figure out what the printer's 100% extruder speed actually comes out to be in mm/s. Then use that to figure out the exact percentage needed to get a slow speed like 0.5mm/s or 1mm/s. I can post a code example later to make it clearer, but I've got to run right now!

//While the selection at menu is true it keeps slowing insert till the filament in on the tube
current_position[E_AXIS] += 1.0;
plan_buffer_line(current_position[(X_AXIS)], current_position[(Y_AXIS)], current_position[(Z_AXIS)], current_position[E_AXIS], FILAMENTCOMPLETCHANGE_SLOW_FEEDRATE, active_extruder);
st_synchronize();
}
}

static void lcd_retract_filament() {
//This value must be setted according the size you have at your printer
current_position[E_AXIS] -= FILAMENTCOMPLETCHANGE_SIZE;
plan_buffer_line(current_position[(X_AXIS)], current_position[(Y_AXIS)], current_position[(Z_AXIS)], current_position[E_AXIS], FILAMENTCOMPLETCHANGE_FAST_FEEDRATE, active_extruder);
st_synchronize();
}

static void lcd_insert_filament(){
//This value must be setted according the size you have at your printer
current_position[E_AXIS] += FILAMENTCOMPLETCHANGE_SIZE;
plan_buffer_line(current_position[(X_AXIS)], current_position[(Y_AXIS)], current_position[(Z_AXIS)], current_position[E_AXIS], FILAMENTCOMPLETCHANGE_FAST_FEEDRATE, active_extruder);
st_synchronize();
}

/**
*
* "Prepare" submenu
Expand Down