From 88b3ae6e81b6041225bf3ae7563accbb34d85a45 Mon Sep 17 00:00:00 2001 From: Andrew Saba Date: Wed, 4 Jul 2018 03:22:57 -0400 Subject: [PATCH 1/3] Uncomment out planner launch --- launch/motion_stack.launch | 2 -- 1 file changed, 2 deletions(-) diff --git a/launch/motion_stack.launch b/launch/motion_stack.launch index fb6bfc0..becd82b 100644 --- a/launch/motion_stack.launch +++ b/launch/motion_stack.launch @@ -11,12 +11,10 @@ - From 373d871131021f8bb26a038884e61c0b5e7b8ca6 Mon Sep 17 00:00:00 2001 From: Andrew Saba Date: Wed, 18 Jul 2018 23:42:30 -0400 Subject: [PATCH 2/3] fixed arena params --- params/arena.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/params/arena.yaml b/params/arena.yaml index 6fb3529..cf151c9 100644 --- a/params/arena.yaml +++ b/params/arena.yaml @@ -1,9 +1,9 @@ # min and max arena specific constraints arena: - max_x: 10.0 # meters - max_y: 10.0 # meters - max_z: 3.0 # meters + max_x: 20.0 # meters + max_y: 20.0 # meters + max_z: 4.0 # meters - min_x: -10.0 # meters - min_y: -10.0 # meters + min_x: 0.0 # meters + min_y: 0.0 # meters min_z: 0.0 # meters From 1a04103b2389c74ba147f92a9009168a87a07090 Mon Sep 17 00:00:00 2001 From: Andrew Saba Date: Thu, 26 Jul 2018 22:31:10 -0400 Subject: [PATCH 3/3] support for test obst avoid abstract --- launch/test_obstacle_avoidance.launch | 12 ++++++++++++ params/safety_config.yaml | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 launch/test_obstacle_avoidance.launch diff --git a/launch/test_obstacle_avoidance.launch b/launch/test_obstacle_avoidance.launch new file mode 100644 index 0000000..8df878b --- /dev/null +++ b/launch/test_obstacle_avoidance.launch @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/params/safety_config.yaml b/params/safety_config.yaml index 1bcb705..e859e8f 100644 --- a/params/safety_config.yaml +++ b/params/safety_config.yaml @@ -17,7 +17,7 @@ safety_bonds: priority: 200 motion_command_coordinator: priority: 250 - motion_planner: + motion_planner: priority: 300 takeoff_land_abstract: priority: 1000 @@ -33,7 +33,7 @@ safety_bonds: priority: 1000 velocity_test_abstract: priority: 1000 - block_roomba_abstract: + block_roomba_abstract: priority: 1000 roomba_request_executer_test_abstract: priority: 1000 @@ -43,9 +43,11 @@ safety_bonds: priority: 1000 high_low_speed_test_abstract: priority: 1000 - test_planner_abstract: + test_planner_abstract: priority: 1000 joystick_velocity_test_abstract: priority: 1000 - go_to_roomba_abstract: + go_to_roomba_abstract: + priority: 1000 + test_obstacle_avoidance_abstract: priority: 1000