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

Feature/dotnetstandard2 0 #11

Draft
wants to merge 7 commits into
base: develop
Choose a base branch
from
Draft

Feature/dotnetstandard2 0 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
926ccb6
Extending gps:info with information on the source
Frank-Wiebeler Jan 8, 2021
ae797eb
Change Version of DotNet nuget Package
Frank-Wiebeler Mar 15, 2021
ed9b7c3
Merge branch 'develop' into feature/gps-naming
Frank-Wiebeler Mar 15, 2021
59bb695
-FIX: Update Protobuf Compiler Version for C# to avoid IBufferMessage…
Frank-Wiebeler Mar 15, 2021
7be6292
Merge branch 'feature/gps-naming' of https://github.com/DKE-Data/agri…
Frank-Wiebeler Mar 15, 2021
a7d070c
Set NetStandard to Version 2.0 instead of 2.1
Frank-Wiebeler Mar 16, 2021
d849c63
Switched Version 2.3 to 2.21 (dotnet) and 2.2 (java), as there are no…
Frank-Wiebeler Mar 16, 2021
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
5 changes: 5 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ Here are some external resources for the development:

If you receive a 404 HTTP status, this means that you are currently not allowed to view this repository because you do not have access. If you are an AEF member and do not have access, please ask the AEF office to grant you access to the repository.

== Usage of these protobuf definitions

These protobuf definitions provide a data structure for data that is sent via agrirouter from one endpoint to one or multiple others.
The content of these messages is not relevant for the agrirouter; just for the receiving endpoints.


== Language specific compiling of the `*.proto` definitions

Expand Down
600 changes: 562 additions & 38 deletions ...otobufDefinitions/AgrirouterTMTProtobufDefinitions/Agrirouter/TechnicalMessageType/Gps.cs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions ...tobufDefinitions/AgrirouterTMTProtobufDefinitions/AgrirouterTMTProtobufDefinitions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>agrirouter-tmt-protobuf-definitions</PackageId>
<Title>Agrirouter TMT Protobuf Definitions</Title>
<Authors>Frank Wiebeler, Sascha Dömer</Authors>
Expand All @@ -12,11 +12,11 @@
<AssemblyName>agrirouter-tmt-protobuf-definitions</AssemblyName>
<Product>agrirouter-tmt-protobuf-definitions</Product>
<RepositoryUrl>https://github.com/DKE-Data/agrirouter-tmt-protobuf-definitions</RepositoryUrl>
<PackageVersion>2.1.0</PackageVersion>
<PackageVersion>2.2.1</PackageVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.11.4" />
<PackageReference Include="Google.Protobuf" Version="3.15.5" />
</ItemGroup>

</Project>
14 changes: 12 additions & 2 deletions dotnet/agrirouter/protobuf/technicalmessagetype/gps.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ message GPSList{
D_MANUAL_INPUT = 7;
D_SIMULATE_MODE = 8;
// 9-13 Reserved
D_ERROR = 14;//Error receiving GPS position from the receiver
D_NOT_AVAILABLE = 15;
D_ERROR = 14; //Error receiving GPS position from the receiver
D_NOT_AVAILABLE = 15;//No GPS Receiver available
}
enum FieldStatus {
FS_UNKNOWN = 0;
Expand All @@ -36,8 +36,18 @@ message GPSList{
uint32 number_of_satellites = 7;
google.protobuf.Timestamp gps_utc_timestamp = 8;
FieldStatus field_status = 9;//Are we on a road, in a field or just somewhere offroad?
uint32 source_device_index = 10;//The index of the source device in the SourceDeviceList
repeated google.protobuf.Any extension = 2048; // Used for proprietary purposes
}

message SourceDevice{
uint32 index = 1;//The index within the list of SourceDevices; Not necessarilly all values are there
string display_name = 2;//Proprietary name for displaying (might change during operation)
string agrirouter_id = 3;//The endpoint_id as mentioned in the ListEndpoints Result
string internal_id = 4;//A proprietary but static id for sources outside of agrirouter
}

repeated GPSEntry gps_entries = 1;
repeated SourceDevice source_devices = 2;
repeated google.protobuf.Any extension = 2048; // Used for proprietary purposes
}
1 change: 1 addition & 0 deletions java/install_local.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
mvn clean install -Pgenerate-protobuf-tmt
7 changes: 6 additions & 1 deletion java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.agrirouter.proto</groupId>
<artifactId>agrirouter-tmt-protobuf-definitions</artifactId>
<version>2.1.0-SNAPSHOT</version>
<version>2.2.0-SNAPSHOT</version>

<name>AGRIROUTER - Technical Message Type Protobuf Definitions</name>
<description>This project contains the Google Protocol Buffer (protobuf) definitions for those technical message types, that are exchanged as protobuf objects. For more informations see the technical integration guide.
Expand All @@ -24,6 +24,11 @@
<name>Sascha Doemer</name>
<email>[email protected]</email>
</developer>
<developer>
<id>frankwiebeler</id>
<name>Frank Wiebeler</name>
<email>[email protected]</email>
</developer>
</developers>

<scm>
Expand Down
Loading