From 43b9fb7890ec3bd8acdead69ea79d203e2320e41 Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 15 Nov 2021 17:04:40 +0100 Subject: [PATCH 1/4] [DAT-825] Wrap sensor data files for injection (#13) --- .../de/cyface/protos/model/measurement.proto | 73 ++++++++++++++----- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/src/main/proto/de/cyface/protos/model/measurement.proto b/src/main/proto/de/cyface/protos/model/measurement.proto index 28e422f..60795aa 100644 --- a/src/main/proto/de/cyface/protos/model/measurement.proto +++ b/src/main/proto/de/cyface/protos/model/measurement.proto @@ -56,24 +56,19 @@ message Measurement { * We use a packed encoding here, so this is a non repeated field. */ LocationRecords location_records = 17; + /* - * Collection of acceleration point batches. - * - * The sensor points are stored in batches to simplify the client code. + * Acceleration data stored during capturing. */ - repeated Accelerations accelerations = 18; + AccelerationsFile accelerations_file = 18; /* - * Collection of rotation point batches. - * - * The sensor points are stored in batches to simplify the client code. + * Rotation data stored during capturing. */ - repeated Rotations rotations = 19; + RotationsFile rotations_file = 19; /* - * Collection of direction point batches. - * - * The sensor points are stored in batches to simplify the client code. + * Direction data stored during capturing. */ - repeated Directions directions = 20; + DirectionsFile directions_file = 20; /* * Collection of events. @@ -121,17 +116,17 @@ message MeasurementBytes { */ LocationRecords location_records = 17; /* - * Collection of acceleration points. + * Acceleration data stored during capturing. */ - bytes accelerations = 18; + bytes accelerations_file = 18; /* - * Collection of rotation points. + * Rotation data stored during capturing. */ - bytes rotations = 19; + bytes rotations_file = 19; /* - * Collection of direction points. + * Direction data stored during capturing. */ - bytes directions = 20; + bytes directions_file = 20; /* * Collection of events. */ @@ -150,6 +145,48 @@ message MeasurementBytes { File capturing_log = 24; } +/* + * A message type which wraps the `Accelerations` batches captured in a `cyfa` file of a measurement. + * + * This allows to inject the bytes from a `cyfa` file on the client without parsing the data [DAT-642]. + */ +message AccelerationsFile { + /* + * Collection of acceleration point batches. + * + * The sensor points are stored in batches to simplify the client code. + */ + repeated Accelerations accelerations = 1; +} + +/* + * A message type which wraps the `Accelerations` batches captured in a `cyfa` file of a measurement. + * + * This allows to inject the bytes from a `cyfa` file on the client without parsing the data [DAT-642]. + */ +message RotationsFile { + /* + * Collection of rotation point batches. + * + * The sensor points are stored in batches to simplify the client code. + */ + repeated Rotations rotations = 1; +} + +/* + * A message type which wraps the `Accelerations` batches captured in a `cyfa` file of a measurement. + * + * This allows to inject the bytes from a `cyfa` file on the client without parsing the data [DAT-642]. + */ +message DirectionsFile { + /* + * Collection of direction point batches. + * + * The sensor points are stored in batches to simplify the client code. + */ + repeated Directions directions = 1; +} + /* * A message type which wraps all geo-locations captured for one measurement. * From 2a8323140bdb04fb8daa80b07b1110294f5b3c4d Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 15 Nov 2021 17:06:11 +0100 Subject: [PATCH 2/4] Set version to 0.2.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8d4a520..6ba8fb1 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ plugins { } group = 'de.cyface' -version = '0.1.0' +version = '0.2.0' tasks.withType(JavaCompile) { options.encoding = 'UTF-8' From 8d50786e66358016f8cfa8e3a90c28269c732022 Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 13 Dec 2021 11:01:37 +0100 Subject: [PATCH 3/4] [DAT-806] Rename *file to *binary (#16) --- .../de/cyface/protos/model/measurement.proto | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/proto/de/cyface/protos/model/measurement.proto b/src/main/proto/de/cyface/protos/model/measurement.proto index 60795aa..01ea1a8 100644 --- a/src/main/proto/de/cyface/protos/model/measurement.proto +++ b/src/main/proto/de/cyface/protos/model/measurement.proto @@ -60,15 +60,15 @@ message Measurement { /* * Acceleration data stored during capturing. */ - AccelerationsFile accelerations_file = 18; + AccelerationsBinary accelerations_binary = 18; /* * Rotation data stored during capturing. */ - RotationsFile rotations_file = 19; + RotationsBinary rotations_binary = 19; /* * Direction data stored during capturing. */ - DirectionsFile directions_file = 20; + DirectionsBinary directions_binary = 20; /* * Collection of events. @@ -118,15 +118,15 @@ message MeasurementBytes { /* * Acceleration data stored during capturing. */ - bytes accelerations_file = 18; + bytes accelerations_binary = 18; /* * Rotation data stored during capturing. */ - bytes rotations_file = 19; + bytes rotations_binary = 19; /* * Direction data stored during capturing. */ - bytes directions_file = 20; + bytes directions_binary = 20; /* * Collection of events. */ @@ -150,7 +150,7 @@ message MeasurementBytes { * * This allows to inject the bytes from a `cyfa` file on the client without parsing the data [DAT-642]. */ -message AccelerationsFile { +message AccelerationsBinary { /* * Collection of acceleration point batches. * @@ -164,7 +164,7 @@ message AccelerationsFile { * * This allows to inject the bytes from a `cyfa` file on the client without parsing the data [DAT-642]. */ -message RotationsFile { +message RotationsBinary { /* * Collection of rotation point batches. * @@ -178,7 +178,7 @@ message RotationsFile { * * This allows to inject the bytes from a `cyfa` file on the client without parsing the data [DAT-642]. */ -message DirectionsFile { +message DirectionsBinary { /* * Collection of direction point batches. * From 0a9f1543ab5a2ff40e510b7d791fc4db8d3532b2 Mon Sep 17 00:00:00 2001 From: Armin Date: Mon, 13 Dec 2021 11:03:01 +0100 Subject: [PATCH 4/4] Set version to 1.0.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 6ba8fb1..34dc65c 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ plugins { } group = 'de.cyface' -version = '0.2.0' +version = '1.0.0' tasks.withType(JavaCompile) { options.encoding = 'UTF-8'