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

Align heater definitions in config.h templates. 

Purely cosmetical, no functional change.
This commit is contained in:
Markus Hitter 2012-05-13 15:04:46 +02:00
parent 9c126e3387
commit 1657fb2731
9 changed files with 32 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.default.h
View File

@ -329,12 +329,12 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, 1, THERMISTOR_EXTRUDER)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
DEFINE_HEATER(extruder, PB3) DEFINE_HEATER(extruder, PB3)
DEFINE_HEATER(bed, PB4) DEFINE_HEATER(bed, PB4)
// DEFINE_HEATER(fan, PORTB, PINB4, OCR0B) // DEFINE_HEATER(fan, PINB4)
// DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A) // DEFINE_HEATER(chamber, PIND7)
// DEFINE_HEATER(motor, PORTD, PIND6, OCR2B) // DEFINE_HEATER(motor, PIND6)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.
@ -345,6 +345,8 @@ DEFINE_HEATER(bed, PB4)
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder
#define HEATER_BED HEATER_bed #define HEATER_BED HEATER_bed
// #define HEATER_FAN HEATER_fan // #define HEATER_FAN HEATER_fan
// #define HEATER_CHAMBER HEATER_chamber
// #define HEATER_MOTOR HEATER_motor

10
config.gen3.h
View File

@ -332,12 +332,9 @@ DEFINE_TEMP_SENSOR(bed, TT_INTERCOM, 1, 0)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
// DEFINE_HEATER(extruder, PORTB, PINB3, OCR0A) // DEFINE_HEATER(extruder, PINB3)
// DEFINE_HEATER(bed, PORTB, PINB4, OCR0B) // DEFINE_HEATER(bed, PINB4)
// DEFINE_HEATER(fan, PORTB, PINB4, OCR0B)
// DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A)
// DEFINE_HEATER(motor, PORTD, PIND6, OCR2B)
/** \def HEATER_EXTRUDER /** \def HEATER_EXTRUDER
\def HEATER_BED \def HEATER_BED
@ -353,7 +350,6 @@ DEFINE_TEMP_SENSOR(bed, TT_INTERCOM, 1, 0)
// workaround for heated bed over intercom. HEATER_BED is the intercom temp channel number. // workaround for heated bed over intercom. HEATER_BED is the intercom temp channel number.
#define HEATER_BED 1 #define HEATER_BED 1
// #define HEATER_FAN HEATER_fan

5
config.gen6.h
View File

@ -325,8 +325,7 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, PINA5, THERMISTOR_EXTRUDER)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
// DEFINE_HEATER(extruder, PORTD, PIND6, OCR2B)
DEFINE_HEATER(extruder, PD6) DEFINE_HEATER(extruder, PD6)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
@ -336,8 +335,6 @@ DEFINE_HEATER(extruder, PD6)
/// I have searched high and low for a way to make the preprocessor do this for us, but so far I have not found a way. /// I have searched high and low for a way to make the preprocessor do this for us, but so far I have not found a way.
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder
// #define HEATER_BED HEATER_bed
// #define HEATER_FAN HEATER_fan

6
config.gen7-v1.1-v1.3.h
View File

@ -334,9 +334,9 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PINA2, THERMISTOR_BED)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
DEFINE_HEATER(extruder, PB4) DEFINE_HEATER(extruder, DIO4)
DEFINE_HEATER(bed, PB3) DEFINE_HEATER(bed, DIO3)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.

6
config.gen7-v1.4.h
View File

@ -334,9 +334,9 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PINA1, THERMISTOR_BED)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
DEFINE_HEATER(extruder, DIO4) DEFINE_HEATER(extruder, DIO4)
DEFINE_HEATER(bed, DIO3) DEFINE_HEATER(bed, DIO3)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.

12
config.ramps-v1.2.h
View File

@ -330,12 +330,10 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1_PIN, THERMISTOR_EXTRUDER)
#endif #endif
// NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different // NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different
// name port pin pwm // name port
DEFINE_HEATER(extruder, PB4) DEFINE_HEATER(extruder, PB4)
DEFINE_HEATER(bed, PH5) DEFINE_HEATER(bed, PH5)
DEFINE_HEATER(fan, PH6) DEFINE_HEATER(fan, PH6)
// DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A)
// DEFINE_HEATER(motor, PORTD, PIND6, OCR2B)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.
@ -345,7 +343,7 @@ DEFINE_HEATER(fan, PH6)
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder
#define HEATER_BED HEATER_bed #define HEATER_BED HEATER_bed
// #define HEATER_FAN HEATER_fan #define HEATER_FAN HEATER_fan

10
config.ramps-v1.3.h
View File

@ -334,12 +334,9 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13_PIN, THERMISTOR_EXTRUDER)
#endif #endif
// NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different // NOTE: these pins are for RAMPS V1.1 and newer. V1.0 is different
// name port pin pwm // name port
DEFINE_HEATER( extruder, PB4) DEFINE_HEATER(extruder, PB4)
//DEFINE_HEATER( bed, PH5) //DEFINE_HEATER( bed, PH5)
//DEFINE_HEATER( fan, PH6)
// DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A)
// DEFINE_HEATER(motor, PORTD, PIND6, OCR2B)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.
@ -349,7 +346,6 @@ DEFINE_HEATER( extruder, PB4)
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder
//#define HEATER_BED HEATER_bed //#define HEATER_BED HEATER_bed
// #define HEATER_FAN HEATER_fan

10
config.sanguinololu-v1.1.h
View File

@ -330,12 +330,9 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6_PIN, THERMISTOR_EXTRUDER)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
DEFINE_HEATER(extruder, PD5) DEFINE_HEATER(extruder, PD5)
DEFINE_HEATER(bed, PD6) DEFINE_HEATER(bed, PD6)
// DEFINE_HEATER(fan, PORTB, PINB4, OCR0B)
// DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A)
// DEFINE_HEATER(motor, PORTD, PIND6, OCR2B)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.
@ -345,7 +342,6 @@ DEFINE_HEATER(bed, PD6)
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder
#define HEATER_BED HEATER_bed #define HEATER_BED HEATER_bed
// #define HEATER_FAN HEATER_fan

10
config.sanguinololu-v1.2.h
View File

@ -330,12 +330,9 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6_PIN, THERMISTOR_BED)
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port pin pwm // name port
DEFINE_HEATER(extruder, PD5) DEFINE_HEATER(extruder, PD5)
DEFINE_HEATER(bed, PD4) DEFINE_HEATER(bed, PD4)
// DEFINE_HEATER(fan, PORTB, PINB4, OCR0B)
// DEFINE_HEATER(chamber, PORTD, PIND7, OCR2A)
// DEFINE_HEATER(motor, PORTD, PIND6, OCR2B)
/// and now because the c preprocessor isn't as smart as it could be, /// and now because the c preprocessor isn't as smart as it could be,
/// uncomment the ones you've listed above and comment the rest. /// uncomment the ones you've listed above and comment the rest.
@ -345,7 +342,6 @@ DEFINE_HEATER(bed, PD4)
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder
#define HEATER_BED HEATER_bed #define HEATER_BED HEATER_bed
// #define HEATER_FAN HEATER_fan