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

Distribute on/off on PWM pins to all config templates.

This commit is contained in:
Markus Hitter 2012-10-17 22:50:20 +02:00
parent 0b11812ce5
commit 7c3920a552
9 changed files with 82 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.gen3.h
View File

@ -325,9 +325,6 @@ DEFINE_TEMP_SENSOR(bed, TT_INTERCOM, AIO1, 0)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -340,15 +337,22 @@ DEFINE_TEMP_SENSOR(bed, TT_INTERCOM, AIO1, 0)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port // name port pwm
// DEFINE_HEATER(extruder, PINB3) // DEFINE_HEATER(extruder, PINB3, 1)
// DEFINE_HEATER(bed, PINB4) // DEFINE_HEATER(bed, PINB4, 1)
/** \def HEATER_EXTRUDER /** \def HEATER_EXTRUDER
\def HEATER_BED \def HEATER_BED

14
config.gen6.h
View File

@ -317,9 +317,6 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -332,14 +329,21 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port // name port pwm
DEFINE_HEATER(extruder, PD6) DEFINE_HEATER(extruder, PD6, 1)
/// 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.

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

@ -326,9 +326,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -341,15 +338,22 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port // name port pwm
DEFINE_HEATER(extruder, DIO4) DEFINE_HEATER(extruder, DIO4, 1)
DEFINE_HEATER(bed, DIO3) DEFINE_HEATER(bed, DIO3, 1)
/// 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.

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

@ -326,9 +326,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -341,15 +338,22 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port // name port pwm
DEFINE_HEATER(extruder, DIO4) DEFINE_HEATER(extruder, DIO4, 1)
DEFINE_HEATER(bed, DIO3) DEFINE_HEATER(bed, DIO3, 1)
/// 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.

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

@ -321,9 +321,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -336,6 +333,13 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
@ -343,10 +347,10 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, 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 // name port pwm
DEFINE_HEATER(extruder, PB4) DEFINE_HEATER(extruder, PB4, 1)
DEFINE_HEATER(bed, PH5) DEFINE_HEATER(bed, PH5, 1)
DEFINE_HEATER(fan, PH6) DEFINE_HEATER(fan, PH6, 1)
/// 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.

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

@ -325,9 +325,6 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, THERMISTOR_EXTRUDER)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -340,6 +337,13 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, THERMISTOR_EXTRUDER)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
@ -347,9 +351,9 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO13, 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 // name port pwm
DEFINE_HEATER(extruder, PB4) DEFINE_HEATER(extruder, PB4, 1)
//DEFINE_HEATER( bed, PH5) //DEFINE_HEATER( bed, PH5, 1)
/// 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.

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

@ -322,9 +322,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_EXTRUDER)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -337,15 +334,22 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_EXTRUDER)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port // name port pwm
DEFINE_HEATER(extruder, PD5) DEFINE_HEATER(extruder, PD5, 1)
DEFINE_HEATER(bed, PD6) DEFINE_HEATER(bed, PD6, 1)
/// 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.

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

@ -322,9 +322,6 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* * * *
* Define your heaters here. * * Define your heaters here. *
* * * *
* Currently, heaters work on PWM-able pins, only. See the end of this file *
* for PWM-able pin mappings. *
* *
* To attach a heater to a temp sensor above, simply use exactly the same * * To attach a heater to a temp sensor above, simply use exactly the same *
* name - copy+paste is your friend. Some common names are 'extruder', * * name - copy+paste is your friend. Some common names are 'extruder', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found * * 'bed', 'fan', 'motor', ... names with special meaning can be found *
@ -337,15 +334,22 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
* temperature sensor of TT_NONE, then you can control the spindle's rpm * * temperature sensor of TT_NONE, then you can control the spindle's rpm *
* via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. * * via temperature commands. M104 S1..255 for spindle on, M104 S0 for off. *
* * * *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
* 0 for using on/off on a PWM-able pin, too. *
* Using PWM usually gives smoother temperature control but can conflict *
* with slow switches, like solid state relays. PWM frequency can be *
* influenced globally with FAST_PWM, see below. *
* *
\***************************************************************************/ \***************************************************************************/
#ifndef DEFINE_HEATER #ifndef DEFINE_HEATER
#define DEFINE_HEATER(...) #define DEFINE_HEATER(...)
#endif #endif
// name port // name port pwm
DEFINE_HEATER(extruder, PD5) DEFINE_HEATER(extruder, PD5, 1)
DEFINE_HEATER(bed, PD4) DEFINE_HEATER(bed, PD4, 1)
/// 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.

4
config.teensy.h
View File

@ -404,8 +404,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER)
DEFINE_HEATER(extruder, DIO10, 1) DEFINE_HEATER(extruder, DIO10, 1)
DEFINE_HEATER(bed, DIO9, 1) DEFINE_HEATER(bed, DIO9, 1)
DEFINE_HEATER(fan, DIO8, 0) DEFINE_HEATER(fan, DIO8, 0)
// DEFINE_HEATER(chamber, PIND7) // DEFINE_HEATER(chamber, PIND7, 1)
// DEFINE_HEATER(motor, PIND6) // DEFINE_HEATER(motor, PIND6, 1)
/// 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.