diff --git a/.gitmodules b/.gitmodules index 6b3fef2..39af5f0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,6 @@ [submodule "dehaeze20_virtu_senso_fusio"] path = dehaeze20_virtu_senso_fusio url = https://git.tdehaeze.xyz/tdehaeze/dehaeze20_virtu_senso_fusio +[submodule "encoder-test-bench"] + path = encoder-test-bench + url = https://git.tdehaeze.xyz/tdehaeze/encoder-test-bench diff --git a/encoder-test-bench b/encoder-test-bench new file mode 160000 index 0000000..f69ecdc --- /dev/null +++ b/encoder-test-bench @@ -0,0 +1 @@ +Subproject commit f69ecdcae5df9de6b73d82543ad2404aa2351e72 diff --git a/index.html b/index.html index b06c8b6..4547572 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + Research Pages @@ -29,8 +29,8 @@

Welcome to my research pages.

-
-

1 Papers

+
+

1 Papers

Conference Papers: @@ -43,12 +43,13 @@ Conference Papers:

-
-

2 Test Benches / Experiments

+ diff --git a/index.org b/index.org index 6866457..306c924 100644 --- a/index.org +++ b/index.org @@ -22,20 +22,35 @@ Welcome to my research pages. #+end_src #+RESULTS: -: Updating 07b37d5..adf16c2 -: Fast-forward -: index.html | 32 ++++++++++++++++---------------- -: index.org | 3 +++ -: 2 files changed, 19 insertions(+), 16 deletions(-) -: Submodule path 'dehaeze20_activ_dampin_rotat_platf_integ_force_feedb': merged in 'adf16c28ada6e1d5be4b586d0231e81691f8fcf6' -: [master 4b3fa08] 2020-10-08 - Update Submodules -: 1 file changed, 1 insertion(+), 1 deletion(-) +#+begin_example +Updating da9f3ed..96d036d +Fast-forward + figs/centralized_control.pdf | Bin 18210 -> 0 bytes + figs/stewart_platform_translations.pdf | Bin 77878 -> 77724 bytes + figs/stewart_platform_translations.png | Bin 114897 -> 114954 bytes + index.html | 370 ++++++++++----------- + index.org | 10 + + stewart_platform/analytical_model.m | 196 +++++++++++ + stewart_platform/drone_platform.slx | Bin 55452 -> 55703 bytes + stewart_platform/drone_platform_R2017b.slx | Bin 0 -> 39014 bytes + stewart_platform/simscape_model.m | 499 +++++++++++++++++++++++++++++ + 9 files changed, 892 insertions(+), 183 deletions(-) + delete mode 100644 figs/centralized_control.pdf + create mode 100644 stewart_platform/analytical_model.m + create mode 100644 stewart_platform/drone_platform_R2017b.slx + create mode 100644 stewart_platform/simscape_model.m +Submodule path 'svd-control': merged in '96d036d9366021552b64807fbe6b632fea43a494' +Unstaged changes after reset: +M index.org +[master af00ebe] 2020-10-13 - Update Submodules + 1 file changed, 1 insertion(+), 1 deletion(-) +#+end_example * Papers Conference Papers: -- MEDSI 2018 [[file:dehaeze18_sampl_stabil_for_tomog_exper/index.org][Sample Stabilization for Tomography Experiments in Presence of Large Plant Uncertainty]] -- ICCMA 2019 [[file:dehaeze19_desig_compl_filte/index.org][Complementary Filters Shaping Using $\mathcal{H}_\infty$ Synthesis]] -- ISMA 2020 [[file:dehaeze20_activ_dampin_rotat_platf_integ_force_feedb/index.org][Active Damping of Rotating Platforms using Integral Force Feedback]] +- Dehaeze, T., Mattenet, M. M., & Collette, C., *Sample Stabilization For Tomography Experiments In Presence Of Large Plant Uncertainty*, In MEDSI'18 (pp. 153–157) (2018). Geneva, Switzerland: JACoW Publishing. ([[file:dehaeze18_sampl_stabil_for_tomog_exper/index.org][link]]) +- Dehaeze, T., Vermat, M., & Christophe, C., *Complementary filters shaping using $H_\infty$ synthesis*, In 7th International Conference on Control, Mechatronics and Automation (ICCMA) (pp. 459–464) (2019). ([[file:dehaeze19_desig_compl_filte/index.org][link]]) +- Dehaeze, T., & Collette, C., *Active damping of rotating platforms using Integral Force Feedback*, In Proceedings of the International Conference on Modal Analysis Noise and Vibration Engineering (ISMA) (2020). ([[file:dehaeze20_activ_dampin_rotat_platf_integ_force_feedb/index.org][link]]) * Work in Progress :noexport: Journal Papers: @@ -46,3 +61,4 @@ Journal Papers: * Test Benches / Experiments - [[file:test-bench-apa/index.org][Amplified Piezoelectric Actuator - Test Bench]] - [[file:sensor-fusion-test-bench/index.org][Sensor Fusion - Test Bench]] +- [[file:encoder-test-bench/index.org][Encoder and Interferometer - Test Bench]]