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

Merge pull request #996 from PavelSindler/snmm_v2

Browse source 
M600 updated
This commit is contained in:
PavelSindler 2018-08-01 19:39:08 +02:00 committed by GitHub
commit ac60b3ebe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Firmware/Marlin_main.cpp
View file

@ -3122,9 +3122,9 @@ void gcode_M600(bool automatic, float x_position, float y_position, float z_shif
// Unload filament // Unload filament
#if defined (SNMM) || defined (SNMM_V2) #if defined (SNMM) || defined (SNMM_V2)
extr_unload(); //unload just current filament extr_unload(); //unload just current filament for multimaterial printers (used also in M702)
#else #else
unload_filament(); //unload filament fopr single material (used also in M702) unload_filament(); //unload filament for single material (used also in M702)
#endif #endif
//finish moves //finish moves
st_synchronize(); st_synchronize();
@ -3164,7 +3164,7 @@ void gcode_M600(bool automatic, float x_position, float y_position, float z_shif
st_synchronize(); st_synchronize();
//Unretract //Unretract
current_position[E_AXIS]= current_position[E_AXIS] - FILAMENTCHANGE_FIRSTRETRACT; current_position[E_AXIS]= current_position[E_AXIS] - e_shift;
plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder); plan_buffer_line(lastpos[X_AXIS], lastpos[Y_AXIS], lastpos[Z_AXIS], current_position[E_AXIS], FILAMENTCHANGE_RFEED, active_extruder);
st_synchronize(); st_synchronize();
@ -3469,7 +3469,9 @@ void process_commands()
enquecommand_P(PSTR("M24")); enquecommand_P(PSTR("M24"));
} }
else if (code_seen("MMURES")) { else if (code_seen("MMURES")) {
fprintf_P(uart2io, PSTR("X0"));
printf_P(PSTR("X0\n"));
fprintf_P(uart2io, PSTR("X0\n"));
} }
else if (code_seen("RESET")) { else if (code_seen("RESET")) {
// careful! // careful!
@ -9104,10 +9106,15 @@ void M600_wait_for_user() {
} }
void mmu_M600_load_filament(bool automatic) { void mmu_M600_load_filament(bool automatic) {
//load filament for mmu v2
#ifdef SNMM_V2 #ifdef SNMM_V2
bool response = false; bool response = false;
bool yes = false;
if (!automatic) { if (!automatic) {
tmp_extruder = choose_extruder_menu(); yes = lcd_show_fullscreen_message_yes_no_and_wait_P(_i("Do you want to switch extruder?"), false);
if(yes) tmp_extruder = choose_extruder_menu();
else tmp_extruder = snmm_extruder;
} }
else { else {
tmp_extruder = (tmp_extruder+1)%5; tmp_extruder = (tmp_extruder+1)%5;
@ -9158,6 +9165,7 @@ void M600_load_filament_movements() {
} }
void M600_load_filament() { void M600_load_filament() {
//load filament for single material and SNMM
lcd_wait_interact(); lcd_wait_interact();
//load_filament_time = millis(); //load_filament_time = millis();

2
Firmware/ultralcd.cpp
View file

@ -5356,7 +5356,7 @@ void extr_adj(int extruder) //loading filament for SNMM
} }
void extr_unload() { //unloads filament void extr_unload() { //unload just current filament for multimaterial printers
#ifndef SNMM_V2 #ifndef SNMM_V2
float tmp_motor[3] = DEFAULT_PWM_MOTOR_CURRENT; float tmp_motor[3] = DEFAULT_PWM_MOTOR_CURRENT;
float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD; float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD;