diff --git a/imgs/main_menu.png b/imgs/main_menu.png new file mode 100644 index 0000000..9b4aee3 Binary files /dev/null and b/imgs/main_menu.png differ diff --git a/imgs/manual_mode.png b/imgs/manual_mode.png new file mode 100644 index 0000000..525e6d1 Binary files /dev/null and b/imgs/manual_mode.png differ diff --git a/imgs/matlab_mode.png b/imgs/matlab_mode.png new file mode 100644 index 0000000..a8458cf Binary files /dev/null and b/imgs/matlab_mode.png differ diff --git a/imgs/matlab_screenshot.png b/imgs/matlab_screenshot.png new file mode 100644 index 0000000..aee9db5 Binary files /dev/null and b/imgs/matlab_screenshot.png differ diff --git a/src/matlab/ABB_SCARA_IRB.m b/src/matlab/ABB_SCARA_IRB.m index 5787821..6e7aa21 100644 --- a/src/matlab/ABB_SCARA_IRB.m +++ b/src/matlab/ABB_SCARA_IRB.m @@ -1,5 +1,4 @@ -clc; -clear all; +clc; clear all; a1 = 0.2; a2 = 0.25; @@ -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]); diff --git a/src/matlab/UnityLink.m b/src/matlab/UnityLink.m index efc8cbf..bdead11 100644 --- a/src/matlab/UnityLink.m +++ b/src/matlab/UnityLink.m @@ -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;