Explorar el Código

PID / manage_heater

some small corrections
MRprusa3d hace 6 años
padre
commit
2c0d62fbf7
Se han modificado 2 ficheros con 2 adiciones y 5 borrados
  1. 1 5
      Firmware/Configuration.h
  2. 1 0
      Firmware/temperature.cpp

+ 1 - 5
Firmware/Configuration.h

@@ -126,15 +126,11 @@
 // Comment the following line to disable PID and enable bang-bang.
 #define PIDTEMP
 #define BANG_MAX 255 // limits current to nozzle while in bang-bang mode; 255=full current
-#define PID_MAX BANG_MAX // limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current
+#define PID_MAX BANG_MAX // limits current to nozzle while PID is active; 255=full current
 #ifdef PIDTEMP
   //#define PID_DEBUG // Sends debug data to the serial port.
   //#define PID_OPENLOOP 1 // Puts PID in open loop. M104/M140 sets the output power from 0 to PID_MAX
   //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
-// :-O :-O :-O
-  #define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature
-                                  // is more then PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
-// :-O :-O :-O
   #define PID_INTEGRAL_DRIVE_MAX PID_MAX  //limit for the integral term
   #define K1 0.95 //smoothing factor within the PID
   #define PID_dT ((OVERSAMPLENR * 10.0)/(F_CPU / 64.0 / 256.0)) //sampling period of the temperature routine

+ 1 - 0
Firmware/temperature.cpp

@@ -589,6 +589,7 @@ void checkExtruderAutoFans()
 
 void resetPID(uint8_t extruder)                   // ready for eventually parameters adjusting
 {
+extruder=extruder;                                // only for compiler-warning elimination (if function do nothing)
 }
 
 void manage_heater()