aboutsummaryrefslogtreecommitdiff
path: root/integrationtests/demo_tests/direct_manual_input_test.py
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2015-03-10 21:26:56 +0100
committerThomas Gubler <thomasgubler@gmail.com>2015-03-10 21:26:56 +0100
commitf2b2c55afdc2fd5ecdfa213ed5181f44abad0934 (patch)
tree13d9c174b2aabd9925c099fa90780970b342e3a5 /integrationtests/demo_tests/direct_manual_input_test.py
parent1837440e4336fda1462de24d622d200d67471ac5 (diff)
parentb311f7302b508d1ed7fd3cfecd0bfbe47b324bde (diff)
downloadpx4-firmware-f2b2c55afdc2fd5ecdfa213ed5181f44abad0934.tar.gz
px4-firmware-f2b2c55afdc2fd5ecdfa213ed5181f44abad0934.tar.bz2
px4-firmware-f2b2c55afdc2fd5ecdfa213ed5181f44abad0934.zip
Merge pull request #1853 from PX4/ros_mavlink_rotorssimulatorupdate
update ros launch files and nodes for update of rotors_simulator
Diffstat (limited to 'integrationtests/demo_tests/direct_manual_input_test.py')
-rwxr-xr-xintegrationtests/demo_tests/direct_manual_input_test.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/integrationtests/demo_tests/direct_manual_input_test.py b/integrationtests/demo_tests/direct_manual_input_test.py
index 6d115316b..b037d842f 100755
--- a/integrationtests/demo_tests/direct_manual_input_test.py
+++ b/integrationtests/demo_tests/direct_manual_input_test.py
@@ -64,8 +64,8 @@ class ManualInputTest(unittest.TestCase):
#
def test_manual_input(self):
rospy.init_node('test_node', anonymous=True)
- rospy.Subscriber('px4_multicopter/actuator_armed', actuator_armed, self.actuator_armed_callback)
- rospy.Subscriber('px4_multicopter/vehicle_control_mode', vehicle_control_mode, self.vehicle_control_mode_callback)
+ rospy.Subscriber('iris/actuator_armed', actuator_armed, self.actuator_armed_callback)
+ rospy.Subscriber('iris/vehicle_control_mode', vehicle_control_mode, self.vehicle_control_mode_callback)
man = ManualInput()