Skip to content

Commit

Permalink
Fix whitespace and M600 feed values
Browse files Browse the repository at this point in the history
  • Loading branch information
shyblower committed Mar 9, 2023
1 parent 36e2a8c commit b59d2fe
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions Firmware/Configuration_prusa.h
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@

//Crash detection
#define CRASHDET_TIMER 45 //seconds
#define CRASHDET_COUNTER_MAX 3
#define CRASHDET_COUNTER_MAX 3

// New XYZ calibration
#define NEW_XYZCAL
Expand Down Expand Up @@ -190,7 +190,7 @@
#define FILAMENT_SENSOR
#define IR_SENSOR

// Backlash -
// Backlash -
//#define BACKLASH_X
//#define BACKLASH_Y

Expand All @@ -216,15 +216,15 @@
#define DEBUG_DCODES //D codes
#define DEBUG_STACK_MONITOR //Stack monitor in stepper ISR
//#define DEBUG_FSENSOR_LOG //Reports fsensor status to serial
//#define DEBUG_RESUME_PRINT //Resume/save print debug enable
//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output
//#define DEBUG_RESUME_PRINT //Resume/save print debug enable
//#define DEBUG_UVLO_AUTOMATIC_RECOVER // Power panic automatic recovery debug output
//#define DEBUG_DISABLE_XMINLIMIT //x min limit ignored
//#define DEBUG_DISABLE_XMAXLIMIT //x max limit ignored
//#define DEBUG_DISABLE_YMINLIMIT //y min limit ignored
//#define DEBUG_DISABLE_YMAXLIMIT //y max limit ignored
//#define DEBUG_DISABLE_ZMINLIMIT //z min limit ignored
//#define DEBUG_DISABLE_ZMAXLIMIT //z max limit ignored
#define DEBUG_DISABLE_STARTMSGS //no startup messages
#define DEBUG_DISABLE_STARTMSGS //no startup messages
//#define DEBUG_DISABLE_MINTEMP //mintemp error ignored
//#define DEBUG_DISABLE_SWLIMITS //sw limits ignored
//#define DEBUG_DISABLE_LCD_STATUS_LINE //empty four lcd line
Expand Down Expand Up @@ -587,15 +587,15 @@

//E distance in mm for fast filament loading sequence used used in filament change (M600)
#if defined(BONDTECH_LGX_SC) || defined(BONDTECH_LGX_SM)
#define FILAMENTCHANGE_FIRSTFEED 10
#define FILAMENTCHANGE_FIRSTFEED 40
#else
#define FILAMENTCHANGE_FIRSTFEED 70
#endif
//E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
#if defined BONDTECH_EXTRUDER
#define FILAMENTCHANGE_FINALFEED 40
#elif defined(BONDTECH_LGX_SC) || defined(BONDTECH_LGX_SM)
#define FILAMENTCHANGE_FINALFEED 65
#define FILAMENTCHANGE_FINALFEED 23
#else
#define FILAMENTCHANGE_FINALFEED 40
#endif
Expand All @@ -604,7 +604,7 @@

#define FILAMENTCHANGE_XYFEED 50
#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_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 7000 / 60
#define FILAMENTCHANGE_EXFEED 2
Expand Down Expand Up @@ -877,7 +877,7 @@
// "dropsegments" steps long. All the above rules still need to apply.
#define UVLO_TINY_Z_AXIS_SHIFT 0.16
// If power panic occured, and the current temperature is higher then target temperature before interrupt minus this offset, print will be recovered automatically.
#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5
#define AUTOMATIC_UVLO_BED_TEMP_OFFSET 5

#define HEATBED_V2

Expand Down
2 changes: 1 addition & 1 deletion Firmware/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3698,7 +3698,7 @@ void gcode_M701()
plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence
st_synchronize();

raise_z_above(MIN_Z_FOR_LOAD, false);
raise_z_above(MIN_Z_FOR_LOAD, false);
current_position[E_AXIS] += feed_mm_before_raising;
plan_buffer_line_curposXYZE(FILAMENTCHANGE_EFEED_FIRST); //fast sequence

Expand Down

0 comments on commit b59d2fe

Please sign in to comment.