Skip to content

Commit

Permalink
added screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
gonzafernan committed Nov 23, 2019
1 parent b0ad4ef commit 8c7e04d
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 4 deletions.
Binary file added imgs/main_menu.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added imgs/manual_mode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added imgs/matlab_mode.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added imgs/matlab_screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/matlab/ABB_SCARA_IRB.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
clc;
clear all;
clc; clear all;

a1 = 0.2;
a2 = 0.25;
Expand Down Expand Up @@ -36,7 +35,7 @@
%R.plot([q1(i) 0 0 0]);
R.sendQ([q1(i) 0 0 0]);
end
pause();

for i=1:length(q2)
%R.plot([q1(i) 0 0 0]);
R.sendQ([0 q2(i) 0 0]);
Expand Down
2 changes: 1 addition & 1 deletion src/matlab/UnityLink.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
%SerialLink Creat a UnityLink robot object

% default properties
default.ip = '172.23.48.46';
default.ip = '192.168.0.10';
default.port = 8888;
default.timeout = 30;

Expand Down

0 comments on commit 8c7e04d

Please sign in to comment.