diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-07-16 05:11:24 -0700 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-07-16 05:11:24 -0700 |
| commit | ed44404bec8c6de621ee20a27e61ec1f783df483 (patch) | |
| tree | 0ef4254b1b4bc4634269c038d6b00accb0866690 | |
| parent | 02566cc007ed8d460e34226c9542282c3e260605 (diff) | |
| parent | ef0ad69571bf9e8ebe134280b1d584919790f878 (diff) | |
Merge pull request #51 from alexrj/temp-smoothing
Respect HEATER_USES_* when initializing temperature smoothing
| -rw-r--r-- | Sprinter/Sprinter.pde | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index b31a629..79c66e6 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -133,7 +133,7 @@ float tt = 0, bt = 0; int temp_iState_max = 100 * PID_INTEGRAL_DRIVE_MAX / PID_IGAIN; #endif #ifdef SMOOTHING - uint32_t nma = SMOOTHFACTOR * analogRead(TEMP_0_PIN); + uint32_t nma = 0; #endif #ifdef WATCHPERIOD int watch_raw = -1000; @@ -1268,6 +1268,7 @@ inline void manage_heater() current_raw = read_max6675(); #endif #ifdef SMOOTHING + if (!nma) nma = SMOOTHFACTOR * current_raw; nma = (nma + current_raw) - (nma / SMOOTHFACTOR); current_raw = nma / SMOOTHFACTOR; #endif |