diff options
author | kliment <kliment.yanev@gmail.com> | 2012-10-14 12:05:58 -0700 |
---|---|---|
committer | kliment <kliment.yanev@gmail.com> | 2012-10-14 12:05:58 -0700 |
commit | de2feb0caccf05b0e70a9deaac462f8023f9a635 (patch) | |
tree | f36750cbd87fac2e6be1377c6f460e54170678e7 /Sprinter/heater.h | |
parent | 1db03fa315d0db499fb68f745e96d67c83264192 (diff) | |
parent | 1f11008dc856d50c730f09e63dae1d69daba6e6f (diff) |
Merge pull request #206 from kliment/experimental
Merge experimental into master
Diffstat (limited to 'Sprinter/heater.h')
-rw-r--r-- | Sprinter/heater.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Sprinter/heater.h b/Sprinter/heater.h index a1d2917..33252a1 100644 --- a/Sprinter/heater.h +++ b/Sprinter/heater.h @@ -88,8 +88,13 @@ extern unsigned char manage_monitor; extern int dTerm; extern int error; extern int heater_duty; + + extern unsigned int PID_Kp, PID_Ki, PID_Kd; #endif +#if defined(FAN_SOFT_PWM) && (FAN_PIN > -1) + extern volatile unsigned char g_fan_pwm_val; +#endif #ifdef AUTOTEMP extern float autotemp_max; @@ -112,8 +117,16 @@ extern unsigned char manage_monitor; -#ifdef PID_SOFT_PWM +#if defined(PID_SOFT_PWM) || (defined(FAN_SOFT_PWM) && (FAN_PIN > -1)) void init_Timer2_softpwm(void); #endif +#ifdef PID_AUTOTUNE + void PID_autotune(int PIDAT_test_temp); +#endif + +#ifdef PIDTEMP + void updatePID(); +#endif + void manage_heater(); |