pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #51 from alexrj/temp-smoothing

Browse source 
Respect HEATER_USES_* when initializing temperature smoothing
This commit is contained in:
kliment 2011-07-16 05:11:24 -07:00
commit ed44404bec
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Sprinter/Sprinter.pde
View file

@ -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