josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load to nozzle function, M600 work in progress

This commit is contained in:
PavelSindler 2018-07-19 13:14:29 +02:00
parent 2006ae58f1
commit 7600848533
2 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Firmware/Marlin.h
View File

@ -468,3 +468,4 @@ void proc_commands();
bool mmu_get_reponse(); bool mmu_get_reponse();
void mmu_not_responding(); void mmu_not_responding();
void mmu_load_to_nozzle();

54
Firmware/Marlin_main.cpp
View File

@ -3366,7 +3366,7 @@ void process_commands()
no_response = false; no_response = false;
} }
else if (code_seen("MMURES")) { else if (code_seen("MMURES")) {
fprintf_P(uart2io, PSTR("x0")); fprintf_P(uart2io, PSTR("X0"));
bool response = mmu_get_reponse(); bool response = mmu_get_reponse();
if (!response) mmu_not_responding(); if (!response) mmu_not_responding();
} }
@ -6478,14 +6478,23 @@ Sigma_Exit:
//finish moves //finish moves
st_synchronize(); st_synchronize();
lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT));
//disable extruder steppers so filament can be removed //disable extruder steppers so filament can be removed
disable_e0(); disable_e0();
disable_e1(); disable_e1();
disable_e2(); disable_e2();
delay(100); delay(100);
#ifdef SNMM_V2
fprintf_P(uart2io, PSTR("U0\n"));
// get response
bool response = mmu_get_reponse();
if (!response) mmu_not_responding();
#else
lcd_display_message_fullscreen_P(_T(MSG_PULL_OUT_FILAMENT));
WRITE(BEEPER, HIGH); WRITE(BEEPER, HIGH);
counterBeep = 0; counterBeep = 0;
@ -6495,6 +6504,7 @@ Sigma_Exit:
counterBeep++; counterBeep++;
} }
WRITE(BEEPER, LOW); WRITE(BEEPER, LOW);
#endif
KEEPALIVE_STATE(PAUSED_FOR_USER); KEEPALIVE_STATE(PAUSED_FOR_USER);
lcd_change_fil_state = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, true);////MSG_UNLOAD_SUCCESSFUL c=20 r=2 lcd_change_fil_state = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Was filament unload successful?"), false, true);////MSG_UNLOAD_SUCCESSFUL c=20 r=2
@ -6564,15 +6574,20 @@ Sigma_Exit:
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 400, active_extruder); plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 400, active_extruder);
target[E_AXIS] += 10; target[E_AXIS] += 10;
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 50, active_extruder); plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], 50, active_extruder);
//Extrude some filament
target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ;
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder);
#else #else
target[E_AXIS] += FILAMENTCHANGE_FIRSTFEED; target[E_AXIS] += FILAMENTCHANGE_FIRSTFEED;
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EFEED, active_extruder); plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EFEED, active_extruder);
#endif // SNMM //Extrude some filament
//Extrude some filament
target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ; target[E_AXIS]+= FILAMENTCHANGE_FINALFEED ;
plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder); plan_buffer_line(target[X_AXIS], target[Y_AXIS], target[Z_AXIS], target[E_AXIS], FILAMENTCHANGE_EXFEED, active_extruder);
#endif // SNMM
//Wait for user to check the state //Wait for user to check the state
lcd_change_fil_state = 0; lcd_change_fil_state = 0;
lcd_loading_filament(); lcd_loading_filament();
@ -7131,17 +7146,8 @@ Sigma_Exit:
snmm_extruder = tmp_extruder; //filament change is finished snmm_extruder = tmp_extruder; //filament change is finished
if (*(strchr_pointer + index) == '?') { // for single material usage with mmu if (*(strchr_pointer + index) == '?') { // for single material usage with mmu
bool saved_e_relative_mode = axis_relative_modes[E_AXIS]; mmu_load_to_nozzle();
if (!saved_e_relative_mode) {
enquecommand_front_P(PSTR("M82")); // set extruder to relative mode
}
enquecommand_front_P((PSTR("G1 E7.2000 F562")));
enquecommand_front_P((PSTR("G1 E14.4000 F871")));
enquecommand_front_P((PSTR("G1 E36.0000 F1393")));
enquecommand_front_P((PSTR("G1 E14.4000 F871")));
if (!saved_e_relative_mode) {
enquecommand_front_P(PSTR("M83")); // set extruder to relative mode
}
} }
#endif #endif
@ -9156,4 +9162,18 @@ void mmu_not_responding() {
printf_P(PSTR("MMU not responding")); printf_P(PSTR("MMU not responding"));
} }
void mmu_load_to_nozzle() {
bool saved_e_relative_mode = axis_relative_modes[E_AXIS];
if (!saved_e_relative_mode) {
enquecommand_front_P(PSTR("M82")); // set extruder to relative mode
}
enquecommand_front_P((PSTR("G1 E7.2000 F562")));
enquecommand_front_P((PSTR("G1 E14.4000 F871")));
enquecommand_front_P((PSTR("G1 E36.0000 F1393")));
enquecommand_front_P((PSTR("G1 E14.4000 F871")));
if (!saved_e_relative_mode) {
enquecommand_front_P(PSTR("M83")); // set extruder to relative mode
}
}
#define FIL_LOAD_LENGTH 60 #define FIL_LOAD_LENGTH 60