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

Merge 2024 engineer code. #27

Merged
merged 161 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
161 commits
Select commit Hold shift + click to select a range
4d8eadd
Add rectifyForLink7().
L-SY Jun 26, 2023
0b206b0
Add joint7 replace joint4.
L-SY Jun 26, 2023
a4f4ee2
Fix target_.orientation.
L-SY Jun 26, 2023
eedd088
Delete useless.
L-SY Jun 26, 2023
ac85f27
Fix error.
L-SY Jun 26, 2023
74a4029
Add joint7 tf.
L-SY Jun 26, 2023
463ac05
Fix error in pr.
L-SY Jun 26, 2023
03bb92a
7-9 11:30.
L-SY Jul 9, 2023
3c11d5f
7-9 20:00.
L-SY Jul 9, 2023
df9d6c5
7-10 15:30.
L-SY Jul 10, 2023
7a28cee
7-10 17:30.
L-SY Jul 10, 2023
150be81
Useful version 7-13 22:50.
L-SY Jul 13, 2023
564d731
Small change.
L-SY Jul 14, 2023
a899c25
Add auto_exchange.h like motion.h.
L-SY Jul 15, 2023
0151e4e
Complete JointInfo class.
L-SY Jul 15, 2023
9583186
Decide to introduce commander into auto_exchange.h.
L-SY Jul 15, 2023
5af7c2a
Add ServoMove.
L-SY Jul 15, 2023
12b8d2c
Fix Error.
L-SY Jul 15, 2023
5ed8a43
test
L-SY Aug 12, 2023
beb074d
record.
L-SY Aug 12, 2023
58e6ede
record.
L-SY Aug 12, 2023
9e1d28d
Merge branch 'auto_exchange'
cc0h Oct 18, 2023
214efaf
change kinematics_solver.
cc0h Nov 4, 2023
5b20911
URDF for new arm on 2023 engineer.
cc0h Nov 5, 2023
ae1b7f9
update engineer arm kinematic config.
cc0h Nov 15, 2023
9cb68a4
test record.
cc0h Nov 26, 2023
4c84e89
add missing head files.
cc0h Dec 5, 2023
a9059d3
new step list for engineer.
cc0h Dec 9, 2023
3e3aa67
add auto exchange motion
cc0h Dec 11, 2023
4c326d2
modify some function.
cc0h Dec 13, 2023
6127e54
test exchange sphere.
Dec 29, 2023
e598230
little optimize.
Jan 28, 2024
d364b9a
new step list. disable collision check between camera and link1.
Feb 23, 2024
9e7a9f7
add a class to control gimbal lifter, ore bin lifter and rotator.
Mar 16, 2024
2f1bfe4
fix roll error didn't being checked.
Mar 17, 2024
fc5279e
Add small island get stone.
2194555 Mar 22, 2024
1476e70
Update.
2194555 Mar 22, 2024
5f3cd6d
Add small island two stone.
2194555 Mar 23, 2024
2445b53
change namespace when loading servo params.
Mar 23, 2024
23d100a
add a launch file to start gazebo for engineer.
Mar 24, 2024
a834134
Update small island two stone.
2194555 Mar 24, 2024
c9b0be5
add necessary controllers, remove useless controllers.
Mar 24, 2024
25c918d
Use load_controllers.launch in engineer_arm_config to avoid controlle…
Mar 24, 2024
57428ba
Merge branch 'ch'
2194555 Mar 24, 2024
ecce1e8
Add a config file for controllers in gazebo simulation. Use different…
Mar 24, 2024
fd2ee5e
Update.
2194555 Mar 24, 2024
7843d78
Adjust default max_planning_times.
Mar 26, 2024
ff24773
Optimize format.
Mar 26, 2024
d36e0c3
Record test steps_list.
Mar 26, 2024
198da34
Update with tested.
2194555 Mar 26, 2024
b2c4450
Fix wrong member name.
Mar 26, 2024
aeffc9f
Update ore_lifter and ore_rotator.
2194555 Mar 26, 2024
460d020
Update.
2194555 Mar 26, 2024
66be75e
Add get stone from ore bin.
2194555 Mar 27, 2024
d19cf68
Update with tested.
2194555 Mar 27, 2024
708299b
Add big island.
2194555 Apr 1, 2024
a401cf0
Add and modify parameters.
2194555 Apr 1, 2024
c8b0a64
Merge branch 'ch'
2194555 Apr 1, 2024
bd6da5c
Merge branch 'master' into master
cc0h Apr 2, 2024
23d5fb2
Merge pull request #1 from 2194555/master
cc0h Apr 2, 2024
2fd93e2
disable collision check between joint7 and ore bin rotator.
Apr 2, 2024
12c6436
optimize step lists.
Apr 2, 2024
fb6bc3b
update steps_list.yaml.
Apr 8, 2024
2382cd4
Add support of extend arms in middleware.
Apr 9, 2024
d0ca289
Add extend arm and gimbal lifter motion.
Apr 10, 2024
c0c16fc
Fix steps list bug.
Apr 10, 2024
fedc09f
Replace KDL solver with TRAC-IK solver.
Apr 14, 2024
1e78179
Record steps list.
Apr 14, 2024
c81a6ef
Disable collision check between joint3 and base_link.
Apr 14, 2024
5bbc02e
Merge extend_arm in step_list and add has_stone logic.
2194555 Apr 14, 2024
10ea583
Remove drift dimensions.
Apr 14, 2024
89e681e
Remove points.
Apr 17, 2024
ca90f99
Update extend_arm logic.
2194555 Apr 17, 2024
9101385
Merge branch 'ch'
2194555 Apr 17, 2024
a528da8
Remove points and make space ee motion available.
Apr 17, 2024
0bc6162
Merge branch 'master' into master
cc0h Apr 17, 2024
80cda70
Merge pull request #2 from 2194555/master
cc0h Apr 17, 2024
9ddcfb0
record.
Apr 18, 2024
86c5ecc
modify quaternion multiplication order.
Apr 20, 2024
9fd7f41
fix format.
Apr 20, 2024
44ecbf8
fix format.
Apr 20, 2024
11e4420
Available auto exchange.
Apr 20, 2024
fe5c620
Merge branch 'auto-exchange' into 2024_engineer
Apr 21, 2024
016e7be
Add points.
Apr 21, 2024
6e22eea
Update steps list.
Apr 21, 2024
f32d12f
Record.
Apr 23, 2024
3ed5c5a
Change servo command frame.
Apr 25, 2024
9f492fc
update step lists.
Apr 25, 2024
25fcf7a
Add moveit_exchange.h.
Apr 27, 2024
d50b699
Adjust chassis motion pid.
Apr 29, 2024
c678b18
change home step into 2 stages.
Apr 29, 2024
a316fe8
change servo direction
Apr 29, 2024
8eca8f6
record.
Apr 29, 2024
d21e500
record.
May 1, 2024
afc93b8
add ChassisTargetMotion,pass arm2base from JointMotion to ChassisTarg…
May 2, 2024
d14681c
fix ore lifter don't fall when an ore is in bin.
May 3, 2024
411a946
Add arm back which just move back joint 2 and 3.
May 3, 2024
9c8e59b
Add chassis motion to compensate arm.
May 4, 2024
4352848
update sim.launch.
May 4, 2024
047f146
record.
May 4, 2024
acc1fa6
record steps list.
May 7, 2024
3c82983
record.
May 8, 2024
51f0fb3
record steps list.
May 11, 2024
ab06274
adjust max vel.
May 12, 2024
5c4f322
adjust motion order.
May 12, 2024
e548a09
adjust tolerance.
May 13, 2024
9d0a14f
adjust tolerance.
May 14, 2024
ec83643
output joints with too big error.
May 16, 2024
5002c34
modify store ore position.
May 16, 2024
c2530b0
roll back joint7 position for small island ore.
May 17, 2024
09aa3ec
simplify small island motion.
May 17, 2024
0d32e53
add engineer2_arm_connfig, modify launch files to select different co…
Jun 3, 2024
8583817
Modify Lv5 exchange pos of engineer.
Jul 1, 2024
69188ab
Record engineer2 arm config pack.Can be used to run gazebo and moveit.
Jul 7, 2024
7867306
Fix wrong collision check matrix.
Jul 8, 2024
41f9170
Fix bug: moveit can't find valid controller when using gazebo.
Jul 8, 2024
5b7a75f
Add controllers for gold and silver structures on engineer2.
Jul 10, 2024
5c77a3a
Add publishers for get ore structure controllers on engineer2.
Jul 10, 2024
01da3ba
Add basic step lists for engineer2.
Jul 10, 2024
f54ac28
Record.
Jul 11, 2024
60c576c
Add gimbal controller in engineer2 sim.
Jul 16, 2024
230cf98
Modify gpio motion to control multi gpio ports.
Jul 16, 2024
464d2a4
Modify gpio motion to avoid invalid gpio port.
Jul 17, 2024
4b35ef9
Add stone num motion.
Jul 18, 2024
f55c277
Improve step lists of engineer2.
Jul 18, 2024
35c127d
Update parameters and step list.
2194555 Jul 19, 2024
0535f41
Merge branch 'cc0h:2024_engineer' into 2024_engineer
2194555 Jul 20, 2024
6041636
Record.
Jul 20, 2024
8243330
Merge pull request #5 from 2194555/2024_engineer
cc0h Jul 20, 2024
ba32d30
Add get side gold motion.
Jul 22, 2024
45e65eb
Enable rm manual in sim.launch.
Jul 22, 2024
5cfbe3b
Merge remote-tracking branch 'origin/2024_engineer' into 2024_engineer
Jul 22, 2024
f082714
Modify arm get small island and store to silver gripper motion.
Jul 23, 2024
7c3ab8c
Uncomment necessary data.
Jul 23, 2024
aaff087
Rewrite major motion.
Jul 24, 2024
2f41fc8
Add middle pitch motion before arm move.
Jul 25, 2024
c6a3a05
Modify home pos.
Jul 25, 2024
d71816f
Modify get side big island omtion.
Jul 26, 2024
238a3ae
Modify motion timeout time.
Jul 26, 2024
c6da30d
Add get ground stone and fix get side big island.
Jul 26, 2024
c7a05eb
Add default 0.05s delay for gpio motion.
Jul 29, 2024
490045f
Set higer speed and accel limit.
Jul 29, 2024
3414f33
Record.
Jul 29, 2024
7a22e9a
Add gpio motion default delay to 0.1s.
Jul 29, 2024
a4f1b5b
Modify joint3 speed limit in moveit config file.
Jul 29, 2024
2db342b
Fix unavailable gpio motion delay.
Jul 29, 2024
97e20a9
Adjust side gold stone motion, add motion to exchange side gold at fr…
Jul 29, 2024
965a94f
Record.
Jul 30, 2024
772ddf1
Enable max acceleration limit for engineer2.
Jul 31, 2024
48e274c
Update.
2194555 Jul 31, 2024
a88d570
Merge pull request #6 from 2194555/2024_engineer
cc0h Jul 31, 2024
38a8c64
Modify gpio motion.
Jul 31, 2024
fd21d7b
Record.
Jul 31, 2024
b4ad7ed
Swap exchange direction of engineer2.
Aug 1, 2024
06de859
Modify get small island motion.
Aug 5, 2024
15273a0
Record.
Aug 8, 2024
3fe3719
Improve gripper 3 silver.
Aug 8, 2024
570501d
Add improved direction change motion, place stone on arm to a stable …
Aug 9, 2024
cee21d4
Disable chassis interface temporarily to avoid crazy chassis motion.
Aug 9, 2024
c8a14d6
Record.
Aug 20, 2024
dd3e111
Merge branch 'refs/heads/2024_engineer'
Aug 20, 2024
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
969 changes: 969 additions & 0 deletions engineer.urdf

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions engineer2_arm_config/.setup_assistant
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
moveit_setup_assistant_config:
URDF:
package: rm_description
relative_path: urdf/engineer2/engineer2.urdf.xacro
xacro_args: ""
SRDF:
relative_path: config/engineer2.srdf
CONFIG:
author_name: Chonghong Cai
author_email: [email protected]
generated_timestamp: 1720344342
10 changes: 10 additions & 0 deletions engineer2_arm_config/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
cmake_minimum_required(VERSION 3.1.3)
project(engineer2_arm_config)

