There may be a small issue with this code... Please post the Marlin_main.cpp file. If there is a problem, I'll edit it for you. But "Yes..." This is the code base you should be using now.