fix ui and unlogger after cereal cleanup
parent
ce00f420ba
commit
dfa10ed184
|
@ -196,7 +196,7 @@ def ui_thread(addr, frame_address):
|
||||||
info_font.render("LONG MPC SOURCE: " + str(sm['longitudinalPlan'].longitudinalPlanSource), True, YELLOW),
|
info_font.render("LONG MPC SOURCE: " + str(sm['longitudinalPlan'].longitudinalPlanSource), True, YELLOW),
|
||||||
None,
|
None,
|
||||||
info_font.render("ANGLE OFFSET (AVG): " + str(round(sm['liveParameters'].angleOffsetAverageDeg, 2)) + " deg", True, YELLOW),
|
info_font.render("ANGLE OFFSET (AVG): " + str(round(sm['liveParameters'].angleOffsetAverageDeg, 2)) + " deg", True, YELLOW),
|
||||||
info_font.render("ANGLE OFFSET (INSTANT): " + str(round(sm['liveParameters'].angleOffset, 2)) + " deg", True, YELLOW),
|
info_font.render("ANGLE OFFSET (INSTANT): " + str(round(sm['liveParameters'].angleOffsetDeg, 2)) + " deg", True, YELLOW),
|
||||||
info_font.render("STIFFNESS: " + str(round(sm['liveParameters'].stiffnessFactor * 100., 2)) + " %", True, YELLOW),
|
info_font.render("STIFFNESS: " + str(round(sm['liveParameters'].stiffnessFactor * 100., 2)) + " %", True, YELLOW),
|
||||||
info_font.render("STEER RATIO: " + str(round(sm['liveParameters'].steerRatio, 2)), True, YELLOW)
|
info_font.render("STEER RATIO: " + str(round(sm['liveParameters'].steerRatio, 2)), True, YELLOW)
|
||||||
]
|
]
|
||||||
|
|
|
@ -99,7 +99,7 @@ class UnloggerWorker(object):
|
||||||
smsg = msg.as_builder()
|
smsg = msg.as_builder()
|
||||||
|
|
||||||
if typ == "roadCameraState":
|
if typ == "roadCameraState":
|
||||||
frame_id = msg.frame.frameId
|
frame_id = msg.roadCameraState.frameId
|
||||||
|
|
||||||
# Frame exists, make sure we have a framereader.
|
# Frame exists, make sure we have a framereader.
|
||||||
# load the frame readers as needed
|
# load the frame readers as needed
|
||||||
|
@ -118,9 +118,9 @@ class UnloggerWorker(object):
|
||||||
img = img.flatten()
|
img = img.flatten()
|
||||||
bts = img.tobytes()
|
bts = img.tobytes()
|
||||||
|
|
||||||
smsg.frame.image = bts
|
smsg.roadCameraState.image = bts
|
||||||
|
|
||||||
extra = (smsg.frame.frameId, smsg.frame.timestampSof, smsg.frame.timestampEof)
|
extra = (smsg.roadCameraState.frameId, smsg.roadCameraState.timestampSof, smsg.roadCameraState.timestampEof)
|
||||||
data_socket.send_pyobj((cookie, VIPC_TYP, msg.logMonoTime, route_time, extra), flags=zmq.SNDMORE)
|
data_socket.send_pyobj((cookie, VIPC_TYP, msg.logMonoTime, route_time, extra), flags=zmq.SNDMORE)
|
||||||
data_socket.send(bts, copy=False)
|
data_socket.send(bts, copy=False)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue