A distance measurement system includes a light transmitter to generate a modulated light signal, a light sensor to generate measurement signals from reflected light among four quad phase angles with respect to a phase of the generated light signal, and a controller. The controller selects a first set of quad phase angles, and generates first measurement signals at the quad phase angles of the first set. Based on the first measurement signals, the controller computes a first phase angle between the generated light signal and the reflected light signal, generates a second set of quad phase angles based on the first phase angle, and generates second measurement signals at the quad phase angles of the second set. Further, based on the second measurement signals, the controller computes a second phase angle between the generated light signal and the reflected light signal and calculates a distance using the second phase angle.