Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
c92812e
Actually added the Arm MoveIt files this time.
bennowotny Mar 8, 2021
05387d0
Added a wr_control_arm package.
bennowotny Mar 11, 2021
348b0c2
Created the Action server file.
bennowotny Mar 11, 2021
531e99a
Added ArmControlSystem source file with default logic for a simple ac…
bennowotny Mar 11, 2021
f7f4824
Added wr_control_arm package build files, currently debugging a build…
bennowotny Mar 11, 2021
eab1e58
Build succeeds on changes logged.
bennowotny Mar 11, 2021
fdf5d67
Recompiled wroboarm_21 for ROS package detection.
bennowotny Mar 12, 2021
ba7afde
Added a RViz launch file to test MoveIt/WRobot integration.
bennowotny Mar 12, 2021
41c39b7
Moved wr_control_arm to pre-existing package wr_control_drive_arm and…
bennowotny Mar 12, 2021
f47440d
Added an ArmMotor class to represent the per motor logic and abstract…
bennowotny Mar 18, 2021
bbb683f
More progress on ArmMotor.cpp, implemented simple runToTarget methods…
bennowotny Mar 19, 2021
d1ae96f
Control loop added, missing ROS logic (spins and such) and publishing…
bennowotny Mar 23, 2021
49a955f
Added framework of publishing Joint State data.
bennowotny Mar 23, 2021
a962e84
Moved and resorted the CMakeLists and package files for the arm and s…
bennowotny Mar 23, 2021
95cd5f5
Modified the demo_test.launch file to run the 'real' robot and read j…
bennowotny Mar 26, 2021
ce6b18a
Updated source code to correctly implement header functions, avoid du…
bennowotny Mar 26, 2021
c6c629a
Modified CMakeLists and package.xml to depend on the new sensor_msgs …
bennowotny Mar 26, 2021
9405495
Re-referenced the wroboclaw topics; wroboclaw topics aren't spelled w…
bennowotny Mar 26, 2021
fb48dd2
Updated motor power message types for the arm control system to use I…
bennowotny Mar 29, 2021
af68786
Updated ArmMotor to fix ArmControlSystem encoder issue; patch reached…
bennowotny Apr 1, 2021
248dd21
Modified the ArmMotor constructor to accept NodeHandle pointers rathe…
bennowotny Apr 1, 2021
99c4fb1
Changed ArmMotor constructor parameter error messages to more accurat…
bennowotny Apr 1, 2021
6f35172
Changed ArmMotor rad->enc and enc->rad methods to accurately compute …
bennowotny Apr 1, 2021
2c23e34
Updated encoder math to reflect the boundries of the encoders and use…
bennowotny Apr 1, 2021
c7f7c53
Updated encoder datatypes to reflect C++ standard for data size requi…
bennowotny Apr 1, 2021
c28bcfb
Added test launch script for the arm control stack.
bennowotny Apr 2, 2021
291db4f
Removed noisy debugging code from ArmControlSystem.cpp; errors not re…
bennowotny Apr 2, 2021
03398e0
Modified the encoder/radian transformation to actually modify the act…
bennowotny Apr 2, 2021
cc7b8c7
Modified the formulas again due to C++ negative modulus behaviour. A…
bennowotny Apr 2, 2021
7c90f71
Added a sleep rate for realism for the actual robot, amped the speed …
bennowotny Apr 2, 2021
a6feb10
Improved readability of ArmControlSystem.cpp.
bennowotny Apr 4, 2021
4bff6ab
Added an Euclidean-correct modulus function for mathematical consiste…
bennowotny Apr 4, 2021
070a002
Updated `COUNTS_PER_ROTATION` to be the actual UINT32 limit; apparent…
bennowotny Apr 4, 2021
958a302
Updated the default encoder tolerance to statically reflect ±0.1 degr…
bennowotny Apr 4, 2021
4fa4331
Added the `time_warp` parameter to the mock launch file in anticipati…
bennowotny Apr 4, 2021
590e847
Updated the demo_test.launch file to disable trajectory execution tim…
bennowotny Apr 4, 2021
e052d32
Updated the Arm Control stack test script to re-navigate back to the …
bennowotny Apr 5, 2021
0bea77a
Updated encoder data types to reflect the amount of data stored in th…
bennowotny Apr 5, 2021
abf59d6
Updated the roboclaw_mock launch file and the roboclaw_enc config fil…
bennowotny Apr 5, 2021
058be8d
Started documentation, removed unneccesary checks from the code.
bennowotny Apr 5, 2021
439da51
Continued documentation, removed use of `temp` variable to track if t…
bennowotny Apr 5, 2021
03fdde1
Continued documentation, added `TODO`s for future work.
bennowotny Apr 5, 2021
8b99b6a
Continued documentation.
bennowotny Apr 5, 2021
bcaae15
Updated documentation to be doxygen-compatible.
bennowotny Apr 5, 2021
a549b1c
Updated Doxygen link.
bennowotny Apr 5, 2021
31df291
Added ArmMotor.hpp doxygen documentation, removed unneeded methods.
bennowotny Apr 6, 2021
915fc62
Added doxygen comments to ArmMotor.cpp, removed unecessary methods an…
bennowotny Apr 6, 2021
c074968
Updated ArmMotor::corrMod to a simpler implementation.
bennowotny Apr 7, 2021
622613f
Added velocity scaling to the arm, assumed speed 0.1 on the last moti…
bennowotny Apr 8, 2021
5c59da1
Added TODO for future type conversion
bennowotny Apr 8, 2021
81eb47e
Updated TODO by migrating encoder data types to `uint32_t` for platfo…
bennowotny Apr 13, 2021
26ee8ae
Added a signal handler to kill the action server if `^C` or `SIGINT` …
bennowotny Apr 16, 2021
9a25398
Adding support for PID position control to arm joints.
bennowotny May 20, 2021
f309e77
Updated PID calculation method to use radians instead of encoder coun…
bennowotny May 21, 2021
fbd4279
Updating the arm URDF files to contain joint limits to prevent overtu…
bennowotny May 24, 2021
0502500
Adding rqt_plot to the arm launch script to see joint state data and …
bennowotny May 24, 2021
98aee31
Adding support for PID control, post-testing.
bennowotny May 24, 2021
ff5274a
PID Tuning.
bennowotny May 24, 2021
a1070ba
Updated arm teleop logic, currently segfaults.
bennowotny May 25, 2021
6397460
Added the arm teleop file (the one that currently segfaults).
bennowotny May 25, 2021
eefef3e
Added a 'control' group tag to the wr_control_drive_arm nodes for org…
bennowotny May 27, 2021
e650085
Added effective `rosrun` control to wr_logic_teleop_arm.
bennowotny May 27, 2021
db8f29a
Modified the ArmTeleopLogic system to plan to a predetermined spot an…
bennowotny May 27, 2021
5e4574f
Removed the visual to set the goal of the arm from the RViz layout fo…
bennowotny May 27, 2021
90ad742
Modified stepping logic and how the test simulation works.
bennowotny May 28, 2021
9523473
Disabled `rqt_plot` tracking by comment, lengthened the timing to sta…
bennowotny May 28, 2021
d2bd61d
Adding the `apt` dependency to `ros-noetic-moveit` to the build script.
bennowotny May 28, 2021
0ff1109
Added controller functionality for the Arm (yay!). Tested with XBox-…
bennowotny Jul 16, 2021
3689fbd
Adding rotational logic and controller support.
bennowotny Jul 20, 2021
b607926
Updating rotation calculations to no transformations.
bennowotny Aug 3, 2021
114b04c
fixed drive science cmake files
nicholasunderwood Sep 23, 2021
33aee03
fixed teleop bug, changed vel/accel scaling, rviz panels hidden by de…
nicholasunderwood Sep 24, 2021
e5f53bc
Removed Yaw(i think and some basic configuration)
dashingzombie Sep 26, 2021
a1b3f70
atomic reference trigger
nicholasunderwood Sep 30, 2021
7a39386
fixed cached msg bug - TOFIX: isDone not functioning correctly
nicholasunderwood Oct 3, 2021
e6483e5
fixed blocked planning, bad state info w/ async plan method
nicholasunderwood Oct 3, 2021
b718ef5
working dummy link
nicholasunderwood Oct 5, 2021
def2de5
Added link 7 to some places and chmod file
dashingzombie Oct 12, 2021
27d956a
dummy axis fully integrated in IK
nicholasunderwood Oct 17, 2021
3f8fa16
Merge branch 'dev/ArmNewAxis' of https://github.com/WisconsinRobotics…
nicholasunderwood Oct 17, 2021
29c53ad
c++ pointers are dumb
nicholasunderwood Oct 18, 2021
1f8bbde
added redundant linear transformation function
nicholasunderwood Oct 18, 2021
ca85dcf
add differential transmission
nicholasunderwood Oct 21, 2021
9034e99
Using ssh instead of git to pull.
Tzanccc Oct 21, 2021
4e0355a
xMerge remote-tracking branch 'origin' into ArmAndEntry
Tzanccc Oct 21, 2021
2e1544b
Working model.
bennowotny Oct 26, 2021
8a61528
Merge remote-tracking branch 'origin/dev/ArmNewAxis' into ArmAndEntry
bennowotny Oct 26, 2021
5073d4b
Merge remote-tracking branch 'origin' into ArmAndEntry
bennowotny Apr 8, 2022
03ae56c
Dev/arm stall (#19) (#20)
bennowotny Apr 8, 2022
fc6ff03
Merge branch 'Arm_Control_System' into ArmAndEntry
bennowotny Apr 8, 2022
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: 1 addition & 1 deletion assemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def __init__(self, pkg_name):
self.pkg_name = pkg_name

def execute(self, root_dir: str, dep_dir: str, args: List[str]):
if not BuildApt.install_list:
if not hasattr(BuildApt,'install_list'):
print_subsec('Caching dpkg install list...')
BuildApt.install_list = set()
with open('/var/lib/dpkg/status') as dpkg_status:
Expand Down
14 changes: 14 additions & 0 deletions project.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,20 @@
"build": {
"provider": "pip"
}
},
{
"name": "wresponsecontrol",
"repo": "ssh://git@github.com/WisconsinRobotics/wresponsecontrol.git",
"build": {
"provider": "noop"
}
},
{
"name": "moveit",
"build": {
"package": "ros-noetic-moveit",
"provider": "apt"
}
}
]
}
2 changes: 2 additions & 0 deletions reconfig_arm_urdf.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
gnome-terminal -- roslaunch wroboarm_21 demo_test.launch
14 changes: 14 additions & 0 deletions src/arm_assembly/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
cmake_minimum_required(VERSION 2.8.3)

