feat: change gps origin, use trackLayout and trackLocation, change te…

…lemetryStatys.data
eagletrt · Aug 12, 2024 · c2ea4c2 · c2ea4c2
1 parent 636c0d5
commit c2ea4c2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/proto/telemetry/gps_maps.proto b/proto/telemetry/gps_maps.proto
@@ -4,21 +4,21 @@ package Telemetry;
 
 message Baseline {
   bool valid = 1;
-  double length = 2;
-  repeated double x = 3;
-  repeated double y = 4;
+  bool logging = 2;
+  double length = 3;
+  repeated double x = 4;
+  repeated double y = 5;
 }
 
 message GPSMapOrigin {
   double latitude = 1;
   double longitude = 2;
-  double ecefX = 3;
-  double ecefY = 4;
-  double ecefZ = 5;
+  double altitude = 3;
 }
 
 message GPSMapOrigins {
-  string selectedMap = 1;
-  map<string, GPSMapOrigin> origins = 2;
-  map<string, Baseline> tracksBaseline = 3;
+  string trackLocation = 1;
+  string trackLayout = 2;
+  map<string, GPSMapOrigin> origins = 3;
+  map<string, Baseline> tracksBaseline = 4;
 }
diff --git a/proto/telemetry/status.proto b/proto/telemetry/status.proto
@@ -2,6 +2,14 @@ syntax = "proto3";
 
 package Telemetry;
 
+enum TelemetryState {
+    INIT = 0;
+    IDLE = 1;
+    SETUP_RUN = 2;
+    RUN = 3;
+    ERROR = 4;
+}
+
 message MessagesPerSecond
 {
     string deviceName = 1;
@@ -10,22 +18,15 @@ message MessagesPerSecond
     uint64 count = 4;
 }
 
-message Camera
-{
-    string status = 1;
-    string error = 2;
-}
-
 message Status
 {
     uint64 timestamp = 1;
     uint64 zeroTimestamp = 2;
-    int64 data = 3;
+    TelemetryState state = 3;
     uint64 cpuTotalLoad = 4;
     uint64 cpuProcessLoad = 5;
     uint64 memProcessLoad = 6;
     uint64 canlibBuildTime = 7;
     uint64 telemetryBuildTime = 8;
-    Camera camera = 9;
     repeated MessagesPerSecond messagesPerSecond = 10;
 }