diff --git a/gmoccapy_preferences b/gmoccapy_preferences index aa52646..7114cf9 100644 --- a/gmoccapy_preferences +++ b/gmoccapy_preferences @@ -9,7 +9,7 @@ hide_turtle_jog_button = False turtle_jog_factor = 20 dro_size = 31 open_file = -screen1 = maximized +screen1 = window x_pos = 40 y_pos = 30 width = 979 @@ -50,7 +50,7 @@ use_auto_units = False probeheight = 40.5 searchvel = 75.0 probevel = 10.0 -use_toolmeasurement = False +use_toolmeasurement = True reload_tool = True blockdel = False opstop = False @@ -72,7 +72,7 @@ homed_color = #00FF00 unhomed_color = #FF0000 dro_digits = 3 toggle_readout = True -tool_in_spindle = 111 +tool_in_spindle = 1 show_keyboard_on_file_selection = False offset_axis_x = 0.0 offset_axis_y = 0.0 diff --git a/io.hal b/io.hal index cc0db30..d147c76 100644 --- a/io.hal +++ b/io.hal @@ -2,11 +2,6 @@ # If you make changes to this file your screwed net home-joint-0 joint.0.home-sw-in <= hm2_7i96.0.gpio.000.in - -#net min-limit-home-joint-0 joint.0.pos-lim-sw-in <= hm2_7i96.0.gpio.000.in_not -#net min-limit-home-joint-0 joint.0.home-sw-in - - net home-joint-1 joint.1.home-sw-in <= hm2_7i96.0.gpio.001.in net home-joint-2 joint.2.home-sw-in <= hm2_7i96.0.gpio.002.in net home-joint-3 joint.3.home-sw-in <= hm2_7i96.0.gpio.003.in diff --git a/macros/on_abort.ngc b/macros/on_abort.ngc index a181f5d..8cc516d 100644 --- a/macros/on_abort.ngc +++ b/macros/on_abort.ngc @@ -5,3 +5,4 @@ G40 G49 o endsub + diff --git a/mesa_2019.hal b/mesa_2019.hal index 8a1a423..a9c9923 100644 --- a/mesa_2019.hal +++ b/mesa_2019.hal @@ -29,13 +29,6 @@ addf pid.2.do-pid-calcs servo-thread addf pid.3.do-pid-calcs servo-thread addf hm2_[HOSTMOT2](BOARD).0.write servo-thread - -loadusr -W hal_manualtoolchange -net tool-change iocontrol.0.tool-change => hal_manualtoolchange.change -net tool-changed iocontrol.0.tool-changed <= hal_manualtoolchange.changed -net tool-number iocontrol.0.tool-prep-number => hal_manualtoolchange.number -net tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared - # Joint 0 # axis enable chain newsig emcmot.0.enable bit diff --git a/mesa_2019.ini b/mesa_2019.ini index 353ad66..9e63c8d 100644 --- a/mesa_2019.ini +++ b/mesa_2019.ini @@ -27,7 +27,7 @@ DISPLAY = gmoccapy POSITION_OFFSET = RELATIVE POSITION_FEEDBACK = COMMANDED -CYCLE_TIME = 0.1 +CYCLE_TIME = 150 INTRO_GRAPHIC = emc2.gif INTRO_TIME = 0 OPEN_FILE = "" @@ -41,9 +41,7 @@ MAX_SPINDLE_OVERRIDE = 15 MIN_SPINDLE_OVERRIDE = 0.2 # required NativeCAM item : #PROGRAM_PREFIX = ncam/scripts/ - - - +PROGRAM_PREFIX = ../../nc_files/ #EMBED_TAB_NAME=Probe Screen #EMBED_TAB_LOCATION = ntb_preview @@ -53,9 +51,9 @@ MIN_SPINDLE_OVERRIDE = 0.2 #EMBED_TAB_LOCATION = ntb_preview #EMBED_TAB_COMMAND = mplayer -quiet -msglevel all=-1 -wid {XID} tv://0 -vf rectangle=-1:2:-1:240,rectangle=2:-1:320:-1 -EMBED_TAB_NAME = DRO -EMBED_TAB_LOCATION = ntb_preview -EMBED_TAB_COMMAND = gladevcp -x {XID} dro.glade +#EMBED_TAB_NAME = DRO +#EMBED_TAB_LOCATION = ntb_preview +#EMBED_TAB_COMMAND = gladevcp -x {XID} dro.glade #EMBED_TAB_NAME = Native CAM #EMBED_TAB_LOCATION = ntb_preview @@ -73,8 +71,26 @@ TOOL_TABLE = tool.tbl [RS274NGC] PARAMETER_FILE = mesa_2019.var # required NativeCAM item : -SUBROUTINE_PATH = ncam/my-stuff:ncam/lib/mill:ncam/lib/utilities:macros +SUBROUTINE_PATH = macros +# Enables the reading of INI and HAL values from gcode +FEATURES=12 + +# is the sub, with is called when a error during tool change happens +ON_ABORT_COMMAND=O call + +# The remap code +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=change epilog=change_epilog + +[TOOLSENSOR] +X = 500 +Y = 500 +Z = 46 +MAXPROBE = -35 +[CHANGE_POSITION] +X = 530 +Y = 570 +Z = 66 [PYTHON] # The path to start a search for user modules @@ -94,7 +110,7 @@ CYCLE_TIME = 0.010 COORDINATES = XYYZ LINEAR_UNITS = metric ANGULAR_UNITS = degree -MAX_LINEAR_VELOCITY = 45 +MAX_LINEAR_VELOCITY = 230 [HAL] #TWOPASS = ON @@ -361,7 +377,7 @@ FF2 = 0.00013 BIAS = 0 MAX_OUTPUT = 0 MAX_ERROR = 0.0127 -HOME = 73 +HOME = 65 HOME_OFFSET = 72 HOME_SEARCH_VEL = -10 HOME_LATCH_VEL = -2 diff --git a/mesa_2019.var b/mesa_2019.var new file mode 100644 index 0000000..6e341e2 --- /dev/null +++ b/mesa_2019.var @@ -0,0 +1,119 @@ +5161 0.000000 +5162 0.000000 +5163 0.000000 +5164 0.000000 +5165 0.000000 +5166 0.000000 +5167 0.000000 +5168 0.000000 +5169 0.000000 +5181 0.000000 +5182 0.000000 +5183 0.000000 +5184 0.000000 +5185 0.000000 +5186 0.000000 +5187 0.000000 +5188 0.000000 +5189 0.000000 +5210 0.000000 +5211 0.000000 +5212 0.000000 +5213 0.000000 +5214 0.000000 +5215 0.000000 +5216 0.000000 +5217 0.000000 +5218 0.000000 +5219 0.000000 +5220 1.000000 +5221 0.000000 +5222 0.000000 +5223 7.108590 +5224 0.000000 +5225 0.000000 +5226 0.000000 +5227 0.000000 +5228 0.000000 +5229 0.000000 +5230 0.000000 +5241 0.000000 +5242 0.000000 +5243 0.000000 +5244 0.000000 +5245 0.000000 +5246 0.000000 +5247 0.000000 +5248 0.000000 +5249 0.000000 +5250 0.000000 +5261 0.000000 +5262 0.000000 +5263 0.000000 +5264 0.000000 +5265 0.000000 +5266 0.000000 +5267 0.000000 +5268 0.000000 +5269 0.000000 +5270 0.000000 +5281 0.000000 +5282 0.000000 +5283 0.000000 +5284 0.000000 +5285 0.000000 +5286 0.000000 +5287 0.000000 +5288 0.000000 +5289 0.000000 +5290 0.000000 +5301 0.000000 +5302 0.000000 +5303 0.000000 +5304 0.000000 +5305 0.000000 +5306 0.000000 +5307 0.000000 +5308 0.000000 +5309 0.000000 +5310 0.000000 +5321 0.000000 +5322 0.000000 +5323 0.000000 +5324 0.000000 +5325 0.000000 +5326 0.000000 +5327 0.000000 +5328 0.000000 +5329 0.000000 +5330 0.000000 +5341 0.000000 +5342 0.000000 +5343 0.000000 +5344 0.000000 +5345 0.000000 +5346 0.000000 +5347 0.000000 +5348 0.000000 +5349 0.000000 +5350 0.000000 +5361 0.000000 +5362 0.000000 +5363 0.000000 +5364 0.000000 +5365 0.000000 +5366 0.000000 +5367 0.000000 +5368 0.000000 +5369 0.000000 +5370 0.000000 +5381 0.000000 +5382 0.000000 +5383 0.000000 +5384 0.000000 +5385 0.000000 +5386 0.000000 +5387 0.000000 +5388 0.000000 +5389 0.000000 +5390 0.000000 diff --git a/mesa_2019.var.bak b/mesa_2019.var.bak index 98f5e56..6e341e2 100644 --- a/mesa_2019.var.bak +++ b/mesa_2019.var.bak @@ -29,7 +29,7 @@ 5220 1.000000 5221 0.000000 5222 0.000000 -5223 -5.284350 +5223 7.108590 5224 0.000000 5225 0.000000 5226 0.000000 diff --git a/postgui.hal b/postgui.hal index 18bedb4..043dbfa 100644 --- a/postgui.hal +++ b/postgui.hal @@ -11,6 +11,17 @@ net estop-reset iocontrol.0.user-request-enable => estop-latch.0.reset net remote-estop estop-latch.0.fault-in <= hm2_7i96.0.gpio.010.in net estop-loop hm2_7i96.0.ssr.00.out-01 +# The next lines are only needed if the pins had been connected before +unlinkp iocontrol.0.tool-change +unlinkp iocontrol.0.tool-changed +unlinkp iocontrol.0.tool-prep-number +unlinkp iocontrol.0.tool-prepared + +net tool-change gmoccapy.toolchange-change <= iocontrol.0.tool-change +net tool-changed gmoccapy.toolchange-changed <= iocontrol.0.tool-changed +net tool-prep-number gmoccapy.toolchange-number <= iocontrol.0.tool-prep-number +net tool-prep-loop iocontrol.0.tool-prepare <= iocontrol.0.tool-prepared + # create signals for tool loading loopback net tooloffset-x gmoccapy.tooloffset-x <= motion.tooloffset.x net tooloffset-z gmoccapy.tooloffset-z <= motion.tooloffset.z diff --git a/tool.tbl b/tool.tbl index fdc3db0..53303f5 100644 --- a/tool.tbl +++ b/tool.tbl @@ -1,11 +1,11 @@ T0 P0 ; T0 P0 ; T0 P0 ; -T1 P1 ; -T42 P42 D6.350000 X+1.000000 Y+1.000000 Z-63.635200 ;added 20190422 -T24 P24 D6.350000 ;comment +T1 P1 Z+1.618921 ; +T42 P42 D6.350000 X+1.000000 Y+1.000000 ;added 20190422 +T24 P24 D6.350000 Z+1.677670 ;comment T6 P6 Z-5.514300 ;comment T99 P99 D1.000000 Z-28.776100 ;60 degre v-bit -T31 P0 D2.000000 Z+7.930094 ;comment -T111 P0 Z+13.110760 ;60 degree small +T31 P0 D2.000000 Z+7.930100 ;comment +T111 P0 Z+13.110800 ;60 degree small T5 P0 ;comment