search

collin80 / GEVCU

Generalized Electric Vehicle Control Unit
114 stars 56 forks source link

Merge good stuff from ArduinoDue branch into WIP branch #76

Closed collin80 closed 9 years ago

collin80 commented 10 years ago

The official EVTV branch is now based on the WIP branch and not the ArduinoDue branch. However, there were valuable commits to the ArduinoDue branch that should be backported to the WIP branch. So, this will now commence. The inverse should also happen - porting relevant changes to WIP into the ArduinoDue branch. There are some philosophical differences between the two branches but the majority of the code is the same.

jrickard commented 10 years ago

I would take extreme care here. Kind of defeats the purpose of branches. There were some serious philisophical differences that led to this situation. Certainly anything useful could be ported from one to the other, but separate branches to accommodate both approaches I think remains a viable strategy.

collin80 commented 10 years ago

Yes, I don't plan to port the big architecture changes between the two. However, an instance of something that should be ported: I had run a static analysis tool on the code in ArduinoDue and fixed up some issues. There was no reason not to apply the fixes to the WIP branch as well. There are probably other fixes to port over but I haven't found anything else yet.

collin80 commented 9 years ago

I did end up merging a couple of things back into the main code. That happened some time ago. So, this will be closed now.