Skip to content

Commit 6569109

Browse files
LcvetteLcvette
committed
updated ui file and subs for new debug messages
1 parent c063c2f commit 6569109

38 files changed

+317
-200
lines changed

‎config/atc_sim/macros_sim_inch/probe_cal_square_boss.ngc‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,12 @@ o<probe_cal_square_boss> sub
102102

103103
(Completed probed width calculations)
104104
#<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
105+
106+
#1001 = #<x_probed_width>
107+
(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
105108

106-
M68 E31 Q[#<x_probed_width>]
107-
108-
M68 E41 Q[#<x_center_probed>]
109+
#1002 = #<x_center_probed>
110+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
109111

110112
G91
111113
F[#<max_vel_slider>]
@@ -157,9 +159,11 @@ o<probe_cal_square_boss> sub
157159
(Completed probed width calculations)
158160
#<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
159161

160-
M68 E32 Q[#<y_probed_width>]
162+
#1003 = #<y_probed_width>
163+
(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
161164

162-
M68 E42 Q[#<y_center_probed>]
165+
#1004 = #<y_center_probed>
166+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
163167

164168
G91
165169
F[#<max_vel_slider>]
@@ -189,11 +193,14 @@ o<probe_cal_square_boss> sub
189193
#<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
190194

191195
o<140> if [#<sq_cal_axis> EQ 0]
192-
M68 E43 Q[ABS[#<new_avg_cal_offset>]]
196+
#1000 = [ABS[#<new_avg_cal_offset>]]
197+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
193198
o<140> else if [#<sq_cal_axis> EQ 1]
194-
M68 E43 Q[ABS[#<new_x_cal_offset>]]
199+
#1000 = [ABS[#<new_x_cal_offset>]]
200+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
195201
o<140> else
196-
M68 E43 Q[ABS[#<new_y_cal_offset>]]
202+
#1000 = [ABS[#<new_y_cal_offset>]]
203+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
197204
o<140> endif
198205

199206
#<x_zero> = [#<x_center_probed> + #<workspace_x>]

‎config/probe_basic/subroutines/probe_cal_reset.ngc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
o<probe_cal_reset> sub
22

3-
M68 E43 Q0
3+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{0}])
44

55
o<probe_cal_reset> endsub
66

‎config/probe_basic/subroutines/probe_cal_round_boss.ngc‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ o<probe_cal_round_boss> sub
9696
(probed center calulation)
9797
#<x_center_probed> = [[#<x_minus_probed> + #<x_plus_probed>] / 2]
9898

99-
M68 E41 Q[#<x_center_probed>]
99+
#1002 = #<x_center_probed>
100+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
100101

101102
G91
102103
F[#<max_vel_slider>]
@@ -142,7 +143,8 @@ o<probe_cal_round_boss> sub
142143
(probed center calulation)
143144
#<y_center_probed> = [[#<y_minus_probed> + #<y_plus_probed>] / 2]
144145

145-
M68 E42 Q[#<y_center_probed>]
146+
#1004 = #<y_center_probed>
147+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
146148

147149
(Move to z clearance plane)
148150
G91
@@ -199,9 +201,11 @@ o<probe_cal_round_boss> sub
199201
(Completed probed width calculations)
200202
#<x_probed_width> = [#<x_raw_width> - #<probe_diameter_offset>]
201203

202-
M68 E31 Q[#<x_probed_width>]
204+
#1001 = #<x_probed_width>
205+
(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
203206

204-
M68 E41 Q[#<x_center_probed>]
207+
#1002 = #<x_center_probed>
208+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
205209

206210
G91
207211
F[#<max_vel_slider>]
@@ -256,13 +260,16 @@ o<probe_cal_round_boss> sub
256260
(Completed probed width calculations)
257261
#<y_probed_width> = [#<y_raw_width> - #<probe_diameter_offset>]
258262

259-
M68 E32 Q[#<y_probed_width>]
263+
#1003 = #<y_probed_width>
264+
(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
260265

261-
M68 E42 Q[#<y_center_probed>]
266+
#1004 = #<y_center_probed>
267+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
262268

263269
#<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
264270

265-
M68 E33 Q[#<averaged_diam>]
271+
#1010 = #<averaged_diam>
272+
(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
266273

267274
G91
268275
F[#<max_vel_slider>]
@@ -292,11 +299,14 @@ o<probe_cal_round_boss> sub
292299
#<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
293300

294301
o<160> if [#<sq_cal_axis> EQ 0]
295-
M68 E43 Q[ABS[#<new_avg_cal_offset>]]
302+
#1000 = [ABS[#<new_avg_cal_offset>]]
303+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
296304
o<160> else if [#<sq_cal_axis> EQ 1]
297-
M68 E43 Q[ABS[#<new_x_cal_offset>]]
305+
#1000 = [ABS[#<new_x_cal_offset>]]
306+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
298307
o<160> else
299-
M68 E43 Q[ABS[#<new_y_cal_offset>]]
308+
#1000 = [ABS[#<new_y_cal_offset>]]
309+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
300310
o<160> endif
301311

302312
#<x_zero> = [#<x_center_probed> + #<workspace_x>]

‎config/probe_basic/subroutines/probe_cal_round_pocket.ngc‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ o<probe_cal_round_pocket> sub
7575
(probed center calculation)
7676
#<x_center_probed> = [[#<x_plus_probed> + #<x_minus_probed>] / 2]
7777

78-
M68 E41 Q[#<x_center_probed>]
78+
#1002 = #<x_center_probed>
79+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
7980

8081
(Probe Completion Move to Z Clearance Plane, and X Zero)
8182
G90
@@ -95,7 +96,8 @@ o<probe_cal_round_pocket> sub
9596
(probed center calculation)
9697
#<y_center_probed> = [[#<y_plus_probed> + #<y_minus_probed>] / 2]
9798

98-
M68 E42 Q[#<y_center_probed>]
99+
#1004 = #<y_center_probed>
100+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
99101

100102
(Probe Completion Move to Z Clearance Plane, Y Zero)
101103
G90
@@ -121,9 +123,11 @@ o<probe_cal_round_pocket> sub
121123
(Completed probed width calculations)
122124
#<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
123125

124-
M68 E31 Q[#<x_probed_width>]
126+
#1001 = #<x_probed_width>
127+
(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
125128

126-
M68 E41 Q[#<x_center_probed>]
129+
#1002 = #<x_center_probed>
130+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
127131

128132
G90
129133
F[#<max_vel_slider>]
@@ -148,13 +152,16 @@ o<probe_cal_round_pocket> sub
148152
(Completed probed diameter calculations)
149153
#<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
150154

151-
M68 E32 Q[#<y_probed_width>]
155+
#1003 = #<y_probed_width>
156+
(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
152157

153-
M68 E42 Q[#<y_center_probed>]
158+
#1004 = #<y_center_probed>
159+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
154160

155161
#<averaged_diam> = [[#<x_probed_width> + #<y_probed_width>] / 2]
156162

157-
M68 E33 Q[#<averaged_diam>]
163+
#1010 = #<averaged_diam>
164+
(DEBUG, EVAL[vcp.getWidget{"averaged_diam"}.setValue{#1010}])
158165

159166
G90
160167
F[#<max_vel_slider>]
@@ -184,11 +191,14 @@ o<probe_cal_round_pocket> sub
184191
#<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
185192

186193
o<140> if [#<sq_cal_axis> EQ 0]
187-
M68 E43 Q[ABS[#<new_avg_cal_offset>]]
194+
#1000 = [ABS[#<new_avg_cal_offset>]]
195+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
188196
o<140> else if [#<sq_cal_axis> EQ 1]
189-
M68 E43 Q[ABS[#<new_x_cal_offset>]]
197+
#1000 = [ABS[#<new_x_cal_offset>]]
198+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
190199
o<140> else
191-
M68 E43 Q[ABS[#<new_y_cal_offset>]]
200+
#1000 = [ABS[#<new_y_cal_offset>]]
201+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
192202
o<140> endif
193203

194204
#<x_zero> = [#<x_center_probed> + #<workspace_x>]

‎config/probe_basic/subroutines/probe_cal_square_boss.ngc‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,11 @@ o<probe_cal_square_boss> sub
103103
(Completed probed width calculations)
104104
#<x_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
105105

106-
M68 E31 Q[#<x_probed_width>]
106+
#1001 = #<x_probed_width>
107+
(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
107108

108-
M68 E41 Q[#<x_center_probed>]
109+
#1002 = #<x_center_probed>
110+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
109111

110112
G91
111113
F[#<max_vel_slider>]
@@ -157,9 +159,11 @@ o<probe_cal_square_boss> sub
157159
(Completed probed width calculations)
158160
#<y_probed_width> = [#<raw_width> - #<probe_diameter_offset>]
159161

160-
M68 E32 Q[#<y_probed_width>]
162+
#1003 = #<y_probed_width>
163+
(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
161164

162-
M68 E42 Q[#<y_center_probed>]
165+
#1004 = #<y_center_probed>
166+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
163167

164168
G91
165169
F[#<max_vel_slider>]
@@ -189,11 +193,14 @@ o<probe_cal_square_boss> sub
189193
#<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
190194

191195
o<140> if [#<sq_cal_axis> EQ 0]
192-
M68 E43 Q[ABS[#<new_avg_cal_offset>]]
196+
#1000 = [ABS[#<new_avg_cal_offset>]]
197+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setText{'%4.2f' % #1000}])
193198
o<140> else if [#<sq_cal_axis> EQ 1]
194-
M68 E43 Q[ABS[#<new_x_cal_offset>]]
199+
#1000 = [ABS[#<new_x_cal_offset>]]
200+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setText{'%4.2f' % #1000}])
195201
o<140> else
196-
M68 E43 Q[ABS[#<new_y_cal_offset>]]
202+
#1000 = [ABS[#<new_y_cal_offset>]]
203+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setText{'%4.2f' % #1000}])
197204
o<140> endif
198205

199206
#<x_zero> = [#<x_center_probed> + #<workspace_x>]

‎config/probe_basic/subroutines/probe_cal_square_pocket.ngc‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ o<probe_cal_square_pocket> sub
8282
(Completed probed width calculations)
8383
#<x_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
8484

85-
M68 E31 Q[#<x_probed_width>]
85+
#1001 = #<x_probed_width>
86+
(DEBUG, EVAL[vcp.getWidget{"x_probed_width"}.setValue{#1001}])
8687

87-
M68 E41 Q[#<x_center_probed>]
88+
#1002 = #<x_center_probed>
89+
(DEBUG, EVAL[vcp.getWidget{"x_center_probed"}.setValue{#1002}])
8890

8991
(Probe Completion Move to Z Clearance Plane, and X Zero, Y Zero)
9092
G90
@@ -110,9 +112,11 @@ o<probe_cal_square_pocket> sub
110112
(Completed probed width calculations)
111113
#<y_probed_width> = [#<raw_width> + #<probe_diameter_offset>]
112114

113-
M68 E32 Q[#<y_probed_width>]
115+
#1003 = #<y_probed_width>
116+
(DEBUG, EVAL[vcp.getWidget{"y_probed_width"}.setValue{#1003}])
114117

115-
M68 E42 Q[#<y_center_probed>]
118+
#1004 = #<y_center_probed>
119+
(DEBUG, EVAL[vcp.getWidget{"y_center_probed"}.setValue{#1004}])
116120

117121
G90
118122
F[#<max_vel_slider>]
@@ -142,11 +146,14 @@ o<probe_cal_square_pocket> sub
142146
#<new_avg_cal_offset> = [[#<new_x_cal_offset> + #<new_y_cal_offset>] / 2]
143147

144148
o<140> if [#<sq_cal_axis> EQ 0]
145-
M68 E43 Q[ABS[#<new_avg_cal_offset>]]
149+
#1000 = [ABS[#<new_avg_cal_offset>]]
150+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
146151
o<140> else if [#<sq_cal_axis> EQ 1]
147-
M68 E43 Q[ABS[#<new_x_cal_offset>]]
152+
#1000 = [ABS[#<new_x_cal_offset>]]
153+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
148154
o<140> else
149-
M68 E43 Q[ABS[#<new_y_cal_offset>]]
155+
#1000 = [ABS[#<new_y_cal_offset>]]
156+
(DEBUG, EVAL[vcp.getWidget{"calibration_offset"}.setValue{#1000}])
150157
o<140> endif
151158

152159
#<x_zero> = [#<x_center_probed> + #<workspace_x>]

‎config/probe_basic/subroutines/probe_corner_x_minus_edge_angle.ngc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@ o<probe_corner_x_minus_edge_angle> sub
124124

125125
#<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
126126

127-
M68 E35 Q[#<edge_delta>]
127+
#1011 = #<edge_delta>
128+
(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
128129

129-
M68 E34 Q[#<edge_angle>]
130+
#1012 = #<edge_angle>
131+
(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
130132

131133
#<c1xr> = [#<z1x> + [#<p2x> - #<z1x>] * COS[-#<edge_angle>] - [#<p2y> - #<z1y>] * SIN[-#<edge_angle>]]
132134

‎config/probe_basic/subroutines/probe_corner_x_plus_edge_angle.ngc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@ o<probe_corner_x_plus_edge_angle> sub
124124

125125
#<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
126126

127-
M68 E35 Q[#<edge_delta>]
127+
#1011 = #<edge_delta>
128+
(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
128129

129-
M68 E34 Q[#<edge_angle>]
130+
#1012 = #<edge_angle>
131+
(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
130132

131133
#<c1xr> = [#<z1x> + [#<p2x> - #<z1x>] * COS[-#<edge_angle>] - [#<p2y> - #<z1y>] * SIN[-#<edge_angle>]]
132134

‎config/probe_basic/subroutines/probe_corner_y_minus_edge_angle.ngc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@ o<probe_corner_y_minus_edge_angle> sub
124124

125125
#<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
126126

127-
M68 E35 Q[#<edge_delta>]
127+
#1011 = #<edge_delta>
128+
(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
128129

129-
M68 E34 Q[#<edge_angle>]
130+
#1012 = #<edge_angle>
131+
(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
130132

131133
#<c1xr> = [#<z1x> + [#<p1x> - #<z1x>] * COS[-#<edge_angle>] - [#<p1y> - #<z1y>] * SIN[-#<edge_angle>]]
132134

‎config/probe_basic/subroutines/probe_corner_y_plus_edge_angle.ngc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,11 @@ o<probe_corner_y_plus_edge_angle> sub
124124

125125
#<edge_angle> = [ATAN [#<edge_delta>] / [#<edge_width>]]
126126

127-
M68 E35 Q[#<edge_delta>]
127+
#1011 = #<edge_delta>
128+
(DEBUG, EVAL[vcp.getWidget{"edge_delta"}.setValue{#1011}])
128129

129-
M68 E34 Q[#<edge_angle>]
130+
#1012 = #<edge_angle>
131+
(DEBUG, EVAL[vcp.getWidget{"edge_angle"}.setValue{#1012}])
130132

131133
#<c1xr> = [#<z1x> + [#<p1x> - #<z1x>] * COS[-#<edge_angle>] - [#<p1y> - #<z1y>] * SIN[-#<edge_angle>]]
132134

0 commit comments

Comments
 (0)