Merge branch 'nlp' into sp-interface-cleanup-new-nlp

sunnypilot · Oct 30, 2023 · c2c8d40 · c2c8d40
2 parents 91429b5 + 12a0d6c
commit c2c8d40
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/log.capnp b/log.capnp
@@ -874,6 +874,8 @@ struct ModelDataV2 {
   navEnabled @22 :Bool;
   locationMonoTime @24 :UInt64;
 
+  # e2e lateral planner
+  lateralPlannerSolution @25: LateralPlannerSolution;
 
   struct LeadDataV2 {
     prob @0 :Float32; # probability that car is your lead at time t
@@ -940,6 +942,18 @@ struct ModelDataV2 {
     transStd @2 :List(Float32); # std m/s in device frame
     rotStd @3 :List(Float32); # std rad/s in device frame
   }
+
+  struct LateralPlannerSolution {
+    x @0 :List(Float32);
+    y @1 :List(Float32);
+    yaw @2 :List(Float32);
+    yawRate @3 :List(Float32);
+    xStd @4 :List(Float32);
+    yStd @5 :List(Float32);
+    yawStd @6 :List(Float32);
+    yawRateStd @7 :List(Float32);
+  }
+
 }
 
 struct EncodeIndex {

diff --git a/visionipc/visionipc_client.h b/visionipc/visionipc_client.h
@@ -17,9 +17,7 @@ class VisionIpcClient {
   Poller * poller;
 
   cl_device_id device_id = nullptr;
-  cl_context ctx = nullptr;
-
-  void init_msgq(bool conflate);
+  cl_context ctx = nullptr;\
 
 public:
   bool connected = false;