On 06/30/2013 07:45 PM, Curtis Dutton wrote: > Ok so I think this code is well enough tested, and the comp files also > includes the documentation. > > What do I need to do to get this integrated into the codebase. > > I have a branch on github with my changes. I can provide a patch if > necessary. https://github.com/OKComputers/linuxcnc
Thanks for your continued work on this driver. I hope to merge it into master before the 2.6 release branch is made, and have it be included in the next official release of LinuxCNC. This branch still includes the incorrect addition of src/objects/hal/utils/comp.py that i mentioned in the last review, that you added in commit 782e98456d278be90b7198ce8b552e824748f5b0. That commit should be removed by rebasing your branch onto origin/master and skipping that commit. Rebasing onto master will also make the branch history cleaner and easier to review, and make your branch easier to merge. I know of one issue that the rebase will run in to: the libmodbus stuff changed in master recently, and your Submakefile changes are affected. It's a straightforward change, see how the mb2hal and vfs11_vfd Submakefiles are changed in commit 53a735f385516b9679a15d2dda97836ac8c3a0e6. When you rebase, edit the first commit of your branch (the one that adds the Submakefile) and change it to use the new libmodbus check instead. Let me know if you want help with the rebase, it can be a bit daunting the first time... -- Sebastian Kuzminsky ------------------------------------------------------------------------------ This SF.net email is sponsored by Windows: Build for Windows Store. http://p.sf.net/sfu/windows-dev2dev _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
