Skip to content

Commit

Permalink
Added axisfree panel for finishing passes
Browse files Browse the repository at this point in the history
  • Loading branch information
arielnh56 committed Dec 15, 2022
1 parent 24f2bdf commit ada5d4e
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Shoptask1720/Shoptask1720.hal
Expand Up @@ -9,7 +9,7 @@ loadrt hostmot2
loadrt hm2_eth board_ip="192.168.1.121" config=" num_encoders=5 num_pwmgens=0 num_stepgens=3 sserial_port_0=00xxxx"
setp hm2_7i76e.0.watchdog.timeout_ns 5000000
loadrt pid names=pid.x,pid.y,pid.z,pid.s
loadrt and2 names=and2.estop-merge-internal-external
loadrt and2 names=and2.estop-merge-internal-external,and2.axisfree.x,and2.axisfree.y,and2.axisfree.z
loadrt or2 names=or2.stop-relay
loadrt not names=not.machine-is-enabled
loadrt edge names=edge.spindle-start,edge.spindle-stop,edge.xb-spindle
Expand All @@ -25,6 +25,9 @@ addf pid.z.do-pid-calcs servo-thread
addf pid.s.do-pid-calcs servo-thread
addf hm2_7i76e.0.write servo-thread
addf and2.estop-merge-internal-external servo-thread
addf and2.axisfree.x servo-thread
addf and2.axisfree.y servo-thread
addf and2.axisfree.z servo-thread
addf edge.spindle-start servo-thread
addf edge.spindle-stop servo-thread
addf edge.xb-spindle servo-thread
Expand Down
3 changes: 3 additions & 0 deletions Shoptask1720/Shoptask1720.ini
Expand Up @@ -28,6 +28,9 @@ MAX_ANGULAR_VELOCITY = 180.000000
MIN_ANGULAR_VELOCITY = 1.666667
EDITOR = gedit
GEOMETRY = xyz
EMBED_TAB_NAME=axisfree
EMBED_TAB_LOCATION=box_custom_4
EMBED_TAB_COMMAND = gladevcp -x {XID} -H axisfree.hal axisfree.glade

[FILTER]
PROGRAM_EXTENSION = .png,.gif,.jpg Greyscale Depth Image
Expand Down
93 changes: 93 additions & 0 deletions Shoptask1720/axisfree.glade
@@ -0,0 +1,93 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-requires gladevcp 0.0 -->
<!-- interface-naming-policy project-wide -->
<object class="GtkWindow" id="window1">
<property name="can_focus">False</property>
<child>
<object class="GtkTable" id="tbl_marius">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
<object class="HAL_ToggleButton" id="hal_togglebutton_freex">
<property name="label" translatable="yes">Free X</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="draw_indicator">True</property>
</object>
</child>
<child>
<object class="HAL_LED" id="hal_led_x_enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="led_bicolor">True</property>
<property name="led_blink_rate">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<object class="HAL_ToggleButton" id="hal_togglebutton_freez">
<property name="label" translatable="yes">Free Z</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<object class="HAL_LED" id="hal_led_z_enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="led_blink_rate">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<object class="HAL_ToggleButton" id="hal_togglebutton_freey">
<property name="label" translatable="yes">Free Y</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<object class="HAL_LED" id="hal_led_y_enabled">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="led_bicolor">True</property>
<property name="led_blink_rate">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
</object>
</child>
</object>
</interface>
20 changes: 20 additions & 0 deletions Shoptask1720/axisfree.hal
@@ -0,0 +1,20 @@
net x-motor-enable axisfree.hal_led_x_enabled
net y-motor-enable axisfree.hal_led_y_enabled
net z-motor-enable axisfree.hal_led_z_enabled
#net machine-is-enabled => hm2_7i76e.0.gpio.006.out
unlinkp hm2_7i76e.0.gpio.006.out
net machine-is-enabled => and2.axisfree.x.in0
net axisfree-x axisfree.hal_togglebutton_freex-not => and2.axisfree.x.in1
net x-motor-enable and2.axisfree.x.out => hm2_7i76e.0.gpio.006.out

unlinkp hm2_7i76e.0.gpio.007.out
net machine-is-enabled => and2.axisfree.y.in0
net axisfree-y axisfree.hal_togglebutton_freey-not => and2.axisfree.y.in1
net y-motor-enable and2.axisfree.y.out => hm2_7i76e.0.gpio.007.out

unlinkp hm2_7i76e.0.gpio.009.out
net machine-is-enabled => and2.axisfree.z.in0
net axisfree-z axisfree.hal_togglebutton_freez-not => and2.axisfree.z.in1
net z-motor-enable and2.axisfree.z.out => hm2_7i76e.0.gpio.009.out


0 comments on commit ada5d4e

Please sign in to comment.