Systems and methods of measuring distance between two wireless devices by combining phase shift and time-of-flight measurements. A first wireless devices sends a first packet to the second wireless device. After receiving the first packet, the second wireless device sending to the first wireless device a second packet. After sending the second packet, the second wireless device sends a first continuous wave signal to the first wireless device. After receiving the first continuous wave signal, the first wireless device sends to the second wireless device a second continuous wave signal. The first wireless device then calculates a time-of-flight measurement based on a time between the first wireless device sending the first packet and receiving the second packet, and calculates a second measurement based on a phase shift of the first continuous wave signal and the second continuous wave signal, and combines the two measurements.