CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

Browse Source
This commit is contained in:
Bernhard Kubicek 2011-11-06 23:21:33 +01:00
commit 977fd2b2c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/temperature.cpp
View File

@ -200,7 +200,7 @@ int temp2analog(int celsius) {
} }
// Overflow: Set to last value in the table // Overflow: Set to last value in the table
if (i == NUMTEMPS_0) raw = heater_0_temptable[i-1][0]; if (i == NUMTEMPS_HEATER_0) raw = heater_0_temptable[i-1][0];
return (1023 * OVERSAMPLENR) - raw; return (1023 * OVERSAMPLENR) - raw;
#elif defined HEATER_0_USES_AD595 #elif defined HEATER_0_USES_AD595
@ -544,4 +544,4 @@ ISR(TIMER0_COMPB_vect)
#endif #endif
} }
} }