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

Merge branch 'master' of github.com:kliment/Sprinter into experimental

Browse source
This commit is contained in:
kliment 2011-07-16 14:13:15 +02:00
commit a5ded5b75f
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

@ -127,7 +127,7 @@ int 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;
@ -1389,6 +1389,7 @@ 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