adding links to fusion 360 files as well as a custom header, that now…

… also includes the license image
LydByDissing · Jan 13, 2022 · ab19435 · ab19435
1 parent ae0a31d
commit ab19435
Show file tree

Hide file tree

Showing 13 changed files with 137 additions and 47 deletions.
diff --git a/docs/source/_templates/footer.html b/docs/source/_templates/footer.html
@@ -0,0 +1,6 @@
+{% extends "!footer.html" %}
+{% block contentinfo %}
+    <p><a href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img src="https://licensebuttons.net/l/by-nc-sa/4.0/88x31.png"></a></p>
+    <p>© Copyright {{ copyright }}</p>
+{% endblock %}
+{{ super() }}
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -33,7 +33,8 @@
     'sphinx.ext.todo',
     'sphinx.ext.autosectionlabel',
     'sphinx-favicon',
-    'sphinxcontrib.youtube'
+    'sphinxcontrib.youtube',
+    'sphinx_panels',
 ]
 
 # Display todos by setting to True
@@ -55,6 +56,10 @@
 exclude_patterns = []
 
 
+## Toolbox options
+#github_username = 'LydByDissing'
+#github_repository = 'stroem'
+
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for

diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -2,6 +2,8 @@
 An Open Source Wireless Streaming Speaker
 #########################################
 
+
+
 The *Strøm* open source speaker project have been started with the main goal of creating a fully functional "streaming speaker", but as an open sourced product. One that you can choose to buy fully built and tested, or choose to built it yourself.
 
 .. figure:: _static/images/stroem-speaker.png

diff --git a/docs/source/requirements.txt b/docs/source/requirements.txt
@@ -10,3 +10,5 @@ fitz>=0.0.1.dev2
 PyMuPDF>=1.19.3
 sphinx-favicon>=0.2
 sphinxcontrib-youtube>=1.0.1
+sphinx-panels>=0.6.0
+sphinx-toolbox=>2.15.3
diff --git a/docs/source/speaker/parts/back-panel.rst b/docs/source/speaker/parts/back-panel.rst
@@ -35,3 +35,15 @@ Downloads
 Download the drawing as a PDF :download:`back-panel-drawing.pdf <back-panel/back-panel-drawing.pdf>`.
 
 Download the CAD file in .STEP format :download:`back-panel.step <back-panel/back-panel.step>`.
+
+.. panels::
+    :column: col-lg-12
+
+    Fusion 360 Source Files
+    ^^^^^^^^^^^^^^^^^^^^^^^
+
+    *The model is developed in Fusion 360. To access the original Fusion 360 source files, follow the link below.*
+
+    .. link-button:: https://a360.co/3rhPEhy
+        :classes: btn-success
+        :text: Access source files
diff --git a/docs/source/speaker/parts/baffle.rst b/docs/source/speaker/parts/baffle.rst
@@ -41,3 +41,15 @@ Downloads
 Download the drawing as a PDF :download:`baffle-drawing.pdf <baffle/baffle-drawing.pdf>`.
 
 Download the CAD file in .STEP format :download:`baffle.step <baffle/baffle.step>`.
+
+.. panels::
+    :column: col-lg-12
+
+    Fusion 360 Source Files
+    ^^^^^^^^^^^^^^^^^^^^^^^
+
+    *The model is developed in Fusion 360. To access the original Fusion 360 source files, follow the link below.*
+
+    .. link-button:: https://a360.co/31U1C8B
+        :classes: btn-success
+        :text: Access source files
diff --git a/docs/source/speaker/parts/dowels.rst b/docs/source/speaker/parts/dowels.rst
@@ -1,3 +1,5 @@
+:partsId: OOWEOE
+
 .. _`dowels`:
 
 Dowels
@@ -8,7 +10,7 @@ Dowels
 
   | **Part name**: *Dowels*
   | **Parts ID**: OOWEOE
-  | **Material**: *6mm, wood*
+  | **Material**: *8mm, wood*
 
 When assembling the cabinet dowels are needed for easy alignment of the different layers.
 

diff --git a/docs/source/speaker/parts/layer-1.rst b/docs/source/speaker/parts/layer-1.rst
@@ -33,3 +33,15 @@ Downloads
 Download the drawing as a PDF :download:`cabinet-layer-1-drawing.pdf <cabinet-layer-1/cabinet-layer-1-drawing.pdf>`.
 
 Download the CAD file in .STEP format :download:`cabinet-layer-1.step <cabinet-layer-1/cabinet-layer-1.step>`.
+
+.. panels::
+    :column: col-lg-12
+
+    Fusion 360 Source Files
+    ^^^^^^^^^^^^^^^^^^^^^^^
+
+    *The model is developed in Fusion 360. To access the original Fusion 360 source files, follow the link below.*
+
+    .. link-button:: https://a360.co/3HY5Qve
+        :classes: btn-success
+        :text: Access source files
diff --git a/docs/source/speaker/parts/layer-2.rst b/docs/source/speaker/parts/layer-2.rst
@@ -34,3 +34,15 @@ Downloads
 Download the drawing as a PDF :download:`cabinet-layer-2-drawing.pdf <cabinet-layer-2/cabinet-layer-2-drawing.pdf>`.
 
 Download the CAD file in .STEP format :download:`cabinet-layer-2.step <cabinet-layer-2/cabinet-layer-2.step>`.
