diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-07 19:27:36 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-03-10 20:56:53 +0100 |
commit | 9a9ca184e80622f2e217b4397be78a74cb1dad7f (patch) | |
tree | a1ea9f707a2c6b2e9fa0db64884aea45d75f4bbb /integrationtests/demo_tests/mavros_offboard_attctl_test.py | |
parent | df4f8259026bb7882659303558f5fb5b0d99e5f6 (diff) | |
download | px4-firmware-9a9ca184e80622f2e217b4397be78a74cb1dad7f.tar.gz px4-firmware-9a9ca184e80622f2e217b4397be78a74cb1dad7f.tar.bz2 px4-firmware-9a9ca184e80622f2e217b4397be78a74cb1dad7f.zip |
update namespace in mavros tests
Diffstat (limited to 'integrationtests/demo_tests/mavros_offboard_attctl_test.py')
-rwxr-xr-x | integrationtests/demo_tests/mavros_offboard_attctl_test.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/integrationtests/demo_tests/mavros_offboard_attctl_test.py b/integrationtests/demo_tests/mavros_offboard_attctl_test.py index a52f7ffc1..92cdf1e0a 100755 --- a/integrationtests/demo_tests/mavros_offboard_attctl_test.py +++ b/integrationtests/demo_tests/mavros_offboard_attctl_test.py @@ -65,12 +65,12 @@ class MavrosOffboardAttctlTest(unittest.TestCase): def setUp(self): rospy.init_node('test_node', anonymous=True) - rospy.wait_for_service('mavros/cmd/arming', 30) - rospy.Subscriber('px4_multicopter/vehicle_control_mode', vehicle_control_mode, self.vehicle_control_mode_callback) - rospy.Subscriber("mavros/position/local", PoseStamped, self.position_callback) - self.pubAtt = rospy.Publisher('mavros/setpoint/attitude', PoseStamped, queue_size=10) - self.pubThr = rospy.Publisher('mavros/setpoint/att_throttle', Float64, queue_size=10) - self.cmdArm = rospy.ServiceProxy("mavros/cmd/arming", CommandBool) + rospy.wait_for_service('iris/mavros/cmd/arming', 30) + rospy.Subscriber('iris/vehicle_control_mode', vehicle_control_mode, self.vehicle_control_mode_callback) + rospy.Subscriber("iris/mavros/position/local", PoseStamped, self.position_callback) + self.pubAtt = rospy.Publisher('iris/mavros/setpoint/attitude', PoseStamped, queue_size=10) + self.pubThr = rospy.Publisher('iris/mavros/setpoint/att_throttle', Float64, queue_size=10) + self.cmdArm = rospy.ServiceProxy("iris/mavros/cmd/arming", CommandBool) self.rate = rospy.Rate(10) # 10hz self.rateSec = rospy.Rate(1) self.hasPos = False @@ -109,7 +109,7 @@ class MavrosOffboardAttctlTest(unittest.TestCase): # set some attitude and thrust att = PoseStamped() - att.header = Header() + att.header = Header() att.header.frame_id = "base_footprint" att.header.stamp = rospy.Time.now() quaternion = quaternion_from_euler(0.15, 0.15, 0) @@ -126,7 +126,7 @@ class MavrosOffboardAttctlTest(unittest.TestCase): att.header.stamp = rospy.Time.now() self.pubAtt.publish(att) self.pubThr.publish(throttle) - + if (self.localPosition.pose.position.x > 5 and self.localPosition.pose.position.z > 5 and self.localPosition.pose.position.y < -5): @@ -135,7 +135,7 @@ class MavrosOffboardAttctlTest(unittest.TestCase): self.rate.sleep() self.assertTrue(count < timeout, "took too long to cross boundaries") - + if __name__ == '__main__': import rostest |