This repository has been archived by the owner on Sep 29, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Controllers dev #71
Merged
Merged
Controllers dev #71
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
ba8f747
update stack of task contr.
gabrielenava a52aa80
new visualizer
gabrielenava 06395ed
update the contr branch
gabrielenava e6d2c6e
general updating
gabrielenava f293481
first version of mexTorqueBalancing
gabrielenava 98a156f
updating mexTorqueBalancing1.0
gabrielenava 3ada78d
general update
gabrielenava d73e93d
debug on the new matlabTorqueBalancing
gabrielenava dde69e3
modifications on the new controller
gabrielenava d6649a8
first complete working version of the torqueBalancing controller
gabrielenava f1bbb9d
new matlab torqueBalancing repository
gabrielenava ae3528a
updated the new controller
gabrielenava 8028ac9
balancing controller code debugging
gabrielenava c0e3ede
continuing debug on matlab torquebalancing
gabrielenava fc8d77a
update the controller
gabrielenava 098c6f4
100% working linearization
gabrielenava 5b066ae
working on linearization and gain tuning
gabrielenava eb2f0e5
working gains optimization
gabrielenava 4a0fd34
cleanup and verifications
gabrielenava a95e37b
modifications
gabrielenava 097195f
modifications for Humanoids2016
gabrielenava c73e48c
modifications for humanoids 2016
gabrielenava 22dc83a
controllers decoupling
gabrielenava 80459a0
update the branch with new controllers
gabrielenava eda5fa1
Update README.md
gabrielenava f245361
Update README.md
gabrielenava d05fb2a
Update README.md
gabrielenava 2f12930
Update README.md
gabrielenava ef607ef
Update README.md
gabrielenava b1e12bf
Update README.md
gabrielenava 88414f0
Update README.md
gabrielenava 3d45f6a
Update README.md
gabrielenava 967a266
Update README.md
gabrielenava c3899b8
Merge remote-tracking branch 'origin/master' into controllers_dev
gabrielenava e4dfd35
fixed issues
gabrielenava ffcdb98
startup only for mex-wholeBodyModel
gabrielenava 960166e
fixed (hopefully all) bugs from smartIndent and startup.m
gabrielenava 61e3a80
fixed a bug in startup.m
gabrielenava File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
%% startup_Mex.m | ||
% Run this script only once to permanently add the required folders for using mexWholebodymodel toolbox to your | ||
% MATLAB path. | ||
|
||
fprintf('\nmexWholeBodyModel Toolbox\n'); | ||
|
||
installDir = '@CMAKE_BINARY_DIR@/install'; | ||
mexDir = [installDir, filesep, 'mex']; | ||
mexWrapDir = [mexDir, filesep, 'mexwbi-wrappers']; | ||
mexUtDir = [mexDir, filesep, 'mexwbi-utilities']; | ||
|
||
if exist(mexDir, 'dir') | ||
addpath(mexDir); | ||
end | ||
|
||
if exist(mexUtDir, 'dir') | ||
addpath(mexDir); | ||
end | ||
|
||
if exist(mexWrapDir, 'dir') | ||
addpath(mexDir); | ||
end | ||
|
||
fileDir = userpath; | ||
pathSeparatorLocation = strfind(fileDir, pathsep); | ||
|
||
if isempty(fileDir) | ||
error('Empty userpath. Please set the userpath before running this script'); | ||
elseif size(pathSeparatorLocation, 2) > 1 | ||
error('Multiple userpaths. Please set a single userpath before running this script'); | ||
end | ||
|
||
if (~isempty(pathSeparatorLocation)) | ||
fileDir(pathSeparatorLocation) = []; | ||
end | ||
|
||
fprintf('Saving paths to %s\n\n', [fileDir, filesep, 'pathdef.m']); | ||
|
||
if (~savepath([fileDir, filesep, 'pathdef.m'])) | ||
fprintf(['A file called pathdef.m has been created in your %s folder.\n', ... | ||
'This should be enough to permanentely add all the Mex-Toolbox to ', ... | ||
'your MATLAB installation.\n'], fileDir); | ||
else | ||
disp('There was an error generating pathdef.m To proceed please manually add the contents of variables mexDir, mexUtDir, mexWrapDir to your matlabpath'); | ||
end |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can avoid to add explictly
${CMAKE_BINARY_DIR}
in the files because this is the directory in which CMake is currently working, and to add${CMAKE_INSTALL_PREFIX}
from the DESTINATION argument due to how theinstall
CMake function works.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Furthermore,
startup_Mex.m
is a bit confusing name , asmex
is a generic suffix.startup_mexwholebodymodel.m
perhaps could be a better name.