Skip to content
This repository has been archived by the owner on Sep 29, 2020. It is now read-only.

Controllers dev #71

Merged
merged 38 commits into from
Aug 17, 2016
Merged
Show file tree
Hide file tree
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 Mar 21, 2016
a52aa80
new visualizer
gabrielenava Mar 24, 2016
06395ed
update the contr branch
gabrielenava Apr 22, 2016
e6d2c6e
general updating
gabrielenava May 9, 2016
f293481
first version of mexTorqueBalancing
gabrielenava May 9, 2016
98a156f
updating mexTorqueBalancing1.0
gabrielenava May 11, 2016
3ada78d
general update
gabrielenava May 13, 2016
d73e93d
debug on the new matlabTorqueBalancing
gabrielenava May 17, 2016
dde69e3
modifications on the new controller
gabrielenava May 18, 2016
d6649a8
first complete working version of the torqueBalancing controller
gabrielenava May 19, 2016
f1bbb9d
new matlab torqueBalancing repository
gabrielenava May 23, 2016
ae3528a
updated the new controller
gabrielenava Jun 13, 2016
8028ac9
balancing controller code debugging
gabrielenava Jun 13, 2016
c0e3ede
continuing debug on matlab torquebalancing
gabrielenava Jun 14, 2016
fc8d77a
update the controller
gabrielenava Jun 15, 2016
098c6f4
100% working linearization
gabrielenava Jun 17, 2016
5b066ae
working on linearization and gain tuning
gabrielenava Jun 19, 2016
eb2f0e5
working gains optimization
gabrielenava Jun 20, 2016
4a0fd34
cleanup and verifications
gabrielenava Jun 21, 2016
a95e37b
modifications
gabrielenava Jun 27, 2016
097195f
modifications for Humanoids2016
gabrielenava Jul 11, 2016
c73e48c
modifications for humanoids 2016
gabrielenava Jul 17, 2016
22dc83a
controllers decoupling
gabrielenava Jul 20, 2016
80459a0
update the branch with new controllers
gabrielenava Aug 2, 2016
eda5fa1
Update README.md
gabrielenava Aug 3, 2016
f245361
Update README.md
gabrielenava Aug 3, 2016
d05fb2a
Update README.md
gabrielenava Aug 3, 2016
2f12930
Update README.md
gabrielenava Aug 3, 2016
ef607ef
Update README.md
gabrielenava Aug 3, 2016
b1e12bf
Update README.md
gabrielenava Aug 3, 2016
88414f0
Update README.md
gabrielenava Aug 3, 2016
3d45f6a
Update README.md
gabrielenava Aug 3, 2016
967a266
Update README.md
gabrielenava Aug 3, 2016
c3899b8
Merge remote-tracking branch 'origin/master' into controllers_dev
gabrielenava Aug 3, 2016
e4dfd35
fixed issues
gabrielenava Aug 4, 2016
ffcdb98
startup only for mex-wholeBodyModel
gabrielenava Aug 4, 2016
960166e
fixed (hopefully all) bugs from smartIndent and startup.m
gabrielenava Aug 4, 2016
61e3a80
fixed a bug in startup.m
gabrielenava Aug 5, 2016
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
8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,11 @@ enable_testing()

add_subdirectory(tests)

#STARTUP MEX-TOOLBOX
# The following line is to properly configure the installation script of the Mex-toolbox
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/startup_Mex.m.in ${CMAKE_BINARY_DIR}/startup_Mex.m)
# Install configuration files
install(FILES ${CMAKE_BINARY_DIR}/startup_Mex.m DESTINATION ${CMAKE_INSTALL_PREFIX}/mex)
Copy link
Contributor

@traversaro traversaro Aug 4, 2016

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 the install CMake function works.

Copy link
Contributor

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 , as mex is a generic suffix. startup_mexwholebodymodel.m perhaps could be a better name.




45 changes: 45 additions & 0 deletions startup_Mex.m.in
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