Solution to DSP course 1

grame-cncm · Nov 6, 2023 · 85142c3 · 85142c3
1 parent 5e69478
commit 85142c3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 29 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -389,5 +389,5 @@ <h4 class="modal-title" id="keyboardModalLabel">Keyboard Shortcuts</h4>
 
 <!--
 MkDocs version : 1.5.3
-Build Date UTC : 2023-11-03 11:38:40.754121+00:00
+Build Date UTC : 2023-11-06 10:06:31.433699+00:00
 -->
diff --git a/docs/lectures/dsp1/index.html b/docs/lectures/dsp1/index.html
@@ -307,16 +307,10 @@ <h3 id="lfo-low-frequency-oscillator">LFO: Low Frequency Oscillator</h3>
 </code></pre>
 <h3 id="towards-the-dx7">Towards the DX7</h3>
 <p>The DX7 carried out frequency modulation over a total of six oscillators that could be patched in <a href="https://static.righto.com/images/dx7-alg/algorithms-w800.jpg">different ways</a>. So FM is not limited to two oscillators... Try to implement an FM synthesizer involving 3 oscillators instead of one. They should be connected in series: 3 -&gt; 2 -&gt; 1.</p>
-<!--
-**Solution:**
-
-Shall be posted after class...
-
-(non-exhaustive)
-
-In `Fm.cpp`:
-
-
+<p><strong>Solution:</strong></p>
+<p>Shall be posted after class...</p>
+<p>(non-exhaustive)</p>
+<p>In <code>Fm.cpp</code>:</p>
 <pre><code>float Fm::tick(){
   int m0Index = m0Phasor.tick()*SINE_TABLE_SIZE;
   float modulator0 = sineTable.tick(m0Index);
@@ -327,9 +321,7 @@ <h3 id="towards-the-dx7">Towards the DX7</h3>
   int cIndex = cPhasor.tick()*SINE_TABLE_SIZE;
   return sineTable.tick(cIndex)*gain;
 }
-</code></pre>
-
---></div>
+</code></pre></div>
             </div>
         </div>
 

diff --git a/docs/search/search_index.json b/docs/search/search_index.json
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
@@ -2,62 +2,62 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
          <loc>https://embaudio.grame.fr/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/architecture/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/control/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/digital-audio/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/dsp1/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/dsp2/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/embedded/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/faust/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/intro/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/os/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/project/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://embaudio.grame.fr/lectures/teensy-faust/</loc>
-         <lastmod>2023-11-03</lastmod>
+         <lastmod>2023-11-06</lastmod>
          <changefreq>daily</changefreq>
     </url>
 </urlset>
diff --git a/docs/sitemap.xml.gz b/docs/sitemap.xml.gz
diff --git a/web/docs/lectures/dsp1.md b/web/docs/lectures/dsp1.md
@@ -205,7 +205,6 @@ for (int i = 0; i < AUDIO_BLOCK_SAMPLES; i++) {
 
 The DX7 carried out frequency modulation over a total of six oscillators that could be patched in [different ways](https://static.righto.com/images/dx7-alg/algorithms-w800.jpg). So FM is not limited to two oscillators... Try to implement an FM synthesizer involving 3 oscillators instead of one. They should be connected in series: 3 -> 2 -> 1.
 
-<!--
 **Solution:**
 
 Shall be posted after class...
@@ -226,4 +225,3 @@ float Fm::tick(){
   return sineTable.tick(cIndex)*gain;
 }
 ```
--->