Skip to content

Commit

Permalink
extruder swap feedrate fix and Heating histeresis update
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukkoz committed Apr 16, 2021
1 parent 6165350 commit b6ab9b3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Marlin/Skriware_Conf_Advanced.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#if ENABLED(THERMAL_PROTECTION_HOTENDS)
#define THERMAL_PROTECTION_PERIOD 45 // Seconds
#define THERMAL_PROTECTION_HYSTERESIS 5 // Degrees Celsius
#define THERMAL_PROTECTION_HYSTERESIS 12 // Degrees Celsius
#define WATCH_TEMP_PERIOD 45 // Seconds
#define WATCH_TEMP_INCREASE 1 // Degrees Celsius
#endif
Expand Down
3 changes: 3 additions & 0 deletions Marlin/Skriware_Functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,11 @@ void Extruder_Down(){
void extruder_swap(uint8_t tmp_extruder,uint8_t active){
bool extruder_change = tmp_extruder != active;
float tmp_Z = current_position[Z_AXIS];
float tmp_feedrate = feedrate_mm_s;
if(extruder_type != 0 && tmp_extruder == 1 && extruder_change){
planner.synchronize();
destination[Z_AXIS] = tmp_Z+3.0;
feedrate_mm_s = 10;
prepare_move_to_destination();
planner.synchronize();
Extruder_Down();
Expand All @@ -190,6 +192,7 @@ void extruder_swap(uint8_t tmp_extruder,uint8_t active){
destination[Z_AXIS] = tmp_Z;
prepare_move_to_destination();
planner.synchronize();
feedrate_mm_s = tmp_feedrate;
}
if(extruder_type != 0 && tmp_extruder == 0 && extruder_change){
planner.synchronize();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* Marlin release version identifier
*/

#define SHORT_BUILD_VERSION "1.1.9.8"
#define SHORT_BUILD_VERSION "1.1.9.9"

/**
* Verbose version identifier which should contain a reference to the location
Expand Down

0 comments on commit b6ab9b3

Please sign in to comment.