find_package(catkin REQUIRED)

catkin_package()

install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
PATTERN "setup_assistant.launch" EXCLUDE)
install(DIRECTORY config DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
5 changes: 5 additions & 0 deletions engineer2_arm_config/config/cartesian_limits.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
cartesian_limits:
max_trans_vel: 1
max_trans_acc: 2.25
max_trans_dec: -5
max_rot_vel: 1.57
18 changes: 18 additions & 0 deletions engineer2_arm_config/config/chomp_planning.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
planning_time_limit: 10.0
max_iterations: 200
max_iterations_after_collision_free: 5
smoothness_cost_weight: 0.1
obstacle_cost_weight: 1.0
learning_rate: 0.01
smoothness_cost_velocity: 0.0
smoothness_cost_acceleration: 1.0
smoothness_cost_jerk: 0.0
ridge_factor: 0.0
use_pseudo_inverse: false
pseudo_inverse_ridge_factor: 1e-4
joint_update_limit: 0.1
collision_clearance: 0.2
collision_threshold: 0.07
use_stochastic_descent: true
enable_failure_recovery: false
max_recovery_attempts: 5
36 changes: 36 additions & 0 deletions engineer2_arm_config/config/engineer2.srdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--This does not replace URDF, and is not an extension of URDF.
This is a format for representing semantic information about the robot structure.
A URDF file must exist for this robot as well, where the joints and the links that are referenced are defined
-->
<robot name="engineer2">
<!--GROUPS: Representation of a set of joints and links. This can be useful for specifying DOF to plan for, defining arms, end effectors, etc-->
<!--LINKS: When a link is specified, the parent joint of that link (if it exists) is automatically included-->
<!--JOINTS: When a joint is specified, the child link of that joint (which will always exist) is automatically included-->
<!--CHAINS: When a chain is specified, all the links along the chain (including endpoints) are included in the group. Additionally, all the joints that are parents to included links are also included. This means that joints along the chain and the parent joint of the base link are included in the group-->
<!--SUBGROUPS: Groups can also be formed by referencing to already defined group names-->
<group name="engineer_arm">
<chain base_link="base_link" tip_link="link6"/>
</group>
<!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'-->
<group_state name="home" group="engineer_arm">
<joint name="joint1" value="0.0101"/>
<joint name="joint2" value="0"/>
<joint name="joint3" value="0"/>
<joint name="joint4" value="0"/>
<joint name="joint5" value="0"/>
<joint name="joint6" value="0"/>
</group_state>
<!--DISABLE COLLISIONS: By default it is assumed that any link of the robot could potentially come into collision with any other link in the robot. This tag disables collision checking between a specified pair of links. -->
<disable_collisions link1="link1" link2="link4" reason="User"/>
<disable_collisions link1="link5" link2="link6" reason="User"/>
<disable_collisions link1="base_link" link2="link1" reason="User"/>
<disable_collisions link1="link1" link2="link2" reason="User"/>
<disable_collisions link1="link1" link2="link3" reason="User"/>
<disable_collisions link1="link2" link2="link3" reason="User"/>
<disable_collisions link1="link3" link2="link4" reason="User"/>
<disable_collisions link1="link3" link2="link5" reason="User"/>
<disable_collisions link1="link4" link2="link5" reason="User"/>
<disable_collisions link1="link3" link2="link6" reason="User"/>
<disable_collisions link1="link4" link2="link6" reason="User"/>
</robot>
13 changes: 13 additions & 0 deletions engineer2_arm_config/config/fake_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
controller_list:
- name: arm_trajectory_controller
type: $(arg fake_execution_type)
joints:
- joint1
- joint2
- joint3
- joint4
- joint5
- joint6
initial: # Define initial robot poses per group
- group: engineer_arm
pose: home
4 changes: 4 additions & 0 deletions engineer2_arm_config/config/gazebo_controllers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Publish joint_states
joint_state_controller:
type: joint_state_controller/JointStateController
publish_rate: 50
Loading
Loading