project(arm_assembly)

find_package(catkin REQUIRED)

catkin_package()

find_package(roslaunch)

foreach(dir config launch meshes urdf)
install(DIRECTORY ${dir}/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
endforeach(dir)
1 change: 1 addition & 0 deletions src/arm_assembly/config/joint_names_arm_assembly.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
controller_joint_names: ['', 'turntable', 'shoulder', 'elbow', 'forearm_roll', 'wrist_pitch', 'wrist_roll', ]
566 changes: 566 additions & 0 deletions src/arm_assembly/export.log

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions src/arm_assembly/launch/display.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<launch>
<arg
name="model" />
<param
name="robot_description"
textfile="$(find arm_assembly)/urdf/arm_assembly.urdf" />
<node
name="joint_state_publisher_gui"
pkg="joint_state_publisher_gui"
type="joint_state_publisher_gui" />
<node
name="robot_state_publisher"
pkg="robot_state_publisher"
type="robot_state_publisher" />
<node
name="rviz"
pkg="rviz"
type="rviz"
args="-d $(find arm_assembly)/urdf.rviz" />
</launch>
20 changes: 20 additions & 0 deletions src/arm_assembly/launch/gazebo.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<launch>
<include
file="$(find gazebo_ros)/launch/empty_world.launch" />
<node
name="tf_footprint_base"
pkg="tf"
type="static_transform_publisher"
args="0 0 0 0 0 0 base_link base_footprint 40" />
<node
name="spawn_model"
pkg="gazebo_ros"
type="spawn_model"
args="-file $(find arm_assembly)/urdf/arm_assembly.urdf -urdf -model arm_assembly"
output="screen" />
<node
name="fake_joint_calibration"
pkg="rostopic"
type="rostopic"
args="pub /calibrated std_msgs/Bool true" />
</launch>
Binary file added src/arm_assembly/meshes/base_link.STL
Binary file not shown.
Binary file added src/arm_assembly/meshes/forarm_link.STL
Binary file not shown.
Binary file added src/arm_assembly/meshes/manipulator_link.STL
Binary file not shown.
Binary file added src/arm_assembly/meshes/shoulderBase_link.STL
Binary file not shown.
Binary file added src/arm_assembly/meshes/upperArm_link.STL
Binary file not shown.
Binary file added src/arm_assembly/meshes/wirstBase_link.STL
Binary file not shown.
Binary file added src/arm_assembly/meshes/wrist_link.STL
Binary file not shown.
21 changes: 21 additions & 0 deletions src/arm_assembly/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<package format="2">
<name>arm_assembly</name>
<version>1.0.0</version>
<description>
<p>URDF Description package for arm_assembly</p>
<p>This package contains configuration data, 3D models and launch files
for arm_assembly robot</p>
</description>
<author>TODO</author>
<maintainer email="TODO@email.com" />
<license>BSD</license>
<buildtool_depend>catkin</buildtool_depend>
<depend>roslaunch</depend>
<depend>robot_state_publisher</depend>
<depend>rviz</depend>
<depend>joint_state_publisher_gui</depend>
<depend>gazebo</depend>
<export>
<architecture_independent />
</export>
</package>
8 changes: 8 additions & 0 deletions src/arm_assembly/urdf/arm_assembly.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Link Name,Center of Mass X,Center of Mass Y,Center of Mass Z,Center of Mass Roll,Center of Mass Pitch,Center of Mass Yaw,Mass,Moment Ixx,Moment Ixy,Moment Ixz,Moment Iyy,Moment Iyz,Moment Izz,Visual X,Visual Y,Visual Z,Visual Roll,Visual Pitch,Visual Yaw,Mesh Filename,Color Red,Color Green,Color Blue,Color Alpha,Collision X,Collision Y,Collision Z,Collision Roll,Collision Pitch,Collision Yaw,Collision Mesh Filename,Material Name,SW Components,Coordinate System,Axis Name,Joint Name,Joint Type,Joint Origin X,Joint Origin Y,Joint Origin Z,Joint Origin Roll,Joint Origin Pitch,Joint Origin Yaw,Parent,Joint Axis X,Joint Axis Y,Joint Axis Z,Limit Effort,Limit Velocity,Limit Lower,Limit Upper,Calibration rising,Calibration falling,Dynamics Damping,Dynamics Friction,Safety Soft Upper,Safety Soft Lower,Safety K Position,Safety K Velocity
base_link,1.03582841131364E-18,0.015606490089144,1.93574980271696E-18,0,0,0,0.93972387307473,0.00251429022255044,8.65861551705636E-21,-7.37485241366082E-20,0.0044229329573873,2.27711298016934E-20,0.0021336882069818,0,0,0,0,0,0,package://arm_assembly/meshes/base_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/base_link.STL,,base-1,Origin_global,,,,0,0,0,0,0,0,,0,0,0,,,,,,,,,,,,
shoulderBase_link,-0.0122586821821901,0.128577249577976,-0.00370544350042927,0,0,0,0.996366805002727,0.00652370094208947,0.0010646616036529,0.000283127005277364,0.0050231810993567,6.82113719161566E-05,0.0086334538259584,0,0,0,0,0,0,package://arm_assembly/meshes/shoulderBase_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/shoulderBase_link.STL,,Shoulder-1,Origin_turntable,Axis_turntable,turntable,continuous,0,0,0.035865,1.5708,0,-0.25129,base_link,0,1,0,,,,,,,,,,,,
upperArm_link,0.0143973999054565,-3.20061625687929E-05,0.279348384794928,0,0,0,0.985210343915811,0.0237982224738339,-8.87977733299251E-07,-0.00388532856230119,0.0293594722597602,-7.12944369971275E-06,0.00625034839320104,0,0,0,0,0,0,package://arm_assembly/meshes/upperArm_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/upperArm_link.STL,,UpperArm-1,Origin_shoulder,Axis_shoulder,shoulder,continuous,0,0.18098,0.043071,-1.1021,0,0,shoulderBase_link,1,0,0,,,,,,,,,,,,
forarm_link,1.84574577843932E-15,0.0550154986611603,0.120152803034247,0,0,0,0.517796101730459,0.00404850874710771,2.11419423634673E-18,-1.54871504075976E-17,0.00375548329392274,-0.000377385363706529,0.000788327838226562,0,0,0,0,0,0,package://arm_assembly/meshes/forarm_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/forarm_link.STL,,Forarm-1,Origin_elbow,Axis_elbow,elbow,continuous,0,0,0.46634,2.4936,0,0,upperArm_link,1,0,0,,,,,,,,,,,,
wirstBase_link,-1.94289029309402E-16,-1.66533453693773E-15,0.0987034845564234,0,0,0,0.301763082175337,0.00210344289702837,-2.71050543121376E-19,-2.24971950790742E-18,0.00305016250706558,1.85669622038143E-18,0.00107609106501786,0,0,0,0,0,0,package://arm_assembly/meshes/wirstBase_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/wirstBase_link.STL,,WristStructure-1,Origin_forearm_roll,Axis_forearm_roll,forearm_roll,continuous,0,0.04445,0.2285,0,0,0,forarm_link,0,0,1,,,,,,,,,,,,
wrist_link,4.30211422042248E-16,-2.77555756156289E-17,0,0,0,0,0.447707117943176,0.000367702266904795,1.79994501291539E-19,-7.45388993583784E-19,0.000843427086265753,-1.35525271560688E-20,0.00084474612356066,0,0,0,0,0,0,package://arm_assembly/meshes/wrist_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/wrist_link.STL,,Wrist-1,Origin_wrist_pitch,Axis_wrist_pitch,wrist_pitch,continuous,0,0,0.23716,-1.333,0,0,wirstBase_link,1,0,0,,,,,,,,,,,,
manipulator_link,-0.000730323740460503,-0.000899365669252,0.0490560099953423,0,0,0,0.397420225554811,0.00159684305263878,-3.07243227891656E-06,2.53235579936151E-05,0.0016343224414688,5.00292290874635E-05,0.000256322563994287,0,0,0,0,0,0,package://arm_assembly/meshes/manipulator_link.STL,0.792156862745098,0.819607843137255,0.933333333333333,1,0,0,0,0,0,0,package://arm_assembly/meshes/manipulator_link.STL,,Manipulator-1,Origin_wrist_roll,Axis_wrist_roll,wrist_roll,continuous,0,0,0,0,0,0.096862,wrist_link,0,0,1,,,,,,,,,,,,
Loading