From 66415078e52893f61db0e1e921d5143f7c191e4b Mon Sep 17 00:00:00 2001 From: Michael Moon Date: Mon, 28 Mar 2011 21:52:23 +1100 Subject: [PATCH] update extruder to match simplified heater --- extruder/config.h.dist | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/extruder/config.h.dist b/extruder/config.h.dist index b6e16eb..2706150 100644 --- a/extruder/config.h.dist +++ b/extruder/config.h.dist @@ -33,7 +33,7 @@ #define H1E_PWM OCR0B #define H2E_PWM OCR0A -//Step/Dir Pins from motherboard to extruder +//Step/Dir Pins from motherboard to extruder //IMPORTANT: Assumes that the step pin is on PCIE0 #define E_STEP_PIN DIO10 #define E_DIR_PIN DIO9 @@ -46,33 +46,33 @@ #define TEMP_PIN AIO3 #define TEMP_PIN_CHANNEL 3 -//Read analog voltage from thermistor -#define TEMP_BED_PIN AIO6 -#define TEMP_BED_PIN_CHANNEL 6 - - +//Read analog voltage from thermistor +#define TEMP_BED_PIN AIO6 +#define TEMP_BED_PIN_CHANNEL 6 + + #define REFERENCE REFERENCE_AVCC -#define ANALOG_MASK (MASK(TRIM_POT_CHANNEL) | MASK(TEMP_PIN_CHANNEL) | MASK(TEMP_BED_PIN_CHANNEL)) +#define ANALOG_MASK (MASK(TRIM_POT_CHANNEL) | MASK(TEMP_PIN_CHANNEL) | MASK(TEMP_BED_PIN_CHANNEL)) #define TEMP_THERMISTOR -#define HEATER_PIN DIO11 -#define BED_PIN AIO1 -#define FAN_PIN DIO12 - +#define HEATER_PIN DIO11 +#define BED_PIN AIO1 +#define FAN_PIN DIO12 + // extruder settings #define TEMP_HYSTERESIS 20 #define TEMP_RESIDENCY_TIME 60 #ifdef DEFINE_TEMP_SENSOR -DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, TEMP_PIN_CHANNEL) -DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, TEMP_BED_PIN_CHANNEL) +DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, TEMP_PIN_CHANNEL) +DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, TEMP_BED_PIN_CHANNEL) #endif #ifdef DEFINE_HEATER -DEFINE_HEATER(extruder, PORTD, HEATER_PIN, OCR0A) -DEFINE_HEATER(bed, PORTD, BED_PIN, OCR0B) +DEFINE_HEATER(extruder, DIO11) +DEFINE_HEATER(bed, AIO1) #endif // list of PWM-able pins and corresponding timers @@ -80,7 +80,7 @@ DEFINE_HEATER(bed, PORTD, BED_PIN, OCR0B) // OC0A DIO6 // OC0B DIO5 // OC1A DIO9 -// OC1B DIO10 +// OC1B DIO10 // OC2A DIO11 // OC2B DIO3