Improved calibration stability

Decreased possibility that second (red) calibration disk is not
detected; adjusted calibration code to more closely resemble code within
App