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

Added implementation for scaling joint speeds based on gear ratios #41

Open
wants to merge 35 commits into
base: Arm_Control_System
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
9cbb73f
Initial commit
Tzanccc Oct 25, 2022
633d124
fixin' things
bennowotny Oct 26, 2022
dc87bfc
Undid local testing changes
Tzanccc Oct 27, 2022
872b85a
Undid local testing changes 2: electric boogaloo
Tzanccc Oct 27, 2022
6498a69
more fixin'
Tzanccc Oct 28, 2022
b11e4e1
Fixing PID constants
Oct 28, 2022
5f0ac8d
Using WROVER_HW to set encoder params
Tzanccc Nov 11, 2022
ede3d26
Updated moveit using new URDF
Tzanccc Nov 15, 2022
d4cacd9
started fixing the launch files and packages for the new arm
JackZautner Nov 17, 2022
1d61fbe
Changed the names of the joints in the control layer
JackZautner Nov 22, 2022
8b48efa
Generated new moveit package
JackZautner Nov 22, 2022
929eddc
Removing self-dependency
bennowotny Nov 23, 2022
853dd98
cleanup and fixes, works again
bennowotny Nov 23, 2022
03839bf
Separated action server and joint state publisher into separate appli…
JackZautner Dec 6, 2022
1fc442f
Deleted old ArmControlSystem file
JackZautner Dec 6, 2022
a78de45
WIP on joint limits
Tzanccc Dec 6, 2022
9511729
Fixed date in header
JackZautner Dec 7, 2022
7701359
Merge branch 'test/rviz' of github.com:WisconsinRobotics/WRover_Softw…
JackZautner Dec 8, 2022
125beae
Merge pull request #28 from WisconsinRobotics/joint-state-publisher-a…
JackZautner Dec 8, 2022
901aa7c
Fixed some of the arm code to run the controller and the jsp at the s…
bennowotny Jan 23, 2023
ad6629c
Fixing controller logic, issue in differential joint marked
Jan 24, 2023
3233dd9
Adding documentation for new structure
bennowotny Feb 2, 2023
63de1f4
Updates to the structure to be better formed and more dynamic with re…
bennowotny Feb 2, 2023
6aaa206
Feature/arm code refactoring (#33)
JackZautner Mar 8, 2023
b5ba588
Added implementation for scaling joint speeds based on gear ratios
JackZautner Mar 9, 2023
dcd1a6f
Fixed joint target setting code as requested in PR
JackZautner Mar 20, 2023
1b774df
Restructured arm parameter files, added gear ratios to motor speed co…
JackZautner Mar 21, 2023
e895166
Removed gear ratios from direct motor speed controllers, they are not…
JackZautner Mar 21, 2023
1114303
Added gear ratios to joint position monitors, changed action server a…
JackZautner Mar 22, 2023
3899295
Updated launch files to reference correct parameters, added gear rati…
JackZautner Apr 3, 2023
9988616
Updated roboclaw offsets, cleaned up velocity scaling in arm control
JackZautner Apr 4, 2023
62f6e63
Added map to store position monitor references
JackZautner Apr 10, 2023
a84b80c
fixed error in constructor
JackZautner Apr 10, 2023
875b326
Tuned gear ratios
JackZautner Apr 13, 2023
ff167a6
Updated code in compliance with #41
JackZautner Apr 24, 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
9 changes: 9 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
BasedOnStyle: LLVM
IndentWidth: 4
AccessModifierOffset: -4
CommentPragmas: 'NOLINT'
PackConstructorInitializers: CurrentLine
AlignOperands: AlignAfterOperator
AlignTrailingComments: true
ColumnLimit: 0
SeparateDefinitionBlocks: Always
10 changes: 10 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Checks: "bugprone-*,performance-*,readability-*,modernize-*,hicpp-*,cppcoreguidelines-*,clang-analyzer-*,-readability-braces-around-statements,-hicpp-braces-around-statements,-cppcoreguidelines-non-private-member-variables-in-classes"
WarningsAsErrors: ''
HeaderFilterRegex: ''
CheckOptions:
- key: readability-magic-numbers.IgnoredIntegerValues
value: '1;'
- key: hicpp-signed-bitwise.IgnorePositiveIntegerLiterals
value: 'true'
- key: readability-function-cognitive-complexity.IgnoreMacros
value: 'true'
2 changes: 2 additions & 0 deletions .clangd
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Diagnostics:
UnusedIncludes: Strict
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,5 +88,6 @@
"python.analysis.extraPaths": [
"/home/nomorenickels/Documents/WRover_Software/devel/lib/python3/dist-packages",
"/opt/ros/noetic/lib/python3/dist-packages"
]
],
"cmake.sourceDirectory": "${workspaceFolder}/src"
}
14 changes: 0 additions & 14 deletions src/arm_assembly/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion src/arm_assembly/config/joint_names_arm_assembly.yaml

This file was deleted.

566 changes: 0 additions & 566 deletions src/arm_assembly/export.log

This file was deleted.

20 changes: 0 additions & 20 deletions src/arm_assembly/launch/display.launch

This file was deleted.

20 changes: 0 additions & 20 deletions src/arm_assembly/launch/gazebo.launch

This file was deleted.

Binary file removed src/arm_assembly/meshes/forarm_link.STL
Binary file not shown.
Binary file removed src/arm_assembly/meshes/manipulator_link.STL
Binary file not shown.
Binary file removed src/arm_assembly/meshes/shoulderBase_link.STL
Binary file not shown.
Binary file removed src/arm_assembly/meshes/upperArm_link.STL
Binary file not shown.
Binary file removed src/arm_assembly/meshes/wirstBase_link.STL
Binary file not shown.
Binary file removed src/arm_assembly/meshes/wrist_link.STL
Binary file not shown.
21 changes: 0 additions & 21 deletions src/arm_assembly/package.xml

This file was deleted.

8 changes: 0 additions & 8 deletions src/arm_assembly/urdf/arm_assembly.csv

This file was deleted.

Loading