More GIT Questions
- islander261
- Offline
- Platinum Member
-
Less
More
- Posts: 757
- Thank you received: 216
04 Nov 2018 17:46 #119933
by islander261
More GIT Questions was created by islander261
Hello
My system is running using the external-offsets branch. I have also applied Andy's patch to apply the arc blending fixes. Now I see that Andy has updated the new spindle control code to remove some of the debugging code that caused a minor problem of flooding the terminal with messages. I want to use this new code but don't know how to. Do I just use Dewey's instructions for installing the EO branch and GIT will use the correct up to date source files? Do I need to wait for Dewey to re-base the EO branch? Do I need to reapply Andy's patch for the arc blending fixes after I rebuild the EO branch? TIA
John
My system is running using the external-offsets branch. I have also applied Andy's patch to apply the arc blending fixes. Now I see that Andy has updated the new spindle control code to remove some of the debugging code that caused a minor problem of flooding the terminal with messages. I want to use this new code but don't know how to. Do I just use Dewey's instructions for installing the EO branch and GIT will use the correct up to date source files? Do I need to wait for Dewey to re-base the EO branch? Do I need to reapply Andy's patch for the arc blending fixes after I rebuild the EO branch? TIA
John
Please Log in or Create an account to join the conversation.
05 Nov 2018 15:18 #119992
by andypugh
Replied by andypugh on topic More GIT Questions
It's probably actually easiest just to hand edit. I just deleted two lines.
Please Log in or Create an account to join the conversation.
- islander261
- Offline
- Platinum Member
-
Less
More
- Posts: 757
- Thank you received: 216
05 Nov 2018 15:43 #119998
by islander261
Replied by islander261 on topic More GIT Questions
Andy
Thank you for the reply. I am a non programmer. Do you mean edit the source file I presently have (which one?) and recompile by running a make command in the src directory?
John
Thank you for the reply. I am a non programmer. Do you mean edit the source file I presently have (which one?) and recompile by running a make command in the src directory?
John
Please Log in or Create an account to join the conversation.
05 Nov 2018 15:48 #119999
by andypugh
Replied by andypugh on topic More GIT Questions
Yes, I mean edit the source file and recompile.
github.com/LinuxCNC/linuxcnc/commit/a2b0...f6c5547f133d3ddf078a
So the file to edit is src/emc/task/emccanon.cc
Just delete the two lines show in the link above.
github.com/LinuxCNC/linuxcnc/commit/a2b0...f6c5547f133d3ddf078a
So the file to edit is src/emc/task/emccanon.cc
Just delete the two lines show in the link above.
The following user(s) said Thank You: islander261
Please Log in or Create an account to join the conversation.
Time to create page: 0.074 seconds