adjustment according to synced cereal

eFiniLan · Feb 5, 2024 · 8c91e2d · 8c91e2d
1 parent a74aab4
commit 8c91e2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cereal b/cereal
diff --git a/selfdrive/boardd/boardd.cc b/selfdrive/boardd/boardd.cc
@@ -388,7 +388,8 @@ std::optional<bool> send_panda_states(PubMaster *pm, const std::vector<Panda *>
     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
@@ -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
+1 −1		.github/workflows/tests.yml
+7 −5		.pre-commit-config.yaml
+1 −1		README.md
+1 −1		SConscript
+5 −3		SConstruct
+10 −6		car.capnp
+16 −12		messaging/__init__.py
+1 −1		messaging/impl_fake.h
+1 −1		messaging/impl_msgq.h
+8 −2		messaging/impl_zmq.cc
+2 −1		messaging/impl_zmq.h
+4 −4		messaging/messaging.h
+2 −2		messaging/socketmaster.cc
+3 −3		messaging/tests/test_messaging.py
+4 −4		messaging/tests/test_services.py
+1 −1		visionipc/tests/test_visionipc.py
+4 −9		visionipc/visionipc_client.cc
+0 −5		visionipc/visionipc_client.h
+11 −9		visionipc/visionipc_server.cc
+1 −1		visionipc/visionipc_server.h