From 2e85558655fcb50bd33f334737dcd2b99edc05cb Mon Sep 17 00:00:00 2001 From: David Mueller Date: Tue, 24 Sep 2024 11:18:25 +0200 Subject: [PATCH] Fix python path errors on startup in newly added trsrn sim configs Looks like the build process messes with the python vismach simulation files in the config folders. I'm not sure why that happens but moving the files relevant to the vismach simulation models into a new subfolder inside the config folder seems to fix it. --- .../{ => vismach}/twp_vismach.py | 4 ++++ .../{xyzacb-trsrn_twp => vismach}/xyzacb-trsrn-gui.py | 4 ++++ .../{xyzbca-trsrn_twp => vismach}/xyzbca-trsrn-gui.py | 4 ++++ .../xyzacb-trsrn_twp/xyzacb-trsrn.ini | 2 +- .../xyzbca-trsrn_twp/xyzbca-trsrn.ini | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) rename configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/{ => vismach}/twp_vismach.py (99%) rename configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/{xyzacb-trsrn_twp => vismach}/xyzacb-trsrn-gui.py (99%) rename configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/{xyzbca-trsrn_twp => vismach}/xyzbca-trsrn-gui.py (99%) diff --git a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/twp_vismach.py b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/twp_vismach.py similarity index 99% rename from configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/twp_vismach.py rename to configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/twp_vismach.py index de99d5aca6f..21543f33dcf 100644 --- a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/twp_vismach.py +++ b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/twp_vismach.py @@ -1,3 +1,7 @@ +# This is a modified version of 'vismach.py' to visualize Tilted Work Plane (TWP) +# Author: David mueller +# email: mueller_david@hotmail.com + # Copyright 2007 John Kasunich and Jeff Epler # # This program is free software; you can redistribute it and/or modify diff --git a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn-gui.py b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/xyzacb-trsrn-gui.py similarity index 99% rename from configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn-gui.py rename to configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/xyzacb-trsrn-gui.py index 147e7456b15..cc79b43eb37 100755 --- a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn-gui.py +++ b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/xyzacb-trsrn-gui.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 +# This is a machine simulation for the 'xyzacb-trsrn' simulation config in linuxcnc +# Author: David mueller +# email: mueller_david@hotmail.com + import hal import math import sys diff --git a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn-gui.py b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/xyzbca-trsrn-gui.py similarity index 99% rename from configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn-gui.py rename to configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/xyzbca-trsrn-gui.py index 7c62baca586..2161038efde 100755 --- a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn-gui.py +++ b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/vismach/xyzbca-trsrn-gui.py @@ -1,5 +1,9 @@ #!/usr/bin/env python3 +# This is a machine simulation for the 'xyzbca-trsrn' simulation config in linuxcnc +# Author: David mueller +# email: mueller_david@hotmail.com + from twp_vismach import * import hal import math diff --git a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn.ini b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn.ini index 1a0c78e5314..a508b208802 100644 --- a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn.ini +++ b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzacb-trsrn_twp/xyzacb-trsrn.ini @@ -114,7 +114,7 @@ HALCMD = net twp-xy <= twp-helper-comp.twp-xy HALCMD = net twp-xz <= twp-helper-comp.twp-xz # load the optional vismach-gui and its hal connections -HALCMD = loadusr -W ./xyzacb-trsrn-gui.py +HALCMD = loadusr -W ../vismach/xyzacb-trsrn-gui.py # vismach machine signals HALCMD = net :axis-x joint.0.pos-fb xyzacb-trsrn-gui.axis_x HALCMD = net :axis-y joint.1.pos-fb xyzacb-trsrn-gui.axis_y diff --git a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn.ini b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn.ini index 4e4cb575ab2..d68248ebc10 100644 --- a/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn.ini +++ b/configs/sim/axis/vismach/5axis/table-rotary_spindle-rotary-nutating/xyzbca-trsrn_twp/xyzbca-trsrn.ini @@ -111,7 +111,7 @@ HALCMD = net twp-xy <= twp-helper-comp.twp-xy HALCMD = net twp-xz <= twp-helper-comp.twp-xz # load the optional vismach-gui and its hal connections -HALCMD = loadusr -W ./xyzbca-trsrn-gui.py +HALCMD = loadusr -W ../vismach/xyzbca-trsrn-gui.py HALCMD = net :axis-x joint.0.pos-fb xyzbca-trsrn-gui.axis_x HALCMD = net :axis-y joint.1.pos-fb xyzbca-trsrn-gui.axis_y