+
+.. panels::
+    :column: col-lg-12
+
+    Fusion 360 Source Files
+    ^^^^^^^^^^^^^^^^^^^^^^^
+
+    *The model is developed in Fusion 360. To access the original Fusion 360 source files, follow the link below.*
+
+    .. link-button:: https://a360.co/3Fishtr
+        :classes: btn-success
+        :text: Access source files
diff --git a/docs/source/speaker/parts/layer-3.rst b/docs/source/speaker/parts/layer-3.rst
@@ -38,3 +38,15 @@ Downloads
 Download the drawing as a PDF :download:`cabinet-layer-3-drawing.pdf <cabinet-layer-3/cabinet-layer-3-drawing.pdf>`.
 
 Download the CAD file in .STEP format :download:`cabinet-layer-3.step <cabinet-layer-3/cabinet-layer-3.step>`.
+
+.. panels::
+    :column: col-lg-12
+
+    Fusion 360 Source Files
+    ^^^^^^^^^^^^^^^^^^^^^^^
+
+    *The model is developed in Fusion 360. To access the original Fusion 360 source files, follow the link below.*
+
+    .. link-button:: https://a360.co/3zRe7yh
+        :classes: btn-success
+        :text: Access source files
diff --git a/docs/source/speaker/parts/softtop-frame.rst b/docs/source/speaker/parts/softtop-frame.rst
@@ -9,3 +9,19 @@ Soft Top Frame
   | **Part name**: *Soft top frame*
   | **Parts ID**: VAU2E8
   | **Material**: 6mm, Black MDF
+
+
+Downloads
+---------
+
+  .. panels::
+      :column: col-lg-12
+
+      Fusion 360 Source Files
+      ^^^^^^^^^^^^^^^^^^^^^^^
+
+      *The model is developed in Fusion 360. To access the original Fusion 360 source files, follow the link below.*
+
+      .. link-button:: https://a360.co/3toLEhR
+          :classes: btn-success
+          :text: Access source files
diff --git a/voicing/measurements/off axis - double ripple.mdat b/voicing/measurements/off axis - double ripple.mdat
diff --git a/voicing/voicing-dsp-filters.yaml b/voicing/voicing-dsp-filters.yaml
@@ -23,18 +23,18 @@ mixers:
       - dest: 0
         sources:
           - channel: 0
-            gain: -6
+            gain: -3
             inverted: false
           - channel: 1
-            gain: -6
+            gain: -3
             inverted: false
       - dest: 1
         sources:
           - channel: 0
-            gain: -6
+            gain: -3
             inverted: false
           - channel: 1
-            gain: -6
+            gain: -3
             inverted: false
 
 filters:
@@ -48,7 +48,7 @@ filters:
     type: Biquad
     parameters:
       type: Highshelf
-      freq: 123
+      freq: 80
       gain: -12
       slope: 6
   highshelf_5k:
@@ -64,20 +64,42 @@ filters:
       type: Lowpass
       freq: 14300
       q: 0.707
-  peak_182:
+  peak_80:
     type: Biquad
     parameters:
       type: Peaking
-      freq: 182
-      q: 10
-      gain: -9.0
+      freq: 80
+      q: 1
+      gain: 5
   peak_316:
     type: Biquad
     parameters:
       type: Peaking
       freq: 316
       q: 5
       gain: -12.3
+  peak_868:
+    type: Biquad
+    parameters:
+      type: Peaking
+      freq: 868
+      q: 1.5
+      gain: -9
+  peak_10500:
+    type: Biquad
+    parameters:
+      type: Peaking
+      freq: 10500
+      q: 2
+      gain: -3
+  channel_timing_fix:
+    type: Delay
+    parameters:
+      delay: 0.1
+      unit: ms
+      subsample: false
+
+
 
 pipeline:
   - type: Mixer
@@ -86,47 +108,22 @@ pipeline:
     channel: 0
     names:
       - LR_highpass
-  - type: Filter
-    channel: 1
-    names:
-      - LR_highpass
-  - type: Filter
-    channel: 0
-    names:
-      - highshelf_123
-  - type: Filter
-    channel: 1
-    names:
       - highshelf_123
-  - type: Filter
-    channel: 0
-    names:
       - highshelf_5k
-  - type: Filter
-    channel: 1
-    names:
-      - highshelf_5k
-  - type: Filter
-    channel: 0
-    names:
-      - highshelf_12k
-  - type: Filter
-    channel: 1
-    names:
       - highshelf_12k
-  - type: Filter
-    channel: 0
-    names:
-      - peak_316
-  - type: Filter
-    channel: 1
-    names:
-      - peak_316
-  - type: Filter
-    channel: 0
-    names:
+      - peak_80
       - peak_316
+      - peak_868
+      - peak_10500
+      - channel_timing_fix
   - type: Filter
     channel: 1
     names:
+      - LR_highpass
+      - highshelf_123
+      - highshelf_5k
+      - highshelf_12k
+      - peak_80
       - peak_316
+      - peak_868
+      - peak_10500