TCP 5-axis kinematics

More
6 years 11 months ago #151593 by 3D-Master
Replied by 3D-Master on topic TCP 5-axis kinematics
aah okay

another question:

is the patch you have posted somehow executable? Because i dont understand what has been added/removed.

for example:

diff --git a/src/Makefile b/src/Makefile
index 82786e4..f7d73ac 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -940,6 +940,9 @@ hal_lib-objs := hal/hal_lib.o $(MATHSTUB)
obj-m += trivkins.o
trivkins-objs := emc/kinematics/trivkins.o

+obj-m += switchKins.o
+switchKins-objs := emc/kinematics/switchKins.o
+
obj-m += 5axiskins.o
5axiskins-objs := emc/kinematics/5axiskins.o

@@ -1098,6 +1101,7 @@ endif
../rtlib/hal_lib$(MODULE_EXT): $(addprefix objects/rt,$(hal_lib-objs))
../rtlib/motmod$(MODULE_EXT): $(addprefix objects/rt,$(motmod-objs))
../rtlib/trivkins$(MODULE_EXT): $(addprefix objects/rt,$(trivkins-objs))
+../rtlib/switchKins$(MODULE_EXT): $(addprefix objects/rt,$(switchKins-objs))
../rtlib/5axiskins$(MODULE_EXT): $(addprefix objects/rt,$(5axiskins-objs))
../rtlib/maxkins$(MODULE_EXT): $(addprefix objects/rt,$(maxkins-objs))
../rtlib/rotatekins$(MODULE_EXT): $(addprefix objects/rt,$(rotatekins-objs))



do the changes have to be in order?

Please Log in or Create an account to join the conversation.

More
6 years 11 months ago - 6 years 11 months ago #151597 by plopes9000
Replied by plopes9000 on topic TCP 5-axis kinematics
The patch file is generated and can be applied to the code automatically but can also be interpreted and manually applied.

To be honest would need to google to tell you how to do it automatically - git-scm.com/docs/git-apply .

Generally the syntax uses „-„ and „—„to represent removing lines from the original file and „+“ and „++“ to represent adding lines where the lines were removed. Location in the file is represented with a „@„ or „@@„.

So for example, @@ -940,6 +940,9 @@ would mean replace the lines 940..945 with the code that follows and now representing lines 940..948.

So something along these lines.

A google search gave me the link www.oreilly.com/library/view/git-pocket-...1449327507/ch11.html .

Yes I think the changes must be applied in that sequence for each file. The order of the files is not relevant.
Last edit: 6 years 11 months ago by plopes9000.

Please Log in or Create an account to join the conversation.

More
6 years 11 months ago #151608 by 3D-Master
Replied by 3D-Master on topic TCP 5-axis kinematics
i am curious if copying the changed files and overwriting the original files would work. Will this change (switchkins) someday be in linuxcnc by default?

Please Log in or Create an account to join the conversation.

More
6 years 11 months ago #151664 by 3D-Master
Replied by 3D-Master on topic TCP 5-axis kinematics
i tried implementing the DWO remap.

At least this works without a problem. Now i need to change my pp to output g55.4 and g55.5

i am curious if copying the changed files and overwriting the original files would work.


i would be glad if someone could post his changed files so i could try to overwrite my files and see if it then works without a problem.

Please Log in or Create an account to join the conversation.

More
6 years 10 months ago - 6 years 10 months ago #151703 by plopes9000
Replied by plopes9000 on topic TCP 5-axis kinematics
I‘ll see if I can manage to post the files tomorrow.
Last edit: 6 years 10 months ago by plopes9000.

Please Log in or Create an account to join the conversation.

More
6 years 10 months ago - 6 years 10 months ago #151771 by plopes9000
Replied by plopes9000 on topic TCP 5-axis kinematics
I've added a file containing the complete changed files, pl-switchkins.tar, to the original post with the patch file on page 18 .
Last edit: 6 years 10 months ago by plopes9000.

Please Log in or Create an account to join the conversation.

Time to create page: 0.117 seconds
Powered by Kunena Forum