diff --git a/mat/conf_log.mat b/mat/conf_log.mat index c7cb1fb..ec0c7b7 100644 Binary files a/mat/conf_log.mat and b/mat/conf_log.mat differ diff --git a/mat/conf_simscape.mat b/mat/conf_simscape.mat index 88fcee1..825cf1c 100644 Binary files a/mat/conf_simscape.mat and b/mat/conf_simscape.mat differ diff --git a/mat/controller.mat b/mat/controller.mat index 49d28a8..1f85ef8 100644 Binary files a/mat/controller.mat and b/mat/controller.mat differ diff --git a/mat/nass_disturbances.mat b/mat/nass_disturbances.mat index 192ca75..354d356 100644 Binary files a/mat/nass_disturbances.mat and b/mat/nass_disturbances.mat differ diff --git a/mat/nass_references.mat b/mat/nass_references.mat index fae9a0f..e9904de 100644 Binary files a/mat/nass_references.mat and b/mat/nass_references.mat differ diff --git a/mat/stages.mat b/mat/stages.mat index c931f63..c4221a6 100644 Binary files a/mat/stages.mat and b/mat/stages.mat differ diff --git a/mat/tomo_exp_hac_dvf.mat b/mat/tomo_exp_hac_dvf.mat index 75f366f..655226f 100644 Binary files a/mat/tomo_exp_hac_dvf.mat and b/mat/tomo_exp_hac_dvf.mat differ diff --git a/org/experiments.org b/org/experiments.org index 4245b76..87e8ad7 100644 --- a/org/experiments.org +++ b/org/experiments.org @@ -325,19 +325,19 @@ And we save the obtained data. figure; ax1 = subplot(2, 3, 1); hold on; - plot(scans_rz_align_dist.Em.Eg.Time, scans_rz_align_dist.Em.Eg.Data(:, 1)) + plot(scans_rz_align_dist.Em.En.Time, scans_rz_align_dist.Em.En.Data(:, 1)) hold off; ylabel('Displacement $\epsilon_x$ [m]'); ax2 = subplot(2, 3, 2); hold on; - plot(scans_rz_align_dist.Em.Eg.Time, scans_rz_align_dist.Em.Eg.Data(:, 2)) + plot(scans_rz_align_dist.Em.En.Time, scans_rz_align_dist.Em.En.Data(:, 2)) hold off; ylabel('Displacement $\epsilon_y$ [m]'); ax3 = subplot(2, 3, 3); hold on; - plot(scans_rz_align_dist.Em.Eg.Time, scans_rz_align_dist.Em.Eg.Data(:, 3)) + plot(scans_rz_align_dist.Em.En.Time, scans_rz_align_dist.Em.En.Data(:, 3)) hold off; ylabel('Displacement $\epsilon_z$ [m]'); diff --git a/org/optimal_stiffness_control.org b/org/optimal_stiffness_control.org index b74c1a7..76c4092 100644 --- a/org/optimal_stiffness_control.org +++ b/org/optimal_stiffness_control.org @@ -1429,6 +1429,7 @@ exportFig('figs/opt_stiff_hac_dvf_L_act_stroke.pdf', 'width', 'full', 'height', #+end_important * Further More complex simulations +** Introduction :ignore: ** Simulation with Micro-Hexapod Offset *** Simulation The micro-hexapod is inducing a 10mm offset of the sample center of mass with the rotation axis. diff --git a/org/uncertainty_payload.org b/org/uncertainty_payload.org index eafc5b3..b951bc6 100644 --- a/org/uncertainty_payload.org +++ b/org/uncertainty_payload.org @@ -427,7 +427,7 @@ And we obtain &= \frac{m^\prime s^2 + c^\prime s + k^\prime}{(ms^2 + cs + k) (m^\prime s^2 + c^\prime s + k^\prime) + m^\prime s^2 (c^\prime s + k)} \end{align*} -Which is the same transfer function that was obtained in section [[sec:introductory_example]] (Eq. [[eq:plant_simple_system]]). +Which is the same transfer function that was obtained in section [[sec:introductory_example]] (Eq. eqref:eq:plant_simple_system). The impedance of the mass-spring-damper system is shown in Figure [[fig:example_impedance_mass_spring_damper]]. - Before the resonance frequency $\omega_0^\prime$, the impedance follows the mass line diff --git a/org/uncertainty_support.org b/org/uncertainty_support.org index 3f1da9e..504e1c1 100644 --- a/org/uncertainty_support.org +++ b/org/uncertainty_support.org @@ -392,7 +392,7 @@ In order to verify that the formula is correct, let's take the same mass-spring- And we obtain \[ \frac{x}{F} = \frac{m^\prime s^2 + c^\prime s + k^\prime}{(ms^2 + cs + k)(m^\prime s^2 + c^\prime s + k^\prime) + ms^2(cs + k)} \] -Which is the same transfer function that was obtained in section [[sec:introductory_example]] (Eq. [[eq:plant_simple_system]]). +Which is the same transfer function that was obtained in section [[sec:introductory_example]] (Eq. eqref:eq:plant_simple_system). ** Matlab Init :noexport:ignore: #+begin_src matlab :tangle no :exports none :results silent :noweb yes :var current_dir=(file-name-directory buffer-file-name) diff --git a/readme.org b/readme.org index 4a06be3..2eefd7d 100644 --- a/readme.org +++ b/readme.org @@ -4,21 +4,3 @@ #+OPTIONS: num:nil toc:nil todo:nil The goal of this project is to study the Nano-Active-Stabilization-System concept using Matlab/Simscape. - -#+begin_src emacs-lisp :tangle no - (setq org-publish-project-alist - '(("nass-simscape" - :base-directory "~/Cloud/thesis/matlab/nass-simscape/org/" - :base-extension "org" - :publishing-directory "~/Cloud/thesis/matlab/nass-simscape/docs/" - :author "Dehaeze Thomas" - :email "dehaeze.thomas@gmail.com/" - :recursive nil - :publishing-function org-html-publish-to-html - :auto-preamble t - :auto-sitemap nil - :with-todo-keywords nil - :html-wrap-src-lines nil - :table-of-contents nil) - )) -#+end_src