Skip to content

Commit

Permalink
Make temperature sensor type TT_NONE obsolete.
Browse files Browse the repository at this point in the history 
The requirement was simply neither obvious nor intuitive. Drawback
is, the indices of temperature sensors can now differ from these
of the heaters. That's easier to recognize for newbies, though.
  • Loading branch information
@Traumflug
Traumflug committed Jan 3, 2013
1 parent ba05d6a commit 6f2ec09
Show file tree
Hide file tree
Showing 14 changed files with 161 additions and 152 deletions.
24 changes: 13 additions & 11 deletions config.default.h
View file
Expand Up @@ -270,25 +270,22 @@
// #define TEMP_AD595
// #define TEMP_PT100
// #define TEMP_INTERCOM
// #define TEMP_NONE

/***************************************************************************\
* *
* Define your temperature sensors here. One line for each sensor, only *
* limited by the number of available ATmega pins. *
* *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to 0. *
* *
* Types are same as TEMP_ list above - TT_MAX6675, TT_THERMISTOR, TT_AD595, *
* TT_PT100, TT_INTERCOM, TT_NONE. See list in temp.c. *
* TT_PT100, TT_INTERCOM. See list in temp.c. *
* *
* The "additional" field is used for TT_THERMISTOR only. It defines the *
* name of the table(s) in ThermistorTable.h to use. Typically, this is *
* THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for *
* the second table. See also early in ThermistorTable.{single|double}.h. *
* *
* TT_INTERCOM and TT_NONE don't use a pin, insert AIO0 anyways to keep *
* the compiler happy. The pin won't be used in this case. *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin *
* won't be used in this case. *
* *
\***************************************************************************/

Expand Down Expand Up @@ -319,19 +316,24 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_EXTRUDER)

/***************************************************************************\
* *
* Define your heaters here. *
* Define your heaters and devices here. *
* *
* 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', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found *
* in gcode_process.c. Currently, these are: *
* HEATER_extruder (M104) *
* HEATER_bed (M140) *
* HEATER_fan (M106/M107) *
* HEATER_fan (M106) *
* *
* Devices don't neccessarily have a temperature sensor, e.g. fans or *
* milling spindles. Operate such devices by setting their power (M106), *
* instead of setting their temperature (M104). *
* *
* A milling spindle can also be defined as a heater. Attach it to a *
* 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. *
* Also note, the index of a heater (M106 P#) can differ from the index of *
* its attached temperature sensor (M104 P#) in case sensor-less devices *
* are defined or the order of the definitions differs. The first defined *
* device has the index 0 (zero). *
* *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
Expand Down
24 changes: 13 additions & 11 deletions config.gen3.h
View file
Expand Up @@ -275,25 +275,22 @@
// #define TEMP_AD595
// #define TEMP_PT100
#define TEMP_INTERCOM
// #define TEMP_NONE

/***************************************************************************\
* *
* Define your temperature sensors here. One line for each sensor, only *
* limited by the number of available ATmega pins. *
* *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to 0. *
* *
* Types are same as TEMP_ list above - TT_MAX6675, TT_THERMISTOR, TT_AD595, *
* TT_PT100, TT_INTERCOM, TT_NONE. See list in temp.c. *
* TT_PT100, TT_INTERCOM. See list in temp.c. *
* *
* The "additional" field is used for TT_THERMISTOR only. It defines the *
* name of the table(s) in ThermistorTable.h to use. Typically, this is *
* THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for *
* the second table. See also early in ThermistorTable.{single|double}.h. *
* *
* TT_INTERCOM and TT_NONE don't use a pin, insert AIO0 anyways to keep *
* the compiler happy. The pin won't be used in this case. *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin *
* won't be used in this case. *
* *
\***************************************************************************/

Expand Down Expand Up @@ -323,19 +320,24 @@ DEFINE_TEMP_SENSOR(bed, TT_INTERCOM, AIO1, 0)

