Commit 7c4cbad0 authored by Jerediah Fevold's avatar Jerediah Fevold
Browse files

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

Merging NR_UAV-core_R2_125_RIL_Z075. Merge conflict resolved by manually adopting the change to remove redundant phrasing. Also adapted the change to another similar clause which was intiially missed.
parents 173cf066 59ce45f9

38331-i00.md

+2 −2
Original line number Original line 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 *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 difference 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 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*;







4\> include *flightPathInfoAvailable*;


























@@ -10886,7 +10886,7 @@ The UE shall:

























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 *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 time between the previously provided timestamp and the new timestamp, if available, is more than the time threshold configured by *flightPathUpdateTimeThr*:



























4\> include *flightPathInfoAvailable*;







4\> include *flightPathInfoAvailable*;