Skip to content

Commit 5656cd5

Browse files
committed
Merge branch 'release/6.6' into master
2 parents 014fb57 + 62a9ae7 commit 5656cd5

File tree

210 files changed

+25599
-5642
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+25599
-5642
lines changed

.github/workflows/build.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Build
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
pull_request:
8+
branches:
9+
- master
10+
- develop
11+
- release/*
12+
13+
env:
14+
# Path to the solution file relative to the root of the project.
15+
SOLUTION_FILE_PATH: ./SourceCode/AgOpenGPS.sln
16+
17+
# Configuration type to build.
18+
# You can convert this to a build matrix if you need coverage of multiple configuration types.
19+
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
20+
BUILD_CONFIGURATION: Release
21+
22+
jobs:
23+
build:
24+
runs-on: windows-latest
25+
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 0
31+
32+
- name: Add MSBuild to PATH
33+
uses: microsoft/setup-msbuild@v2
34+
35+
- name: Restore NuGet packages
36+
run: nuget restore ${{env.SOLUTION_FILE_PATH}} -PackagesDirectory .\SourceCode\packages -source "https://api.nuget.org/v3/index.json"
37+
38+
- name: Build
39+
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
40+
41+
- name: Create AgOpenGPS.zip
42+
shell: powershell
43+
run: Compress-Archive -Path "AgOpenGPS" -Destination "AgOpenGPS.zip"
44+
45+
- name: Upload artifact
46+
uses: actions/upload-artifact@v4
47+
with:
48+
name: AgOpenGPS.zip
49+
path: AgOpenGPS.zip

.github/workflows/main.yml

Lines changed: 0 additions & 155 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: Build and release
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- release/*
8+
workflow_dispatch:
9+
10+
env:
11+
# Path to the solution file relative to the root of the project.
12+
SOLUTION_FILE_PATH: ./SourceCode/AgOpenGPS.sln
13+
14+
# Configuration type to build.
15+
# You can convert this to a build matrix if you need coverage of multiple configuration types.
16+
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
17+
BUILD_CONFIGURATION: Release
18+
19+
jobs:
20+
build-and-release:
21+
runs-on: windows-latest
22+
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
with:
27+
fetch-depth: 0
28+
29+
- name: Add MSBuild to PATH
30+
uses: microsoft/setup-msbuild@v2
31+
32+
- name: Restore NuGet packages
33+
run: nuget restore ${{env.SOLUTION_FILE_PATH}} -PackagesDirectory .\SourceCode\packages -source "https://api.nuget.org/v3/index.json"
34+
35+
- name: Build
36+
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
37+
38+
- name: Create AgOpenGPS.zip
39+
shell: powershell
40+
run: Compress-Archive -Path "AgOpenGPS" -Destination "AgOpenGPS.zip"
41+
42+
- name: Create Release
43+
id: create_release
44+
uses: actions/create-release@v1
45+
env:
46+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47+
with:
48+
tag_name: ${{ env.GitVersion_SemVer }}
49+
release_name: Release ${{ env.GitVersion_SemVer }}
50+
body: |
51+
Automated Release by GitHub Action CI
52+
draft: false
53+
prerelease: ${{ contains(github.ref_name, 'release/') }}
54+
55+
- name: Upload Release Asset
56+
uses: actions/upload-release-asset@v1
57+
env:
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
with:
60+
upload_url: ${{ steps.create_release.outputs.upload_url }}
61+
asset_path: ./AgOpenGPS.zip
62+
asset_name: AgOpenGPS.zip
63+
asset_content_type: application/zip

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ bld/
3030
[Oo]bj/
3131
[Ll]og/
3232
[Ll]ogs/
33-
AgOpenGPS_v5/
34-
AgOpenGPS_v63/
35-
AgOpenGPS_v64/
33+
/AgOpenGPS/
3634

3735
# Visual Studio 2015/2017 cache/options directory
3836
.vs/

README.md

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
1+
# AgOpenGPS - Guidance software
12

2-
# AgOpenGPS **** Guidance software
3-
4-
Most [Stable AgOpenGPS Release](https://github.com/farmerbriantee/AgOpenGPS/releases)
5-
6-
[AgOpenGPS Wiki](https://github.com/farmerbriantee/AgOpenGPS/wiki)
7-
8-
Discussed in detail on the [AgOpengGPS Forum](https://discourse.agopengps.com/)
9-
10-
11-
The [PCB and Firmware Repository](https://github.com/AgHardware)
12-
13-
The [SK21 Rate Control Repository is here](https://github.com/AgHardware)
14-
15-
The [Ag Hardware Wiki](https://github.com/AgHardware/Boards/wiki)
3+
[![GitHub Release](https://img.shields.io/github/v/release/farmerbriantee/AgOpenGPS)](https://github.com/farmerbriantee/AgOpenGPS/releases/latest)
164

175
Ag Precision Mapping and Section Control Software
186

197
AgOpenGPS is 2 programs. AgIO is the communication hub to the outside world and AgOpenGPS is the
20-
application. You can run either and within each, you can run the other.
8+
application. You can run either and within each, you can run the other.
219

2210
You only need to run AgOpenGPS if you are using the simulator.
2311

24-
To install click on the "Most Stable Release" link above and download the AgOpenGPS_v5.zip.
25-
Unzip or extract the contents to a folder (folder accessible by user not the root of C:\)
26-
Even on your desktop, and run AgOpenGPS.exe
27-
2812
The software reads NMEA strings for the purpose of recording and mapping position information
2913
for Agricultural use. Also it has up to 16 sections of Section Control that can have unique widths
3014
or up to 64 same width sections to control implements application of product preventing
@@ -38,7 +22,34 @@ Included in this repository is an application, and source folders.
3822

3923
See the PCB repo for PCB layouts, firmware for steering and rate control, machine control, GPS and simulator.
4024

41-
*** Important ****
25+
## Installation
26+
27+
1. Download the [Most Stable AgOpenGPS Release](https://github.com/farmerbriantee/AgOpenGPS/releases)
28+
2. Unzip or extract the contents to a folder (folder accessible by user not the root of C:\\)
29+
Even on your desktop
30+
3. Run AgOpenGPS.exe
31+
32+
## Contributing
33+
34+
The `master` branch contains the most stable version of AgOpenGPS, while the `develop` branch
35+
is actively being worked on and may not be ready for production use.
36+
37+
In order to contribute to AgOpenGPS, follow these steps:
38+
39+
1. Checkout the `develop` branch
40+
2. Create a new branch named after your feature
41+
3. Make your changes and commit to this branch
42+
4. Create a PR targeting the `develop` branch
43+
44+
## Links
45+
46+
- [AgOpenGPS Wiki](https://github.com/farmerbriantee/AgOpenGPS/wiki)
47+
- [AgOpenGPS Forum](https://discourse.agopengps.com/)
48+
- [PCB and Firmware Repository](https://github.com/AgHardware/Boards)
49+
- [SK21 Rate Control Repository](https://github.com/AgHardware/Rate_Control)
50+
- [AgHardware Wiki](https://github.com/AgHardware/Boards/wiki)
51+
52+
## License
4253

4354
If you distribute copies of such a program, whether
4455
gratis or for a fee, you must pass on to the recipients the same
@@ -49,4 +60,3 @@ know their rights as Outlined in the GPLv3 License.
4960
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
5061
IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
5162
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
52-

0 commit comments

Comments
 (0)