Tool offset patch

More
20 Sep 2012 15:31 #24464 by ArcEye
Replied by ArcEye on topic Tool offset patch
Hi

I find git very aptly named sometimes! It can be very frustrating.

The answer I believe is to delete the rebase-apply directory which is inside the hidden .git directory in the root of the file tree.

regards

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

More
20 Sep 2012 15:41 #24466 by LAIR82
Replied by LAIR82 on topic Tool offset patch
How do get to where i delete it out?

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

More
20 Sep 2012 15:47 #24469 by BigJohnT
Replied by BigJohnT on topic Tool offset patch
Open up the file manager and check off show hidden files then you should be able to see the .git directory.

John

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

More
20 Sep 2012 15:51 #24470 by andypugh
Replied by andypugh on topic Tool offset patch
ArcEye wrote:

I find git very aptly named sometimes! It can be very frustrating.
The answer I believe is to delete the rebase-apply directory which is inside the hidden .git directory in the root of the file tree.


It might be worth trying:
git reset --hard origin/master

(or origin v2.5_branch if that is the branch you are patching)

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

More
20 Sep 2012 16:08 #24474 by LAIR82
Replied by LAIR82 on topic Tool offset patch
So just delete the whole rebase-apply folder?

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

More
20 Sep 2012 16:29 #24481 by LAIR82
Replied by LAIR82 on topic Tool offset patch
I moved that folder to my thumb drive, I re-tried loading the patch and this is what I get now

srt@Cinci:~/linuxcnc-dev$ git am --signoff 0001-Fanuc-style-tool-change-for-Lathes.-On-Fanuc-control.patch
Applying: Fanuc-style tool change for Lathes. On Fanuc-controlled lathes (as well Fanuc-like lathes like Haas, Okuma, and likely others). tool changes are not commanded with an M6, and offsets are not applied with G43. Rather the T word both commands a tool change and applies offsets. The offsets on Fanuc lathe controls are stored in two separate registers: geometry and wear. The wear offset register has IDs in the 1-99 range, the geometry offset register has IDs in the 10001 - 10099 range. A T word followed by one or two digits causes a tool change and applies only the geometry offsets. A T word with three or four digits also applies the wear offsets.
/home/srt/linuxcnc-dev/.git/rebase-apply/patch:41: trailing whitespace.
CHP((find_tool_pocket(settings, geo_offset_register, &index)));
/home/srt/linuxcnc-dev/.git/rebase-apply/patch:45: trailing whitespace.
CHP((find_tool_pocket(settings, wear_offset_register, &index)));
/home/srt/linuxcnc-dev/.git/rebase-apply/patch:50: trailing whitespace.
}
/home/srt/linuxcnc-dev/.git/rebase-apply/patch:74: trailing whitespace.
}
error: patch failed: src/emc/rs274ngc/interp_convert.cc:3511
error: src/emc/rs274ngc/interp_convert.cc: patch does not apply
error: patch failed: src/emc/rs274ngc/interp_find.cc:707
error: src/emc/rs274ngc/interp_find.cc: patch does not apply
error: patch failed: src/emc/rs274ngc/interp_internal.hh:723
error: src/emc/rs274ngc/interp_internal.hh: patch does not apply
Patch failed at 0001 Fanuc-style tool change for Lathes. On Fanuc-controlled lathes (as well Fanuc-like lathes like Haas, Okuma, and likely others). tool changes are not commanded with an M6, and offsets are not applied with G43. Rather the T word both commands a tool change and applies offsets. The offsets on Fanuc lathe controls are stored in two separate registers: geometry and wear. The wear offset register has IDs in the 1-99 range, the geometry offset register has IDs in the 10001 - 10099 range. A T word followed by one or two digits causes a tool change and applies only the geometry offsets. A T word with three or four digits also applies the wear offsets.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
srt@Cinci:~/linuxcnc-dev$

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

More
20 Sep 2012 16:46 #24484 by BigJohnT
Replied by BigJohnT on topic Tool offset patch
The fellow that made the patch didn't mention what branch it is for... do a "git branch" and tell me what it says.

John

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

More
20 Sep 2012 16:47 #24485 by LAIR82
Replied by LAIR82 on topic Tool offset patch
srt@Cinci:~/linuxcnc-dev$ git branch
* master
srt@Cinci:~/linuxcnc-dev$

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

More
20 Sep 2012 16:57 #24487 by BigJohnT
Replied by BigJohnT on topic Tool offset patch
He might have patched the 2.5 branch so it won't hurt to try.

git am --abort

git checkout -b v2.5_branch origin/v2.5_branch

git branch

then try and apply your patch.

John

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

More
20 Sep 2012 17:12 #24489 by LAIR82
Replied by LAIR82 on topic Tool offset patch
Question John,

In the actual patch, should it have the description in it, or should I delete all that stuff and just leave the code?

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

Time to create page: 0.092 seconds
Powered by Kunena Forum