NEWS
LinuxCNC 2.5.2 Release
LinuxCNC 2.5.2 Update Released (changelog).
 
LinuxCNC 2.5.1 Release

LinuxCNC 2.5.1 Update Released (changelog). If the Package Manager does not prompt you to upgrade see this page.
 
LinuxCNC 2.5.0 Release
New major release (changelog). See the instructions to update your system from EMC 2.4 to LinuxCNC 2.5.
 
Home Forum Using LinuxCNC G Code Tool offset patch

Welcome, Guest
Username: Password: Remember me
Forgot your password? Forgot your username?

TOPIC: Tool offset patch

Re:Tool offset patch 20 Sep 2012 09:46 #24484

  • BigJohnT
  • BigJohnT's Avatar
  • OFFLINE
  • Administrator
  • Posts: 4960
  • Thank you received: 87
  • Karma: 134
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
The administrator has disabled public write access.

Re:Tool offset patch 20 Sep 2012 09:47 #24485

  • LAIR82
  • LAIR82's Avatar
  • OFFLINE
  • Gold Boarder
  • Posts: 198
  • Thank you received: 5
  • Karma: 2
srt@Cinci:~/linuxcnc-dev$ git branch
* master
srt@Cinci:~/linuxcnc-dev$
The administrator has disabled public write access.

Re:Tool offset patch 20 Sep 2012 09:57 #24487

  • BigJohnT
  • BigJohnT's Avatar
  • OFFLINE
  • Administrator
  • Posts: 4960
  • Thank you received: 87
  • Karma: 134
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
The administrator has disabled public write access.

Re:Tool offset patch 20 Sep 2012 10:12 #24489

  • LAIR82
  • LAIR82's Avatar
  • OFFLINE
  • Gold Boarder
  • Posts: 198
  • Thank you received: 5
  • Karma: 2
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?
The administrator has disabled public write access.

Re:Tool offset patch 20 Sep 2012 11:26 #24491

  • BigJohnT
  • BigJohnT's Avatar
  • OFFLINE
  • Administrator
  • Posts: 4960
  • Thank you received: 87
  • Karma: 134
Yes, there is some info at the top of the file that git uses when it does the patch. So you should not modify the patch.

John
The administrator has disabled public write access.

Re:Tool offset patch 05 Oct 2012 12:04 #24997

  • LAIR82
  • LAIR82's Avatar
  • OFFLINE
  • Gold Boarder
  • Posts: 198
  • Thank you received: 5
  • Karma: 2
Guys,

I was finally able to get that tool table patch applied to my machine and it is running, time to run some programs and see how she runs.

Thanks again for all the help.
The administrator has disabled public write access.
Time to create page: 1.208 seconds
Powered by Kunena Forum
© 2013 LinuxCNC.org
Joomla! is Free Software released under the GNU General Public License.