Commit Graph

138 Commits

Author SHA1 Message Date
Derek Witcpalek
216cc3485f Merge branch 'GEAR_arm_controller' of github.com:EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-27 00:52:23 -04:00
Derek Witcpalek
2b00967330 Added missing dependencies to dockerfile 2020-04-27 00:48:29 -04:00
Sravan Balaji
9404576a4f Small Fixes
- Add "/" to front of topic name in cv_model
- Change default spawn point to be closer to depth camera
- Fix desired grasp pose offset
2020-04-27 00:47:10 -04:00
Sravan Balaji
e64d02c249 Merge branch 'GEAR_arm_controller' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-27 00:05:57 -04:00
Derek Witcpalek
c6dd1a8382 Updated model mappings 2020-04-27 00:05:44 -04:00
Sravan Balaji
20d23cd809 Merge branch 'GEAR_arm_controller' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-27 00:04:04 -04:00
Derek Witcpalek
aa0d8a5d6a Added generic trash and generic recyclable 2020-04-27 00:03:19 -04:00
Sravan Balaji
038c7e90c6 Merge branch 'GEAR_arm_controller' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-26 23:58:07 -04:00
Derek Witcpalek
428f97d410 Added more images 2020-04-26 23:57:45 -04:00
Sravan Balaji
69086dcd98 Merge branch 'GEAR_arm_controller' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-26 23:27:32 -04:00
Derek Witcpalek
a550377733 Fixed COM for plastic bottle 2020-04-26 23:27:14 -04:00
Sravan Balaji
cfb5b0b377 Merge branch 'GEAR_arm_controller' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-26 23:09:25 -04:00
Sravan Balaji
d7015b655c Trash vs Recycling
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Combine pip3 install commands in Dockerfile
- Add positions for trash and recycling bins
- Classification is now just trash vs recycling
- Remove extra bins, so we only have 2
- Increase default time limit to 10 minutes
2020-04-26 23:09:16 -04:00
Derek Witcpalek
371b6e5d34 Updated COM for pop can gazebo model 2020-04-26 23:06:02 -04:00
Derek Witcpalek
2b8e29c189 Merge branch 'GEAR_arm_controller' of github.com:EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-26 22:35:37 -04:00
Sravan Balaji
b761daf3b3 Arm Workflow Working & Comment Cleanup
- Remove extra points after decimal and slightly increase z for arm_pub_test
- Increase rotation threshold to 0.05 for comparing quaternion orientations
- Remove TODO comments
- Fix z offset direction when correcting position if item doesn't attach
- Remove commented out code from test_arm
2020-04-26 21:12:24 -04:00
Sravan Balaji
c4969bbb4c Asynchronous Spinner & Quaternion Comparison
- Test arm prints to arm_test.debug instead of data.txt
- Update gitignore to not include .debug files
- Fix target location for dropping item when checking if it has been reached
- Compare quaternion rotations instead of roll, pitch, yaw for mathematical robustness
- Make ros spinner asynchronous
2020-04-26 20:53:22 -04:00
Sravan Balaji
733f637d08 Bunch of Fixes
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Add instructs for running all simulation nodes
- calculateInverseKinematics takes double vector instead of JntArray now
- Fix calls to calculateInverseKinematics
- Fix orientations and bin positions in arm_pub_test.sh
- calc_joint_positions takes start location as argument so we can path plan from intermediate states
- Add some ROS_INFO prints for debugging
- Fix bug in cv_model.py
- Fix orientations sent by depth_camera_node.cpp
- Add a small z offset to desired grasp pose in rrrobot_node before sending to arm controller so end effector doesn't hit object
2020-04-26 19:51:26 -04:00
Derek Witcpalek
74d9d40a7b Merge branch 'GEAR_arm_controller' of github.com:EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-26 15:52:15 -04:00
Sravan Balaji
bcac9feeec Angle Threshold Fix
- Wrap roll, pitch, yaw to [-pi, pi] instead of [0, 2pi]
- Fix getRPY to GetRPY
2020-04-26 15:16:59 -04:00
Derek Witcpalek
3f8c413a93 Merge branch 'GEAR_arm_controller' of github.com:EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-26 15:10:45 -04:00
Derek Witcpalek
e123bf9aa5 Added state printouts for rrrobot_node 2020-04-26 15:09:27 -04:00
Sravan Balaji
ed45f76ae0 Tune target reached thresholds
- Add QuatToEuler function to convert quaternion to roll, pitch, yaw for easy angle threshold comparison
- Tune position and rotation thresholds
2020-04-26 15:03:59 -04:00
Sravan Balaji
e0d84b2adc Arm Controller Retry Attempts & Intermediate Positions
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Add parameters for arm controller: time per step, retry attempts, and z adjustment when trying to attach item
- Implement retry attempts for arm_destination_callback
- Add enum arm_action_phase to allow for different trajectories based on phase
- Add intermediate positions to send_joint_trajectory function
- gripper_control function now returns success status
2020-04-26 14:36:06 -04:00
Derek Witcpalek
719dcc9ac3 Function signature changed to allow forward kinematics to calculate any joint's pose 2020-04-26 12:48:42 -04:00
Derek Witcpalek
3a2c3bb2cc Fixed arm representation by correcting the joint-link associations 2020-04-26 12:43:59 -04:00
Derek Witcpalek
85d0bff6ec Makes depth camera publish to the channel the rrrobot_node is listening on 2020-04-26 10:46:23 -04:00
Derek Witcpalek
4098662c5d Added ros::spin to depth camera node 2020-04-25 23:50:36 -04:00
Derek Witcpalek
2a85cdee8d Update inverse kinematics solver parameters. This makes the solver finish without errors 2020-04-25 22:44:41 -04:00
Sravan Balaji
21d20ec5a1 Additional Time to Move
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Remove ArmRepresentation class (commented out) from arm_controller_node.cpp
- Give additional time to joint trajectory if we don't reach the target
- Change arm_pub_test.sh location
- Add script to move robot to all joint positions = 0
2020-04-25 20:12:37 -04:00
Sravan Balaji
d94f3dcc11 Merge branch 'GEAR_arm_controller' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-25 19:28:28 -04:00
Sravan Balaji
fc106196d0 Fix Coordinate Transforms for Arm
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Fix base position and orientation relative to world in arm_representation.h
- Update all joint rotation defintions to use Quaternions
2020-04-25 19:28:00 -04:00
Sravan Balaji
dc6bec7df3 Fix Coordinate Transforms for Arm
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Fix base position and orientation relative to world in arm_representation.h
- Update all joint rotation defintions to use Quaternions
- Add script to move all arm joints to position 0
2020-04-25 19:26:54 -04:00
Derek Witcpalek
ed133366d4 Merge branch 'GEAR_arm_controller' of github.com:EECS-467-W20-RRRobot-Project/RRRobot into GEAR_arm_controller 2020-04-25 17:34:11 -04:00
Derek Witcpalek
8bc0046e7b Changes to arm controller to get it closer to working, and some tests for verifying the correctness of the KDL arm representation 2020-04-25 17:28:06 -04:00
Sravan Balaji
e2c9279a48 Dockerfile Updates
- Remove copying Eigen folder (no longer needed)
2020-04-25 05:29:57 -04:00
Sravan Balaji
d7918b49a0 KDL Planning Implementation
Co-authored-by: dwitcpa <dwitcpa@umich.edu>

