Configtool: add some formatting to collected help texts.
Tooltips don't size their box after line lengths, but have their own idea on how wide to make it. Accordingly one should display text with newlines only for paragraph delimiters. This also required adjustments to all the board and printer description comments. No functional change there. This should solve issue #148.
This commit is contained in:
parent
2f8ed0dbeb
commit
0991e4a41f
|
|
@ -198,6 +198,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -189,6 +189,7 @@ DEFINE_TEMP_SENSOR(noheater, TT_INTERCOM, AIO0, 0)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -193,6 +193,7 @@ DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, AIO5, THERMISTOR_EXTRUDER)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO2, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -203,6 +203,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -199,6 +199,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO1, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO14, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -202,6 +202,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO11, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -200,6 +200,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -200,6 +200,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -200,6 +200,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO6, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, AIO0, THERMISTOR_BED)
|
||||||
Set 'pwm' to ...
|
Set 'pwm' to ...
|
||||||
1 for using PWM on a PWM-able pin and on/off on other pins.
|
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.
|
0 for using on/off on a PWM-able pin, too.
|
||||||
|
|
||||||
Using PWM usually gives smoother temperature control but can conflict
|
Using PWM usually gives smoother temperature control but can conflict
|
||||||
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.
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,15 @@
|
||||||
|
|
||||||
Valid values (see dda_kinematics.h):
|
Valid values (see dda_kinematics.h):
|
||||||
|
|
||||||
KINEMATICS_STRAIGHT Motors move axis directions directly. This is the
|
KINEMATICS_STRAIGHT
|
||||||
|
Motors move axis directions directly. This is the
|
||||||
traditional type, found in many printers, including
|
traditional type, found in many printers, including
|
||||||
Mendel, Prusa i3, Mendel90, Ormerod, Mantis.
|
Mendel, Prusa i3, Mendel90, Ormerod, Mantis.
|
||||||
|
|
||||||
KINEMATICS_COREXY A bot using CoreXY kinematics. Typical for CoreXY are
|
KINEMATICS_COREXY
|
||||||
long and crossing toothed belts and a print head moving
|
A bot using CoreXY kinematics. Typical for CoreXY
|
||||||
on the X-Y-plane.
|
are long and crossing toothed belts and a print head
|
||||||
|
moving on the X-Y-plane.
|
||||||
*/
|
*/
|
||||||
#define KINEMATICS KINEMATICS_STRAIGHT
|
#define KINEMATICS KINEMATICS_STRAIGHT
|
||||||
|
|
||||||
|
|
@ -292,8 +294,9 @@
|
||||||
false alarm sometimes, Teacup debounces them by counting a number of
|
false alarm sometimes, Teacup debounces them by counting a number of
|
||||||
consecutive positives.
|
consecutive positives.
|
||||||
|
|
||||||
Valid range: 1...255. Use 4 or less for reliable endstops, 8 or even more
|
Use 4 or less for reliable endstops, 8 or even more for flaky ones.
|
||||||
for flaky ones.
|
|
||||||
|
Valid range: 1...255.
|
||||||
*/
|
*/
|
||||||
#define ENDSTOP_STEPS 4
|
#define ENDSTOP_STEPS 4
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,13 +10,15 @@
|
||||||
|
|
||||||
Valid values (see dda_kinematics.h):
|
Valid values (see dda_kinematics.h):
|
||||||
|
|
||||||
KINEMATICS_STRAIGHT Motors move axis directions directly. This is the
|
KINEMATICS_STRAIGHT
|
||||||
|
Motors move axis directions directly. This is the
|
||||||
traditional type, found in many printers, including
|
traditional type, found in many printers, including
|
||||||
Mendel, Prusa i3, Mendel90, Ormerod, Mantis.
|
Mendel, Prusa i3, Mendel90, Ormerod, Mantis.
|
||||||
|
|
||||||
KINEMATICS_COREXY A bot using CoreXY kinematics. Typical for CoreXY are
|
KINEMATICS_COREXY
|
||||||
long and crossing toothed belts and a print head moving
|
A bot using CoreXY kinematics. Typical for CoreXY
|
||||||
on the X-Y-plane.
|
are long and crossing toothed belts and a print head
|
||||||
|
moving on the X-Y-plane.
|
||||||
*/
|
*/
|
||||||
#define KINEMATICS KINEMATICS_STRAIGHT
|
#define KINEMATICS KINEMATICS_STRAIGHT
|
||||||
|
|
||||||
|
|
@ -292,8 +294,9 @@
|
||||||
false alarm sometimes, Teacup debounces them by counting a number of
|
false alarm sometimes, Teacup debounces them by counting a number of
|
||||||
consecutive positives.
|
consecutive positives.
|
||||||
|
|
||||||
Valid range: 1...255. Use 4 or less for reliable endstops, 8 or even more
|
Use 4 or less for reliable endstops, 8 or even more for flaky ones.
|
||||||
for flaky ones.
|
|
||||||
|
Valid range: 1...255.
|
||||||
*/
|
*/
|
||||||
#define ENDSTOP_STEPS 4
|
#define ENDSTOP_STEPS 4
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -237,6 +237,14 @@ class BoardPanel(wx.Panel):
|
||||||
if gatheringHelpText:
|
if gatheringHelpText:
|
||||||
if reHelpTextEnd.match(ln):
|
if reHelpTextEnd.match(ln):
|
||||||
gatheringHelpText = False
|
gatheringHelpText = False
|
||||||
|
helpTextString = helpTextString.strip()
|
||||||
|
# Keep paragraphs with double-newline.
|
||||||
|
helpTextString = helpTextString.replace("\n\n ", "\n\n")
|
||||||
|
# Keep indented lines, typically a list.
|
||||||
|
helpTextString = helpTextString.replace("\n\n ", "\n\n ")
|
||||||
|
helpTextString = helpTextString.replace("\n ", "\n\n ")
|
||||||
|
# Remove all other newlines and indents.
|
||||||
|
helpTextString = helpTextString.replace("\n ", " ")
|
||||||
hk = helpKey.split()
|
hk = helpKey.split()
|
||||||
for k in hk:
|
for k in hk:
|
||||||
self.helpText[k] = helpTextString
|
self.helpText[k] = helpTextString
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,14 @@ class PrinterPanel(wx.Panel):
|
||||||
if gatheringHelpText:
|
if gatheringHelpText:
|
||||||
if reHelpTextEnd.match(ln):
|
if reHelpTextEnd.match(ln):
|
||||||
gatheringHelpText = False
|
gatheringHelpText = False
|
||||||
|
helpTextString = helpTextString.strip()
|
||||||
|
# Keep paragraphs with double-newline.
|
||||||
|
helpTextString = helpTextString.replace("\n\n ", "\n\n")
|
||||||
|
# Keep indented lines, typically a list.
|
||||||
|
helpTextString = helpTextString.replace("\n\n ", "\n\n ")
|
||||||
|
helpTextString = helpTextString.replace("\n ", "\n\n ")
|
||||||
|
# Remove all other newlines and indents.
|
||||||
|
helpTextString = helpTextString.replace("\n ", " ")
|
||||||
hk = helpKey.split()
|
hk = helpKey.split()
|
||||||
for k in hk:
|
for k in hk:
|
||||||
self.helpText[k] = helpTextString
|
self.helpText[k] = helpTextString
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue