Skip to content

Commit 32599f2

Browse files
author
Chris Polanski
committed
added unhome buttons and fixed ref all button
1 parent feae953 commit 32599f2

File tree

3 files changed

+131
-4
lines changed

3 files changed

+131
-4
lines changed

‎config/probe_basic/tool.tbl‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,10 @@ T42 P42 Z+0.000000 D+0.000000 ; DRILL CHUCK EMPTY
4343
T44 P44 Z+0.000000 D+0.000000 ; DRILL CHUCK EMPTY 2
4444
T47 P47 Z+0.000000 D+1.968500 ; 50mm Boring Head 10-125mm 63mm head length
4545
T48 P48 Z+6.000000 D+3.937000 ; 100mm (3.9370) 6 Flute 45 deg Face Mill 4mm Loc 50mm oal
46+
T56 P56 Z+6.000000 D+0.433900 ; drill .4339
47+
T58 P58 Z+4.000000 D+0.201000 ; drill .201
48+
T59 P59 Z+3.000000 D+0.180000 ; threadmill
49+
T60 P60 Z+3.000000 D+0.500000 ; drill
50+
T65 P65 Z+3.000000 D+0.500000 ; half endmill
4651
T99 P99 Z+5.939600 D+0.125000 ; Probe Tool 0.125" ball Probe Tip
4752
T100 P100 Z+0.000000 D+0.000000 ; Spindle Nose

‎config/probe_basic_lathe/probe_basic_lathe.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ DEFAULT_VELOCITY = 1.0
103103
MAX_LINEAR_VELOCITY = 3.333334
104104
DEFAULT_ACCELERATION = 20.0
105105
MAX_ACCELERATION = 20.0
106-
NO_FORCE_HOMING = 1
106+
NO_FORCE_HOMING = 0
107107
# Axes sections ---------------------------------------------------------------
108108

109109
# First axis

‎probe_basic_lathe/probe_basic_lathe.ui‎

Lines changed: 125 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17887,6 +17887,128 @@ border-radius: 6px;
1788717887
<verstretch>1</verstretch>
1788817888
</sizepolicy>
1788917889
</property>
17890+
<layout class="QVBoxLayout" name="verticalLayout_21">
17891+
<property name="spacing">
17892+
<number>20</number>
17893+
</property>
17894+
<property name="leftMargin">
17895+
<number>15</number>
17896+
</property>
17897+
<property name="rightMargin">
17898+
<number>15</number>
17899+
</property>
17900+
<property name="bottomMargin">
17901+
<number>20</number>
17902+
</property>
17903+
<item>
17904+
<widget class="QWidget" name="widget_26" native="true"/>
17905+
</item>
17906+
<item>
17907+
<widget class="ActionButton" name="ref_all_button_2">
17908+
<property name="sizePolicy">
17909+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
17910+
<horstretch>1</horstretch>
17911+
<verstretch>0</verstretch>
17912+
</sizepolicy>
17913+
</property>
17914+
<property name="minimumSize">
17915+
<size>
17916+
<width>62</width>
17917+
<height>40</height>
17918+
</size>
17919+
</property>
17920+
<property name="maximumSize">
17921+
<size>
17922+
<width>16777215</width>
17923+
<height>40</height>
17924+
</size>
17925+
</property>
17926+
<property name="focusPolicy">
17927+
<enum>Qt::NoFocus</enum>
17928+
</property>
17929+
<property name="styleSheet">
17930+
<string notr="true">QPushButton {
17931+
font: 15pt &quot;Bebas Kai&quot;;
17932+
}</string>
17933+
</property>
17934+
<property name="text">
17935+
<string>UN REF ALL</string>
17936+
</property>
17937+
<property name="rules" stdset="0">
17938+
<string>[]</string>
17939+
</property>
17940+
<property name="actionName" stdset="0">
17941+
<string>machine.unhome.all</string>
17942+
</property>
17943+
</widget>
17944+
</item>
17945+
<item>
17946+
<widget class="ActionButton" name="axisactionbutton_10">
17947+
<property name="sizePolicy">
17948+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
17949+
<horstretch>0</horstretch>
17950+
<verstretch>0</verstretch>
17951+
</sizepolicy>
17952+
</property>
17953+
<property name="minimumSize">
17954+
<size>
17955+
<width>60</width>
17956+
<height>40</height>
17957+
</size>
17958+
</property>
17959+
<property name="maximumSize">
17960+
<size>
17961+
<width>16777215</width>
17962+
<height>40</height>
17963+
</size>
17964+
</property>
17965+
<property name="styleSheet">
17966+
<string notr="true">QPushButton {
17967+
font: 15pt &quot;Bebas Kai&quot;;
17968+
}</string>
17969+
</property>
17970+
<property name="text">
17971+
<string>UN REF X</string>
17972+
</property>
17973+
<property name="actionName" stdset="0">
17974+
<string>machine.unhome.axis:x</string>
17975+
</property>
17976+
</widget>
17977+
</item>
17978+
<item>
17979+
<widget class="ActionButton" name="axisactionbutton_9">
17980+
<property name="sizePolicy">
17981+
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
17982+
<horstretch>0</horstretch>
17983+
<verstretch>0</verstretch>
17984+
</sizepolicy>
17985+
</property>
17986+
<property name="minimumSize">
17987+
<size>
17988+
<width>60</width>
17989+
<height>40</height>
17990+
</size>
17991+
</property>
17992+
<property name="maximumSize">
17993+
<size>
17994+
<width>16777215</width>
17995+
<height>40</height>
17996+
</size>
17997+
</property>
17998+
<property name="styleSheet">
17999+
<string notr="true">QPushButton {
18000+
font: 15pt &quot;Bebas Kai&quot;;
18001+
}</string>
18002+
</property>
18003+
<property name="text">
18004+
<string>UN REF Z</string>
18005+
</property>
18006+
<property name="actionName" stdset="0">
18007+
<string>machine.unhome.axis:z</string>
18008+
</property>
18009+
</widget>
18010+
</item>
18011+
</layout>
1789018012
</widget>
1789118013
</item>
1789218014
<item>
@@ -19754,7 +19876,7 @@ border-radius: 1px;
1975419876
</widget>
1975519877
</item>
1975619878
<item>
19757-
<widget class="ActionButton" name="ref_all_button_2">
19879+
<widget class="ActionButton" name="ref_all_button">
1975819880
<property name="sizePolicy">
1975919881
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
1976019882
<horstretch>1</horstretch>
@@ -19785,7 +19907,7 @@ border-radius: 1px;
1978519907
<string>REF ALL</string>
1978619908
</property>
1978719909
<property name="rules" stdset="0">
19788-
<string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:all_axes_homed&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;'HOMED' if ch[0] else 'REF ALL'&quot;, &quot;name&quot;: &quot;reference_all&quot;}]</string>
19910+
<string>[{&quot;channels&quot;: [{&quot;url&quot;: &quot;status:homed?anum=0&quot;, &quot;trigger&quot;: true}, {&quot;url&quot;: &quot;status:homed?anum=1&quot;, &quot;trigger&quot;: true}], &quot;property&quot;: &quot;Text&quot;, &quot;expression&quot;: &quot;'HOMED' if ch[0] and ch[1] else 'REF ALL'&quot;, &quot;name&quot;: &quot;reference_all&quot;}]</string>
1978919911
</property>
1979019912
<property name="actionName" stdset="0">
1979119913
<string>machine.home.all</string>
@@ -23478,8 +23600,8 @@ font: 11pt bebas kai;
2347823600
</property>
2347923601
</designerdata>
2348023602
<buttongroups>
23481-
<buttongroup name="btngrpMdi"/>
2348223603
<buttongroup name="lathecontrolpointbtngroup"/>
2348323604
<buttongroup name="diamradbtngroup"/>
23605+
<buttongroup name="btngrpMdi"/>
2348423606
</buttongroups>
2348523607
</ui>

0 commit comments

Comments
 (0)