Fixed some problems, like methods not found and variables. Made it wo…

.travis.yml

@@ -162,10 +162,10 @@ script:
   - opt_enable LCM1602
   - build_marlin
   #
-  # Enable FILAMENTCHANGEENABLE
+  # Enable FILAMENTCHANGEENABLE and MANUAL_FILAMENT_CHANGE
   #
   - restore_configs
-  - opt_enable FILAMENTCHANGEENABLE ULTIMAKERCONTROLLER
+  - opt_enable FILAMENTCHANGEENABLE MANUAL_FILAMENT_CHANGE ULTIMAKERCONTROLLER
   - build_marlin
   #
   # Enable filament sensor

Marlin/Configuration_adv.h

@@ -518,14 +518,22 @@ const unsigned int dropsegments = 5; //everything with less than this number of
 #if ENABLED(ULTIPANEL)
   //#define FILAMENTCHANGEENABLE
   #if ENABLED(FILAMENTCHANGEENABLE)
+    #define MANUAL_FILAMENT_CHANGE              //Add Filament Change to the LCD Menus
     #define FILAMENTCHANGE_XPOS 3
     #define FILAMENTCHANGE_YPOS 3
     #define FILAMENTCHANGE_ZADD 10
     #define FILAMENTCHANGE_FIRSTRETRACT -2
     #define FILAMENTCHANGE_FINALRETRACT -100
-    #define AUTO_FILAMENT_CHANGE                //This extrude filament until you press the button on LCD
+    #define AUTO_FILAMENT_CHANGE                //Extrude filament until you press the button on LCD
     #define AUTO_FILAMENT_CHANGE_LENGTH 0.04    //Extrusion length on automatic extrusion loop
     #define AUTO_FILAMENT_CHANGE_FEEDRATE 300   //Extrusion feedrate (mm/min) on automatic extrusion loop
+
+  #if ENABLED(MANUAL_FILAMENT_CHANGE)
+    #define FILAMENT_LOAD_LENGTH 55
+    #define FILAMENT_CHANGE_NORMAL_SPEED 100
+    #define FILAMENT_CHANGE_SLOW_SPEED 3.5
+  #endif
+
   #endif
 #endif
 

Marlin/example_configurations/Felix/Configuration.h

@@ -1060,7 +1060,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

Marlin/example_configurations/Hephestos/Configuration.h

@@ -1069,7 +1069,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

Marlin/example_configurations/Hephestos_2/Configuration.h

@@ -1071,7 +1071,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

Marlin/example_configurations/K8200/Configuration.h

@@ -1094,7 +1094,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

Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h

@@ -1071,7 +1071,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

Marlin/example_configurations/RigidBot/Configuration.h

@@ -1074,7 +1074,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

Marlin/example_configurations/SCARA/Configuration.h

@@ -1085,7 +1085,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

Marlin/example_configurations/TAZ4/Configuration.h

@@ -1098,7 +1098,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

Marlin/example_configurations/WITBOX/Configuration.h

@@ -1069,7 +1069,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

Marlin/example_configurations/adafruit/ST7565/Configuration.h

@@ -1077,7 +1077,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

Marlin/example_configurations/delta/biv2.5/Configuration.h

@@ -1206,7 +1206,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

Marlin/example_configurations/delta/generic/Configuration.h

@@ -1206,7 +1206,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

Marlin/example_configurations/delta/kossel_mini/Configuration.h

@@ -1210,7 +1210,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

Marlin/example_configurations/delta/kossel_pro/Configuration.h

@@ -1203,7 +1203,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

Marlin/example_configurations/delta/kossel_xl/Configuration.h

@@ -1211,7 +1211,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

Marlin/example_configurations/makibox/Configuration.h

@@ -1080,7 +1080,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

Marlin/example_configurations/tvrrug/Round2/Configuration.h

@@ -1071,7 +1071,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

Marlin/language_en.h

@@ -508,5 +508,23 @@
 #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_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

Marlin/language_pt-br.h

@@ -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