diff --git a/common/logging_extra.py b/common/logging_extra.py index a779fc8f7..63b2ea928 100644 --- a/common/logging_extra.py +++ b/common/logging_extra.py @@ -171,6 +171,7 @@ class SwagLogger(logging.Logger): tstp['timestamp']["event"] = event_name tstp['timestamp']["frameId"] = frame_id tstp['timestamp']["time"] = sec_since_boot()*1e9 + tstp['timestamp']["translate"] = False if args: tstp['timestamp']['args'] = args tstp['timestamp'].update(kwargs) diff --git a/panda b/panda index e6722c7f9..ba10911db 160000 --- a/panda +++ b/panda @@ -1 +1 @@ -Subproject commit e6722c7f99b8f7b9f81bb0216edb88cc2e5ad7c0 +Subproject commit ba10911dbc0a6f2c5c04886ca793f6ac38400cd3 diff --git a/selfdrive/controls/controlsd.py b/selfdrive/controls/controlsd.py index f83735990..de201a48b 100755 --- a/selfdrive/controls/controlsd.py +++ b/selfdrive/controls/controlsd.py @@ -631,9 +631,10 @@ class Controls: if not self.read_only and self.initialized: # send car controls over can self.last_actuators, can_sends = self.CI.apply(CC) - sendcan_msg = can_list_to_can_capnp(can_sends, msgtype='sendcan') - self.pm.send('sendcan', sendcan_msg , valid=CS.canValid) - cloudlog.event("translation", logMonoTime=sendcan_msg.logMonoTime, frameId=frame_id, debug=True) + sendcan_bytes = can_list_to_can_capnp(can_sends, msgtype='sendcan', valid=CS.canValid) + self.pm.send('sendcan', sendcan_bytes) + sendcanMonoTime = log.Event.from_bytes(sendcan_bytes).logMonoTime + cloudlog.event("translation", logMonoTime=sendcanMonoTime, frameId=frame_id, debug=True) cloudlog.timestamp("sendcan Published", frame_id) CC.actuatorsOutput = self.last_actuators