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

Merge branch 'dev' into variants

This commit is contained in:
PavelSindler 2019-02-04 01:14:11 +01:00
parent 454a087fb3 fba207e0ec
commit 71e4459cc9
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Firmware/Marlin_main.cpp
View File

@ -142,6 +142,7 @@
#define PRINTING_TYPE_SD 0 #define PRINTING_TYPE_SD 0
#define PRINTING_TYPE_USB 1 #define PRINTING_TYPE_USB 1
#define PRINTING_TYPE_NONE 2
//filament types //filament types
#define FILAMENT_DEFAULT 0 #define FILAMENT_DEFAULT 0
@ -8777,7 +8778,8 @@ void stop_and_save_print_to_ram(float z_move, float e_move)
saved_printing_type = PRINTING_TYPE_USB; saved_printing_type = PRINTING_TYPE_USB;
} }
else { else {
//not sd printing nor usb printing saved_printing_type = PRINTING_TYPE_NONE;
//not sd printing nor usb printing
} }
#if 0 #if 0
@ -8942,10 +8944,12 @@ void restore_print_from_ram_and_continue(float e_move)
// for (int axis = X_AXIS; axis <= E_AXIS; axis++) // for (int axis = X_AXIS; axis <= E_AXIS; axis++)
// current_position[axis] = st_get_position_mm(axis); // current_position[axis] = st_get_position_mm(axis);
active_extruder = saved_active_extruder; //restore active_extruder active_extruder = saved_active_extruder; //restore active_extruder
setTargetHotendSafe(saved_extruder_temperature,saved_active_extruder); if (saved_extruder_temperature) {
heating_status = 1; setTargetHotendSafe(saved_extruder_temperature, saved_active_extruder);
wait_for_heater(_millis(),saved_active_extruder); heating_status = 1;
heating_status = 2; wait_for_heater(_millis(), saved_active_extruder);
heating_status = 2;
}
feedrate = saved_feedrate2; //restore feedrate feedrate = saved_feedrate2; //restore feedrate
axis_relative_modes[E_AXIS] = saved_extruder_relative_mode; axis_relative_modes[E_AXIS] = saved_extruder_relative_mode;
fanSpeed = saved_fanSpeed; fanSpeed = saved_fanSpeed;