Rename folder

This commit is contained in:
tdehaeze committed 2019-05-02 14:09:20 +02:00
1 parent 6d52460f5b
commit 4be6fa1163
45 files changed
+23 -19

No files matched your search

+21 -18
View File
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<!-- 2019-05-02 jeu. 10:11 -->
<!-- 2019-05-02 jeu. 14:08 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Effect of the rotation of the Slip-Ring</title>
@@ -254,16 +254,16 @@ for the JavaScript code in this tag.
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
<ul>
<li><a href="#org080be51">1. Measurement Description</a></li>
<li><a href="#orgd6d4c44">2. Load data</a></li>
<li><a href="#org13f8e49">3. Analysis</a></li>
<li><a href="#org650786b">4. Conclusion</a></li>
<li><a href="#org6cf5814">1. Measurement Description</a></li>
<li><a href="#orgd40e7ef">2. Load data</a></li>
<li><a href="#org4ee458b">3. Analysis</a></li>
<li><a href="#org7c09cda">4. Conclusion</a></li>
</ul>
</div>
</div>
<div id="outline-container-org080be51" class="outline-2">
<h2 id="org080be51"><span class="section-number-2">1</span> Measurement Description</h2>
<div id="outline-container-org6cf5814" class="outline-2">
<h2 id="org6cf5814"><span class="section-number-2">1</span> Measurement Description</h2>
<div class="outline-text-2" id="text-1">
<p>
Random Signal is generated by one DAC of the SpeedGoat.
@@ -352,8 +352,8 @@ Here, the rotation speed of the Slip-Ring is set to 1rpm.
</div>
</div>
<div id="outline-container-orgd6d4c44" class="outline-2">
<h2 id="orgd6d4c44"><span class="section-number-2">2</span> Load data</h2>
<div id="outline-container-orgd40e7ef" class="outline-2">
<h2 id="orgd40e7ef"><span class="section-number-2">2</span> Load data</h2>
<div class="outline-text-2" id="text-2">
<p>
We load the data of the z axis of two geophones.
@@ -366,11 +366,11 @@ sr_on = load<span class="org-rainbow-delimiters-depth-1">(</span><span class="o
</div>
</div>
<div id="outline-container-org13f8e49" class="outline-2">
<h2 id="org13f8e49"><span class="section-number-2">3</span> Analysis</h2>
<div id="outline-container-org4ee458b" class="outline-2">
<h2 id="org4ee458b"><span class="section-number-2">3</span> Analysis</h2>
<div class="outline-text-2" id="text-3">
<p>
Let's first look at the signal produced by the DAC (figure <a href="#org1fa25e6">1</a>).
Let's first look at the signal produced by the DAC (figure <a href="#org7a29853">1</a>).
</p>
<div class="org-src-container">
@@ -384,14 +384,14 @@ xlim<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-rainbo
</div>
<div id="org1fa25e6" class="figure">
<div id="org7a29853" class="figure">
<p><img src="figs/random_signal.png" alt="random_signal.png" />
</p>
<p><span class="figure-number">Figure 1: </span>Random signal produced by the DAC</p>
</div>
<p>
We now look at the difference between the signal directly measured by the ADC and the signal that goes through the slip-ring (figure <a href="#org5daa921">2</a>).
We now look at the difference between the signal directly measured by the ADC and the signal that goes through the slip-ring (figure <a href="#org88cd8db">2</a>).
</p>
<div class="org-src-container">
@@ -407,7 +407,7 @@ legend<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-stri
</div>
<div id="org5daa921" class="figure">
<div id="org88cd8db" class="figure">
<p><img src="figs/slipring_comp_signals.png" alt="slipring_comp_signals.png" />
</p>
<p><span class="figure-number">Figure 2: </span>Alteration of the signal when the slip-ring is turning</p>
@@ -415,9 +415,10 @@ legend<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-stri
</div>
</div>
<div id="outline-container-org650786b" class="outline-2">
<h2 id="org650786b"><span class="section-number-2">4</span> Conclusion</h2>
<div id="outline-container-org7c09cda" class="outline-2">
<h2 id="org7c09cda"><span class="section-number-2">4</span> Conclusion</h2>
<div class="outline-text-2" id="text-4">
<div class="note">
<p>
<b>Remaining questions</b>:
</p>
@@ -425,12 +426,14 @@ legend<span class="org-rainbow-delimiters-depth-1">(</span><span class="org-stri
<li>Should the measurement be redone using voltage amplifiers?</li>
<li>Use higher rotation speed and measure for longer periods (to have multiple revolutions) ?</li>
</ul>
</div>
</div>
</div>
</div>
<div id="postamble" class="status">
<p class="author">Author: Thomas Dehaeze</p>
<p class="date">Created: 2019-05-02 jeu. 10:11</p>
<p class="date">Created: 2019-05-02 jeu. 14:08</p>
<p class="validation"><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
</div>
</body>
+2 -1
View File
@@ -102,7 +102,8 @@ We now look at the difference between the signal directly measured by the ADC an
[[file:figs/slipring_comp_signals.png]]
* Conclusion
#+begin_note
*Remaining questions*:
- Should the measurement be redone using voltage amplifiers?
- Use higher rotation speed and measure for longer periods (to have multiple revolutions) ?
#+end_note
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.