change calib order; move joystick input to thread