Firmware/temperature.cpp

@@ -743,24 +743,26 @@ void manage_heater()
 
 #ifdef FAN_SOFT_PWM
 #ifdef FANCHECK
-  if ((_millis() - extruder_autofan_last_check > FAN_CHECK_PERIOD) && (!fan_measuring)) {
-	  extruder_autofan_last_check = _millis();
-	  fanSpeedBckp = fanSpeedSoftPwm;
-	  
-	  if (fanSpeedSoftPwm >= MIN_PRINT_FAN_SPEED) { //if we are in rage where we are doing fan check, set full PWM range for a short time to measure fan RPM by reading tacho signal without modulation by PWM signal
-		//  printf_P(PSTR("fanSpeedSoftPwm 1: %d\n"), fanSpeedSoftPwm);
-		  fanSpeedSoftPwm = 255;
-	  }
-	  fan_measuring = true;
-  }
-  if ((_millis() - extruder_autofan_last_check > FAN_CHECK_DURATION) && (fan_measuring)) {
-	  countFanSpeed();
-	  checkFanSpeed();
-	  //printf_P(PSTR("fanSpeedSoftPwm 1: %d\n"), fanSpeedSoftPwm);
-	  fanSpeedSoftPwm = fanSpeedBckp;
-	  //printf_P(PSTR("fan PWM: %d; extr fanSpeed measured: %d; print fan speed measured: %d \n"), fanSpeedBckp, fan_speed[0], fan_speed[1]);
-	  extruder_autofan_last_check = _millis();
-	  fan_measuring = false;
+  if (fans_check_enabled) {
+    if ((_millis() - extruder_autofan_last_check > FAN_CHECK_PERIOD) && (!fan_measuring)) {
+      extruder_autofan_last_check = _millis();
+      fanSpeedBckp = fanSpeedSoftPwm;
+      
+      if (fanSpeedSoftPwm >= MIN_PRINT_FAN_SPEED) { //if we are in rage where we are doing fan check, set full PWM range for a short time to measure fan RPM by reading tacho signal without modulation by PWM signal
+      //  printf_P(PSTR("fanSpeedSoftPwm 1: %d\n"), fanSpeedSoftPwm);
+        fanSpeedSoftPwm = 255;
+      }
+      fan_measuring = true;
+    }
+    if ((_millis() - extruder_autofan_last_check > FAN_CHECK_DURATION) && (fan_measuring)) {
+      countFanSpeed();
+      checkFanSpeed();
+      //printf_P(PSTR("fanSpeedSoftPwm 1: %d\n"), fanSpeedSoftPwm);
+      fanSpeedSoftPwm = fanSpeedBckp;
+      //printf_P(PSTR("fan PWM: %d; extr fanSpeed measured: %d; print fan speed measured: %d \n"), fanSpeedBckp, fan_speed[0], fan_speed[1]);
+      extruder_autofan_last_check = _millis();
+      fan_measuring = false;
+    }
   }
 #endif //FANCHECK
   checkExtruderAutoFans();
@@ -768,8 +770,8 @@ void manage_heater()
   if(_millis() - extruder_autofan_last_check > 1000)  // only need to check fan state very infrequently
   {
 #if (defined(FANCHECK) && ((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))
-	countFanSpeed();
-	checkFanSpeed();
+    countFanSpeed();
+    checkFanSpeed();
 #endif //(defined(TACH_0) && TACH_0 >-1) || (defined(TACH_1) && TACH_1 > -1)
     checkExtruderAutoFans();
     extruder_autofan_last_check = _millis();

Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h

@@ -69,7 +69,7 @@
 #define X_MIN_POS 0
 #define Y_MAX_POS 212.5
 #define Y_MIN_POS -4 //orig -4
-#define Z_MAX_POS 182
+#define Z_MAX_POS 192
 #define Z_MIN_POS 0.10
 
 // Canceled home position
@@ -361,10 +361,10 @@
 #define FILAMENTCHANGE_FINALRETRACT -80
 
 #define FILAMENTCHANGE_FIRSTFEED 70  //E distance in mm for fast filament loading sequence used used in filament change (M600)
-#define FILAMENTCHANGE_FINALFEED 140 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
+#define FILAMENTCHANGE_FINALFEED 100 //E distance in mm for slow filament loading sequence used used in filament change (M600) and filament load (M701)
 #define FILAMENTCHANGE_RECFEED 5
 
-#define FILAMENTCHANGE_LOADRETRACT 20 // Distance to retract after loading is complete (need to account for this in start gcode)
+#define FILAMENTCHANGE_LOADRETRACT 10 // Distance to retract after loading is complete (need to account for this in start gcode)
 
 #define FILAMENTCHANGE_XYFEED 50
 #define FILAMENTCHANGE_EFEED_FIRST 20 // feedrate in mm/s for fast filament loading sequence used in filament change (M600)
@@ -494,8 +494,8 @@
 #define FARM_PREHEAT_HOTEND_TEMP 250
 #define FARM_PREHEAT_HPB_TEMP 80
 
-#define PLA_PREHEAT_HOTEND_TEMP 215
-#define PLA_PREHEAT_HPB_TEMP 60
+#define PLA_PREHEAT_HOTEND_TEMP 225
+#define PLA_PREHEAT_HPB_TEMP 70
 
 #define ASA_PREHEAT_HOTEND_TEMP 260
 #define ASA_PREHEAT_HPB_TEMP 105
@@ -506,13 +506,13 @@
 #define HIPS_PREHEAT_HOTEND_TEMP 220
 #define HIPS_PREHEAT_HPB_TEMP 100
 
-#define PP_PREHEAT_HOTEND_TEMP 254
+#define PP_PREHEAT_HOTEND_TEMP 255
 #define PP_PREHEAT_HPB_TEMP 100
 
 #define PC_PREHEAT_HOTEND_TEMP 280
 #define PC_PREHEAT_HPB_TEMP 105
 
-#define PET_PREHEAT_HOTEND_TEMP 230
+#define PET_PREHEAT_HOTEND_TEMP 250
 #define PET_PREHEAT_HPB_TEMP 85
 
 #define FLEX_PREHEAT_HOTEND_TEMP 240