commit c95cda370dfb7918aaf63e814463679587da9973
parent 87f9c013eae4c5993b7f40b5ae98e70c6bc29a89
Author: Matt Demanett <matt@demanett.net>
Date: Wed, 21 Mar 2018 00:49:32 -0400
VCO: panel, stub, initial implementation.
Diffstat:
7 files changed, 572 insertions(+), 8 deletions(-)
diff --git a/res-src/VCO-src.svg b/res-src/VCO-src.svg
@@ -0,0 +1,330 @@
+<svg
+ version="1.1"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="150"
+ height="380"
+ viewBox="0 0 150 380"
+>
+ <style>
+ text {
+ fill: #333;
+ font-family: 'Roboto', sans-serif;
+ font-weight: bold;
+ }
+ text.title {
+ font-family: 'Comfortaa', sans-serif;
+ font-weight: normal;
+ }
+ text.brand {
+ font-family: 'Audiowide', sans-serif;
+ font-weight: bold;
+ }
+ </style>
+
+ <defs>
+ <symbol id="knob-large" viewBox="0 0 68px 68px">
+ <g transform="translate(34 34)">
+ <polyline points="-10,0 10,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-10 0,10" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="33.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knob-medium" viewBox="0 0 26px 26px">
+ <g transform="translate(13 13)">
+ <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" />
+ <circle cx="0" cy="0" r="12" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knob-smallest" viewBox="0 0 16px 16px">
+ <g transform="translate(8 8)">
+ <polyline points="-3,0 3,0" stroke-width="1" stroke="#00f" />
+ <polyline points="0,-3 0,3" stroke-width="1" stroke="#00f" />
+ <circle r="7.5" stroke-width="1" stroke="#00f" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-frequency" viewBox="0 0 108px 108px">
+ <g transform="translate(54 54)">
+ <g transform="rotate(-240) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(240) translate(-6 3)">-3</text>
+ </g>
+ <g transform="rotate(-220.56) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-206.667) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(206.667) translate(-5.5 3)">-2</text>
+ </g>
+ <g transform="rotate(-187.23) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-173.333) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(173.333) translate(-4 3)">-1</text>
+ </g>
+ <g transform="rotate(-153.89) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-140) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" letter-spacing="1px" transform="translate(16 0) rotate(140) translate(-6 3.5)">0V</text>
+ </g>
+ <g transform="rotate(-120.56) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-106.667) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(106.667) translate(-2.7 3)">1</text>
+ </g>
+ <g transform="rotate(-87.23) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-73.33) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(73.333) translate(-2.7 3)">2</text>
+ </g>
+ <g transform="rotate(-53.89) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-40) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(40) translate(-2.7 3)">3</text>
+ </g>
+ <g transform="rotate(-20.56) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(-6.667) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(6.667) translate(-2.7 3)">4</text>
+ </g>
+ <g transform="rotate(12.77) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(26.667) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(-26.667) translate(-2.7 3)">5</text>
+ </g>
+ <g transform="rotate(46.11) translate(34 0)">
+ <polyline points="0,0 3,0" stroke-width="0.7" stroke="#333" transform="translate(3 0)" />
+ </g>
+
+ <g transform="rotate(60) translate(34 0)">
+ <polyline points="0,0 5,0" stroke-width="1" stroke="#333" transform="translate(3 0)" />
+ <text font-size="7.0pt" transform="translate(14 0) rotate(-60) translate(-2.7 3)">6</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-attenuverter" viewBox="0 0 45px 45px">
+ <g transform="translate(22.5 22.5)">
+ <g transform="rotate(-240) translate(15 0)">
+ <text font-size="9.0pt" transform="translate(3 0) rotate(240) translate(-2.2 3.6)">-</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)">
+ <text font-size="5.0pt" transform="translate(2 0) rotate(90) translate(-2 2)">0</text>
+ </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)">+</text>
+ </g>
+ </g>
+ </symbol>
+
+ <symbol id="knobguide-centertick" viewBox="0 0 40px 40px">
+ <g transform="translate(20 20)">
+ <g transform="rotate(-90) translate(10 0)">
+ <polyline points="0,0 4,0" stroke-width="1" stroke="#333" />
+ </g>
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(20)" />
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 1 12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(43)" />
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-20)" />
+ <path d="M 0 -12.5 A 12.5 12.5 0 0 0 -12.5 0" stroke="#333" stroke-width="0.5" stroke-linecap="round" fill="none" transform="rotate(-43)" />
+ </g>
+ </symbol>
+
+ <symbol id="input" viewBox="0 0 24px 24px">
+ <g transform="translate(12 12)">
+ <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#0f0" fill="#0f0" />
+ <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#0f0" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="output" viewBox="0 0 24px 24px">
+ <g transform="translate(12 12)">
+ <circle cx="0" cy="0" r="5" stroke-width="1" stroke="#f00" fill="#f00" />
+ <circle cx="0" cy="0" r="10.5" stroke-width="3" stroke="#f00" fill="none" />
+ </g>
+ </symbol>
+
+ <symbol id="button-small" viewBox="0 0 9px 9px">
+ <g transform="translate(4.5 4.5)">
+ <circle r="4" stroke-width="1" stroke="#00f" fill="#f00" />
+ </g>
+ </symbol>
+
+ <symbol id="light-small" viewBox="0 0 6.4px 6.4px">
+ <rect width="6.4" height="6.4" fill="#0f0" />
+ </symbol>
+ </defs>
+
+ <rect width="100%" height="100%" fill="#ddd" />
+ <polyline points="1,1 149,1 149,379 1,379 1,1" stroke="#e4e4e4" stroke-width="0.5" fill="none" />
+ <polyline points="0.5,0.5 149.5,0.5 149.5,379.5 0.5,379.5 0.5,0.5" stroke="#ebebeb" stroke-width="0.8" fill="none" />
+ <polyline points="0,0 150,0 150,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
+
+ <!-- <rect width="50" height="20" fill="#0f0" transform="translate(0 0)" /> -->
+ <!-- <rect width="50" height="20" fill="#0f0" transform="translate(100 0)" /> -->
+
+ <text class="title" x="52" y="19" font-size="12pt" letter-spacing="4px">VCO</text>
+ <g transform="translate(35.5 374)">
+ <text class="brand" font-size="8pt" letter-spacing="2px">BOGAUDIO</text>
+ <rect width="3.0" height="3" fill="#ddd" transform="translate(24 -5)" />
+ </g>
+
+ <g transform="translate(20 25)">
+ <!-- <rect width="108" height="98" fill="none" stroke="#0f0" /> -->
+ <!-- <polyline points="0,54 54,54" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <!-- <polyline points="54,54 54,354" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <use id="FREQUENCY_PARAM" xlink:href="#knob-large" transform="translate(20 20)" />
+ </g>
+ <use xlink:href="#knobguide-frequency" transform="translate(20 25)" />
+
+ <text font-size="6pt" letter-spacing="1px" transform="translate(29 135)">0V = C4 = 261.63HZ</text>
+
+ <g transform="translate(20 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" /> -->
+ <!-- <polyline points="21,-10 21,240" stroke="#0f0" stroke-width="1" fill="none" /> -->
+ <text font-size="8pt" letter-spacing="2px" transform="translate(0 22) rotate(270)">FINE</text>
+ <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 140)" />
+
+ <g transform="translate(90 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)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(9 6.1)">SLOW</text>
+ <!-- <rect width="90" height="10" fill="#0f0" transform="translate(0 7)" /> -->
+ </g>
+
+ <!-- <rect width="100" height="6" fill="#0f0" transform="translate(10 178)" /> -->
+
+ <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>
+ <use xlink:href="#knobguide-attenuverter" transform="translate(18.5 176.5)" />
+
+ <!-- <rect width="100" height="6" fill="#0f0" transform="translate(10 220)" /> -->
+
+ <g transform="translate(10 231)">
+ <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>
+ <use id="FM_PARAM" xlink:href="#knob-medium" transform="translate(18 0)" />
+ </g>
+ <!-- <rect width="90" height="10" fill="#0f0" transform="translate(0 26)" /> -->
+ <g transform="translate(52 1)">
+ <use id="FM_TYPE_PARAM" xlink:href="#button-small" transform="translate(30 7.5)" />
+ <g transform="translate(0 3)">
+ <use id="FM_EXP_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(9 6.2)">EXP</text>
+ </g>
+ <g transform="translate(0 14.3)">
+ <use id="FM_LIN_LIGHT" xlink:href="#light-small" transform="translate(0 0)" />
+ <text font-size="6pt" letter-spacing="2px" transform="translate(9 6.2)">LIN</text>
+ </g>
+ </g>
+ </g>
+ <use xlink:href="#knobguide-attenuverter" transform="translate(18.5 221.5)" />
+
+ <!-- <rect width="100" height="6" fill="#0f0" transform="translate(10 263)" /> -->
+
+ <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" /> -->
+ <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" /> -->
+ <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>
+ <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(0 -44)">
+ <!-- <rect width="30" height="47" rx="5" fill="#bbb" transform="translate(0 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>
+ </g>
+ <g transform="translate(0 0)">
+ <!-- <rect width="30" height="47" rx="5" fill="#bbb" transform="translate(0 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>
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/res/VCO.svg b/res/VCO.svg
Binary files differ.
diff --git a/src/VCO.cpp b/src/VCO.cpp
@@ -0,0 +1,148 @@
+
+#include "VCO.hpp"
+#include "dsp/pitch.hpp"
+
+void VCO::onReset() {
+ _syncTrigger.reset();
+ _modulationStep = modulationSteps;
+}
+
+void VCO::onSampleRateChange() {
+ _phasor.setSampleRate(engineGetSampleRate());
+ _modulationStep = modulationSteps;
+}
+
+void VCO::step() {
+ lights[SLOW_LIGHT].value = _slowMode;
+ lights[FM_EXP_LIGHT].value = !_fmLinearMode;
+ lights[FM_LIN_LIGHT].value = _fmLinearMode;
+
+ if (!(
+ outputs[SQUARE_OUTPUT].active ||
+ outputs[SAW_OUTPUT].active ||
+ outputs[TRIANGLE_OUTPUT].active ||
+ outputs[SINE_OUTPUT].active
+ )) {
+ return;
+ }
+
+ ++_modulationStep;
+ if (_modulationStep >= modulationSteps) {
+ _modulationStep = 0;
+
+ _baseVOct = params[FREQUENCY_PARAM].value;
+ _baseVOct += params[FINE_PARAM].value;
+ if (inputs[PITCH_INPUT].active) {
+ _baseVOct += clamp(inputs[PITCH_INPUT].value, -5.0f, 5.0f);
+ }
+ if ((_slowMode = ((int)params[SLOW_PARAM].value)) == 1) {
+ _baseVOct -= 5.0f;
+ }
+ _baseHz = cvToFrequency(_baseVOct);
+
+ if (_syncTrigger.process(inputs[SYNC_INPUT].value)) {
+ _phasor.setPhase(0.0f);
+ }
+
+ float pw = params[PW_PARAM].value;
+ if (inputs[PW_INPUT].active) {
+ pw *= clamp(inputs[PW_INPUT].value / 5.0f, -1.0f, 1.0f);
+ }
+ pw = (pw + 1.0f) / 2.0f;
+ pw *= 1.0f - 2.0f * _square.minPulseWidth;
+ _square.setPulseWidth(pw);
+
+ _fmDepth = params[FM_PARAM].value;
+ _fmLinearMode = ((int)params[FM_TYPE_PARAM].value) == 1;
+ }
+
+ if (inputs[FM_INPUT].active) {
+ float fm = inputs[FM_INPUT].value * _fmDepth;
+ if (_fmLinearMode) {
+ _phasor.setFrequency(_baseHz + fm * _baseHz);
+ }
+ else {
+ _phasor.setFrequency(cvToFrequency(_baseVOct + fm));
+ }
+ }
+ else {
+ _phasor.setFrequency(_baseHz);
+ }
+ _phasor.advancePhase();
+ if (outputs[SQUARE_OUTPUT].active) {
+ outputs[SQUARE_OUTPUT].value = amplitude * _square.nextFromPhasor(_phasor);
+ }
+ if (outputs[SAW_OUTPUT].active) {
+ outputs[SAW_OUTPUT].value = amplitude * _saw.nextFromPhasor(_phasor);
+ }
+ if (outputs[TRIANGLE_OUTPUT].active) {
+ outputs[TRIANGLE_OUTPUT].value = amplitude * _triangle.nextFromPhasor(_phasor);
+ }
+ if (outputs[SINE_OUTPUT].active) {
+ outputs[SINE_OUTPUT].value = amplitude * _sine.nextFromPhasor(_phasor);
+ }
+}
+
+struct VCOWidget : ModuleWidget {
+ VCOWidget(VCO* module) : ModuleWidget(module) {
+ box.size = Vec(RACK_GRID_WIDTH * 10, RACK_GRID_HEIGHT);
+
+ {
+ SVGPanel *panel = new SVGPanel();
+ panel->box.size = box.size;
+ panel->setBackground(SVG::load(assetPlugin(plugin, "res/VCO.svg")));
+ addChild(panel);
+ }
+
+ addChild(Widget::create<ScrewSilver>(Vec(0, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 0)));
+ addChild(Widget::create<ScrewSilver>(Vec(0, 365)));
+ addChild(Widget::create<ScrewSilver>(Vec(box.size.x - 15, 365)));
+
+ // 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.5, 186.5);
+ auto fmParamPosition = Vec(28.5, 231.5);
+ auto fmTypeParamPosition = Vec(92.0, 239.5);
+
+ 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(62.0, 235.0);
+ auto fmLinLightPosition = Vec(62.0, 246.3);
+ // end generated by svg_widgets.rb
+
+ addParam(ParamWidget::create<Knob68>(frequencyParamPosition, module, VCO::FREQUENCY_PARAM, -3.0, 6.0, 0.0));
+ addParam(ParamWidget::create<Knob16>(fineParamPosition, module, VCO::FINE_PARAM, -1.0, 1.0, 0.0));
+ addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, VCO::SLOW_PARAM, 0.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(pwParamPosition, module, VCO::PW_PARAM, -1.0, 1.0, 0.0));
+ addParam(ParamWidget::create<Knob26>(fmParamPosition, module, VCO::FM_PARAM, -1.0, 1.0, 0.0));
+ addParam(ParamWidget::create<StatefulButton9>(fmTypeParamPosition, module, VCO::FM_TYPE_PARAM, 0.0, 1.0, 0.0));
+
+ addInput(Port::create<Port24>(pitchInputPosition, Port::INPUT, module, VCO::PITCH_INPUT));
+ addInput(Port::create<Port24>(syncInputPosition, Port::INPUT, module, VCO::SYNC_INPUT));
+ addInput(Port::create<Port24>(pwInputPosition, Port::INPUT, module, VCO::PW_INPUT));
+ addInput(Port::create<Port24>(fmInputPosition, Port::INPUT, module, VCO::FM_INPUT));
+
+ addOutput(Port::create<Port24>(squareOutputPosition, Port::OUTPUT, module, VCO::SQUARE_OUTPUT));
+ addOutput(Port::create<Port24>(sawOutputPosition, Port::OUTPUT, module, VCO::SAW_OUTPUT));
+ addOutput(Port::create<Port24>(triangleOutputPosition, Port::OUTPUT, module, VCO::TRIANGLE_OUTPUT));
+ addOutput(Port::create<Port24>(sineOutputPosition, Port::OUTPUT, module, VCO::SINE_OUTPUT));
+
+ addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(slowLightPosition, module, VCO::SLOW_LIGHT));
+ addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(fmExpLightPosition, module, VCO::FM_EXP_LIGHT));
+ addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(fmLinLightPosition, module, VCO::FM_LIN_LIGHT));
+ }
+};
+
+Model* modelVCO = Model::create<VCO, VCOWidget>("Bogaudio", "Bogaudio-VCO", "VCO", OSCILLATOR_TAG);
diff --git a/src/VCO.hpp b/src/VCO.hpp
@@ -0,0 +1,80 @@
+#pragma once
+
+#include "bogaudio.hpp"
+#include "dsp/oscillator.hpp"
+
+using namespace bogaudio::dsp;
+
+extern Model* modelVCO;
+
+namespace bogaudio {
+
+struct VCO : Module {
+ enum ParamsIds {
+ FREQUENCY_PARAM,
+ FINE_PARAM,
+ SLOW_PARAM,
+ PW_PARAM,
+ FM_PARAM,
+ FM_TYPE_PARAM,
+ NUM_PARAMS
+ };
+
+ enum InputsIds {
+ PITCH_INPUT,
+ SYNC_INPUT,
+ PW_INPUT,
+ FM_INPUT,
+ NUM_INPUTS
+ };
+
+ enum OutputsIds {
+ SQUARE_OUTPUT,
+ SAW_OUTPUT,
+ TRIANGLE_OUTPUT,
+ SINE_OUTPUT,
+ NUM_OUTPUTS
+ };
+
+ enum LightsIds {
+ SLOW_LIGHT,
+ FM_EXP_LIGHT,
+ FM_LIN_LIGHT,
+ NUM_LIGHTS
+ };
+
+ const int modulationSteps = 100;
+ const float amplitude = 5.0f;
+ int _modulationStep = 0;
+ float _baseVOct = 0.0f;
+ float _baseHz = 0.0f;
+ bool _slowMode = false;
+ float _fmDepth = 0.0f;
+ bool _fmLinearMode = false;
+ SchmittTrigger _syncTrigger;
+
+ Phasor _phasor;
+ BandLimitedSquareOscillator _square;
+ BandLimitedSawOscillator _saw;
+ TriangleOscillator _triangle;
+ SineTableOscillator _sine;
+
+ VCO()
+ : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS)
+ , _phasor(engineGetSampleRate(), 1.0f)
+ , _square(0.0f, 0.0f)
+ , _saw(0.0f, 0.0f)
+ , _triangle(0.0f, 0.0f)
+ , _sine(0.0f, 0.0f)
+ {
+ onReset();
+ _saw.setQuality(12);
+ _square.setQuality(12);
+ }
+
+ virtual void onReset() override;
+ virtual void onSampleRateChange() override;
+ virtual void step() override;
+};
+
+} // namespace bogaudio
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -1,6 +1,7 @@
#include "bogaudio.hpp"
+#include "VCO.hpp"
#include "XCO.hpp"
#include "Additator.hpp"
#include "FMOp.hpp"
@@ -40,6 +41,7 @@ void init(rack::Plugin *p) {
p->manual = "https://github.com/bogaudio/BogaudioModules/blob/master/README.md";
#ifdef EXPERIMENTAL
+ p->addModel(modelVCO);
p->addModel(modelXCO);
p->addModel(modelAdditator);
p->addModel(modelFMOp);
diff --git a/src/dsp/oscillator.cpp b/src/dsp/oscillator.cpp
@@ -148,11 +148,11 @@ void SquareOscillator::setPulseWidth(float pw) {
}
_pulseWidthInput = pw;
- if (pw >= 0.97f) {
- _pulseWidth = 0.97f;
+ if (pw >= maxPulseWidth) {
+ _pulseWidth = maxPulseWidth;
}
- else if (pw <= 0.03f) {
- _pulseWidth = 0.03f;
+ else if (pw <= minPulseWidth) {
+ _pulseWidth = minPulseWidth;
}
else {
_pulseWidth = pw;
@@ -182,11 +182,11 @@ void BandLimitedSquareOscillator::setPulseWidth(float pw) {
}
_pulseWidthInput = pw;
- if (pw >= 0.97f) {
- _pulseWidth = 0.97f;
+ if (pw >= maxPulseWidth) {
+ _pulseWidth = maxPulseWidth;
}
- else if (pw <= 0.03f) {
- _pulseWidth = 0.03f;
+ else if (pw <= minPulseWidth) {
+ _pulseWidth = minPulseWidth;
}
else {
_pulseWidth = pw;
diff --git a/src/dsp/oscillator.hpp b/src/dsp/oscillator.hpp
@@ -205,6 +205,8 @@ struct BandLimitedSawOscillator : SaturatingSawOscillator {
};
struct SquareOscillator : Phasor {
+ const float minPulseWidth = 0.03f;
+ const float maxPulseWidth = 1.0f - minPulseWidth;
float _amplitude;
float _negativeAmplitude;
float _pulseWidthInput;
@@ -228,6 +230,8 @@ struct SquareOscillator : Phasor {
};
struct BandLimitedSquareOscillator : BandLimitedSawOscillator {
+ const float minPulseWidth = 0.03f;
+ const float maxPulseWidth = 1.0f - minPulseWidth;
float _pulseWidthInput;
float _pulseWidth;
float _offset;
