bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added a new preprocessor file for using laser on a Marlin motion controller but with the laser connected to one of the FAN pins, named 'Marlin_laser_use_FAN_pin'

Browse Source
This commit is contained in:
Marius Stanciu
2020-02-08 20:38:51 +02:00
committed by Marius
parent 9911402c95
commit 48029da52b
17 changed files with 256 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
flatcamGUI/ObjectUI.py
View File

@@ -992,23 +992,23 @@ class ExcellonObjectUI(ObjectUI):
self.grid3.addWidget(self.estartz_entry, 9, 1)
# End move Z:
self.eendz_label = QtWidgets.QLabel('%s:' % _("End move Z"))
self.eendz_label.setToolTip(
self.endz_label = QtWidgets.QLabel('%s:' % _("End move Z"))
self.endz_label.setToolTip(
_("Height of the tool after\n"
"the last move at the end of the job.")
)
self.eendz_entry = FCDoubleSpinner(callback=self.confirmation_message)
self.eendz_entry.set_precision(self.decimals)
self.endz_entry = FCDoubleSpinner(callback=self.confirmation_message)
self.endz_entry.set_precision(self.decimals)
if machinist_setting == 0:
self.eendz_entry.set_range(0.0, 9999.9999)
self.endz_entry.set_range(0.0, 9999.9999)
else:
self.eendz_entry.set_range(-9999.9999, 9999.9999)
self.endz_entry.set_range(-9999.9999, 9999.9999)
self.eendz_entry.setSingleStep(0.1)
self.endz_entry.setSingleStep(0.1)
self.grid3.addWidget(self.eendz_label, 11, 0)
self.grid3.addWidget(self.eendz_entry, 11, 1)
self.grid3.addWidget(self.endz_label, 11, 0)
self.grid3.addWidget(self.endz_entry, 11, 1)
# Feedrate X-Y
self.frxylabel = QtWidgets.QLabel('%s:' % _('Feedrate X-Y'))
@@ -1748,23 +1748,23 @@ class GeometryObjectUI(ObjectUI):
# self.grid3.addWidget(self.gstartz_entry, 8, 1)
# The Z value for the end move
self.endzlabel = QtWidgets.QLabel('%s:' % _('End move Z'))
self.endzlabel.setToolTip(
self.endz_label = QtWidgets.QLabel('%s:' % _('End move Z'))
self.endz_label.setToolTip(
_("Height of the tool after\n"
"the last move at the end of the job.")
)
self.gendz_entry = FCDoubleSpinner(callback=self.confirmation_message)
self.gendz_entry.set_precision(self.decimals)
self.endz_entry = FCDoubleSpinner(callback=self.confirmation_message)
self.endz_entry.set_precision(self.decimals)
if machinist_setting == 0:
self.gendz_entry.set_range(0, 9999.9999)
self.endz_entry.set_range(0, 9999.9999)
else:
self.gendz_entry.set_range(-9999.9999, 9999.9999)
self.endz_entry.set_range(-9999.9999, 9999.9999)
self.gendz_entry.setSingleStep(0.1)
self.endz_entry.setSingleStep(0.1)
self.grid3.addWidget(self.endzlabel, 9, 0)
self.grid3.addWidget(self.gendz_entry, 9, 1)
self.grid3.addWidget(self.endz_label, 9, 0)
self.grid3.addWidget(self.endz_entry, 9, 1)
# Feedrate X-Y
self.frlabel = QtWidgets.QLabel('%s:' % _('Feedrate X-Y'))
@@ -1804,16 +1804,16 @@ class GeometryObjectUI(ObjectUI):
"It is useful only for Marlin,\n"
"ignore for any other cases.")
)
self.cncfeedrate_rapid_entry = FCDoubleSpinner(callback=self.confirmation_message)
self.cncfeedrate_rapid_entry.set_precision(self.decimals)
self.cncfeedrate_rapid_entry.set_range(0, 99999.9999)
self.cncfeedrate_rapid_entry.setSingleStep(0.1)
self.feedrate_rapid_entry = FCDoubleSpinner(callback=self.confirmation_message)
self.feedrate_rapid_entry.set_precision(self.decimals)
self.feedrate_rapid_entry.set_range(0, 99999.9999)
self.feedrate_rapid_entry.setSingleStep(0.1)
self.grid3.addWidget(self.fr_rapidlabel, 12, 0)
self.grid3.addWidget(self.cncfeedrate_rapid_entry, 12, 1)
self.grid3.addWidget(self.feedrate_rapid_entry, 12, 1)
# default values is to hide
self.fr_rapidlabel.hide()
self.cncfeedrate_rapid_entry.hide()
self.feedrate_rapid_entry.hide()
# Cut over 1st point in path
self.extracut_cb = FCCheckBox('%s:' % _('Re-cut'))

