Sorry, there was a mix of tabs and spaces in indentation in the file so we
cleaned it all up- didn't think about larger implications . Also sorry about
various oddly named patches, don't use git often enough to keep straight.
-Tom
> On Oct 10, 2015, at 5:24 PM, Sebastian Kuzminsky <s...@highlab.com> wrote:
>
>> On 10/09/2015 08:23 AM, Tom Easterday wrote:
>> Ok, I think we have cleaned up the indentation. Let me know if anything is
>> amiss…
>>
>>> On Oct 5, 2015, at 11:06 PM, Sebastian Kuzminsky <s...@highlab.com> wrote:
>>>
>>> My only nitpick is that the indentation in the new "while (done==0) {"
>>> main loop is inconsistent, and that makes it a bit hard to follow. Our
>>> coding style guide (src/CodingStyle) says to use what's known as the One
>>> True Brace Style.
>
> I only meant the indentation in the new main loop, not in the whole
> file! Sorry if I wasn't clear about that and you did extra work!
>
> It's hardly ever a good idea to change whitespace in code that you're
> not otherwise touching, because it makes the diff bigger and harder to
> understand, and it complicates future merges.
>
>
> Anyway, so here's what I've done:
>
> I noticed that the new patch you sent applies cleanly on top of the
> original 2015-05-15 patch you sent called
> "0003-Added-an-initialize-option-to-gs2_vfd.c-so-it-can-be.patch", not
> on top of the 2015-10-03 patch called
> "Added-an-initialize-option-to-gs2_vfd.patch", so I used the first patch
> as the starting place.
>
> I applied the first patch to the current tip of 2.7, then applied the
> new patch you sent on 2015-10-09 named
> "Added-initialize-option-to-gs2_vfd.c.patch", on top of that. I used
> 'git gui' to stage only the lines of that second patch that fix up the
> indentation & comments in the first patch. I committed those lines,
> then used "git checkout gs2_vfd.c" to discard the superfluous whitespace
> changes.
>
> The result looks really good to me, and runs my GS2 just like before
> with no config changes. I pushed the result to the
> '2.7-tom-easterday-gs2' branch on git.linuxcnc.org.
>
> This looks like a "go" to me. Any last comments from anyone before I
> squash these two commits together and push to 2.7?
>
>
> --
> Sebastian Kuzminsky
>
> ------------------------------------------------------------------------------
> _______________________________________________
> Emc-developers mailing list
> Emc-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/emc-developers
------------------------------------------------------------------------------
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
