Commit b693aedc authored by Jerediah Fevold's avatar Jerediah Fevold
Browse files

Merging NR_UAV-core_R2_125_RIL_W012. Merge conflict resolved by manually... 

Merging NR_UAV-core_R2_125_RIL_W012. Merge conflict resolved by manually adoping the time difference language into the merging branch.
parents 4e0aec83 4a3daf2d

38331-i00.md

+1 −1
Original line number Diff line number Diff line
@@ -6742,7 +6742,7 @@ NOTE 0b: The UE does not expect that the *reportUplinkTxDirectCurrentTwoCarrier* 














3\> if *flightPathUpdateDistanceThr* is configured and for at least one waypoint, the 3D distance between the previously provided location and the new location is more than the distance threshold configured by *flightPathUpdateDistanceThr*; or



























3\> if *flightPathUpdateTimeThr* is configured and for at least one waypoint, the timestamp was not previously provided but is now available, or the time between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:













3\> if *flightPathUpdateTimeThr* is configured and for at least one waypoint, the timestamp was not previously provided but is now available, or the time difference between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:





























4\> include *flightPathInfoAvailable*;