Merge commit '0c36faa8034f2c21e834efcff73aa41137be31dd' into experimental

This commit is contained in:
midopple 2012-03-27 21:07:59 +02:00
commit 0d4d5714bc

View file

@ -5,7 +5,7 @@
//// The following define selects which electronics board you have. Please choose the one that matches your setup
// MEGA/RAMPS up to 1.2 = 3,
// RAMPS 1.3 = 33
// RAMPS 1.3/1.4 = 33
// Gen6 = 5,
// Sanguinololu up to 1.1 = 6
// Sanguinololu 1.2 and above = 62
@ -16,7 +16,7 @@
// Gen 3 Plus = 21
// gen 3 Monolithic Electronics = 22
// Gen3 PLUS for TechZone Gen3 Remix Motherboard = 23
#define MOTHERBOARD 3
#define MOTHERBOARD 33
//// Thermistor settings:
// 1 is 100k thermistor