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

This commit is contained in:
Bernhard Kubicek 2011-11-06 22:48:36 +01:00
commit 156763d027

View file

@ -27,8 +27,8 @@
// 5 is ParCan supplied 104GT-2 100K
// 6 is EPCOS 100k
// 7 is 100k Honeywell thermistor 135-104LAG-J01
#define THERMISTORHEATER_0 3
#define THERMISTORHEATER_1 3
#define THERMISTORHEATER_2 3
#define THERMISTORBED 3
//#define HEATER_0_USES_THERMISTOR