diff --git a/ROUTINES/go_home.ngc b/ROUTINES/go_home.ngc new file mode 100644 index 0000000..2f077cf --- /dev/null +++ b/ROUTINES/go_home.ngc @@ -0,0 +1,9 @@ +(go_home.ngc) + +O sub +G0 Z0.500 +G0 X0 Y0 +O endsub + +M2 + diff --git a/ROUTINES/touch_plate.ngc b/ROUTINES/touch_plate.ngc new file mode 100644 index 0000000..1a1bd57 --- /dev/null +++ b/ROUTINES/touch_plate.ngc @@ -0,0 +1,28 @@ +O sub +g91 (switch to relative coordinates) +G38.2 Z-10 F6 (down fast to get approximate) +F10 G1 Z.6 (up .08) +G38.2 Z-1 F1 (down slow to get exact) +F10 G1 Z1 (up .1) + +(vesion 1 set but at 0 and manually hit zero button) +T0 M6 (pause) +F10 G1 Z-.18 (down to true zero - .1 up + .08 thickness of plate) +g90 (switch to absolute coordinates) + + +(Version 2) +(g90) +(G38.2 Z-1 F1) +(G10 L20 P0 Z0.1230) +(G0 Z.5) + + +(Version 3) +(g90) +(G38.2 Z-1 F1) +(G92 Z0.1230) +(G0 Z.5) + +O endsub +M2 diff --git a/autosave.halscope b/autosave.halscope new file mode 100644 index 0000000..8004462 --- /dev/null +++ b/autosave.halscope @@ -0,0 +1,7 @@ +THREAD servo-thread +MAXCHAN 4 +HMULT 1 +HZOOM 1 +HPOS 5.000000e-01 +TMODE 0 +RMODE 0 diff --git a/cnc-router.hal b/cnc-router.hal index 293b8a2..acdea81 100644 --- a/cnc-router.hal +++ b/cnc-router.hal @@ -1,4 +1,4 @@ -# Generated by PNCconf at Sat Dec 29 01:00:17 2018 +# Generated by PNCconf at Thu Jul 11 17:23:41 2019 # If you make changes to this file, they will be # overwritten when you run PNCconf again @@ -8,6 +8,8 @@ loadrt hostmot2 loadrt hm2_eth board_ip="192.168.1.121" config=" num_encoders=0 num_pwmgens=0 num_stepgens=4 sserial_port_0=00xxxx" setp hm2_7i76e.0.watchdog.timeout_ns 5000000 loadrt pid names=pid.x,pid.y,pid.y2,pid.z,pid.s +loadrt abs names=abs.spindle +loadrt lowpass names=lowpass.spindle addf hm2_7i76e.0.read servo-thread addf motion-command-handler servo-thread @@ -17,6 +19,8 @@ addf pid.y.do-pid-calcs servo-thread addf pid.y2.do-pid-calcs servo-thread addf pid.z.do-pid-calcs servo-thread addf pid.s.do-pid-calcs servo-thread +addf abs.spindle servo-thread +addf lowpass.spindle servo-thread addf hm2_7i76e.0.write servo-thread setp hm2_7i76e.0.dpll.01.timer-us -50 setp hm2_7i76e.0.stepgen.timer-number 1 @@ -25,7 +29,7 @@ setp hm2_7i76e.0.stepgen.timer-number 1 # --- ESTOP-OUT --- -net estop-out hm2_7i76e.0.7i76.0.0.output-08 +net estop-out hm2_7i76e.0.7i76.0.0.output-07 # external input signals @@ -42,6 +46,9 @@ net min-home-y2 <= hm2_7i76e.0.7i76.0.0.input-02 # --- MAX-HOME-Z --- net max-home-z <= hm2_7i76e.0.7i76.0.0.input-03 +# --- PROBE-IN --- +net probe-in <= hm2_7i76e.0.7i76.0.0.input-15 + # --- ESTOP-EXT --- net estop-ext <= hm2_7i76e.0.7i76.0.0.input-24 diff --git a/cnc-router.ini b/cnc-router.ini index 13a9644..f9a1a69 100644 --- a/cnc-router.ini +++ b/cnc-router.ini @@ -1,4 +1,4 @@ -# Generated by PNCconf at Sat Dec 29 01:00:16 2018 +# Generated by PNCconf at Thu Jul 11 17:23:41 2019 # If you make changes to this file, they will be # overwritten when you run PNCconf again @@ -9,6 +9,7 @@ VERSION = 1.1 [DISPLAY] DISPLAY = axis +GLADEVCP = -H gvcp_call_list.hal gvcp-panel.ui POSITION_OFFSET = RELATIVE POSITION_FEEDBACK = ACTUAL MAX_FEED_OVERRIDE = 2.000000 @@ -17,10 +18,11 @@ MIN_SPINDLE_OVERRIDE = 0.500000 INTRO_GRAPHIC = linuxcnc.gif INTRO_TIME = 5 PROGRAM_PREFIX = /home/cnc/linuxcnc/nc_files +PYVCP = pyvcp-panel.xml INCREMENTS = 5mm 1mm .5mm .1mm .05mm .01mm .005mm POSITION_FEEDBACK = ACTUAL DEFAULT_LINEAR_VELOCITY = 6.000000 -MAX_LINEAR_VELOCITY = 25.000000 +MAX_LINEAR_VELOCITY = 33.333333 MIN_LINEAR_VELOCITY = 0.500000 DEFAULT_ANGULAR_VELOCITY = 12.000000 MAX_ANGULAR_VELOCITY = 180.000000 @@ -41,7 +43,9 @@ TASK = milltask CYCLE_TIME = 0.010 [RS274NGC] + PARAMETER_FILE = linuxcnc.var +SUBROUTINE_PATH = /home/cnc/linuxcnc/configs/cnc-router/ROUTINES/ [EMCMOT] EMCMOT = motmod @@ -61,6 +65,8 @@ POSTGUI_HALFILE = postgui_call_list.hal SHUTDOWN = shutdown.hal [HALUI] +MDI_COMMAND = O CALL +MDI_COMMAND = O CALL [KINS] JOINTS = 4 @@ -70,8 +76,8 @@ KINEMATICS = trivkins coordinates=XYYZ kinstype=BOTH COORDINATES = XYYZ LINEAR_UNITS = mm ANGULAR_UNITS = degree -DEFAULT_LINEAR_VELOCITY = 2.50 -MAX_LINEAR_VELOCITY = 25.00 +DEFAULT_LINEAR_VELOCITY = 6.67 +MAX_LINEAR_VELOCITY = 66.67 [EMCIO] EMCIO = io @@ -81,22 +87,22 @@ TOOL_CHANGE_QUILL_UP = 1 #****************************************** [AXIS_X] -MAX_VELOCITY = 25.0 -MAX_ACCELERATION = 350.0 +MAX_VELOCITY = 58.3333333333 +MAX_ACCELERATION = 400.0 MIN_LIMIT = -0.01 -MAX_LIMIT = 500.0 +MAX_LIMIT = 818.0 [JOINT_0] TYPE = LINEAR HOME = 0.0 FERROR = 10.0 MIN_FERROR = 1.0 -MAX_VELOCITY = 25.0 -MAX_ACCELERATION = 350.0 +MAX_VELOCITY = 58.3333333333 +MAX_ACCELERATION = 400.0 # The values below should be 25% larger than MAX_VELOCITY and MAX_ACCELERATION # If using BACKLASH compensation STEPGEN_MAXACCEL should be 100% larger. -STEPGEN_MAXVEL = 31.25 -STEPGEN_MAXACCEL = 437.50 +STEPGEN_MAXVEL = 72.92 +STEPGEN_MAXACCEL = 500.00 P = 1000.0 I = 0.0 D = 0.0 @@ -108,38 +114,38 @@ DEADBAND = 0.0 MAX_OUTPUT = 0.0 # these are in nanoseconds DIRSETUP = 5000 -DIRHOLD = 6000 -STEPLEN = 3000 -STEPSPACE = 3000 +DIRHOLD = 5000 +STEPLEN = 2500 +STEPSPACE = 2500 STEP_SCALE = 673.6842 MIN_LIMIT = -0.01 -MAX_LIMIT = 500.0 +MAX_LIMIT = 818.0 HOME_OFFSET = -2.000000 -HOME_SEARCH_VEL = -4.000000 +HOME_SEARCH_VEL = -20.000000 HOME_LATCH_VEL = -0.500000 HOME_FINAL_VEL = 0.000000 HOME_USE_INDEX = NO HOME_IGNORE_LIMITS = YES -HOME_SEQUENCE = -1 +HOME_SEQUENCE = 1 #****************************************** #****************************************** [AXIS_Y] -MAX_VELOCITY = 25.0 -MAX_ACCELERATION = 200.0 +MAX_VELOCITY = 66.6666666667 +MAX_ACCELERATION = 750.0 MIN_LIMIT = -0.01 -MAX_LIMIT = 500.0 +MAX_LIMIT = 885.0 [JOINT_1] TYPE = LINEAR HOME = 0.0 FERROR = 10.0 MIN_FERROR = 1.0 -MAX_VELOCITY = 25.0 -MAX_ACCELERATION = 200.0 +MAX_VELOCITY = 66.6666666667 +MAX_ACCELERATION = 750.0 # The values below should be 25% larger than MAX_VELOCITY and MAX_ACCELERATION # If using BACKLASH compensation STEPGEN_MAXACCEL should be 100% larger. -STEPGEN_MAXVEL = 31.25 +STEPGEN_MAXVEL = 83.33 STEPGEN_MAXACCEL = 937.50 P = 1000.0 I = 0.0 @@ -153,13 +159,13 @@ MAX_OUTPUT = 0.0 # these are in nanoseconds DIRSETUP = 5000 DIRHOLD = 6000 -STEPLEN = 3000 -STEPSPACE = 3000 +STEPLEN = 2500 +STEPSPACE = 2500 STEP_SCALE = 640.0 MIN_LIMIT = -0.01 -MAX_LIMIT = 500.0 -HOME_OFFSET = -4.000000 -HOME_SEARCH_VEL = -4.000000 +MAX_LIMIT = 885.0 +HOME_OFFSET = -2.000000 +HOME_SEARCH_VEL = -20.000000 HOME_LATCH_VEL = -0.500000 HOME_FINAL_VEL = 0.000000 HOME_USE_INDEX = NO @@ -171,11 +177,11 @@ TYPE = LINEAR HOME = 0.0 FERROR = 10.0 MIN_FERROR = 1.0 -MAX_VELOCITY = 25.0 -MAX_ACCELERATION = 200.0 +MAX_VELOCITY = 66.6666666667 +MAX_ACCELERATION = 750.0 # The values below should be 25% larger than MAX_VELOCITY and MAX_ACCELERATION # If using BACKLASH compensation STEPGEN_MAXACCEL should be 100% larger. -STEPGEN_MAXVEL = 31.25 +STEPGEN_MAXVEL = 83.33 STEPGEN_MAXACCEL = 937.50 P = 1000.0 I = 0.0 @@ -189,13 +195,13 @@ MAX_OUTPUT = 0.0 # these are in nanoseconds DIRSETUP = 5000 DIRHOLD = 6000 -STEPLEN = 3000 -STEPSPACE = 3000 +STEPLEN = 2500 +STEPSPACE = 2500 STEP_SCALE = 640.0 MIN_LIMIT = -0.01 -MAX_LIMIT = 500.0 +MAX_LIMIT = 885.0 HOME_OFFSET = -2.000000 -HOME_SEARCH_VEL = -4.000000 +HOME_SEARCH_VEL = -20.000000 HOME_LATCH_VEL = -0.500000 HOME_FINAL_VEL = 0.000000 HOME_USE_INDEX = NO @@ -233,18 +239,18 @@ MAX_OUTPUT = 0.0 # these are in nanoseconds DIRSETUP = 5000 DIRHOLD = 6000 -STEPLEN = 3000 -STEPSPACE = 3000 +STEPLEN = 2500 +STEPSPACE = 2500 STEP_SCALE = 800.0 MIN_LIMIT = -0.0 MAX_LIMIT = 170.01 HOME_OFFSET = 172.000000 -HOME_SEARCH_VEL = 4.000000 +HOME_SEARCH_VEL = 20.000000 HOME_LATCH_VEL = 0.500000 HOME_FINAL_VEL = 0.000000 HOME_USE_INDEX = NO HOME_IGNORE_LIMITS = YES -HOME_SEQUENCE = -0 +HOME_SEQUENCE = 0 #****************************************** [SPINDLE_9] diff --git a/custom_postgui.hal b/custom_postgui.hal index a5d07ab..f600881 100644 --- a/custom_postgui.hal +++ b/custom_postgui.hal @@ -1,2 +1,5 @@ # Include your custom_postgui HAL commands here # This file will not be overwritten when you run PNCconf again + +# set up the touch plate button +net remote-laserzero halui.mdi-command-01 <= pyvcp.laserzero diff --git a/gvcp-panel.ui b/gvcp-panel.ui new file mode 100644 index 0000000..74aa6d9 --- /dev/null +++ b/gvcp-panel.ui @@ -0,0 +1,85 @@ + + + + + + + 100 + + + True + + + + True + 36 +1000 + + #0000ffff0000 + 44.25 + #ffffffff0000 + #bebebebebebe + Spindle: % 4d RPM + 0.94999998807907104 + #ffff00000000 + False + + + False + 0 + + + + + + True + + + True + 5 + Spindle Up To Speed + + + False + False + 0 + + + + + True + 2 + green + 5 + + + False + False + 10 + 1 + + + + + False + 1 + + + + + + True + 5 + False + + + + False + False + 2 + + + + + + diff --git a/gvcp_call_list.hal b/gvcp_call_list.hal new file mode 100644 index 0000000..1a0c7de --- /dev/null +++ b/gvcp_call_list.hal @@ -0,0 +1,4 @@ +# These files are loaded post gladeVCP, in the order they appear + +source gvcp_options.hal +source custom_gvcp.hal diff --git a/gvcp_options.hal b/gvcp_options.hal new file mode 100644 index 0000000..adf8cf5 --- /dev/null +++ b/gvcp_options.hal @@ -0,0 +1,9 @@ +# _DO NOT_ include your HAL commands here. +# Put custom HAL commands in custom_gvcp.hal + +# **** Setup of spindle speed display using gladevcp **** + +net spindle-vel-cmd-rpm-abs => gladevcp.spindle-speed +net spindle-at-speed => gladevcp.spindle-at-speed-led +# **** Setup GLADE MDI buttons **** +net machine-is-on => gladevcp.button-box-active diff --git a/linuxcnc.var b/linuxcnc.var index d7fc1b5..dad5e80 100644 --- a/linuxcnc.var +++ b/linuxcnc.var @@ -27,9 +27,9 @@ 5218 0.000000 5219 0.000000 5220 1.000000 -5221 72.338267 -5222 0.723667 -5223 131.977067 +5221 264.265600 +5222 138.082833 +5223 40.799261 5224 0.000000 5225 0.000000 5226 0.000000 diff --git a/pyvcp-panel.xml b/pyvcp-panel.xml new file mode 100644 index 0000000..6c3c742 --- /dev/null +++ b/pyvcp-panel.xml @@ -0,0 +1,17 @@ + + + + + RAISED + 5 + + + diff --git a/tool.tbl.bak b/tool.tbl.bak new file mode 100644 index 0000000..ed8e917 --- /dev/null +++ b/tool.tbl.bak @@ -0,0 +1,4 @@ +T0 P0 ; +T1 P1 ; +T2 P2 ; +T3 P3 ;