Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

catch indigo branch up with current master #106

Open
wants to merge 110 commits into
base: indigo
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
5349d71
Migrate segbot_v4 to use urg_node (#77)
jack-oquin Sep 5, 2017
43a9d3d
Configure segbot_v4 URG node as serial device (#77).
jack-oquin Sep 5, 2017
0cbcb44
Kinetic: delete segbot_gui package (#93, utexas-bwi/bwi_common#95)
jack-oquin Oct 24, 2017
3465eb4
Changed uses of level_mux/map frame ID to level_mux_map (#93)
jack-oquin Nov 14, 2017
b876e55
Merge branch 'master' into joq/kinetic
jack-oquin Nov 28, 2017
d3eb4c6
remove dependency on hokuyo_node (#95, #77)
jack-oquin Dec 9, 2017
5bf984b
Kinetic: comment out use of angle_range_filter (#77)
jack-oquin Dec 19, 2017
15133f1
Kinetic: use scan_filtered topic for hokuyo (#77)
jack-oquin Dec 19, 2017
dde50f0
Migrate xacro.py to xacro
nickswalker Jan 21, 2018
430c51b
Add arm robot
nickswalker Jan 21, 2018
6bd9bad
segbot_logical_translator: moved to bwi_logical_translator (#96, utex…
jack-oquin Jan 24, 2018
360de39
Migrate arm packages
nickswalker Jan 26, 2018
921a293
Move xtion.launch to sensors package
nickswalker Jan 26, 2018
ff92f3f
Migrate moveit_utils to bwi_moveit_utils
nickswalker Jan 26, 2018
599cb49
Fix broken rosdeps from segbot_arm
nickswalker Jan 26, 2018
90029d3
Migrate segbot_arm_perception to bwi_perception
nickswalker Jan 26, 2018
ad8681d
updated moveit_utils path to bwi_moveit_utils
Jan 26, 2018
03204ed
changed geometry_msgs/TwistStamped instances to kinova_msgs/PoseVeloc…
Jan 27, 2018
850c4bd
Remove outdated demos
nickswalker Jan 31, 2018
894a3fe
Add additional arm launch parameters
nickswalker Jan 31, 2018
cc3bd70
Travis: use ROS-I tools for kinetic (#98)
jack-oquin Jan 31, 2018
ef28937
Merge branch 'kinetic' of https://github.com/utexas-bwi/segbot into k…
jack-oquin Jan 31, 2018
74ad801
Travis: use travis_wait for timeout workaround (#98)
jack-oquin Feb 1, 2018
4f4fe47
Travis: travis_wait does not work with ROS-I tools (#98)
jack-oquin Feb 1, 2018
cfab769
Move arm_util header into a library
nickswalker Feb 3, 2018
cb9cc6a
Clean up tabletop grasp code
nickswalker Feb 3, 2018
9a4c78a
Travis: separately compile arm and base (#98)
jack-oquin Feb 3, 2018
c79dc0f
Travis: add missing openni2_launch dependency (#98)
jack-oquin Feb 3, 2018
234f540
Travis: remove bogus segbot_arm_demos dependency (#98)
jack-oquin Feb 3, 2018
e5d0a38
Travis: comment out failing segbot arm tests (#98)
jack-oquin Feb 3, 2018
4ac180d
Consolidate joint state publishers
nickswalker Feb 4, 2018
1b79935
Move grasp utils into the arm_utilities library
nickswalker Feb 4, 2018
4e0f2cc
Clean up grasp demo
nickswalker Feb 4, 2018
8bc4031
Migrate most code to new arm library
nickswalker Feb 4, 2018
24f7856
Remove obstacle avoidance demo
nickswalker Feb 4, 2018
2639429
Migrate to new arm library
nickswalker Feb 4, 2018
3fa7b96
Travis: run arm tests, but allow failures (#98)
jack-oquin Feb 6, 2018
627b621
Travis: try again with different syntax (#98)
jack-oquin Feb 6, 2018
3d0a840
Travis: revert to commenting out (#98)
jack-oquin Feb 6, 2018
8c875c4
updates for separation of kr_execution; now depends on plan_execution
YuqianJiang Feb 10, 2018
4e01ef3
Make separate handover action server
nickswalker Feb 10, 2018
a36a8d2
Normalize quaternions properly
nickswalker Feb 11, 2018
3c0c669
Remove old arm_utils helpers
nickswalker Feb 11, 2018
46a2f87
Outline heuristic grasper in tabletop grasp action server
nickswalker Feb 11, 2018
129a288
Inherit some functions from bwi_manipulation
nickswalker Feb 11, 2018
41a25c2
Port back recording helpers
nickswalker Feb 11, 2018
9d957b3
Update bwi_moveit_utils usage
nickswalker Feb 12, 2018
33c175e
Use bwi_perception's BoundingBox class for heuristic grasp generation
nickswalker Feb 12, 2018
98c9e43
Merge remote-tracking branch 'origin/kinetic' into kr_execution_update
YuqianJiang Feb 12, 2018
4efc2ed
Added missing exec_depend for pointcloud_to_laserscan.
FernandezR Feb 20, 2018
ac87b0b
Added missing exec_depend for pointcloud_to_laserscan.
FernandezR Feb 20, 2018
394ed7c
Add additional heuristic grasps
nickswalker Feb 20, 2018
34413bd
Updated LED server to use LED set status (#103)
FernandezR Feb 21, 2018
00f9698
Updated LED server to use LED set status (#102)
FernandezR Feb 21, 2018
25134ca
Migrate navigation safety node
nickswalker Feb 21, 2018
49e7cd7
Add additional heuristic grasp generators
nickswalker Feb 21, 2018
6eeb0b9
Track nav safety port
nickswalker Feb 21, 2018
65d8171
Fix variable initialization
nickswalker Feb 21, 2018
0a5c167
Revert mistaken changes to arguments
nickswalker Feb 21, 2018
7a91ca5
added hand offset
harely22 Feb 22, 2018
b349b40
Update NavSafety header path
nickswalker Feb 24, 2018
0aeb013
Merge pull request #100 from utexas-bwi/kr_execution_update
nickswalker Feb 24, 2018
aa3e5c8
Updated LED server to use LED set status (#103)
FernandezR Feb 21, 2018
1e6865d
Fixing incorrect urg node param names, issue #107
FernandezR Mar 2, 2018
208a0b6
Kinetic: use kinetic HEAD in place of master (#77)
jack-oquin Mar 2, 2018
294bc9e
Kinetic: use kinetic HEAD in place of master (#77)
jack-oquin Mar 2, 2018
3f29674
Travis: use master branch for tests (#98)
jack-oquin Mar 2, 2018
0eeb014
Travis: do not explicitly check out current branch
jack-oquin Mar 2, 2018
14bc497
enable angle_range_filter for v2 (#107)
jack-oquin Mar 2, 2018
4076825
set angle range in driver, not via angle_range_filter (#107)
jack-oquin Mar 2, 2018
9a5b4a2
Merge arm and v2 bringup files
nickswalker Mar 7, 2018
7621283
Swap laptop for alienware in v2 URDF
nickswalker Mar 7, 2018
68249fb
Refactor table approach
nickswalker Mar 7, 2018
4b40a71
Improve interface to position database
nickswalker Mar 7, 2018
64cdd86
Merge branch 'kinetic'
nickswalker Mar 7, 2018
aa82d83
Fix undefined PI issue
nickswalker Mar 9, 2018
2b28631
Add default arguments for v2 bringup
nickswalker Mar 9, 2018
e3ac0d3
Update tabletop perception usage
nickswalker Mar 10, 2018
2503162
Remove configuration_file argument
nickswalker Mar 19, 2018
8783e06
Support arm simulation
nickswalker Mar 19, 2018
d799075
Strip out heuristic grasp generation code
nickswalker Mar 30, 2018
10827d2
Add arm retraction and cloud reordering services to iSpy server
nickswalker Mar 30, 2018
d2bdcbc
Fix arguments to included launch file
nickswalker Apr 2, 2018
a61442a
Add default arguments to fix testing errors
nickswalker Apr 2, 2018
d4e2370
Add missing demo file
nickswalker Apr 9, 2018
d6fb9fc
Update TabletopGrasp result fields
nickswalker Apr 11, 2018
cb6c9a5
Added urdf for the Alienware computer, changed table approach paramet…
harely22 Apr 23, 2018
46ee5ef
Removed dependency on grounded_dialogue_agent_ros
harely22 May 16, 2018
3f5dd11
Removed the dependency on grounded_dialogue_agent_ros
harely22 May 16, 2018
054d347
Make agile_grasp an optional dependency
nickswalker Oct 3, 2018
d8bbe0e
Added a dedicated urdf file for V4 that has the Hukuyo set 0.75 inch …
Dec 7, 2018
6da759a
Merge branch 'master' of https://github.com/utexas-bwi/segbot
Dec 7, 2018
cb95764
Use grasp code before refactoring
YuqianJiang Mar 2, 2019
6869db1
Add a new urdf file for the v2 arm robot to represent the added front…
YuqianJiang Apr 9, 2019
63be038
changed the file to call the new segbot_base.arm.urdf.xacro urdf fil…
YuqianJiang Apr 9, 2019
06a1477
Add gestures demo file for guidance
YuqianJiang May 8, 2019
eba2a44
Added gesture jointspace positions for guidance
YuqianJiang May 8, 2019
174657f
adds xtion mount description files and integrates them into the v2.ar…
maxsvetlik Mar 2, 2020
fb43d3b
adds flag for non-gazebo simulators, to compartmentalize gazebo-centr…
maxsvetlik May 18, 2020
db90b5f
Update master to Melodic (#115)
maxsvetlik Jun 9, 2020
f550248
Minor bugfix - added PoseStamped.h to position_record.cpp.
justinhart Sep 21, 2020
b36a160
Merge pull request #117 from utexas-bwi/posestamped_bugfix
dbalaban Sep 25, 2020
9a17229
adding option to launch mobile base with gmapping and set topic
dbalaban Feb 23, 2021
baf3170
adds flag to prevent compilation on non-armmed segbots
maxsvetlik Jul 9, 2021
0059082
Merge branch 'master' of https://github.com/utexas-bwi/segbot
maxsvetlik Jul 9, 2021
70aec09
Architecture update (#118)
maxsvetlik Jul 21, 2021
04bd875
angle range filter bug fix: verify intensity values before use to gua…
dbalaban Sep 21, 2021
29c4fdd
Merge branch 'master' of https://github.com/utexas-bwi/segbot
dbalaban Sep 21, 2021
48fff67
segbot_bringup has been moved into its own repo.
justinhart Apr 26, 2022
1c6cc78
Redirect move_base scan topic
jinsooPark-17 Jul 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ lib
*.swp
*.swo
*.pyc
.idea
cmake-build-debug
27 changes: 22 additions & 5 deletions .travis.rosinstall
Original file line number Diff line number Diff line change
@@ -1,16 +1,33 @@
- git:
local-name: agile_grasp
uri: https://github.com/utexas-bwi/agile_grasp.git
version: melodic-devel
- git:
local-name: bwi_common
uri: https://github.com/utexas-bwi/bwi_common.git
version: indigo
version: devel
- git:
local-name: kinova-ros
uri: https://github.com/utexas-bwi/kinova-ros.git
version: melodic-devel
- git:
local-name: segbot
uri: https://github.com/utexas-bwi/segbot.git
version: indigo
local-name: libsegwayrmp
uri: https://github.com/utexas-bwi/libsegwayrmp.git
version: cpp11
- git:
local-name: segway_rmp
uri: https://github.com/utexas-bwi/segway_rmp.git
version: piyushk/remove_zero_odom_values
version: melodic-devel
- git:
local-name: segway_v3
uri: https://github.com/utexas-bwi/segway_v3.git
version: melodic-devel
- git:
local-name: camera1394
uri: https://github.com/ros-drivers/camera1394
version: master
- git:
local-name: frontier_exploration
uri: https://github.com/paulbovbel/frontier_exploration.git
version: melodic-devel

7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ compiler:
- gcc
env:
global:
- CATKIN_CONFIG='--no-install' # work around kinova-ros install bug
- CCACHE_DIR=$HOME/.ccache
- ROS_DISTRO="melodic"
- ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- UPSTREAM_WORKSPACE=file
matrix:
- ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
- BUILD_PKGS_WHITELIST="only_segbot_base"
#- BUILD_PKGS_WHITELIST="only_segbot_arm"
install:
- git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
script:
Expand Down
8 changes: 8 additions & 0 deletions m1n6s200_segbot_moveit_config/.setup_assistant
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
moveit_setup_assistant_config:
URDF:
package: kinova_description
relative_path: urdf/m1n6s300_standalone.xacro
SRDF:
relative_path: config/m1n6s300.srdf
CONFIG:
generated_timestamp: 1484110350
9 changes: 9 additions & 0 deletions m1n6s200_segbot_moveit_config/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION 2.8.3)
project(m1n6s200_segbot_moveit_config)

find_package(catkin REQUIRED)

catkin_package()

install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(DIRECTORY config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
19 changes: 19 additions & 0 deletions m1n6s200_segbot_moveit_config/config/controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
controller_list:
- name: m1n6s200
action_ns: follow_joint_trajectory
type: FollowJointTrajectory
default: true
joints:
- m1n6s200_joint_1
- m1n6s200_joint_2
- m1n6s200_joint_3
- m1n6s200_joint_4
- m1n6s200_joint_5
- m1n6s200_joint_6
- name: m1n6s200_gripper
action_ns: gripper_command
type: GripperCommand
default: true
joints:
- m1n6s200_joint_finger_1
- m1n6s200_joint_finger_2
19 changes: 19 additions & 0 deletions m1n6s200_segbot_moveit_config/config/controllers_ros_control.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
controller_list:
- name: m1n6s200/effort_joint_trajectory_controller
action_ns: follow_joint_trajectory
type: FollowJointTrajectory
default: true
joints:
- m1n6s200_joint_1
- m1n6s200_joint_2
- m1n6s200_joint_3
- m1n6s200_joint_4
- m1n6s200_joint_5
- m1n6s200_joint_6
- name: m1n6s200/effort_finger_trajectory_controller
action_ns: follow_joint_trajectory
type: FollowJointTrajectory
default: true
joints:
- m1n6s200_joint_finger_1
- m1n6s200_joint_finger_2
17 changes: 17 additions & 0 deletions m1n6s200_segbot_moveit_config/config/fake_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
controller_list:
- name: fake_arm_controller
joints:
- m1n6s200_joint_1
- m1n6s200_joint_2
- m1n6s200_joint_3
- m1n6s200_joint_4
- m1n6s200_joint_5
- m1n6s200_joint_6
- name: fake_gripper_controller
joints:
- m1n6s200_joint_finger_1
- m1n6s200_joint_finger_2

initial:
- group: arm
pose: Home
44 changes: 44 additions & 0 deletions m1n6s200_segbot_moveit_config/config/joint_limits.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# joint_limits.yaml allows the dynamics properties specified in the URDF to be overwritten or augmented as needed
# Specific joint properties can be changed with the keys [max_position, min_position, max_velocity, max_acceleration]
# Joint limits can be turned off with [has_velocity_limits, has_acceleration_limits]
joint_limits:
m1n6s200_joint_1:
has_velocity_limits: true
max_velocity: 0.35
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_2:
has_velocity_limits: true
max_velocity: 0.35
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_3:
has_velocity_limits: true
max_velocity: 0.35
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_4:
has_velocity_limits: true
max_velocity: 0.35
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_5:
has_velocity_limits: true
max_velocity: 0.35
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_6:
has_velocity_limits: true
max_velocity: 0.35
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_finger_1:
has_velocity_limits: true
max_velocity: 5
has_acceleration_limits: false
max_acceleration: 0
m1n6s200_joint_finger_2:
has_velocity_limits: true
max_velocity: 5
has_acceleration_limits: false
max_acceleration: 0
1 change: 1 addition & 0 deletions m1n6s200_segbot_moveit_config/config/joint_names.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
controller_joint_names: [m1n6s200_joint_1 m1n6s200_joint_2 m1n6s200_joint_3 m1n6s200_joint_4 m1n6s200_joint_5 m1n6s200_joint_6]
7 changes: 7 additions & 0 deletions m1n6s200_segbot_moveit_config/config/kinematics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
arm:
kinematics_solver: trac_ik_kinematics_plugin/TRAC_IKKinematicsPlugin
#kinematics_solver: m1n6s200_mico_arm_kinematics/IKFastKinematicsPlugin
#kinematics_solver: kdl_kinematics_plugin/KDLKinematicsPlugin
kinematics_solver_attempts: 3
kinematics_solver_search_resolution: 0.005
kinematics_solver_timeout: 0.005
80 changes: 80 additions & 0 deletions m1n6s200_segbot_moveit_config/config/ompl_planning.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
planner_configs:
SBLkConfigDefault:
type: geometric::SBL
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
ESTkConfigDefault:
type: geometric::EST
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0 setup()
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05
LBKPIECEkConfigDefault:
type: geometric::LBKPIECE
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
border_fraction: 0.9 # Fraction of time focused on boarder default: 0.9
min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5
BKPIECEkConfigDefault:
type: geometric::BKPIECE
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
border_fraction: 0.9 # Fraction of time focused on boarder default: 0.9
failed_expansion_score_factor: 0.5 # When extending motion fails, scale score by factor. default: 0.5
min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5
KPIECEkConfigDefault:
type: geometric::KPIECE
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
goal_bias: 0.05 # When close to goal select goal, with this probability. default: 0.05
border_fraction: 0.9 # Fraction of time focused on boarder default: 0.9 (0.0,1.]
failed_expansion_score_factor: 0.5 # When extending motion fails, scale score by factor. default: 0.5
min_valid_path_fraction: 0.5 # Accept partially valid moves above fraction. default: 0.5
RRTkConfigDefault:
type: geometric::RRT
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05
RRTConnectkConfigDefault:
type: geometric::RRTConnect
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
RRTstarkConfigDefault:
type: geometric::RRTstar
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05
delay_collision_checking: 1 # Stop collision checking as soon as C-free parent found. default 1
TRRTkConfigDefault:
type: geometric::TRRT
range: 0.0 # Max motion added to tree. ==> maxDistance_ default: 0.0, if 0.0, set on setup()
goal_bias: 0.05 # When close to goal select goal, with this probability? default: 0.05
max_states_failed: 10 # when to start increasing temp. default: 10
temp_change_factor: 2.0 # how much to increase or decrease temp. default: 2.0
min_temperature: 10e-10 # lower limit of temp change. default: 10e-10
init_temperature: 10e-6 # initial temperature. default: 10e-6
frountier_threshold: 0.0 # dist new state to nearest neighbor to disqualify as frontier. default: 0.0 set in setup()
frountierNodeRatio: 0.1 # 1/10, or 1 nonfrontier for every 10 frontier. default: 0.1
k_constant: 0.0 # value used to normalize expresssion. default: 0.0 set in setup()
PRMkConfigDefault:
type: geometric::PRM
max_nearest_neighbors: 10 # use k nearest neighbors. default: 10
PRMstarkConfigDefault:
type: geometric::PRMstar
arm:
planner_configs:
- SBLkConfigDefault
- ESTkConfigDefault
- LBKPIECEkConfigDefault
- BKPIECEkConfigDefault
- KPIECEkConfigDefault
- RRTkConfigDefault
- RRTConnectkConfigDefault
- RRTstarkConfigDefault
- TRRTkConfigDefault
- PRMkConfigDefault
- PRMstarkConfigDefault
gripper:
planner_configs:
- SBLkConfigDefault
- ESTkConfigDefault
- LBKPIECEkConfigDefault
- BKPIECEkConfigDefault
- KPIECEkConfigDefault
- RRTkConfigDefault
- RRTConnectkConfigDefault
- RRTstarkConfigDefault
- TRRTkConfigDefault
- PRMkConfigDefault
- PRMstarkConfigDefault
Loading