Browse Source

Fixed print fan speed monitoring

Kevin Lee 4 years ago
parent
commit
472e88df2e
2 changed files with 11 additions and 7 deletions
  1. 10 6
      Firmware/temperature.cpp
  2. 1 1
      Firmware/variants/1_75mm_MK3S-EINSy10a-E3Dv6full.h

+ 10 - 6
Firmware/temperature.cpp

@@ -2063,7 +2063,7 @@ FORCE_INLINE static void temperature_isr()
   }
 #endif //BABYSTEPPING
 
-#if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1))
+#if (defined(FANCHECK) && ((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))
   check_fans();
 #endif //(defined(TACH_0))
 }
@@ -2277,23 +2277,27 @@ else {                                            // ambient temperature is stan
 #endif //AMBIENT_THERMISTOR
 }
  
-#if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1))
+#if (defined(FANCHECK) && ((defined(TACH_0) && (TACH_0 >-1)) || (defined(TACH_1) && (TACH_1 > -1))))
 void check_fans() {
 #ifdef FAN_SOFT_PWM
 	if (READ(TACH_0) != fan_state[0]) {
 		if(fan_measuring) fan_edge_counter[0] ++;
 		fan_state[0] = !fan_state[0];
 	}
+	if (READ(TACH_1) != fan_state[1]) {
+		if(fan_measuring) fan_edge_counter[1] ++;
+		fan_state[1] = !fan_state[1];
+	}
 #else //FAN_SOFT_PWM
 	if (READ(TACH_0) != fan_state[0]) {
 		fan_edge_counter[0] ++;
 		fan_state[0] = !fan_state[0];
 	}
+	if (READ(TACH_1) != fan_state[1]) {
+		fan_edge_counter[1] ++;
+		fan_state[1] = !fan_state[1];
+	}
 #endif
-	//if (READ(TACH_1) != fan_state[1]) {
-	//	fan_edge_counter[1] ++;
-	//	fan_state[1] = !fan_state[1];
-	//}
 }
 #endif //TACH_0
 

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

@@ -623,7 +623,7 @@
 
 #define DEFAULT_PID_TEMP 210
 
-#define MIN_PRINT_FAN_SPEED 75
+#define MIN_PRINT_FAN_SPEED 50
 
 
 // How much shall the print head be lifted on power panic?