Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Travelled Distance Calculation Fix (Update CurrentState.cs) #3455

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

Travelled Distance Calculation Fix (Update CurrentState.cs) #3455

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion ExtLibs/ArduPilot/CurrentState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,8 @@ public int toh

[DisplayFieldName("distTraveled.Field")]
[DisplayText("Dist Traveled (dist)")][GroupText("Position")] public float distTraveled { get; set; }

public string distTravelledUnit = CurrentState.DistanceUnit; // added by Mir 30112024

[DisplayText("Time in Air (sec)")][GroupText("Position")] public float timeSinceArmInAir { get; set; }

[DisplayFieldName("timeInAir.Field")]
Expand Down Expand Up @@ -4417,6 +4418,18 @@ public void UpdateCurrentSettings(Action<CurrentState> bs, bool updatenow,
!mavinterface.logreadmode)
distTraveled = 0;

// added by Mir 30112024
if (distTravelledUnit != CurrentState.DistanceUnit) // did distance unit change?
{
distTravelledUnit = CurrentState.DistanceUnit; // set the new unit
if(distTravelledUnit == "m") // changed to meters (was feets)
distTraveled = (float)(distTraveled / 3.28084); //Fix disttravelled
else // changed to feets (was meters)
distTraveled = (float)(distTraveled * 3.28084); //Fix disttravelled

} // end of my added


distTraveled += (float)lastpos.GetDistance(new PointLatLngAlt(lat, lng, 0, "")) *
multiplierdist;
lastpos = new PointLatLngAlt(lat, lng, 0, "");
Expand Down