From 9baa4c04d369a20fd4cfa8da57f672fcac50043f Mon Sep 17 00:00:00 2001 From: Thomas Dehaeze Date: Tue, 15 Apr 2025 10:00:30 +0200 Subject: [PATCH] Correct Matlab scripts --- matlab/detail_kinematics_1_geometry.m | 1 - matlab/detail_kinematics_2_cubic.m | 1 - matlab/detail_kinematics_3_nano_hexapod.m | 7 +++---- nass-geometry.org | 8 +++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/matlab/detail_kinematics_1_geometry.m b/matlab/detail_kinematics_1_geometry.m index 12c58d3..a8baaaa 100644 --- a/matlab/detail_kinematics_1_geometry.m +++ b/matlab/detail_kinematics_1_geometry.m @@ -5,7 +5,6 @@ clear; close all; clc; s = zpk('s'); %% Path for functions, data and scripts -addpath('./mat/'); % Path for data addpath('./src/'); % Path for functions addpath('./subsystems/'); % Path for Subsystems Simulink files diff --git a/matlab/detail_kinematics_2_cubic.m b/matlab/detail_kinematics_2_cubic.m index e22295d..304bf78 100644 --- a/matlab/detail_kinematics_2_cubic.m +++ b/matlab/detail_kinematics_2_cubic.m @@ -5,7 +5,6 @@ clear; close all; clc; s = zpk('s'); %% Path for functions, data and scripts -addpath('./mat/'); % Path for data addpath('./src/'); % Path for functions addpath('./subsystems/'); % Path for Subsystems Simulink files diff --git a/matlab/detail_kinematics_3_nano_hexapod.m b/matlab/detail_kinematics_3_nano_hexapod.m index 756bdb4..991cb4a 100644 --- a/matlab/detail_kinematics_3_nano_hexapod.m +++ b/matlab/detail_kinematics_3_nano_hexapod.m @@ -5,7 +5,6 @@ clear; close all; clc; s = zpk('s'); %% Path for functions, data and scripts -addpath('./mat/'); % Path for data addpath('./src/'); % Path for functions addpath('./subsystems/'); % Path for Subsystems Simulink files @@ -97,7 +96,7 @@ for Dx = Dxs end end -sprintf('Actuator stroke should be from %.0f um to %.0f um', 1e6*L_min, 1e6*L_max) +disp(sprintf('Actuator stroke should be from %.0f um to %.0f um', 1e6*L_min, 1e6*L_max)) %% Compute mobility in translation with combined angular motion % Direction of motion (spherical coordinates) @@ -232,5 +231,5 @@ for Dx = Dxs end end -sprintf('Fixed joint stroke should be %.1f mrad', 1e3*max(max_angles_F)) -sprintf('Mobile joint stroke should be %.1f mrad', 1e3*max(max_angles_M)) +disp(sprintf('Fixed joint stroke should be %.1f mrad', 1e3*max(max_angles_F))) +disp(sprintf('Mobile joint stroke should be %.1f mrad', 1e3*max(max_angles_M))) diff --git a/nass-geometry.org b/nass-geometry.org index 44b1ac8..df6885e 100644 --- a/nass-geometry.org +++ b/nass-geometry.org @@ -3502,7 +3502,7 @@ for Dx = Dxs end end -sprintf('Actuator stroke should be from %.0f um to %.0f um', 1e6*L_min, 1e6*L_max) +disp(sprintf('Actuator stroke should be from %.0f um to %.0f um', 1e6*L_min, 1e6*L_max)) #+end_src #+begin_src matlab @@ -3662,8 +3662,8 @@ for Dx = Dxs end end -sprintf('Fixed joint stroke should be %.1f mrad', 1e3*max(max_angles_F)) -sprintf('Mobile joint stroke should be %.1f mrad', 1e3*max(max_angles_M)) +disp(sprintf('Fixed joint stroke should be %.1f mrad', 1e3*max(max_angles_F))) +disp(sprintf('Mobile joint stroke should be %.1f mrad', 1e3*max(max_angles_M))) #+end_src * Conclusion @@ -4904,7 +4904,6 @@ end #+NAME: m-init-path #+BEGIN_SRC matlab %% Path for functions, data and scripts -addpath('./matlab/mat/'); % Path for data addpath('./matlab/src/'); % Path for functions addpath('./matlab/subsystems/'); % Path for Subsystems Simulink files addpath('./matlab/'); % Path for scripts @@ -4913,7 +4912,6 @@ addpath('./matlab/'); % Path for scripts #+NAME: m-init-path-tangle #+BEGIN_SRC matlab %% Path for functions, data and scripts -addpath('./mat/'); % Path for data addpath('./src/'); % Path for functions addpath('./subsystems/'); % Path for Subsystems Simulink files #+END_SRC