From 64d5a2c507f7e47a34d1aeceec221e20289ab649 Mon Sep 17 00:00:00 2001 From: bartoolina Date: Thu, 5 Jun 2025 08:11:08 +0200 Subject: [PATCH] zmina nazwy --- linuxcnc.var | 6 +- linuxcnc.var.bak | 6 +- mayo-mil_1743671917.ini | 4 +- mayo-mil_1743748199.ini | 4 +- mayo-mil_1743748594.ini | 4 +- mayo-mil_1743769745.ini | 4 +- mayo-mil_1743772099.ini | 4 +- mayo-mil_1743772222.ini | 4 +- mayo-mil_1743772332.ini | 4 +- mayo-mil_1743772490.ini | 4 +- mayo-mil_1743772610.ini | 4 +- mayo-mil_1743772750.ini | 4 +- mayo-mil_1743773326.ini | 4 +- mayo-mil_1743773415.ini | 4 +- mayo-mil_1744006034.ini | 4 +- mayo-mil_1744006256.ini | 4 +- mayo-mil_1744006396.ini | 4 +- mayo-mil_1744006774.ini | 4 +- mayo-mil_1744006951.ini | 4 +- mayo-mil_1744007191.ini | 4 +- mayo-mil_1744007292.ini | 4 +- mayo-mil_1744007395.ini | 4 +- mayo-mil_1744007521.ini | 4 +- mayo-mil_1744007613.ini | 4 +- mayo-mil_1744013382.ini | 4 +- mayo-mil_1744013480.ini | 4 +- mayo-mil_1744013673.ini | 4 +- mayo-mil_1744014176.ini | 4 +- mayo-mil_1744014386.ini | 4 +- mayo-mil_1744014660.ini | 4 +- mayo-mil_1744019047.ini | 4 +- mayo-mil_1744896542.ini | 4 +- mayo-mil_1744896831.ini | 4 +- mayo-mill.hal | 84 ++++++++++ mayo-mill.ini | 191 +++++++++++++++++++++++ mayo-mil.hal => mayo-mill_1748512114.hal | 0 mayo-mil.ini => mayo-mill_1748512114.ini | 4 +- postgui_call_list.hal | 2 +- pyvcp_options.hal | 2 +- qtdragon.pref | 12 +- 40 files changed, 353 insertions(+), 78 deletions(-) create mode 100644 mayo-mill.hal create mode 100644 mayo-mill.ini rename mayo-mil.hal => mayo-mill_1748512114.hal (100%) rename mayo-mil.ini => mayo-mill_1748512114.ini (98%) diff --git a/linuxcnc.var b/linuxcnc.var index b2ac4c7..ebcec22 100644 --- a/linuxcnc.var +++ b/linuxcnc.var @@ -26,7 +26,7 @@ 5217 0.000000 5218 0.000000 5219 0.000000 -5220 2.000000 +5220 1.000000 5221 317.201300 5222 249.269700 5223 -43.050000 @@ -37,9 +37,9 @@ 5228 0.000000 5229 0.000000 5230 0.000000 -5241 242.590500 +5241 302.590500 5242 75.191000 -5243 -87.130000 +5243 -81.985254 5244 0.000000 5245 0.000000 5246 0.000000 diff --git a/linuxcnc.var.bak b/linuxcnc.var.bak index b2ac4c7..ebcec22 100644 --- a/linuxcnc.var.bak +++ b/linuxcnc.var.bak @@ -26,7 +26,7 @@ 5217 0.000000 5218 0.000000 5219 0.000000 -5220 2.000000 +5220 1.000000 5221 317.201300 5222 249.269700 5223 -43.050000 @@ -37,9 +37,9 @@ 5228 0.000000 5229 0.000000 5230 0.000000 -5241 242.590500 +5241 302.590500 5242 75.191000 -5243 -87.130000 +5243 -81.985254 5244 0.000000 5245 0.000000 5246 0.000000 diff --git a/mayo-mil_1743671917.ini b/mayo-mil_1743671917.ini index e2dac99..c6526cc 100644 --- a/mayo-mil_1743671917.ini +++ b/mayo-mil_1743671917.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743748199.ini b/mayo-mil_1743748199.ini index 5a279bc..1447c95 100644 --- a/mayo-mil_1743748199.ini +++ b/mayo-mil_1743748199.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743748594.ini b/mayo-mil_1743748594.ini index db113af..7f0911e 100644 --- a/mayo-mil_1743748594.ini +++ b/mayo-mil_1743748594.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743769745.ini b/mayo-mil_1743769745.ini index 70f780f..367ee00 100644 --- a/mayo-mil_1743769745.ini +++ b/mayo-mil_1743769745.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743772099.ini b/mayo-mil_1743772099.ini index a00e157..0be4712 100644 --- a/mayo-mil_1743772099.ini +++ b/mayo-mil_1743772099.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743772222.ini b/mayo-mil_1743772222.ini index b0a89bf..439e92e 100644 --- a/mayo-mil_1743772222.ini +++ b/mayo-mil_1743772222.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743772332.ini b/mayo-mil_1743772332.ini index 29deea2..cd59c4c 100644 --- a/mayo-mil_1743772332.ini +++ b/mayo-mil_1743772332.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743772490.ini b/mayo-mil_1743772490.ini index 93ea293..910669d 100644 --- a/mayo-mil_1743772490.ini +++ b/mayo-mil_1743772490.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743772610.ini b/mayo-mil_1743772610.ini index b3b74b6..882d0c1 100644 --- a/mayo-mil_1743772610.ini +++ b/mayo-mil_1743772610.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743772750.ini b/mayo-mil_1743772750.ini index 9fb1091..54575a1 100644 --- a/mayo-mil_1743772750.ini +++ b/mayo-mil_1743772750.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743773326.ini b/mayo-mil_1743773326.ini index 9d93bde..06b4dca 100644 --- a/mayo-mil_1743773326.ini +++ b/mayo-mil_1743773326.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1743773415.ini b/mayo-mil_1743773415.ini index 6ca6496..17bf0ff 100644 --- a/mayo-mil_1743773415.ini +++ b/mayo-mil_1743773415.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744006034.ini b/mayo-mil_1744006034.ini index acaa4c8..4a7709b 100644 --- a/mayo-mil_1744006034.ini +++ b/mayo-mil_1744006034.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744006256.ini b/mayo-mil_1744006256.ini index b77e0ce..eaba6e9 100644 --- a/mayo-mil_1744006256.ini +++ b/mayo-mil_1744006256.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744006396.ini b/mayo-mil_1744006396.ini index 5081f6b..1299012 100644 --- a/mayo-mil_1744006396.ini +++ b/mayo-mil_1744006396.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744006774.ini b/mayo-mil_1744006774.ini index 38cf552..1b7c1cd 100644 --- a/mayo-mil_1744006774.ini +++ b/mayo-mil_1744006774.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744006951.ini b/mayo-mil_1744006951.ini index d5ab756..9d8fefd 100644 --- a/mayo-mil_1744006951.ini +++ b/mayo-mil_1744006951.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744007191.ini b/mayo-mil_1744007191.ini index 742d313..82ac003 100644 --- a/mayo-mil_1744007191.ini +++ b/mayo-mil_1744007191.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744007292.ini b/mayo-mil_1744007292.ini index 95b1522..274aa3e 100644 --- a/mayo-mil_1744007292.ini +++ b/mayo-mil_1744007292.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744007395.ini b/mayo-mil_1744007395.ini index 495191f..2c1c777 100644 --- a/mayo-mil_1744007395.ini +++ b/mayo-mil_1744007395.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744007521.ini b/mayo-mil_1744007521.ini index 8db2837..be792ac 100644 --- a/mayo-mil_1744007521.ini +++ b/mayo-mil_1744007521.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744007613.ini b/mayo-mil_1744007613.ini index c6aa047..adae165 100644 --- a/mayo-mil_1744007613.ini +++ b/mayo-mil_1744007613.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744013382.ini b/mayo-mil_1744013382.ini index 679f877..73d3851 100644 --- a/mayo-mil_1744013382.ini +++ b/mayo-mil_1744013382.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744013480.ini b/mayo-mil_1744013480.ini index 55dfd8c..e70ed21 100644 --- a/mayo-mil_1744013480.ini +++ b/mayo-mil_1744013480.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744013673.ini b/mayo-mil_1744013673.ini index a5401b3..1aac1f2 100644 --- a/mayo-mil_1744013673.ini +++ b/mayo-mil_1744013673.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744014176.ini b/mayo-mil_1744014176.ini index 9ef9d80..358877d 100644 --- a/mayo-mil_1744014176.ini +++ b/mayo-mil_1744014176.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744014386.ini b/mayo-mil_1744014386.ini index f5adb81..0e6b6e5 100644 --- a/mayo-mil_1744014386.ini +++ b/mayo-mil_1744014386.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744014660.ini b/mayo-mil_1744014660.ini index 0ddb754..ee389c4 100644 --- a/mayo-mil_1744014660.ini +++ b/mayo-mil_1744014660.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744019047.ini b/mayo-mil_1744019047.ini index 3353628..a20937f 100644 --- a/mayo-mil_1744019047.ini +++ b/mayo-mil_1744019047.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744896542.ini b/mayo-mil_1744896542.ini index 65bb25d..8591beb 100644 --- a/mayo-mil_1744896542.ini +++ b/mayo-mil_1744896542.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mil_1744896831.ini b/mayo-mil_1744896831.ini index d0cc145..afb9877 100644 --- a/mayo-mil_1744896831.ini +++ b/mayo-mil_1744896831.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -54,7 +54,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/mayo-mill.hal b/mayo-mill.hal new file mode 100644 index 0000000..23fe242 --- /dev/null +++ b/mayo-mill.hal @@ -0,0 +1,84 @@ +# Generated by stepconf 1.1 at Thu May 29 11:48:34 2025 +# If you make changes to this file, they will be +# overwritten when you run stepconf again +loadrt [KINS]KINEMATICS +loadrt [EMCMOT]EMCMOT base_period_nsec=[EMCMOT]BASE_PERIOD servo_period_nsec=[EMCMOT]SERVO_PERIOD num_joints=[KINS]JOINTS +loadrt hal_parport cfg="0 out" +setp parport.0.reset-time 5000 +loadrt stepgen step_type=0,0,0 + +addf parport.0.read base-thread +addf stepgen.make-pulses base-thread +addf parport.0.write base-thread +addf parport.0.reset base-thread + +addf stepgen.capture-position servo-thread +addf motion-command-handler servo-thread +addf motion-controller servo-thread +addf stepgen.update-freq servo-thread + +net probe-in => motion.probe-input + +setp parport.0.pin-01-out-invert 1 +net spindle-on => parport.0.pin-01-out +net xdir => parport.0.pin-02-out +net xstep => parport.0.pin-03-out +setp parport.0.pin-03-out-reset 1 +net ydir => parport.0.pin-04-out +net ystep => parport.0.pin-05-out +setp parport.0.pin-05-out-reset 1 +net zdir => parport.0.pin-06-out +net zstep => parport.0.pin-07-out +setp parport.0.pin-07-out-reset 1 +net home-x <= parport.0.pin-10-in +net home-y <= parport.0.pin-11-in +net home-z <= parport.0.pin-12-in +net estop-ext <= parport.0.pin-13-in-not +net probe-in <= parport.0.pin-15-in + +setp stepgen.0.position-scale [JOINT_0]SCALE +setp stepgen.0.steplen 1 +setp stepgen.0.stepspace 0 +setp stepgen.0.dirhold 70000 +setp stepgen.0.dirsetup 70000 +setp stepgen.0.maxaccel [JOINT_0]STEPGEN_MAXACCEL +net xpos-cmd joint.0.motor-pos-cmd => stepgen.0.position-cmd +net xpos-fb stepgen.0.position-fb => joint.0.motor-pos-fb +net xstep <= stepgen.0.step +net xdir <= stepgen.0.dir +net xenable joint.0.amp-enable-out => stepgen.0.enable +net home-x => joint.0.home-sw-in + +setp stepgen.1.position-scale [JOINT_1]SCALE +setp stepgen.1.steplen 1 +setp stepgen.1.stepspace 0 +setp stepgen.1.dirhold 70000 +setp stepgen.1.dirsetup 70000 +setp stepgen.1.maxaccel [JOINT_1]STEPGEN_MAXACCEL +net ypos-cmd joint.1.motor-pos-cmd => stepgen.1.position-cmd +net ypos-fb stepgen.1.position-fb => joint.1.motor-pos-fb +net ystep <= stepgen.1.step +net ydir <= stepgen.1.dir +net yenable joint.1.amp-enable-out => stepgen.1.enable +net home-y => joint.1.home-sw-in + +setp stepgen.2.position-scale [JOINT_2]SCALE +setp stepgen.2.steplen 1 +setp stepgen.2.stepspace 0 +setp stepgen.2.dirhold 70000 +setp stepgen.2.dirsetup 70000 +setp stepgen.2.maxaccel [JOINT_2]STEPGEN_MAXACCEL +net zpos-cmd joint.2.motor-pos-cmd => stepgen.2.position-cmd +net zpos-fb stepgen.2.position-fb => joint.2.motor-pos-fb +net zstep <= stepgen.2.step +net zdir <= stepgen.2.dir +net zenable joint.2.amp-enable-out => stepgen.2.enable +net home-z => joint.2.home-sw-in + +net estop-out <= iocontrol.0.user-enable-out +net estop-ext => iocontrol.0.emc-enable-in + +net tool-change <= iocontrol.0.tool-change +net tool-changed => iocontrol.0.tool-changed +net tool-number <= iocontrol.0.tool-prep-number +net tool-prepare-loopback iocontrol.0.tool-prepare => iocontrol.0.tool-prepared diff --git a/mayo-mill.ini b/mayo-mill.ini new file mode 100644 index 0000000..6e467c7 --- /dev/null +++ b/mayo-mill.ini @@ -0,0 +1,191 @@ +# Generated by stepconf 1.1 at Thu May 29 11:48:34 2025 +# If you make changes to this file, they will be +# overwritten when you run stepconf again + +[EMC] +MACHINE = mayo-mill +DEBUG = 0 +VERSION = 1.1 + +[DISPLAY] +DISPLAY = qtvcp qtdragon +PREFERENCE_FILE_PATH = WORKINGFOLDER/qtdragon.pref +EDITOR = gedit +POSITION_OFFSET = RELATIVE +POSITION_FEEDBACK = ACTUAL +ARCDIVISION = 64 +GRIDS = 10mm 20mm 50mm 100mm 1in 2in 5in 10in +MAX_FEED_OVERRIDE = 1.2 +MIN_SPINDLE_OVERRIDE = 0.5 +MAX_SPINDLE_OVERRIDE = 1.2 +DEFAULT_LINEAR_VELOCITY = 5.00 +MIN_LINEAR_VELOCITY = 0 +MAX_LINEAR_VELOCITY = 50.00 +CYCLE_TIME = 0.100 +INTRO_GRAPHIC = linuxcnc.gif +INTRO_TIME = 5 +PROGRAM_PREFIX = /home/cnc/linuxcnc/nc_files +INCREMENTS = 5mm 1mm .5mm .1mm .05mm .01mm .005mm + +[KINS] +JOINTS = 3 +KINEMATICS = trivkins coordinates=XYZ + +[FILTER] +PROGRAM_EXTENSION = .png,.gif,.jpg Greyscale Depth Image +PROGRAM_EXTENSION = .py Python Script +PROGRAM_EXTENSION = .nc,.tap G-Code File +png = image-to-gcode +gif = image-to-gcode +jpg = image-to-gcode +py = python + +[TASK] +TASK = milltask +CYCLE_TIME = 0.010 + +[RS274NGC] +PARAMETER_FILE = linuxcnc.var + +# start up G/M codes when first loaded +RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.0127 G80 G90 G94 G97 M5 M9 + +# subroutine/remap path list +SUBROUTINE_PATH =\ +~/linuxcnc/nc_files/examples/ngcgui_lib:\ +~/linuxcnc/nc_files/examples/ngcgui_lib/utilitysubs:\ +~/linuxcnc/nc_files/examples/remap-subroutines:\ +~/linuxcnc/nc_files/examples/remap_lib + +# is the sub, with is called when a error during tool change happens. +ON_ABORT_COMMAND=O call + +# The remap code for QtVCP's versaprobe's automatic tool probe of Z +REMAP=M6 modalgroup=6 prolog=change_prolog ngc=qt_auto_probe_tool epilog=change_epilog + +# required for python remaps +[PYTHON] +# The path to start a search for user modules. ie python's sys.path.insert(0,PATH) +#PATH_PREPEND = ~/linuxcnc/nc_files/examples/remap_lib/python-stdglue/python + +# The path start point for all remap searches ie. python's sys.path.append() +PATH_APPEND = ~/linuxcnc/nc_files/examples/remap_lib/python-stdglue/python +# path to the tremap's 'oplevel file +TOPLEVEL = ~/linuxcnc/nc_files/examples/remap_lib/python-stdglue/python/toplevel.py +# set remap debug level +#LOG_LEVEL = 1000 + +[EMCMOT] +EMCMOT = motmod +COMM_TIMEOUT = 1.0 +BASE_PERIOD = 100000 +SERVO_PERIOD = 1000000 + +[HAL] +HALFILE = mayo-mill.hal +HALFILE = custom.hal +POSTGUI_HALFILE = postgui_call_list.hal + +[TRAJ] +COORDINATES = X Y Z +LINEAR_UNITS = mm +ANGULAR_UNITS = degree +DEFAULT_LINEAR_VELOCITY = 5.00 +MAX_LINEAR_VELOCITY = 50.00 + +[EMCIO] +EMCIO = io +CYCLE_TIME = 0.100 +TOOL_TABLE = tool.tbl +[PROBE] +# pick basic probe or versa probe or remove for none +USE_PROBE = versaprobe +#USE_PROBE = basicprobe + +[VERSA_TOOLSETTER] +X = 100 +Y = 40 +Z = -30 +Z_MAX_CLEAR = -2 +MAXPROBE = 40 + +[CHANGE_POSITION] +X = 10 +Y = 10 +Z = -2 + +[MDI_COMMAND_LIST] +# for macro buttons on main oage up to 10 possible +MDI_COMMAND = G0 Z25;X0 Y0;Z0, Goto\nUser\nZero +MDI_COMMAND = G53 G0 Z0;G53 G0 X0 Y0,Goto\nMachn\nZero +#*** AXIS_X ******************************* +[AXIS_X] +MAX_VELOCITY = 50.0 +MAX_ACCELERATION = 500.0 +MIN_LIMIT = -0.001 +MAX_LIMIT = 780.0 + +[JOINT_0] +TYPE = LINEAR +HOME = 0.0 +MIN_LIMIT = -0.001 +MAX_LIMIT = 780.0 +MAX_VELOCITY = 50.0 +MAX_ACCELERATION = 500.0 +STEPGEN_MAXACCEL = 625.0 +SCALE = 80.0 +FERROR = 1 +MIN_FERROR = .25 +HOME_OFFSET = 0.000000 +HOME_SEARCH_VEL = -20.000000 +HOME_LATCH_VEL = -6.250000 +HOME_SEQUENCE = 2 +#****************************************** + +#*** AXIS_Y ******************************* +[AXIS_Y] +MAX_VELOCITY = 50.0 +MAX_ACCELERATION = 500.0 +MIN_LIMIT = -0.001 +MAX_LIMIT = 485.0 + +[JOINT_1] +TYPE = LINEAR +HOME = 0.0 +MIN_LIMIT = -0.001 +MAX_LIMIT = 485.0 +MAX_VELOCITY = 50.0 +MAX_ACCELERATION = 500.0 +STEPGEN_MAXACCEL = 625.0 +SCALE = 80.0 +FERROR = 1 +MIN_FERROR = .25 +HOME_OFFSET = 0.000000 +HOME_SEARCH_VEL = -20.000000 +HOME_LATCH_VEL = -6.250000 +HOME_SEQUENCE = 1 +#****************************************** + +#*** AXIS_Z ******************************* +[AXIS_Z] +MAX_VELOCITY = 25.0 +MAX_ACCELERATION = 500.0 +MIN_LIMIT = -100.0 +MAX_LIMIT = 0.001 + +[JOINT_2] +TYPE = LINEAR +HOME = 0.0 +MIN_LIMIT = -100.0 +MAX_LIMIT = 0.001 +MAX_VELOCITY = 25.0 +MAX_ACCELERATION = 500.0 +STEPGEN_MAXACCEL = 625.0 +SCALE = 80.0 +FERROR = 1 +MIN_FERROR = .25 +HOME_OFFSET = 0.000000 +HOME_SEARCH_VEL = 10.000000 +HOME_LATCH_VEL = 6.250000 +HOME_SEQUENCE = 0 +#****************************************** diff --git a/mayo-mil.hal b/mayo-mill_1748512114.hal similarity index 100% rename from mayo-mil.hal rename to mayo-mill_1748512114.hal diff --git a/mayo-mil.ini b/mayo-mill_1748512114.ini similarity index 98% rename from mayo-mil.ini rename to mayo-mill_1748512114.ini index e31b04d..c034242 100644 --- a/mayo-mil.ini +++ b/mayo-mill_1748512114.ini @@ -3,7 +3,7 @@ # overwritten when you run stepconf again [EMC] -MACHINE = mayo-mil +MACHINE = mayo-mill DEBUG = 0 VERSION = 1.1 @@ -82,7 +82,7 @@ BASE_PERIOD = 100000 SERVO_PERIOD = 1000000 [HAL] -HALFILE = mayo-mil.hal +HALFILE = mayo-mill.hal HALFILE = custom.hal POSTGUI_HALFILE = postgui_call_list.hal diff --git a/postgui_call_list.hal b/postgui_call_list.hal index d7e9d3b..14904bd 100644 --- a/postgui_call_list.hal +++ b/postgui_call_list.hal @@ -1,5 +1,5 @@ # These files are loaded post GUI, in the order they appear -# Generated by stepconf 1.1 at Thu Apr 17 15:33:51 2025 +# Generated by stepconf 1.1 at Thu May 29 11:48:34 2025 # If you make changes to this file, they will be # overwritten when you run stepconf again diff --git a/pyvcp_options.hal b/pyvcp_options.hal index 465188e..63a1e14 100644 --- a/pyvcp_options.hal +++ b/pyvcp_options.hal @@ -1,5 +1,5 @@ # These files are loaded post GUI, in the order they appear -# Generated by stepconf 1.1 at Thu Apr 17 15:33:51 2025 +# Generated by stepconf 1.1 at Thu May 29 11:48:34 2025 # If you make changes to this file, they will be # overwritten when you run stepconf again sets spindle-at-speed true diff --git a/qtdragon.pref b/qtdragon.pref index a2908d0..6977bb2 100644 --- a/qtdragon.pref +++ b/qtdragon.pref @@ -25,12 +25,12 @@ RunFromLineDialog_play_sound = True RunFromLineDialog_sound_type = READY [BOOK_KEEPING] -last_loaded_directory = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/air_throtle -last_loaded_file = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/probe_pcb/estop_pcb_bottom_contour.ngc +last_loaded_directory = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/szablon_regius_R +last_loaded_file = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/szablon_regius_R/emka_1mm_regius.ngc style_QSS_Path = DEFAULT -RecentPath_0 = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/air_throtle/air_bottom.nc -last_saved_directory = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode -RecentSavedPath_0 = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/kite_holes.ngc +RecentPath_0 = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/szablon_regius_R/emka_1mm_regius.ngc +last_saved_directory = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/air_throtle +RecentSavedPath_0 = /home/cnc/Nextcloud/@Home/MyFiles/cnc/MyGcode/air_throtle/air_drill_corners.nc [ORIGINOFFSET_SYSTEM_NAMES] __dialogOffsetViewWidget-G54 = User System 1 @@ -96,7 +96,7 @@ gcodegraphics-user-lat = 0.0 gcodegraphics-user-lon = 0.0 [CUSTOM_FORM_ENTRIES] -Tool to load = 2 +Tool to load = 0 Laser X = 100.0 Laser Y = -20.0 Sensor X = 10.0