From 8c91e2dae174ab28d0cb2e7c3e7d0de64a1161bc Mon Sep 17 00:00:00 2001 From: Rick Lan Date: Mon, 5 Feb 2024 22:42:28 +0800 Subject: [PATCH] adjustment according to synced cereal --- cereal | 2 +- selfdrive/boardd/boardd.cc | 3 ++- selfdrive/controls/controlsd.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cereal b/cereal index fb0ed1291..a0a13a79d 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit fb0ed12914b550371739ddb9b24c4257261d4cf6 +Subproject commit a0a13a79d8d6bd4d5edbc294290c7567e953d92f diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc index 9bfea80a3..ad1f3803f 100644 --- a/selfdrive/boardd/boardd.cc +++ b/selfdrive/boardd/boardd.cc @@ -388,7 +388,8 @@ std::optional send_panda_states(PubMaster *pm, const std::vector ps.setIgnitionLine(health.ignition_line_pkt); ps.setIgnitionCan(health.ignition_can_pkt); ps.setControlsAllowed(health.controls_allowed_pkt); - ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt); + // rick - deprecated in panda +// ps.setGasInterceptorDetected(health.gas_interceptor_detected_pkt); ps.setTxBufferOverflow(health.tx_buffer_overflow_pkt); ps.setRxBufferOverflow(health.rx_buffer_overflow_pkt); ps.setGmlanSendErrs(health.gmlan_send_errs_pkt); diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 8b077d21b..1a81d455a 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -795,7 +795,8 @@ def publish_logs(self, CS, start_time, CC, lac_log): controlsState.active = self.active controlsState.curvature = curvature controlsState.desiredCurvature = self.desired_curvature - controlsState.desiredCurvatureRate = self.desired_curvature_rate + # rick - deprecated + # controlsState.desiredCurvatureRate = self.desired_curvature_rate controlsState.state = self.state controlsState.engageable = not self.events.contains(ET.NO_ENTRY) controlsState.longControlState = self.LoC.long_control_state