3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1329 from PavelSindler/M600_load_fil_message

Browse source 
M600 filament load progress bar changes
This commit is contained in:
XPila 2018-11-12 20:52:06 +01:00 committed by GitHub
commit 3d97d81734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Firmware/Marlin_main.cpp
View file

@ -8965,9 +8965,8 @@ static void print_time_remaining_init()
void load_filament_final_feed() void load_filament_final_feed()
{ {
st_synchronize();
current_position[E_AXIS]+= FILAMENTCHANGE_FINALFEED; current_position[E_AXIS]+= FILAMENTCHANGE_FINALFEED;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 200/60, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED_FINAL, active_extruder);
} }
void M600_check_state() void M600_check_state()
@ -8990,6 +8989,7 @@ void M600_check_state()
// Filament loaded properly but color is not clear // Filament loaded properly but color is not clear
case 3: case 3:
st_synchronize();
load_filament_final_feed(); load_filament_final_feed();
lcd_loading_color(); lcd_loading_color();
st_synchronize(); st_synchronize();
@ -9108,7 +9108,7 @@ void M600_load_filament_movements()
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], 50, active_extruder);
#else #else
current_position[E_AXIS]+= FILAMENTCHANGE_FIRSTFEED ; current_position[E_AXIS]+= FILAMENTCHANGE_FIRSTFEED ;
plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED, active_extruder); plan_buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_EFEED_FIRST, active_extruder);
#endif #endif
load_filament_final_feed(); load_filament_final_feed();
lcd_loading_filament(); lcd_loading_filament();

19
Firmware/ultralcd.cpp
View file

@ -2254,20 +2254,15 @@ void lcd_change_success() {
} }
static void lcd_loading_progress_bar() { static void lcd_loading_progress_bar(uint16_t loading_time_ms) {
for (int i = 0; i < 20; i++) {
for (int i = 0; i < 20; i++) {
lcd_set_cursor(i, 3); lcd_set_cursor(i, 3);
lcd_print("."); lcd_print(".");
//0.375 s delay: //loading_time_ms/20 delay
for (int j = 0; j < 5; j++) { for (int j = 0; j < 5; j++) {
manage_heater(); delay_keep_alive(loading_time_ms / 100);
manage_inactivity(true);
delay(75);
} }
} }
} }
@ -2282,7 +2277,7 @@ void lcd_loading_color() {
lcd_puts_P(_i("Loading color"));////MSG_LOADING_COLOR c=0 r=0 lcd_puts_P(_i("Loading color"));////MSG_LOADING_COLOR c=0 r=0
lcd_set_cursor(0, 2); lcd_set_cursor(0, 2);
lcd_puts_P(_T(MSG_PLEASE_WAIT)); lcd_puts_P(_T(MSG_PLEASE_WAIT));
lcd_loading_progress_bar(); lcd_loading_progress_bar((FILAMENTCHANGE_FINALFEED * 1000ul) / FILAMENTCHANGE_EFEED_FINAL); //show progress bar during filament loading slow sequence
} }
@ -2311,7 +2306,9 @@ void lcd_loading_filament() {
} }
#else //SNMM #else //SNMM
lcd_loading_progress_bar(); uint16_t slow_seq_time = (FILAMENTCHANGE_FINALFEED * 1000ul) / FILAMENTCHANGE_EFEED_FINAL;
uint16_t fast_seq_time = (FILAMENTCHANGE_FIRSTFEED * 1000ul) / FILAMENTCHANGE_EFEED_FIRST;
lcd_loading_progress_bar(slow_seq_time + fast_seq_time); //show progress bar for total time of filament loading fast + slow sequence
#endif //SNMM #endif //SNMM
} }

7
Firmware/variants/1_75mm_MK2-RAMBo10a-E3Dv6full.h
View file

@ -165,12 +165,13 @@ CHANGE FILAMENT SETTINGS
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FINALRETRACT -80
#define FILAMENTCHANGE_FIRSTFEED 70 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 50 #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RECFEED 5 #define FILAMENTCHANGE_RECFEED 5
#define FILAMENTCHANGE_XYFEED 50 #define FILAMENTCHANGE_XYFEED 50
#define FILAMENTCHANGE_EFEED 20 #define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600)
#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RFEED 400 #define FILAMENTCHANGE_RFEED 400
#define FILAMENTCHANGE_EXFEED 2 #define FILAMENTCHANGE_EXFEED 2
#define FILAMENTCHANGE_ZFEED 15 #define FILAMENTCHANGE_ZFEED 15

