From cdd79392fd965bac20a7e97c47408c6586ad26d4 Mon Sep 17 00:00:00 2001
From: Pavel Lutskov <pavel.lutskov@gmail.com>
Date: Mon, 4 Jun 2018 10:10:50 +0200
Subject: [PATCH] renamed motion to movements because of conflict

---
 scripts/ball_approach.py            | 2 +-
 scripts/imagereaders.py             | 1 +
 scripts/motion_setter.py            | 2 +-
 scripts/move_robot.py               | 2 +-
 scripts/{motion.py => movements.py} | 1 +
 scripts/setangles.py                | 2 +-
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename scripts/{motion.py => movements.py} (99%)

diff --git a/scripts/ball_approach.py b/scripts/ball_approach.py
index 969d1ce..f7d6846 100644
--- a/scripts/ball_approach.py
+++ b/scripts/ball_approach.py
@@ -5,7 +5,7 @@ from utils import read_config
 
 from imagereaders import NaoImageReader
 from finders import BallFinder
-from motion import NaoMover
+from movements import NaoMover
 
 
 class BallFollower(object):
diff --git a/scripts/imagereaders.py b/scripts/imagereaders.py
index 70af785..b2500b7 100644
--- a/scripts/imagereaders.py
+++ b/scripts/imagereaders.py
@@ -14,6 +14,7 @@ class NaoImageReader(object):
     }
 
     def __init__(self, ip, port=9559, res=1, fps=30, cam_id=0):
+        ip = bytes(ip)
         self.res = self.RESOLUTIONS[res]
         self.vd = ALProxy('ALVideoDevice', ip, port)
         self.sub = self.vd.subscribeCamera(
diff --git a/scripts/motion_setter.py b/scripts/motion_setter.py
index a702f58..ab0926c 100644
--- a/scripts/motion_setter.py
+++ b/scripts/motion_setter.py
@@ -1,5 +1,5 @@
 import argparse
-from motion import NaoMover
+from movements import NaoMover
 from utils import read_config
 
 if __name__ == "__main__":
diff --git a/scripts/move_robot.py b/scripts/move_robot.py
index 78f4115..bfb598e 100644
--- a/scripts/move_robot.py
+++ b/scripts/move_robot.py
@@ -1,4 +1,4 @@
-from motion import NaoMover
+from movements import NaoMover
 from utils import read_config
 
 
diff --git a/scripts/motion.py b/scripts/movements.py
similarity index 99%
rename from scripts/motion.py
rename to scripts/movements.py
index d300bb1..f3c16aa 100644
--- a/scripts/motion.py
+++ b/scripts/movements.py
@@ -4,6 +4,7 @@ from naoqi import ALProxy
 class NaoMover(object):
 
     def __init__(self, nao_ip, nao_port=9559):
+        nao_ip = bytes(nao_ip)
         self.mp = ALProxy('ALMotion', nao_ip, nao_port)
         self.pp = ALProxy('ALRobotPosture', nao_ip, nao_port)
         ap = ALProxy("ALAutonomousLife", nao_ip, nao_port)
diff --git a/scripts/setangles.py b/scripts/setangles.py
index 3b822fc..dc0cc70 100644
--- a/scripts/setangles.py
+++ b/scripts/setangles.py
@@ -1,5 +1,5 @@
 import argparse
-from motion import NaoMover
+from movements import NaoMover
 from utils import read_config