Skip to content

Commit

Permalink
Merge branch 'release/6.6' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
FantasyTeddy committed Jan 10, 2025
2 parents 014fb57 + 62a9ae7 commit 5656cd5
Show file tree
Hide file tree
Showing 210 changed files with 25,599 additions and 5,642 deletions.
49 changes: 49 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build

on:
push:
branches:
- develop
pull_request:
branches:
- master
- develop
- release/*

env:
# Path to the solution file relative to the root of the project.
SOLUTION_FILE_PATH: ./SourceCode/AgOpenGPS.sln

# Configuration type to build.
# You can convert this to a build matrix if you need coverage of multiple configuration types.
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
BUILD_CONFIGURATION: Release

jobs:
build:
runs-on: windows-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Restore NuGet packages
run: nuget restore ${{env.SOLUTION_FILE_PATH}} -PackagesDirectory .\SourceCode\packages -source "https://api.nuget.org/v3/index.json"

- name: Build
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

- name: Create AgOpenGPS.zip
shell: powershell
run: Compress-Archive -Path "AgOpenGPS" -Destination "AgOpenGPS.zip"

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: AgOpenGPS.zip
path: AgOpenGPS.zip
155 changes: 0 additions & 155 deletions .github/workflows/main.yml

This file was deleted.

63 changes: 63 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Build and release

on:
push:
branches:
- master
- release/*
workflow_dispatch:

env:
# Path to the solution file relative to the root of the project.
SOLUTION_FILE_PATH: ./SourceCode/AgOpenGPS.sln

# Configuration type to build.
# You can convert this to a build matrix if you need coverage of multiple configuration types.
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
BUILD_CONFIGURATION: Release

jobs:
build-and-release:
runs-on: windows-latest

steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Restore NuGet packages
run: nuget restore ${{env.SOLUTION_FILE_PATH}} -PackagesDirectory .\SourceCode\packages -source "https://api.nuget.org/v3/index.json"

- name: Build
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

- name: Create AgOpenGPS.zip
shell: powershell
run: Compress-Archive -Path "AgOpenGPS" -Destination "AgOpenGPS.zip"

- name: Create Release
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ env.GitVersion_SemVer }}
release_name: Release ${{ env.GitVersion_SemVer }}
body: |
Automated Release by GitHub Action CI
draft: false
prerelease: ${{ contains(github.ref_name, 'release/') }}

- name: Upload Release Asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./AgOpenGPS.zip
asset_name: AgOpenGPS.zip
asset_content_type: application/zip
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ bld/
[Oo]bj/
[Ll]og/
[Ll]ogs/
AgOpenGPS_v5/
AgOpenGPS_v63/
AgOpenGPS_v64/
/AgOpenGPS/

# Visual Studio 2015/2017 cache/options directory
.vs/
Expand Down
52 changes: 31 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
# AgOpenGPS - Guidance software

# AgOpenGPS **** Guidance software

Most [Stable AgOpenGPS Release](https://github.com/farmerbriantee/AgOpenGPS/releases)

[AgOpenGPS Wiki](https://github.com/farmerbriantee/AgOpenGPS/wiki)

Discussed in detail on the [AgOpengGPS Forum](https://discourse.agopengps.com/)


The [PCB and Firmware Repository](https://github.com/AgHardware)

The [SK21 Rate Control Repository is here](https://github.com/AgHardware)

The [Ag Hardware Wiki](https://github.com/AgHardware/Boards/wiki)
[![GitHub Release](https://img.shields.io/github/v/release/farmerbriantee/AgOpenGPS)](https://github.com/farmerbriantee/AgOpenGPS/releases/latest)

Ag Precision Mapping and Section Control Software

AgOpenGPS is 2 programs. AgIO is the communication hub to the outside world and AgOpenGPS is the
application. You can run either and within each, you can run the other.
application. You can run either and within each, you can run the other.

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

To install click on the "Most Stable Release" link above and download the AgOpenGPS_v5.zip.
Unzip or extract the contents to a folder (folder accessible by user not the root of C:\)
Even on your desktop, and run AgOpenGPS.exe

The software reads NMEA strings for the purpose of recording and mapping position information
for Agricultural use. Also it has up to 16 sections of Section Control that can have unique widths
or up to 64 same width sections to control implements application of product preventing
Expand All @@ -38,7 +22,34 @@ Included in this repository is an application, and source folders.

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

*** Important ****
## Installation

1. Download the [Most Stable AgOpenGPS Release](https://github.com/farmerbriantee/AgOpenGPS/releases)
2. Unzip or extract the contents to a folder (folder accessible by user not the root of C:\\)
Even on your desktop
3. Run AgOpenGPS.exe

## Contributing

The `master` branch contains the most stable version of AgOpenGPS, while the `develop` branch
is actively being worked on and may not be ready for production use.

In order to contribute to AgOpenGPS, follow these steps:

1. Checkout the `develop` branch
2. Create a new branch named after your feature
3. Make your changes and commit to this branch
4. Create a PR targeting the `develop` branch

## Links

- [AgOpenGPS Wiki](https://github.com/farmerbriantee/AgOpenGPS/wiki)
- [AgOpenGPS Forum](https://discourse.agopengps.com/)
- [PCB and Firmware Repository](https://github.com/AgHardware/Boards)
- [SK21 Rate Control Repository](https://github.com/AgHardware/Rate_Control)
- [AgHardware Wiki](https://github.com/AgHardware/Boards/wiki)

## License

If you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
Expand All @@ -49,4 +60,3 @@ know their rights as Outlined in the GPLv3 License.
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.
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;
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.

Loading

0 comments on commit 5656cd5

Please sign in to comment.