Skip to content

Merge master into develop #781

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

Closed
FantasyTeddy wants to merge 16 commits into from
Closed

Merge master into develop #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
11e2660
fix youturn with offset
P00qwerty Apr 18, 2025
014931a
Merge pull request #749 from AgOpenGPS-Official/FixOffsetYouturn
richardklasens Apr 18, 2025
8b65966
Textlabel wrong place (anchor setting)
richardklasens Apr 7, 2025
c9de774
Close quick AB curve form if insufficient points recorded, fixing #738
mattmccormack Apr 12, 2025
665b0d0
Merge pull request #751 from FantasyTeddy/fixes
richardklasens Apr 18, 2025
cccda2d
Fixed Tool Width not updating in the config form when loading a new v…
Apr 19, 2025
3ef467a
Choose the first visible track when track button is pressed, otherwis…
mattmccormack Apr 12, 2025
2c429f3
Merge pull request #757 from mattmccormack/fixes
FantasyTeddy Apr 19, 2025
5631cca
Merge pull request #754 from spencerryan/tool-width-update
mattmccormack Apr 19, 2025
041d046
Fix Bnd Tool 3rd point always on
farmerbriantee May 6, 2025
1a9ed49
Merge pull request #773 from AgOpenGPS-Official/BndToolFix
richardklasens May 6, 2025
1548b73
Fixes for .lt language
richardklasens May 6, 2025
15df42d
Modified the Display All Settings form to appropriately scale the WAS…
lansalot May 6, 2025
c0525ea
Merge pull request #775 from lansalot/hotfix/6.7-WASdisplayscale
richardklasens May 6, 2025
952727d
Added 460800 as GPS baud option, for lightbar users (#776)
lansalot May 10, 2025
cf5eafe
Merge pull request #774 from AgOpenGPS-Official/hotfix/6.7
richardklasens May 19, 2025
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
6 changes: 4 additions & 2 deletions SourceCode/AgIO/Source/Forms/FormCommSetGPS.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion SourceCode/AgIO/Source/Forms/FormSerialMonitor.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions SourceCode/GPS/Classes/CYouTurn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ private bool CreateCurveOmegaTurn()
//build the next line to add sequencelines
double widthMinusOverlap = mf.tool.width - mf.tool.overlap;

double distAway = widthMinusOverlap * (mf.curve.howManyPathsAway + ((isTurnLeft ^ mf.curve.isHeadingSameWay) ? rowSkipsWidth : -rowSkipsWidth)) + (mf.curve.isHeadingSameWay ? -mf.tool.offset : mf.tool.offset) + track.nudgeDistance;
double distAway = widthMinusOverlap * (mf.curve.howManyPathsAway + ((isTurnLeft ^ mf.curve.isHeadingSameWay) ? rowSkipsWidth : -rowSkipsWidth)) + (mf.curve.isHeadingSameWay ? mf.tool.offset : -mf.tool.offset) + track.nudgeDistance;

distAway += (0.5 * widthMinusOverlap);

Expand Down Expand Up @@ -509,7 +509,7 @@ private bool CreateCurveWideTurn()
//build the next line to add sequencelines
double widthMinusOverlap = mf.tool.width - mf.tool.overlap;

double distAway = widthMinusOverlap * (mf.curve.howManyPathsAway + ((isTurnLeft ^ mf.curve.isHeadingSameWay) ? rowSkipsWidth : -rowSkipsWidth)) + (mf.curve.isHeadingSameWay ? -mf.tool.offset : mf.tool.offset) + track.nudgeDistance;
double distAway = widthMinusOverlap * (mf.curve.howManyPathsAway + ((isTurnLeft ^ mf.curve.isHeadingSameWay) ? rowSkipsWidth : -rowSkipsWidth)) + (mf.curve.isHeadingSameWay ? mf.tool.offset : -mf.tool.offset) + track.nudgeDistance;

distAway += (0.5 * widthMinusOverlap);

Expand Down Expand Up @@ -948,7 +948,7 @@ private bool CreateABWideTurn()

CTrk track = mf.trk.gArr[mf.trk.idx];

double distAway = widthMinusOverlap * (mf.ABLine.howManyPathsAway + ((isTurnLeft ^ mf.ABLine.isHeadingSameWay) ? rowSkipsWidth : -rowSkipsWidth)) + (mf.ABLine.isHeadingSameWay ? -mf.tool.offset : mf.tool.offset) + track.nudgeDistance;
double distAway = widthMinusOverlap * (mf.ABLine.howManyPathsAway + ((isTurnLeft ^ mf.ABLine.isHeadingSameWay) ? rowSkipsWidth : -rowSkipsWidth)) + (mf.ABLine.isHeadingSameWay ? mf.tool.offset : -mf.tool.offset) + track.nudgeDistance;

distAway += (0.5 * widthMinusOverlap);

Expand Down Expand Up @@ -1456,7 +1456,7 @@ public bool KStyleTurnAB()
}

//grab the vehicle widths and offsets
double turnOffset = (mf.tool.width - mf.tool.overlap) * rowSkipsWidth + (isTurnLeft ? -mf.tool.offset : mf.tool.offset);
double turnOffset = (mf.tool.width - mf.tool.overlap) * rowSkipsWidth + (isTurnLeft ? mf.tool.offset : -mf.tool.offset);

//add the tail to first turn
int count = ytList.Count;
Expand Down
Loading
Loading