commit 04c88e8a751fa7bc954124c4da7ab386897c3836
parent 7ca67699a501cef724f3a809d845e09d9fcc2d9e
Author: Matt Demanett <matt@demanett.net>
Date: Thu, 29 Mar 2018 00:58:40 -0400
Oscillators: random fixes, layout cleanup.
Diffstat:
11 files changed, 176 insertions(+), 209 deletions(-)
diff --git a/res-src/Additator-src.svg b/res-src/Additator-src.svg
@@ -136,19 +136,19 @@
</g>
</symbol>
- <symbol id="knobguide-partials" viewBox="0 0 60px 60px">
- <g transform="translate(30 30)">
- <text font-size="5.0pt" transform="rotate(-240) translate(24 0) rotate(240) translate(-2 2)">1</text>
+ <symbol id="knobguide-partials" viewBox="0 0 70px 70px">
+ <g transform="translate(35 35)">
+ <text font-size="6.0pt" transform="rotate(-240) translate(25.5 0) rotate(240) translate(-2.5 2.5)">1</text>
<polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(21 0)" />
- <text font-size="5.0pt" transform="rotate(-180) translate(24 0) rotate(180) translate(-4 2)">20</text>
+ <text font-size="6.0pt" transform="rotate(-180) translate(25 0) rotate(180) translate(-7 2.5)">20</text>
<polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(21 0)" />
- <text font-size="5.0pt" transform="rotate(-120) translate(24 0) rotate(120) translate(-4 2)">40</text>
+ <text font-size="6.0pt" transform="rotate(-120) translate(25 0) rotate(120) translate(-7 2.5)">40</text>
<polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(21 0)" />
- <text font-size="5.0pt" transform="rotate(-60) translate(24 0) rotate(60) translate(-4 2)">60</text>
+ <text font-size="6.0pt" transform="rotate(-60) translate(25 0) rotate(60) translate(-3 2.5)">60</text>
<polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(21 0)" />
- <text font-size="5.0pt" transform="rotate(0) translate(24 0) rotate(0) translate(-4 2)">80</text>
+ <text font-size="6.0pt" transform="rotate(0) translate(25 0) rotate(0) translate(-2.5 2.5)">80</text>
<polyline points="0,0 3,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(21 0)" />
- <text font-size="5.0pt" transform="rotate(60) translate(24 0) rotate(-60) translate(-2 2)">100</text>
+ <text font-size="6.0pt" transform="rotate(60) translate(25.5 0) rotate(-60) translate(-2 2.5)">100</text>
</g>
</symbol>
@@ -275,12 +275,12 @@
<text font-size="6pt" letter-spacing="1px" transform="translate(29 135)">0V = C4 = 261.63HZ</text>
- <g transform="translate(143 60)">
+ <g transform="translate(144 60)">
<!-- <polyline points="0,19 68,19" stroke="#0f0" stroke-width="1" fill="none" /> -->
<!-- <polyline points="39,-20 39,50" stroke="#0f0" stroke-width="1" fill="none" /> -->
- <text font-size="8pt" letter-spacing="2px" transform="translate(5 50) rotate(270)">PARTIALS</text>
- <use id="PARTIALS_PARAM" xlink:href="#knob" transform="translate(20 0)" />
- <use xlink:href="#knobguide-partials" transform="translate(9 -11)" />
+ <text font-size="8pt" letter-spacing="2px" transform="translate(4 50) rotate(270)">PARTIALS</text>
+ <use id="PARTIALS_PARAM" xlink:href="#knob" transform="translate(21 0)" />
+ <use xlink:href="#knobguide-partials" transform="translate(5 -16)" />
</g>
<g transform="translate(10 155)">
diff --git a/res-src/FMOp-src.svg b/res-src/FMOp-src.svg
@@ -98,39 +98,17 @@
<symbol id="knobguide-linear" viewBox="0 0 45px 45px">
<g transform="translate(22.5 22.5)">
- <g transform="rotate(-240) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
- </g>
- <g transform="rotate(-210) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-180) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-150) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-120) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-90) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-60) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-30) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(0) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(30) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(60) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-2.2 2.2)">1</text>
- </g>
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-2 2)">0</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(15 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(60) translate(15 0)" />
</g>
</symbol>
@@ -243,7 +221,7 @@
<use xlink:href="#knobguide-centertick" transform="translate(90 20)" />
</g>
- <g transform="translate(87 92)">
+ <g transform="translate(87 90)">
<g transform="translate(0 0)">
<text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">ATT</text>
<use id="ATTACK_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
@@ -273,37 +251,37 @@
<use xlink:href="#knobguide-time" transform="translate(10.5 119.5)" />
</g>
- <g transform="translate(16 115)">
+ <g transform="translate(16 113)">
<g transform="translate(0 0)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 26) rotate(270)">FMD</text>
+ <text font-size="8pt" letter-spacing="1px" transform="translate(8 33) rotate(270)">DEPTH</text>
<use id="DEPTH_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
</g>
<use xlink:href="#knobguide-linear" transform="translate(10.5 -9.5)" />
<g transform="translate(0 49)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 25) rotate(270)">FBK</text>
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 29) rotate(270)">FDBK</text>
<use id="FEEDBACK_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
</g>
<use xlink:href="#knobguide-linear" transform="translate(10.5 39.5)" />
<g transform="translate(0 98)">
- <text font-size="8pt" letter-spacing="2px" transform="translate(8 24) rotate(270)">LVL</text>
+ <text font-size="8pt" letter-spacing="2px" transform="translate(8 33) rotate(270)">LEVEL</text>
<use id="LEVEL_PARAM" xlink:href="#knob-medium" transform="translate(20 0)" />
</g>
<use xlink:href="#knobguide-linear" transform="translate(10.5 88.5)" />
</g>
- <g transform="translate(15 241)">
+ <g transform="translate(13 239)">
<g transform="translate(0 17.5)">
<!-- <polyline points="0,0 200,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(0 3.3)" /> -->
- <text font-size="6pt" letter-spacing="2px" transform="translate(0 6.2)">ENV:</text>
- <g transform="translate(31 0)">
+ <text font-size="6pt" letter-spacing="1px" transform="translate(0 6.2)">ENV:</text>
+ <g transform="translate(27 0)">
<use id="ENV_TO_LEVEL_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(10 6.2)">LVL</text>
- <use id="ENV_TO_LEVEL_PARAM" xlink:href="#button-small" transform="translate(30 -1.2)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(9 6.2)">LEVEL</text>
+ <use id="ENV_TO_LEVEL_PARAM" xlink:href="#button-small" transform="translate(38 -1.2)" />
</g>
- <g transform="translate(78 0)">
+ <g transform="translate(81 0)">
<use id="ENV_TO_FEEDBACK_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(10 6.2)">FBK</text>
- <use id="ENV_TO_FEEDBACK_PARAM" xlink:href="#button-small" transform="translate(32 -1.2)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(9 6.2)">FDBK</text>
+ <use id="ENV_TO_FEEDBACK_PARAM" xlink:href="#button-small" transform="translate(34 -1.2)" />
</g>
</g>
</g>
@@ -317,15 +295,15 @@
<g transform="translate(12 0)">
<use id="DEPTH_INPUT" xlink:href="#input" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(5 40)">FMD</text>
+ <text font-size="6pt" letter-spacing="1px" transform="translate(0.5 40)">DEPTH</text>
</g>
<g transform="translate(44 0)">
<use id="FEEDBACK_INPUT" xlink:href="#input" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(9 40)">FB</text>
+ <text font-size="6pt" letter-spacing="1px" transform="translate(3.5 40)">FDBK</text>
</g>
<g transform="translate(76 0)">
<use id="LEVEL_INPUT" xlink:href="#input" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(6 40)">LVL</text>
+ <text font-size="6pt" letter-spacing="1px" transform="translate(1.5 40)">LEVEL</text>
</g>
<g transform="translate(108 0)">
<use id="SUSTAIN_INPUT" xlink:href="#input" transform="translate(3 5)" />
diff --git a/res-src/VCO-src.svg b/res-src/VCO-src.svg
@@ -168,39 +168,17 @@
<symbol id="knobguide-fm" viewBox="0 0 45px 45px">
<g transform="translate(22.5 22.5)">
- <g transform="rotate(-240) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
- </g>
- <g transform="rotate(-210) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-180) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-150) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-120) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-90) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-60) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-30) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(0) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(30) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(60) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-2.2 2.2)">1</text>
- </g>
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-2 2)">0</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(15 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(60) translate(15 0)" />
</g>
</symbol>
@@ -265,7 +243,9 @@
<text font-size="6pt" letter-spacing="1px" transform="translate(29 135)">0V = C4 = 261.63HZ</text>
- <g transform="translate(20 151)">
+ <!-- <rect width="100" height="7" fill="#0f0" transform="translate(10 136)" /> -->
+
+ <g transform="translate(34 151)">
<!-- <polyline points="0,-5 70,-5" stroke="#0f0" stroke-width="1" fill="none" /> -->
<!-- <polyline points="0,8 70,8" stroke="#0f0" stroke-width="1" fill="none" /> -->
<!-- <polyline points="0,21 70,21" stroke="#0f0" stroke-width="1" fill="none" /> -->
@@ -274,9 +254,9 @@
<use id="FINE_PARAM" xlink:href="#knob-smallest" transform="translate(13 0)" />
<!-- <rect width="90" height="10" fill="#0f0" transform="translate(0 17)" /> -->
</g>
- <use xlink:href="#knobguide-centertick" transform="translate(21 139)" />
+ <use xlink:href="#knobguide-centertick" transform="translate(35 139)" />
- <g transform="translate(90 156.5)">
+ <g transform="translate(81 156.5)">
<!-- <polyline points="0,3.2 70,3.2" stroke="#0f0" stroke-width="1" fill="none" /> -->
<use id="SLOW_PARAM" xlink:href="#button-small" transform="translate(40 -1.3)" />
<use id="SLOW_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
@@ -284,20 +264,19 @@
<!-- <rect width="90" height="10" fill="#0f0" transform="translate(0 7)" /> -->
</g>
- <!-- <rect width="100" height="6" fill="#0f0" transform="translate(10 178)" /> -->
+ <!-- <rect width="100" height="7" fill="#0f0" transform="translate(10 172)" /> -->
- <g transform="translate(10 186)">
- <g transform="translate(0 0)">
- <!-- <polyline points="0,13 70,13" stroke="#0f0" stroke-width="1" fill="none" /> -->
- <text font-size="8pt" letter-spacing="2px" transform="translate(10 22.5) rotate(270)">PW</text>
- <use id="PW_PARAM" xlink:href="#knob-medium" transform="translate(18 0)" />
- </g>
+ <g transform="translate(43 187)">
+ <!-- <polyline points="0,13 70,13" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(10 22.5) rotate(270)">PW</text>
+ <use id="PW_PARAM" xlink:href="#knob-medium" transform="translate(18 0)" />
</g>
- <use xlink:href="#knobguide-attenuverter" transform="translate(18.5 176.5)" />
+ <use xlink:href="#knobguide-attenuverter" transform="translate(51.5 177.5)" />
- <!-- <rect width="100" height="6" fill="#0f0" transform="translate(10 220)" /> -->
+ <!-- <rect width="100" height="7" fill="#0f0" transform="translate(10 218)" /> -->
- <g transform="translate(10 231)">
+ <g transform="translate(34.5 230)">
+ <!-- <rect width="83" height="7" fill="#0f0" transform="translate(0 0)" /> -->
<g transform="translate(0 0)">
<!-- <polyline points="0,13 100,13" stroke="#0f0" stroke-width="1" fill="none" /> -->
<text font-size="8pt" letter-spacing="2px" transform="translate(10 22) rotate(270)">FM</text>
@@ -316,52 +295,67 @@
</g>
</g>
</g>
- <use xlink:href="#knobguide-fm" transform="translate(18.5 221.5)" />
+ <use xlink:href="#knobguide-fm" transform="translate(43 220.5)" />
- <!-- <rect width="100" height="6" fill="#0f0" transform="translate(10 263)" /> -->
+ <!-- <rect width="150" height="7" fill="#0f0" transform="translate(10 262)" /> -->
- <g transform="translate(0 313)">
- <rect width="70" height="91" rx="5" fill="#fafafa" transform="translate(10 -44)" />
- <g transform="translate(10 0)">
- <!-- <rect width="30" height="47" rx="5" fill="#fafafa" /> -->
- <use id="PITCH_INPUT" xlink:href="#input" transform="translate(4 5)" />
- <text font-size="6pt" letter-spacing="1px" transform="translate(2 40)">V/OCT</text>
- </g>
- <g transform="translate(50 0)">
- <!-- <rect width="30" height="47" rx="5" fill="#fafafa" /> -->
- <use id="SYNC_INPUT" xlink:href="#input" transform="translate(2 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(0 40)">SYNC</text>
- </g>
- <g transform="translate(10 -44)">
- <!-- <rect width="30" height="47" rx="5" fill="#fafafa" /> -->
+ <g transform="translate(0 269)">
+ <rect width="130" height="91" rx="5" fill="#bbb" transform="translate(10 0)" />
+ <!-- <rect width="97" height="91" rx="5" fill="#fafafa" transform="translate(10 0)" /> -->
+ <rect width="65" height="91" rx="5" fill="#fafafa" transform="translate(10 0)" />
+ <rect width="10" height="8" fill="#fafafa" transform="translate(65 0)" />
+ <rect width="10" height="8" fill="#fafafa" transform="translate(65 83)" />
+
+ <g transform="translate(12 0)">
<use id="PW_INPUT" xlink:href="#input" transform="translate(4 5)" />
<text font-size="6pt" letter-spacing="2px" transform="translate(9 40)">PW</text>
</g>
- <g transform="translate(50 -44)">
- <!-- <rect width="30" height="47" rx="5" fill="#fafafa" /> -->
+ <g transform="translate(44 0)">
<use id="FM_INPUT" xlink:href="#input" transform="translate(2 5)" />
<text font-size="6pt" letter-spacing="2px" transform="translate(7 40)">FM</text>
</g>
- <g transform="translate(110 0)">
- <g transform="translate(0 -132)">
- <rect width="30" height="179" rx="5" fill="#bbb" transform="translate(0 0)" />
- <use id="SQUARE_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 40)">SQR</text>
+ <g transform="translate(76 0)">
+ <use id="SQUARE_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(5.5 40)">SQR</text> -->
+ <g transform="translate(9 33.5)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <polyline points="0,4 0,0 6,0 6,8 12,8 12,4" stroke-width="1" stroke="#333" fill="none" />
</g>
- <g transform="translate(0 -88)">
- <!-- <rect width="30" height="47" rx="5" fill="#bbb" transform="translate(0 0)" /> -->
- <use id="SAW_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(4.5 40)">SAW</text>
+ </g>
+ <g transform="translate(108 0)">
+ <use id="SAW_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(4.5 40)">SAW</text> -->
+ <g transform="translate(9 33.5)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <polyline points="0,8 12,0 12,8" stroke-width="1" stroke="#333" fill="none" />
</g>
- <g transform="translate(0 -44)">
- <!-- <rect width="30" height="47" rx="5" fill="#bbb" transform="translate(0 0)" /> -->
+ </g>
+
+ <g transform="translate(10 44)">
+ <g transform="translate(2 0)">
+ <use id="PITCH_INPUT" xlink:href="#input" transform="translate(4 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(2 40)">V/OCT</text>
+ </g>
+ <g transform="translate(34 0)">
+ <use id="SYNC_INPUT" xlink:href="#input" transform="translate(2 5)" />
+ <text font-size="6pt" letter-spacing="1px" transform="translate(0 40)">SYNC</text>
+ </g>
+ <g transform="translate(66 0)">
<use id="TRIANGLE_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(7 40)">TRI</text>
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(7 40)">TRI</text> -->
+ <g transform="translate(9 33.5)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <polyline points="0,4 3,0 9,8 12,4" stroke-width="1" stroke="#333" fill="none" />
+ </g>
</g>
- <g transform="translate(0 0)">
- <!-- <rect width="30" height="47" rx="5" fill="#bbb" transform="translate(0 0)" /> -->
+ <g transform="translate(98 0)">
<use id="SINE_OUTPUT" xlink:href="#output" transform="translate(3 5)" />
- <text font-size="6pt" letter-spacing="2px" transform="translate(6.5 40)">SIN</text>
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(6.5 40)">SIN</text> -->
+ <g transform="translate(9 33.5)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <path d="M 0 4 A 2 3 0 0 1 6 4" stroke="#333" stroke-width="1" fill="none" />
+ <path d="M 6 4 A 2 3 0 0 0 12 4" stroke="#333" stroke-width="1" fill="none" />
+ </g>
</g>
</g>
</g>
diff --git a/res-src/XCO-src.svg b/res-src/XCO-src.svg
@@ -130,39 +130,17 @@
<symbol id="knobguide-fm" viewBox="0 0 45px 45px">
<g transform="translate(22.5 22.5)">
- <g transform="rotate(-240) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(240) translate(-2.2 2.2)">0</text>
- </g>
- <g transform="rotate(-210) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-180) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-150) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-120) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-90) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-60) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(-30) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(0) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(30) translate(15 0)">
- <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" />
- </g>
- <g transform="rotate(60) translate(15 0)">
- <text font-size="5.0pt" transform="translate(3 0) rotate(-60) translate(-2.2 2.2)">1</text>
- </g>
+ <text font-size="5.0pt" transform="rotate(-240) translate(18 0) rotate(240) translate(-2 2)">0</text>
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-210) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-180) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-150) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-120) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-90) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-60) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(-30) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(0) translate(15 0)" />
+ <polyline points="0,0 2.5,0" stroke-width="0.3" stroke="#333" transform="rotate(30) translate(15 0)" />
+ <polyline points="0,0 3.5,0" stroke-width="1" stroke="#333" transform="rotate(60) translate(15 0)" />
</g>
</symbol>
@@ -306,7 +284,11 @@
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 90)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 177)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 267)" /> -->
- <text font-size="6pt" letter-spacing="2px" transform="translate(5.2 15)">SQR</text>
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(5.2 15)">SQR</text> -->
+ <g transform="translate(9 6)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <polyline points="0,4 0,0 6,0 6,8 12,8 12,4" stroke-width="1" stroke="#333" fill="none" />
+ </g>
<g transform="translate(3 30)">
<use id="SQUARE_PW_PARAM" xlink:href="#knob-smallest" transform="translate(4 0)" />
<text font-size="6pt" letter-spacing="2px" transform="translate(5 30)">PW</text>
@@ -341,7 +323,11 @@
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 90)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 177)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 267)" /> -->
- <text font-size="6pt" letter-spacing="2px" transform="translate(4.3 15)">SAW</text>
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(4.3 15)">SAW</text> -->
+ <g transform="translate(9 6)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <polyline points="0,8 12,0 12,8" stroke-width="1" stroke="#333" fill="none" />
+ </g>
<g transform="translate(3 30)">
<use id="SAW_SATURATION_PARAM" xlink:href="#knob-smallest" transform="translate(4 0)" />
<text font-size="6pt" letter-spacing="2px" transform="translate(2.5 30)">SAT</text>
@@ -376,7 +362,11 @@
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 90)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 177)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 267)" /> -->
- <text font-size="6pt" letter-spacing="2px" transform="translate(7 15)">TRI</text>
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(7 15)">TRI</text> -->
+ <g transform="translate(9 6)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <polyline points="0,4 3,0 9,8 12,4" stroke-width="1" stroke="#333" fill="none" />
+ </g>
<g transform="translate(3 118)">
<use id="TRIANGLE_PHASE_PARAM" xlink:href="#knob-smallest" transform="translate(4 0)" />
<text font-size="6pt" letter-spacing="2px" transform="translate(2 30)">PHS</text>
@@ -405,7 +395,12 @@
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 90)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 177)" /> -->
<!-- <rect width="30" height="20" fill="#0f0" transform="translate(0 267)" /> -->
- <text font-size="6pt" letter-spacing="2px" transform="translate(6.5 15)">SIN</text>
+ <!-- <text font-size="6pt" letter-spacing="2px" transform="translate(6.5 15)">SIN</text> -->
+ <g transform="translate(9 6)">
+ <!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
+ <path d="M 0 4 A 2 3 0 0 1 6 4" stroke="#333" stroke-width="1" fill="none" />
+ <path d="M 6 4 A 2 3 0 0 0 12 4" stroke="#333" stroke-width="1" fill="none" />
+ </g>
<g transform="translate(3 118)">
<use id="SINE_PHASE_PARAM" xlink:href="#knob-smallest" transform="translate(4 0)" />
<text font-size="6pt" letter-spacing="2px" transform="translate(2 30)">PHS</text>
diff --git a/res/Additator.svg b/res/Additator.svg
Binary files differ.
diff --git a/res/FMOp.svg b/res/FMOp.svg
Binary files differ.
diff --git a/res/VCO.svg b/res/VCO.svg
Binary files differ.
diff --git a/res/XCO.svg b/res/XCO.svg
Binary files differ.
diff --git a/src/Additator.cpp b/src/Additator.cpp
@@ -148,7 +148,7 @@ struct AdditatorWidget : ModuleWidget {
// generated by svg_widgets.rb
auto frequencyParamPosition = Vec(40.0, 45.0);
- auto partialsParamPosition = Vec(163.0, 60.0);
+ auto partialsParamPosition = Vec(165.0, 60.0);
auto fineParamPosition = Vec(30.0, 160.0);
auto widthParamPosition = Vec(79.0, 155.0);
auto oddSkewParamPosition = Vec(132.0, 155.0);
diff --git a/src/FMOp.cpp b/src/FMOp.cpp
@@ -132,15 +132,15 @@ struct FMOpWidget : ModuleWidget {
// generated by svg_widgets.rb
auto ratioParamPosition = Vec(30.0, 45.0);
auto fineParamPosition = Vec(112.0, 57.0);
- auto attackParamPosition = Vec(107.0, 92.0);
- auto decayParamPosition = Vec(107.0, 135.0);
- auto sustainParamPosition = Vec(107.0, 178.0);
- auto releaseParamPosition = Vec(107.0, 221.0);
- auto depthParamPosition = Vec(36.0, 115.0);
- auto feedbackParamPosition = Vec(36.0, 164.0);
- auto levelParamPosition = Vec(36.0, 213.0);
- auto envToLevelParamPosition = Vec(76.0, 257.3);
- auto envToFeedbackParamPosition = Vec(125.0, 257.3);
+ auto attackParamPosition = Vec(107.0, 90.0);
+ auto decayParamPosition = Vec(107.0, 133.0);
+ auto sustainParamPosition = Vec(107.0, 176.0);
+ auto releaseParamPosition = Vec(107.0, 219.0);
+ auto depthParamPosition = Vec(36.0, 113.0);
+ auto feedbackParamPosition = Vec(36.0, 162.0);
+ auto levelParamPosition = Vec(36.0, 211.0);
+ auto envToLevelParamPosition = Vec(78.0, 255.3);
+ auto envToFeedbackParamPosition = Vec(128.0, 255.3);
auto depthInputPosition = Vec(15.0, 274.0);
auto feedbackInputPosition = Vec(47.0, 274.0);
@@ -152,8 +152,8 @@ struct FMOpWidget : ModuleWidget {
auto audioOutputPosition = Vec(111.0, 318.0);
- auto envToLevelLightPosition = Vec(46.0, 258.5);
- auto envToFeedbackLightPosition = Vec(93.0, 258.5);
+ auto envToLevelLightPosition = Vec(40.0, 256.5);
+ auto envToFeedbackLightPosition = Vec(94.0, 256.5);
// end generated by svg_widgets.rb
addParam(ParamWidget::create<Knob38>(ratioParamPosition, module, FMOp::RATIO_PARAM, -1.0, 1.0, 0.0));
@@ -183,4 +183,4 @@ struct FMOpWidget : ModuleWidget {
}
};
-Model* modelFMOp = Model::create<FMOp, FMOpWidget>("Bogaudio", "Bogaudio-FMOp", "FM-OP");
+Model* modelFMOp = Model::create<FMOp, FMOpWidget>("Bogaudio", "Bogaudio-FMOp", "FM-OP", OSCILLATOR_TAG);
diff --git a/src/VCO.cpp b/src/VCO.cpp
@@ -103,25 +103,25 @@ struct VCOWidget : ModuleWidget {
// generated by svg_widgets.rb
auto frequencyParamPosition = Vec(40.0, 45.0);
- auto fineParamPosition = Vec(33.0, 151.0);
- auto slowParamPosition = Vec(130.0, 155.2);
- auto pwParamPosition = Vec(28.0, 186.0);
- auto fmParamPosition = Vec(28.0, 231.0);
- auto fmTypeParamPosition = Vec(72.0, 254.0);
-
- auto pitchInputPosition = Vec(14.0, 318.0);
- auto syncInputPosition = Vec(52.0, 318.0);
- auto pwInputPosition = Vec(14.0, 274.0);
- auto fmInputPosition = Vec(52.0, 274.0);
-
- auto squareOutputPosition = Vec(113.0, 186.0);
- auto sawOutputPosition = Vec(113.0, 230.0);
- auto triangleOutputPosition = Vec(113.0, 274.0);
- auto sineOutputPosition = Vec(113.0, 318.0);
-
- auto slowLightPosition = Vec(90.0, 156.5);
- auto fmExpLightPosition = Vec(63.0, 230.0);
- auto fmLinLightPosition = Vec(63.0, 243.3);
+ auto fineParamPosition = Vec(47.0, 151.0);
+ auto slowParamPosition = Vec(121.0, 155.2);
+ auto pwParamPosition = Vec(61.0, 187.0);
+ auto fmParamPosition = Vec(52.5, 230.0);
+ auto fmTypeParamPosition = Vec(96.5, 253.0);
+
+ auto pwInputPosition = Vec(16.0, 274.0);
+ auto fmInputPosition = Vec(46.0, 274.0);
+ auto pitchInputPosition = Vec(16.0, 318.0);
+ auto syncInputPosition = Vec(46.0, 318.0);
+
+ auto squareOutputPosition = Vec(79.0, 274.0);
+ auto sawOutputPosition = Vec(111.0, 274.0);
+ auto triangleOutputPosition = Vec(79.0, 318.0);
+ auto sineOutputPosition = Vec(111.0, 318.0);
+
+ auto slowLightPosition = Vec(81.0, 156.5);
+ auto fmExpLightPosition = Vec(87.5, 229.0);
+ auto fmLinLightPosition = Vec(87.5, 242.3);
// end generated by svg_widgets.rb
addParam(ParamWidget::create<Knob68>(frequencyParamPosition, module, VCO::FREQUENCY_PARAM, -3.0, 6.0, 0.0));
