Re-added fixed calibration code back to the master branch. Commented out the code for the other motors, as the button ids were conflicting.