If you aren't afraid to use the Arduino IDE I would be tempted to get the absolute latest from ErikZalm as he has some nice new features added/bugs fixed pretty much every week. But first I would use ginge to create the configuration.h file and do a diff (winmerge) between the ginge one and the one that comes with ErikZalm and use winmerge's nice features to grab what I want from each file. And also a diff between yours and either of those configuration.h files.
UM2 firmwares are build from https://github.com/Ultimaker/Ultimaker2Marlin
UM-Ori firmwares are build from https://github.com/Ultimaker/Marlin
Link to post
Share on other sites