48
flatcamGUI/PreferencesUI.py
View File

@@ -3128,21 +3128,21 @@ class ExcellonOptPrefGroupUI(OptionsGroupUI):
grid2.addWidget(self.toolchangez_entry, 3, 1)
# End Move Z
endzlabel = QtWidgets.QLabel('%s:' % _('End move Z'))
endzlabel.setToolTip(
endz_label = QtWidgets.QLabel('%s:' % _('End move Z'))
endz_label.setToolTip(
_("Height of the tool after\n"
"the last move at the end of the job.")
)
self.eendz_entry = FCDoubleSpinner()
self.eendz_entry.set_precision(self.decimals)
self.endz_entry = FCDoubleSpinner()
self.endz_entry.set_precision(self.decimals)
if machinist_setting == 0:
self.eendz_entry.set_range(0.0000, 9999.9999)
self.endz_entry.set_range(0.0000, 9999.9999)
else:
self.eendz_entry.set_range(-9999.9999, 9999.9999)
self.endz_entry.set_range(-9999.9999, 9999.9999)
grid2.addWidget(endzlabel, 4, 0)
grid2.addWidget(self.eendz_entry, 4, 1)
grid2.addWidget(endz_label, 4, 0)
grid2.addWidget(self.endz_entry, 4, 1)
# Feedrate Z
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate Z'))
@@ -4055,24 +4055,24 @@ class GeometryOptPrefGroupUI(OptionsGroupUI):
grid1.addWidget(self.toolchangez_entry, 5, 1)
# End move Z
endzlabel = QtWidgets.QLabel('%s:' % _('End move Z'))
endzlabel.setToolTip(
endz_label = QtWidgets.QLabel('%s:' % _('End move Z'))
endz_label.setToolTip(
_("Height of the tool after\n"
"the last move at the end of the job.")
)
self.gendz_entry = FCDoubleSpinner()
self.endz_entry = FCDoubleSpinner()
if machinist_setting == 0:
self.gendz_entry.set_range(0.000, 9999.9999)
self.endz_entry.set_range(0.000, 9999.9999)
else:
self.gendz_entry.set_range(-9999.9999, 9999.9999)
self.endz_entry.set_range(-9999.9999, 9999.9999)
self.gendz_entry.set_precision(self.decimals)
self.gendz_entry.setSingleStep(0.1)
self.gendz_entry.setWrapping(True)
self.endz_entry.set_precision(self.decimals)
self.endz_entry.setSingleStep(0.1)
self.endz_entry.setWrapping(True)
grid1.addWidget(endzlabel, 6, 0)
grid1.addWidget(self.gendz_entry, 6, 1)
grid1.addWidget(endz_label, 6, 0)
grid1.addWidget(self.endz_entry, 6, 1)
# Feedrate X-Y
frlabel = QtWidgets.QLabel('%s:' % _('Feedrate X-Y'))
@@ -4207,14 +4207,14 @@ class GeometryAdvOptPrefGroupUI(OptionsGroupUI):
"It is useful only for Marlin,\n"
"ignore for any other cases.")
)
self.cncfeedrate_rapid_entry = FCDoubleSpinner()
self.cncfeedrate_rapid_entry.set_range(0, 99999.9999)
self.cncfeedrate_rapid_entry.set_precision(self.decimals)
self.cncfeedrate_rapid_entry.setSingleStep(0.1)
self.cncfeedrate_rapid_entry.setWrapping(True)
self.feedrate_rapid_entry = FCDoubleSpinner()
self.feedrate_rapid_entry.set_range(0, 99999.9999)
self.feedrate_rapid_entry.set_precision(self.decimals)
self.feedrate_rapid_entry.setSingleStep(0.1)
self.feedrate_rapid_entry.setWrapping(True)
grid1.addWidget(fr_rapid_label, 4, 0)
grid1.addWidget(self.cncfeedrate_rapid_entry, 4, 1)
grid1.addWidget(self.feedrate_rapid_entry, 4, 1)
# End move extra cut
self.extracut_cb = FCCheckBox('%s' % _('Re-cut'))