Skip to content

Commit 068cb18

Browse files
committed
Update github install instructions
Tweak RTB startup file to handle distro or github case
1 parent 2626eb5 commit 068cb18

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,10 @@ git clone https://github.com/petercorke/robotics-toolbox-matlab.git robot
121121
git clone https://github.com/petercorke/spatial-math.git smtb
122122
git clone https://github.com/petercorke/toolbox-common-matlab.git common
123123
make -C robot
124-
mv common/startup_rvc.m .
125124
```
126-
127-
Then, from within MATLAB
125+
The last command builds the MEX files and Java class files. Then, from within MATLAB
128126
```matlab
129-
>> cd rvctools % this is the same folder as above
127+
>> addpath rvctools/common % rvctools is the same folder as above
130128
>> startup_rvc
131129
```
132130
The second line sets up the MATLAB path appropriately but it's only for the current session. You can either:

startup_rtb.m

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,20 @@ function startup_rtb(tbpath)
5050
if ~exist('DHFactor')
5151
javaaddpath( fullfile(tbpath, 'java', 'DHFactor.jar') );
5252
end
53+
p = fullfile(tbpath, 'simulink');
54+
if exist(p, 'dir')
55+
addpath( p );
56+
end
5357
addpath( fullfile(tbpath, 'interfaces', 'VREP') );
5458
% add the contrib code to the path
5559
rvcpath = fileparts(tbpath); % strip one folder off path
5660
p = fullfile(rvcpath, 'contrib');
5761
if exist(p, 'dir')
5862
addpath(p)
5963
end
64+
6065

61-
p = fullfile(tbpath, 'data', 'ARTE');
66+
p = fullfile(tbpath, 'data', 'meshes');
6267
disp([' - ARTE contributed code: 3D models for robot manipulators (' p ')']);
6368
p = fullfile(rvcpath, 'contrib', 'pHRIWARE', 'next');
6469
if exist(p, 'dir')

0 commit comments

Comments
 (0)