pavel/kick-it
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed motion to movements because of conflict

Browse Source
This commit is contained in:
Pavel Lutskov
2018-06-04 10:10:50 +02:00
parent 5bd50de06e
commit cdd79392fd
6 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ball_approach.py
View File

@@ -5,7 +5,7 @@ from utils import read_config
from imagereaders import NaoImageReader from imagereaders import NaoImageReader
from finders import BallFinder from finders import BallFinder
from motion import NaoMover from movements import NaoMover
class BallFollower(object): class BallFollower(object):

1
scripts/imagereaders.py
View File

@@ -14,6 +14,7 @@ class NaoImageReader(object):
} }
def __init__(self, ip, port=9559, res=1, fps=30, cam_id=0): def __init__(self, ip, port=9559, res=1, fps=30, cam_id=0):
ip = bytes(ip)
self.res = self.RESOLUTIONS[res] self.res = self.RESOLUTIONS[res]
self.vd = ALProxy('ALVideoDevice', ip, port) self.vd = ALProxy('ALVideoDevice', ip, port)
self.sub = self.vd.subscribeCamera( self.sub = self.vd.subscribeCamera(

2
scripts/motion_setter.py
View File

@@ -1,5 +1,5 @@
import argparse import argparse
from motion import NaoMover from movements import NaoMover
from utils import read_config from utils import read_config
if __name__ == "__main__": if __name__ == "__main__":

2
scripts/move_robot.py
View File

@@ -1,4 +1,4 @@
from motion import NaoMover from movements import NaoMover
from utils import read_config from utils import read_config

1
scripts/motion.py → scripts/movements.py
View File

@@ -4,6 +4,7 @@ from naoqi import ALProxy
class NaoMover(object): class NaoMover(object):
def __init__(self, nao_ip, nao_port=9559): def __init__(self, nao_ip, nao_port=9559):
nao_ip = bytes(nao_ip)
self.mp = ALProxy('ALMotion', nao_ip, nao_port) self.mp = ALProxy('ALMotion', nao_ip, nao_port)
self.pp = ALProxy('ALRobotPosture', nao_ip, nao_port) self.pp = ALProxy('ALRobotPosture', nao_ip, nao_port)
ap = ALProxy("ALAutonomousLife", nao_ip, nao_port) ap = ALProxy("ALAutonomousLife", nao_ip, nao_port)

2
scripts/setangles.py
View File

@@ -1,5 +1,5 @@
import argparse import argparse
from motion import NaoMover from movements import NaoMover
from utils import read_config from utils import read_config