Merge remote-tracking branch 'origin/dev' into feat/actuation-receiver
# Conflicts: # src/robot_interface/endpoints/socket_base.py
This commit is contained in:
@@ -6,6 +6,7 @@ import zmq
|
||||
|
||||
from robot_interface.endpoints.actuation_receiver import ActuationReceiver
|
||||
from robot_interface.endpoints.main_receiver import MainReceiver
|
||||
from robot_interface.endpoints.video_sender import VideoSender
|
||||
from robot_interface.state import state
|
||||
|
||||
|
||||
@@ -22,6 +23,11 @@ def main_loop(context):
|
||||
actuation_receiver = ActuationReceiver(context)
|
||||
state.sockets.append(actuation_receiver)
|
||||
|
||||
video_sender = VideoSender(context)
|
||||
state.sockets.append(video_sender)
|
||||
|
||||
video_sender.start_video_rcv()
|
||||
|
||||
# Sockets that can run on the main thread. These sockets' endpoints should not block for long (say 50 ms at most).
|
||||
receivers = [main_receiver, actuation_receiver]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user