Add angular rates carcontroller packet (commaai#23980)

* Controlsd: give carcontroller angular rates * Update cereal * Needs to be list * Update refs # Conflicts: # cereal
budney · Mar 27, 2022 · 580fe2f · 580fe2f
1 parent 817433e
commit 580fe2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/cereal b/cereal
diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py
@@ -572,10 +572,14 @@ def update_button_timers(self, buttonEvents):
   def publish_logs(self, CS, start_time, CC, lac_log):
     """Send actuators and hud commands to the car, send controlsstate and MPC logging"""
 
-    orientation_value = self.sm['liveLocationKalman'].orientationNED.value
+    # Orientation and angle rates can be useful for carcontroller
+    # Only calibrated (car) frame is relevant for the carcontroller
+    orientation_value = list(self.sm['liveLocationKalman'].calibratedOrientationNED.value)
     if len(orientation_value) > 2:
-      CC.roll = orientation_value[0]
-      CC.pitch = orientation_value[1]
+      CC.orientationNED = orientation_value
+    angular_rate_value = list(self.sm['liveLocationKalman'].angularVelocityCalibrated.value)
+    if len(angular_rate_value) > 2:
+      CC.angularVelocity = angular_rate_value
 
     CC.cruiseControl.cancel = CS.cruiseState.enabled and (not self.enabled or not self.CP.pcmCruise)
     if self.joystick_mode and self.sm.rcv_frame['testJoystick'] > 0 and self.sm['testJoystick'].buttons[0]:

diff --git a/selfdrive/test/process_replay/ref_commit b/selfdrive/test/process_replay/ref_commit
@@ -1 +1 @@
-927918307b45657df0a4ac0255c3e8e3dc62d7cd
+61bac237e228da19e59d456c883f99a92172d217