josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update extruder to match simplified heater

This commit is contained in:
Michael Moon 2011-03-28 21:52:23 +11:00
parent 3c3624542f
commit 66415078e5
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
extruder/config.h.dist
View File

@ -33,7 +33,7 @@
#define H1E_PWM OCR0B #define H1E_PWM OCR0B
#define H2E_PWM OCR0A #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 //IMPORTANT: Assumes that the step pin is on PCIE0
#define E_STEP_PIN DIO10 #define E_STEP_PIN DIO10
#define E_DIR_PIN DIO9 #define E_DIR_PIN DIO9
@ -46,33 +46,33 @@
#define TEMP_PIN AIO3 #define TEMP_PIN AIO3
#define TEMP_PIN_CHANNEL 3 #define TEMP_PIN_CHANNEL 3
//Read analog voltage from thermistor //Read analog voltage from thermistor
#define TEMP_BED_PIN AIO6 #define TEMP_BED_PIN AIO6
#define TEMP_BED_PIN_CHANNEL 6 #define TEMP_BED_PIN_CHANNEL 6
#define REFERENCE REFERENCE_AVCC #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 TEMP_THERMISTOR
#define HEATER_PIN DIO11 #define HEATER_PIN DIO11
#define BED_PIN AIO1 #define BED_PIN AIO1
#define FAN_PIN DIO12 #define FAN_PIN DIO12
// extruder settings // extruder settings
#define TEMP_HYSTERESIS 20 #define TEMP_HYSTERESIS 20
#define TEMP_RESIDENCY_TIME 60 #define TEMP_RESIDENCY_TIME 60
#ifdef DEFINE_TEMP_SENSOR #ifdef DEFINE_TEMP_SENSOR
DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, TEMP_PIN_CHANNEL) DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, TEMP_PIN_CHANNEL)
DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, TEMP_BED_PIN_CHANNEL) DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, TEMP_BED_PIN_CHANNEL)
#endif #endif
#ifdef DEFINE_HEATER #ifdef DEFINE_HEATER
DEFINE_HEATER(extruder, PORTD, HEATER_PIN, OCR0A) DEFINE_HEATER(extruder, DIO11)
DEFINE_HEATER(bed, PORTD, BED_PIN, OCR0B) DEFINE_HEATER(bed, AIO1)
#endif #endif
// list of PWM-able pins and corresponding timers // list of PWM-able pins and corresponding timers
@ -80,7 +80,7 @@ DEFINE_HEATER(bed, PORTD, BED_PIN, OCR0B)
// OC0A DIO6 // OC0A DIO6
// OC0B DIO5 // OC0B DIO5
// OC1A DIO9 // OC1A DIO9
// OC1B DIO10 // OC1B DIO10
// OC2A DIO11 // OC2A DIO11
// OC2B DIO3 // OC2B DIO3