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

Configtool: also prettify writing heater definitions.

This commit is contained in:
Markus Hitter 2015-04-03 19:41:11 +02:00
parent 778af87102
commit 29dd85a129
14 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/board.3drag.h
View File

@ -193,8 +193,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO10, 1) DEFINE_HEATER(extruder, DIO10, 1)
DEFINE_HEATER(bed, DIO9, 1) DEFINE_HEATER(bed, DIO9, 1)
DEFINE_HEATER(fan, DIO8, 1) DEFINE_HEATER(fan, DIO8, 1)

2
config/board.gen3.h
View File

@ -188,8 +188,8 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, AIO0, 0)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
//DEFINE_HEATERS_END //DEFINE_HEATERS_END

2
config/board.gen6.h
View File

@ -189,8 +189,8 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO6, 1) DEFINE_HEATER(extruder, DIO6, 1)
#define HEATER_EXTRUDER HEATER_extruder #define HEATER_EXTRUDER HEATER_extruder

2
config/board.gen7-v1.1-v1.3.h
View File

@ -197,8 +197,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO4, 1) DEFINE_HEATER(extruder, DIO4, 1)
DEFINE_HEATER(bed, DIO3, 1) DEFINE_HEATER(bed, DIO3, 1)

2
config/board.gen7-v1.4.h
View File

@ -198,8 +198,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO4, 1) DEFINE_HEATER(extruder, DIO4, 1)
DEFINE_HEATER(bed, DIO3, 1) DEFINE_HEATER(bed, DIO3, 1)

2
config/board.ramps-v1.2.h
View File

@ -194,8 +194,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO10, 1) DEFINE_HEATER(extruder, DIO10, 1)
DEFINE_HEATER(bed, DIO8, 1) DEFINE_HEATER(bed, DIO8, 1)
DEFINE_HEATER(fan, DIO9, 1) DEFINE_HEATER(fan, DIO9, 1)

2
config/board.ramps-v1.3.h
View File

@ -197,8 +197,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO10, 1) DEFINE_HEATER(extruder, DIO10, 1)
DEFINE_HEATER(bed, DIO8, 1) DEFINE_HEATER(bed, DIO8, 1)
DEFINE_HEATER(fan, DIO9, 1) DEFINE_HEATER(fan, DIO9, 1)

2
config/board.rumba.h
View File

@ -197,8 +197,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO11, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO2, 1) DEFINE_HEATER(extruder, DIO2, 1)
DEFINE_HEATER(bed, DIO9, 1) DEFINE_HEATER(bed, DIO9, 1)
DEFINE_HEATER(fan, DIO8, 1) DEFINE_HEATER(fan, DIO8, 1)

2
config/board.sanguinololu-v1.1.h
View File

@ -195,8 +195,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO13, 1) DEFINE_HEATER(extruder, DIO13, 1)
DEFINE_HEATER(bed, DIO14, 1) DEFINE_HEATER(bed, DIO14, 1)

2
config/board.sanguinololu-v1.2.h
View File

@ -195,8 +195,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO12, 1) DEFINE_HEATER(extruder, DIO12, 1)
DEFINE_HEATER(bed, DIO13, 1) DEFINE_HEATER(bed, DIO13, 1)

2
config/board.sanguish.h
View File

@ -195,8 +195,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO3, 1) DEFINE_HEATER(extruder, DIO3, 1)
DEFINE_HEATER(bed, DIO4, 1) DEFINE_HEATER(bed, DIO4, 1)

2
config/board.teensy++-v2.0.h
View File

@ -193,8 +193,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
DEFINE_HEATER(extruder, DIO15, 1) DEFINE_HEATER(extruder, DIO15, 1)
DEFINE_HEATER(bed, DIO14, 1) DEFINE_HEATER(bed, DIO14, 1)
DEFINE_HEATER(fan, DIO16, 0) DEFINE_HEATER(fan, DIO16, 0)

2
config/board.teensy-v2.0.h
View File

@ -193,8 +193,8 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
with slow switches, like solid state relays. PWM frequency can be with slow switches, like solid state relays. PWM frequency can be
influenced globally with FAST_PWM, see below. influenced globally with FAST_PWM, see below.
*/ */
// name port pwm
//DEFINE_HEATERS_START //DEFINE_HEATERS_START
// name port pwm
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)

4
configtool/boardpanel.py
View File

@ -483,10 +483,10 @@ class BoardPanel(wx.Panel):
m = reStartHeaters.match(ln) m = reStartHeaters.match(ln)
if m: if m:
fp.write(ln) fp.write(ln)
fp.write("// name port pwm\n")
for s in self.heaters: for s in self.heaters:
sstr = ", ".join(s) sstr = "%-10s%-7s%s" % ((s[0] + ","), (s[1] + ","), s[2])
fp.write("DEFINE_HEATER(%s)\n" % sstr) fp.write("DEFINE_HEATER(%s)\n" % sstr)
fp.write("\n") fp.write("\n")
for s in self.heaters: for s in self.heaters:
fp.write(defineHeaterFormat % (s[0].upper(), s[0])) fp.write(defineHeaterFormat % (s[0].upper(), s[0]))