From 183e7820e3d3e9f103b850a2b53a61fbbd97f121 Mon Sep 17 00:00:00 2001 From: Arne Schwarck Date: Mon, 2 Dec 2019 20:26:35 +0100 Subject: [PATCH] Try and combine events together. This could probably not work --- selfdrive/controls/controlsd.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index 63211063c87533..c336b11b9cfd00 100644 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -60,11 +60,12 @@ def data_sample(CI, CC, sm, can_sock, cal_status, cal_perc, overtemp, free_space # Update carstate from CAN and create events can_strs = messaging.drain_sock_raw(can_sock, wait_for_one=True) - CS = CI.update(CC, can_strs) + CS, CS_arne182 = CI.update(CC, can_strs) sm.update(0) - events = list(CS.events) + events = list(CS.events.extend(CS_arne182.events)) + enabled = isEnabled(state) # Check for CAN timeout