Merge branch 'master' into av/navigation-sensor-data

aviggen · aviggen · commit c39473970901 · 2024-11-14T13:20:53.000+01:00
diff --git a/protobuf_definitions/message_formats.proto b/protobuf_definitions/message_formats.proto
@@ -1076,4 +1076,6 @@ message PersistentStorageSettings {
 message CPUInfo {
   float cpu_load = 1; // CPU load (0..1)
   float memory_bus_load = 2; // Memory bus load (0..1)
+  float main_queue_load = 3; // Main queue load (0..1)
+  float guestport_queue_load = 4 ; // Guestport queue load (0..1)
 }
diff --git a/protobuf_definitions/telemetry.proto b/protobuf_definitions/telemetry.proto
@@ -277,6 +277,7 @@ message MultibeamDiscoveryTel {
   MultibeamDiscovery discovery = 1; // Discovery data from a multibeam sonar
 }
 
+// Information about cpu and memory usage
 message CPUInfoTel {
   CPUInfo cpu_info = 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -1076,4 +1076,6 @@ message PersistentStorageSettings {`
`1076`	`1076`	`message CPUInfo {`
`1077`	`1077`	`float cpu_load = 1; // CPU load (0..1)`
`1078`	`1078`	`float memory_bus_load = 2; // Memory bus load (0..1)`
	`1079`	`+ float main_queue_load = 3; // Main queue load (0..1)`
	`1080`	`+ float guestport_queue_load = 4 ; // Guestport queue load (0..1)`
`1079`	`1081`	`}`
Original file line number	Diff line number	Diff line change
`@@ -277,6 +277,7 @@ message MultibeamDiscoveryTel {`
`277`	`277`	`MultibeamDiscovery discovery = 1; // Discovery data from a multibeam sonar`
`278`	`278`	`}`
`279`	`279`
	`280`	`+// Information about cpu and memory usage`
`280`	`281`	`message CPUInfoTel {`
`281`	`282`	`CPUInfo cpu_info = 1;`
`282`	`283`	`}`