/***************************************************************************\
* *
* Define your heaters here. *
* Define your heaters and devices here. *
* *
* 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', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found *
* in gcode_process.c. Currently, these are: *
* HEATER_extruder (M104) *
* HEATER_bed (M140) *
* HEATER_fan (M106/M107) *
* HEATER_fan (M106) *
* *
* Devices don't neccessarily have a temperature sensor, e.g. fans or *
* milling spindles. Operate such devices by setting their power (M106), *
* instead of setting their temperature (M104). *
* *
* A milling spindle can also be defined as a heater. Attach it to a *
* 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. *
* Also note, the index of a heater (M106 P#) can differ from the index of *
* its attached temperature sensor (M104 P#) in case sensor-less devices *
* are defined or the order of the definitions differs. The first defined *
* device has the index 0 (zero). *
* *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
Expand Down
24 changes: 13 additions & 11 deletions config.gen6.h
View file
Expand Up @@ -270,25 +270,22 @@
// #define TEMP_AD595
// #define TEMP_PT100
// #define TEMP_INTERCOM
// #define TEMP_NONE

/***************************************************************************\
* *
* Define your temperature sensors here. One line for each sensor, only *
* limited by the number of available ATmega pins. *
* *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to 0. *
* *
* Types are same as TEMP_ list above - TT_MAX6675, TT_THERMISTOR, TT_AD595, *
* TT_PT100, TT_INTERCOM, TT_NONE. See list in temp.c. *
* TT_PT100, TT_INTERCOM. See list in temp.c. *
* *
* The "additional" field is used for TT_THERMISTOR only. It defines the *
* name of the table(s) in ThermistorTable.h to use. Typically, this is *
* THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for *
* the second table. See also early in ThermistorTable.{single|double}.h. *
* *
* TT_INTERCOM and TT_NONE don't use a pin, insert AIO0 anyways to keep *
* the compiler happy. The pin won't be used in this case. *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin *
* won't be used in this case. *
* *
\***************************************************************************/

Expand All @@ -315,19 +312,24 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER)

/***************************************************************************\
* *
* Define your heaters here. *
* Define your heaters and devices here. *
* *
* 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', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found *
* in gcode_process.c. Currently, these are: *
* HEATER_extruder (M104) *
* HEATER_bed (M140) *
* HEATER_fan (M106/M107) *
* HEATER_fan (M106) *
* *
* Devices don't neccessarily have a temperature sensor, e.g. fans or *
* milling spindles. Operate such devices by setting their power (M106), *
* instead of setting their temperature (M104). *
* *
* A milling spindle can also be defined as a heater. Attach it to a *
* 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. *
* Also note, the index of a heater (M106 P#) can differ from the index of *
* its attached temperature sensor (M104 P#) in case sensor-less devices *
* are defined or the order of the definitions differs. The first defined *
* device has the index 0 (zero). *
* *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
Expand Down
24 changes: 13 additions & 11 deletions config.gen7-v1.1-v1.3.h
View file
Expand Up @@ -278,25 +278,22 @@
// #define TEMP_AD595
// #define TEMP_PT100
// #define TEMP_INTERCOM
// #define TEMP_NONE

/***************************************************************************\
* *
* Define your temperature sensors here. One line for each sensor, only *
* limited by the number of available ATmega pins. *
* *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to 0. *
* *
* Types are same as TEMP_ list above - TT_MAX6675, TT_THERMISTOR, TT_AD595, *
* TT_PT100, TT_INTERCOM, TT_NONE. See list in temp.c. *
* TT_PT100, TT_INTERCOM. See list in temp.c. *
* *
* The "additional" field is used for TT_THERMISTOR only. It defines the *
* name of the table(s) in ThermistorTable.h to use. Typically, this is *
* THERMISTOR_EXTRUDER for the first or only table, or THERMISTOR_BED for *
* the second table. See also early in ThermistorTable.{single|double}.h. *
* *
* TT_INTERCOM and TT_NONE don't use a pin, insert AIO0 anyways to keep *
* the compiler happy. The pin won't be used in this case. *
* For a GEN3 set temp_type to TT_INTERCOM and temp_pin to AIO0. The pin *
* won't be used in this case. *
* *
\***************************************************************************/

Expand Down Expand Up @@ -324,19 +321,24 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)

/***************************************************************************\
* *
* Define your heaters here. *
* Define your heaters and devices here. *
* *
* 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', *
* 'bed', 'fan', 'motor', ... names with special meaning can be found *
* in gcode_process.c. Currently, these are: *
* HEATER_extruder (M104) *
* HEATER_bed (M140) *
* HEATER_fan (M106/M107) *
* HEATER_fan (M106) *
* *
* Devices don't neccessarily have a temperature sensor, e.g. fans or *
* milling spindles. Operate such devices by setting their power (M106), *
* instead of setting their temperature (M104). *
* *
* A milling spindle can also be defined as a heater. Attach it to a *
* 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. *
* Also note, the index of a heater (M106 P#) can differ from the index of *
* its attached temperature sensor (M104 P#) in case sensor-less devices *
* are defined or the order of the definitions differs. The first defined *
* device has the index 0 (zero). *
* *
* Set 'pwm' to ... *
* 1 for using PWM on a PWM-able pin and on/off on other pins. *
Expand Down

0 comments on commit 6f2ec09

Please sign in to comment.