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

Remapping controller #46

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
47ea80e
Adding arm mesh files, launch files
bennowotny Feb 26, 2021
6956b12
Actually added the Arm MoveIt files this time.
bennowotny Mar 8, 2021
efe970a
Added a wr_control_arm package.
bennowotny Mar 11, 2021
354555a
Created the Action server file.
bennowotny Mar 11, 2021
2ca7b10
Added ArmControlSystem source file with default logic for a simple ac…
bennowotny Mar 11, 2021
325cc2c
Added wr_control_arm package build files, currently debugging a build…
bennowotny Mar 11, 2021
5d59d63
Build succeeds on changes logged.
bennowotny Mar 11, 2021
dbae7e7
Recompiled wroboarm_21 for ROS package detection.
bennowotny Mar 12, 2021
a4ab271
Added a RViz launch file to test MoveIt/WRobot integration.
bennowotny Mar 12, 2021
b14c19e
Moved wr_control_arm to pre-existing package wr_control_drive_arm and…
bennowotny Mar 12, 2021
f1d28da
Added an ArmMotor class to represent the per motor logic and abstract…
bennowotny Mar 18, 2021
1f7e43c
More progress on ArmMotor.cpp, implemented simple runToTarget methods…
bennowotny Mar 19, 2021
37e757b
Control loop added, missing ROS logic (spins and such) and publishing…
bennowotny Mar 23, 2021
0f41937
Added framework of publishing Joint State data.
bennowotny Mar 23, 2021
cb8fa6a
Moved and resorted the CMakeLists and package files for the arm and s…
bennowotny Mar 23, 2021
ba61806
Modified the demo_test.launch file to run the 'real' robot and read j…
bennowotny Mar 26, 2021
00c681d
Updated source code to correctly implement header functions, avoid du…
bennowotny Mar 26, 2021
864f75c
Modified CMakeLists and package.xml to depend on the new sensor_msgs …
bennowotny Mar 26, 2021
7011f4c
Re-referenced the wroboclaw topics; wroboclaw topics aren't spelled w…
bennowotny Mar 26, 2021
7efa405
Updated motor power message types for the arm control system to use I…
bennowotny Mar 29, 2021
d11e8c4
Merge remote-tracking branch 'origin' into Arm_Control_System
bennowotny Apr 8, 2022
ff30999
Arm and entry (#21)
bennowotny Apr 8, 2022
2e7e12c
Fixing build.
bennowotny Apr 8, 2022
072d198
De-linting for Arm_Control_System Branch (#22)
Tzanccc May 1, 2022
4112fb7
Merge branch 'master' of github.com:WisconsinRobotics/WRover_Software…
JackZautner Oct 13, 2022
9f46d86
Changed encoder offsets
JackZautner Oct 13, 2022
c4cb4d5
fixed enc read bug
nicholasunderwood Oct 13, 2022
62e033d
Merge branch 'Arm_Control_System' into Arm_Control_System
nicholasunderwood Oct 13, 2022
f15346f
fixed assembly files
nicholasunderwood Oct 13, 2022
0380961
Modified stall checking logics
Tzanccc Oct 17, 2022
9fb9004
Adapting to real hardware
Oct 18, 2022
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
f576ded
re-mapped controller
JackZautner Apr 26, 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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ devel/
/.vscode/*
# except recommended extensions
!/.vscode/extensions.json
!/.vscode/settings.json

# fetched external libs
# NOTE: these may be removed in the future, tbd
Expand All @@ -20,6 +21,11 @@ src/wroboclaw
src/wrosout
src/wresponsecontrol

# external lib destination dirs
src/drive/lib
src/manager/lib
src/science/lib

*.pyc
src/arm/lib

Expand Down
93 changes: 93 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"clang-tidy.checks": [
"bugprone-*",
"performance-*",
"readability-*",
"modernize-*",
"hicpp-*",
"cppcoreguidelines-*",
"clang-analyzer-*",
"-readability-braces-around-statements",
"-hicpp-braces-around-statements",
"-cppcoreguidelines-non-private-member-variables-in-classes"
],
"files.associations": {
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"array": "cpp",
"atomic": "cpp",
"strstream": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"chrono": "cpp",
"complex": "cpp",
"condition_variable": "cpp",
"cstdint": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"string": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"hash_map": "cpp",
"hash_set": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"ostream": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cfenv": "cpp",
"cinttypes": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"variant": "cpp"
},
"python.autoComplete.extraPaths": [
"/home/nomorenickels/Documents/WRover_Software/devel/lib/python3/dist-packages",
"/opt/ros/noetic/lib/python3/dist-packages"
],
"python.analysis.extraPaths": [
"/home/nomorenickels/Documents/WRover_Software/devel/lib/python3/dist-packages",
"/opt/ros/noetic/lib/python3/dist-packages"
],
"cmake.sourceDirectory": "${workspaceFolder}/src"
}
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 @@ -27,6 +27,20 @@
"build": {
"provider": "noop"
}
},
{
"name": "moveit",
"build": {
"package": "ros-noetic-moveit",
"provider": "apt"
}
},
{
"name": "moveit-visual-tools",
"build": {
"package": "ros-noetic-moveit-visual-tools",
"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
3 changes: 3 additions & 0 deletions setup.zsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
. $ROOT_DIR/venv/bin/activate
. $ROOT_DIR/devel/setup.zsh
Loading