Merge branch 'develop'

Author: david2611

nodes/benchbot_robot_controller

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import rospy
 

nodes/debug_move_to_pose

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 

nodes/noisify_odom

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This node takes a ground truth pose publishing system and converts it to the
 # noisy "odom -> base_link" + "map -> odom" corrections when localisation

scripts/create_env

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 

scripts/create_env_map

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 

src/benchbot_robot_controller.py

@@ -40,8 +40,8 @@
 CONNS = [CONN_API_TO_ROS, CONN_ROS_TO_API, CONN_ROSCACHE_TO_API]
 
 TIMEOUT_PREPARE = 120
-TIMEOUT_ROS_PING = 5
-TIMEOUT_RUN = 90
+TIMEOUT_ROS_PING = 20
+TIMEOUT_RUN = 120
 
 VARIABLES = {
     'ENVS_PATH':
@@ -57,7 +57,7 @@
     'START_POSE':
         "self.config_env['start_pose']",
     'OBJECT_LABELS':
-        'str(json.dumps([{"name": lbl.encode("ascii")} for lbl in self.config_env["object_labels"]]))'
+        'str(json.dumps([{"name": lbl} for lbl in self.config_env["object_labels"]]))'
 }
 
 _CMD_DELETE_FILE = 'rm -f $FILENAME'