Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added lib/libmedia_codec/src/ffmpeg-dll/avcodec-58.dll
Binary file not shown.
Binary file added lib/libmedia_codec/src/ffmpeg-dll/avutil-56.dll
Binary file not shown.
Binary file not shown.
Binary file added lib/libmedia_codec/src/ffmpeg-dll/swscale-5.dll
Binary file not shown.
Binary file added lib/libmedia_codec/src/opus-dll/opus.dll
Binary file not shown.
Binary file added lib/libmedia_codec/src/opus-share/lib/opus.lib
Binary file not shown.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
####### example-requirements.txt #######
#
###### Requirements without Version Specifiers ######
robomaster
# robomaster
#
###### Requirements with Version Specifiers ######
# See https://www.python.org/dev/peps/pep-0440/#version-specifiers
Expand Down
20 changes: 19 additions & 1 deletion src/multi_robomaster/multi_robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import time
import random
import threading
import socket
from robomaster import protocol
from robomaster import conn
from robomaster import robot
Expand Down Expand Up @@ -161,6 +162,7 @@ class MultiEP(MultiRobotBase):
""" S1_EP"""
def __init__(self):
super().__init__()
self._port_list = []

def initialize(self, proto_type=config.DEFAULT_PROTO_TYPE):
"""scan all robots and init its
Expand Down Expand Up @@ -193,7 +195,23 @@ def _scan_multi_robot(self, proto_type=config.DEFAULT_PROTO_TYPE):
proto._ip = config.LOCAL_IP_STR
else:
proto._ip = '0.0.0.0'
proto._port = random.randint(config.ROBOT_SDK_PORT_MIN, config.ROBOT_SDK_PORT_MAX)

while True:
port = random.randint(config.ROBOT_SDK_PORT_MIN, config.ROBOT_SDK_PORT_MAX)
if port not in self._port_list:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
logger.info(port,proto._ip,s.connect_ex((proto._ip, port)))
if s.connect_ex((proto._ip, port)) != 0:
self._port_list.append(port)
proto._port = port
logger.info("Set up port: {0}".format(proto._port))
break
else:
logger.info("port {0} are using".format(port))
else:
logger.info("Repeated port: {0}".format(port))
# proto._port = random.randint(config.ROBOT_SDK_PORT_MIN, config.ROBOT_SDK_PORT_MAX)

msg = protocol.Msg(robot.ROBOT_DEFAULT_HOST, protocol.host2byte(9, 0), proto)
result, local_ip = sdk_conn.switch_remote_route(msg, proxy_addr)
proto._ip = local_ip
Expand Down