Skip to content

Commit 3928ff1

Browse files
committed
Merge branch 'master' into hs/adis
2 parents 82e8fbb + 7dc2e1a commit 3928ff1

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

Blueye.Protocol.Protobuf.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Google.Protobuf" Version="3.31.1" />
17-
<PackageReference Include="Google.Protobuf.Tools" Version="3.31.0">
16+
<PackageReference Include="Google.Protobuf" Version="3.32.0" />
17+
<PackageReference Include="Google.Protobuf.Tools" Version="3.32.0">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>

protobuf_definitions/message_formats.proto

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,3 +1223,26 @@ message CPUInfo {
12231223
float guestport_queue_load = 4 ; // Guestport queue load (0..1).
12241224
float comm_queue_load = 5; // Communication queue load (0..1).
12251225
}
1226+
1227+
// Surface Unit battery information.
1228+
//
1229+
// This message is published by the Surface Unit, and re-published by
1230+
// the drone over the communication protocol.
1231+
message SurfaceUnitBatteryInfo {
1232+
enum ChargeStatus {
1233+
CHARGE_STATUS_UNSPECIFIED = 0;
1234+
CHARGE_STATUS_DISCHARGE = 1;
1235+
CHARGE_STATUS_CHARGE = 2;
1236+
CHARGE_STATUS_CHARGE_ERROR = 3;
1237+
}
1238+
ChargeStatus status = 1; // Battery charge status.
1239+
float level = 2; // Battery level (0..1).
1240+
}
1241+
1242+
// Surface Unit version information.
1243+
//
1244+
// This message is published by the Surface Unit, and re-published by
1245+
// the drone over the communication protocol.
1246+
message SurfaceUnitVersionInfo {
1247+
string version = 1; // Surface Unit firmware version (x.y.z).
1248+
}

protobuf_definitions/telemetry.proto

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,3 +292,9 @@ message MultibeamDiscoveryTel {
292292
message CPUInfoTel {
293293
CPUInfo cpu_info = 1; // CPU information.
294294
}
295+
296+
// Surface Unit telemetry message.
297+
message SurfaceUnitTel {
298+
SurfaceUnitBatteryInfo battery_info = 1; // Battery information.
299+
SurfaceUnitVersionInfo version_info = 2; // Version information.
300+
}

0 commit comments

Comments
 (0)