Marlin firmware fork for MakerFarm i3v w/ auto bed level & Roxy's enhancements

[dacb]

OK! That sort of worked. I think I got the memory leak update pushed up. And I think I got the Slic3r Plug-In uploaded. But I'm not sure they are 'Committed'. I can view them on GitHub's web page and it shows your name in the fork so I think they are there. But then going any further up the list of changes I get conflicts and can't resolve them. There isn't anything that is worth resolving... I just made a couple of changes to the Configuration.h file to test if I could sync and commit this morning.

* The memory leak fix committed fine: https://github.com/beckdac/Marlin/co...46120e33f10927
* as did the Slic3r script: https://github.com/beckdac/Marlin/co...87c5bb8b292614
* It looks like you didn't do a git pull before starting the changes to Configuration.h and the termistor table stuff reverted: https://github.com/beckdac/Marlin/co...87c5bb8b292614
I dropped your changes to Configuration.h (too hard to discern from the log, sorry) and reverted to the type 1 thermistor: https://github.com/beckdac/Marlin/co...21af567a295c68
Maybe you can do a git pull and then restore you Configuration.h changes?
* Finally, I noticed that your awesome missing free fix referenced the wrong variable name, I fixed this and it compiles great. I'm testing this on my machine right now. Commit: https://github.com/beckdac/Marlin/co...306c106ceaf9b6

Well, it looks like Erik Zalm has made a couple of releases since you branched off. I was mostly wondering if I interpreted that right, and was curious why you didn't branch from a higher level.

I've pulled all those and incorporated them so we are good to go there.

If you publish a link I'll re-clone starting at that point? That would get rid of all my conflicts and let me start fresh.

That is certainly a possibility. In your web browser, click the fork link on my repo and get started. Issue a pull request when you have something to incorporate. Personally, I'd rather we were all operating on the same repo vs. another merge set, but open source works many ways and a fork of a fork is absolutely fine. Let me know which way you choose.

Thanks for all your hard work.

[Roxy]

* The memory leak fix committed fine: https://github.com/beckdac/Marlin/co...46120e33f10927
* as did the Slic3r script: https://github.com/beckdac/Marlin/co...87c5bb8b292614

Great! I'm starting to figure out the process! The Slic3r one has more stuff in it, right? It has the both the Memory Leak fix and the Slic3r G29 Post Processor stuff? If so, that will be the one I should start from next.

* It looks like you didn't do a git pull before starting the changes to Configuration.h and the termistor table stuff reverted: https://github.com/beckdac/Marlin/co...87c5bb8b292614
I dropped your changes to Configuration.h (too hard to discern from the log, sorry) and reverted to the type 1 thermistor: https://github.com/beckdac/Marlin/co...21af567a295c68

I don't understand. I got the whole code base. Can't I just make changes to test stuff and send it back when it is right? I guess I don't understand this Push and Pull stuff. When I did the clone, doesn't that 'Pull' everything from the branch so I have it too? Or is the problem the fact that other changes were made in the mean time? If that is the case, my guess is there is a way to merge the two divergent paths back together again. But right now... I'm not advanced enough to do that.

Maybe you can do a git pull and then restore you Configuration.h changes?

I'll do a diff but I suspect there is hardly anything there to preserve. I was unable to make the Push work so I wanted to just have a simple change to the Configuration.h file to see if I could make it happen. I cleaned up some wording on a comment. It was a worth while fix but nothing that will be noticed if it isn't done.

* Finally, I noticed that your awesome missing free fix referenced the wrong variable name, I fixed this and it compiles great. I'm testing this on my machine right now. Commit: https://github.com/beckdac/Marlin/co...306c106ceaf9b6

Oooops! I went back and looked at my post. (And I cut and pasted that into the cloned image I grabbed.) I didn't have any way to compile it or I probably would have found that mistake. Sorry!

I've pulled all those and incorporated them so we are good to go there.

That is certainly a possibility. In your web browser, click the fork link on my repo and get started. Issue a pull request when you have something to incorporate. Personally, I'd rather we were all operating on the same repo vs. another merge set, but open source works many ways and a fork of a fork is absolutely fine. Let me know which way you choose.

I certainly don't need to Fork! The reason I said that is that is the only experience I have for getting a code base. Is a Clone and a Pull the same thing? If so, then I understand why you said what you did. It would make sense to just Pull the current code base and use that as a new starting point. But I still don't understand why I needed to Pull the Configuration.h file to make a small change when I already had it. Maybe the answer is I didn't have the most recent version. The code base had already moved on from what I had???