- Add PCL, Eigen3, KDL dependencies to CMakeLists.txt
- Clean up and fix typos in topic_names.h
- Add KDL implementation of arm_controller_node
- Fix small typo in depth_camera_node.cpp
- Fix small typo in rrrobot_node.cpp
- Add instructions for building RRRobot package and running node
2020-04-25 05:15:11 -04:00
Sravan Balaji
6937aa5074 Starting Custom IK Arm Controller
- Add framework for sending joint trajectory commands via ARIAC interface
2020-04-25 00:10:53 -04:00
Sravan Balaji
9ea4101f35 Merge branch 'GEAR' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR 2020-04-24 23:32:55 -04:00
Sravan Balaji
3e1e47a3f6 Removing MoveIt Dependencies
- Fix gitignore not ignoring core files and add comments
- Remove MoveIt dependencies from Dockerfile
- Delete build.sh from ariac_ws since not using MoveIt configs
- Remove catkin_make clean from arm_test.sh
- Remove catkin_make clean and install from rrrobot_run.sh
2020-04-24 23:32:44 -04:00
Euxitheos
37c165428a specified depth camera posistion 2020-04-24 21:32:26 -04:00
Euxitheos
6ae4e18100 depth camera node 2020-04-24 15:45:05 -04:00
Sravan Balaji
890f0414fa Move Universal Robot submodule to ariac_ws folder
- Rename moveit_ws to ariac_ws
- Update submodule commit
2020-04-24 12:47:18 -04:00
Sravan Balaji
4fbf138ad2 Add universal_robot submodule
- Forked osrf/universal_robot to our GitHub group so we can make and track changes to config and launch files
2020-04-24 12:32:37 -04:00
Sravan Balaji
b833a55acb Remove ARIAC universal robots submodule 2020-04-24 12:23:24 -04:00
Sravan Balaji
24ae633ad2 Merge branch 'GEAR' of https://github.com/EECS-467-W20-RRRobot-Project/RRRobot into GEAR 2020-04-23 22:17:01 -04:00
Sravan Balaji
8ae09a1b8e Adding FIles for Merge 2020-04-23 22:15:10 -04:00
Sravan Balaji
758fd38ab7 Arm Controller Node Implementation
- Ignore core file
- Add moveit_ros_planning_interface to catkin required components
- Add executables for arm_controller and comment out other nodes
- Move position of depth camera
- Add arm_controller MoveIt implementation
2020-04-23 22:07:40 -04:00
Sravan Balaji
1877a471da Add Scripts
- Add build.sh in ariac_ws to build and enable motion planning
- Add arm_pub_test.sh to publish a target position ros message
- Add arm_test.sh to build and run arm_controller_node
2020-04-23 22:04:11 -04:00
Sravan Balaji
375c069318 Dockerfile Fix Dependency
- Copy Eigen folder inside /usr/include/eigen3 to /usr/include folder to fix dependency issue
2020-04-23 21:57:13 -04:00