7
Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h
View file

@ -165,12 +165,13 @@ CHANGE FILAMENT SETTINGS
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FINALRETRACT -80
#define FILAMENTCHANGE_FIRSTFEED 70 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 50 #define FILAMENTCHANGE_FINALFEED 50 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RECFEED 5 #define FILAMENTCHANGE_RECFEED 5
#define FILAMENTCHANGE_XYFEED 50 #define FILAMENTCHANGE_XYFEED 50
#define FILAMENTCHANGE_EFEED 20 #define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600)
#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RFEED 400 #define FILAMENTCHANGE_RFEED 400
#define FILAMENTCHANGE_EXFEED 2 #define FILAMENTCHANGE_EXFEED 2
#define FILAMENTCHANGE_ZFEED 15 #define FILAMENTCHANGE_ZFEED 15

7
Firmware/variants/1_75mm_MK25-RAMBo10a-E3Dv6full.h
View file

@ -220,12 +220,13 @@
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FINALRETRACT -80
#define FILAMENTCHANGE_FIRSTFEED 70 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RECFEED 5 #define FILAMENTCHANGE_RECFEED 5
#define FILAMENTCHANGE_XYFEED 50 #define FILAMENTCHANGE_XYFEED 50
#define FILAMENTCHANGE_EFEED 20 #define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600)
#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701)
//#define FILAMENTCHANGE_RFEED 400 //#define FILAMENTCHANGE_RFEED 400
#define FILAMENTCHANGE_RFEED 7000 / 60 #define FILAMENTCHANGE_RFEED 7000 / 60
#define FILAMENTCHANGE_EXFEED 2 #define FILAMENTCHANGE_EXFEED 2

7
Firmware/variants/1_75mm_MK25-RAMBo13a-E3Dv6full.h
View file

@ -221,12 +221,13 @@
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FINALRETRACT -80
#define FILAMENTCHANGE_FIRSTFEED 70 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RECFEED 5 #define FILAMENTCHANGE_RECFEED 5
#define FILAMENTCHANGE_XYFEED 50 #define FILAMENTCHANGE_XYFEED 50
#define FILAMENTCHANGE_EFEED 20 #define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600)
#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701)
//#define FILAMENTCHANGE_RFEED 400 //#define FILAMENTCHANGE_RFEED 400
#define FILAMENTCHANGE_RFEED 7000 / 60 #define FILAMENTCHANGE_RFEED 7000 / 60
#define FILAMENTCHANGE_EXFEED 2 #define FILAMENTCHANGE_EXFEED 2

7
Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h
View file

@ -341,12 +341,13 @@
#define FILAMENTCHANGE_FIRSTRETRACT -2 #define FILAMENTCHANGE_FIRSTRETRACT -2
#define FILAMENTCHANGE_FINALRETRACT -80 #define FILAMENTCHANGE_FINALRETRACT -80
#define FILAMENTCHANGE_FIRSTFEED 70 #define FILAMENTCHANGE_FIRSTFEED 70 //E distance in mm for fast filament loading sequence used used in filament change (M600)
#define FILAMENTCHANGE_FINALFEED 25 #define FILAMENTCHANGE_FINALFEED 25 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
#define FILAMENTCHANGE_RECFEED 5 #define FILAMENTCHANGE_RECFEED 5
#define FILAMENTCHANGE_XYFEED 50 #define FILAMENTCHANGE_XYFEED 50
#define FILAMENTCHANGE_EFEED 20 #define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600)
#define FILAMENTCHANGE_EFEED_FINAL 3.3f // feedrate in mm/s for slow filament loading sequence used in filament change (M600) and filament load (M701)
//#define FILAMENTCHANGE_RFEED 400 //#define FILAMENTCHANGE_RFEED 400
#define FILAMENTCHANGE_RFEED 7000 / 60 #define FILAMENTCHANGE_RFEED 7000 / 60
#define FILAMENTCHANGE_EXFEED 2 #define FILAMENTCHANGE_EXFEED 2