pepperplus/pepperplus-ri
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge dev with main #27

Merged
8464960 merged 89 commits from dev into main 2026-01-28 10:54:23 +00:00
Conversation 2 Commits 89 Files Changed 49 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a408fafc7c - Show all commits

4
src/robot_interface/main.py
View File

@@ -65,7 +65,7 @@ def start_video_rcv(robot_ip, port, socket):
:type port: int :type port: int
:param socket: The ZMQ socket to send the video images over. :param socket: The ZMQ socket to send the video images over.
:type: Socket :type: VideoSender
""" """
socket.socket.setsockopt(zmq.CONFLATE,1) socket.socket.setsockopt(zmq.CONFLATE,1)
@@ -94,7 +94,7 @@ def video_rcv_loop(vid_service, vid_stream_name, socket):
:type vid_service: Object (Qi service object) :type vid_service: Object (Qi service object)
:param socket: The ZMQ socket to send the video images over. :param socket: The ZMQ socket to send the video images over.
:type: Socket :type: VideoSender
""" """
while not state.exit_event.is_set(): while not state.exit_event.is_set():
try: try: