From f80edeabb0a96c2568cba0abe4c69787e6abedd7 Mon Sep 17 00:00:00 2001 From: Michael Moon Date: Mon, 14 Feb 2011 10:58:00 +1100 Subject: [PATCH] fix example heaters, add note to gen3 config clarifying that heaters connected to extruder go in extruder config --- config.gen3.h | 9 ++++++--- config.h.dist | 6 +++--- config.ramps.h | 6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/config.gen3.h b/config.gen3.h index 736dd7e..6c64b5f 100644 --- a/config.gen3.h +++ b/config.gen3.h @@ -249,6 +249,9 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, 0) * * * Define your heaters here * * * +* WARNING: For GEN3, ONLY DEFINE HEATERS CONNECTED TO YOUR MOTHERBOARD HERE * +* Heaters connected to your extruder controller belong in extruder/config.h * +* * * If your heater isn't on a PWM-able pin, set heater_pwm to zero and we'll * * use bang-bang output. Note that PID will still be used * * * @@ -269,9 +272,9 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, 0) #endif // name port pin pwm -// DEFINE_HEATER(extruder, PORTD, PINB3, OCR0A) -// DEFINE_HEATER(bed, PORTD, PINB4, OCR0B) -// DEFINE_HEATER(fan, PORTD, PINB4, OCR0B) +// DEFINE_HEATER(extruder, PORTB, PINB3, OCR0A) +// DEFINE_HEATER(bed, PORTB, PINB4, OCR0B) +// DEFINE_HEATER(fan, PORTB, PINB4, OCR0B) // DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A) // DEFINE_HEATER(motor, PORTD, PIND6, OCR2B) diff --git a/config.h.dist b/config.h.dist index f5a4281..60ec956 100644 --- a/config.h.dist +++ b/config.h.dist @@ -288,9 +288,9 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, 0) #endif // name port pin pwm -DEFINE_HEATER(extruder, PORTD, PINB3, OCR0A) -DEFINE_HEATER(bed, PORTD, PINB4, OCR0B) -// DEFINE_HEATER(fan, PORTD, PINB4, OCR0B) +DEFINE_HEATER(extruder, PORTB, PINB3, OCR0A) +DEFINE_HEATER(bed, PORTB, PINB4, OCR0B) +// DEFINE_HEATER(fan, PORTB, PINB4, OCR0B) // DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A) // DEFINE_HEATER(motor, PORTD, PIND6, OCR2B) diff --git a/config.ramps.h b/config.ramps.h index d54196d..72be769 100644 --- a/config.ramps.h +++ b/config.ramps.h @@ -275,9 +275,9 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1_PIN) // NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different // name port pin pwm -DEFINE_HEATER(extruder, PORTD, PINB4, OCR2A) -DEFINE_HEATER(bed, PORTD, PINH5, OCR4CL) -DEFINE_HEATER(fan, PORTD, PINH6, OCR2B) +DEFINE_HEATER(extruder, PORTB, PINB4, OCR2A) +DEFINE_HEATER(bed, PORTH, PINH5, OCR4CL) +DEFINE_HEATER(fan, PORTH, PINH6, OCR2B) // DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A) // DEFINE_HEATER(motor, PORTD, PIND6, OCR2B)