From 96dba53e228b21964ddd4565ffd2c004c5fd3220 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Sun, 7 May 2017 05:41:12 -0700 Subject: [PATCH] Added Rampage components --- src/ABC.cpp | 4 +- src/Befaco.cpp | 2 +- src/DualAtenuverter.cpp | 4 +- src/EvenVCO.cpp | 8 ++-- src/Mixer.cpp | 4 +- src/Rampage.cpp | 87 +++++++++++++++++++++++++++++++++++++---- src/SlewLimiter.cpp | 8 ++-- src/SpringReverb.cpp | 12 +++--- 8 files changed, 100 insertions(+), 29 deletions(-) diff --git a/src/ABC.cpp b/src/ABC.cpp index 351b7b1..19102ec 100644 --- a/src/ABC.cpp +++ b/src/ABC.cpp @@ -80,8 +80,8 @@ ABCWidget::ABCWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(15, 365))); addParam(createParam(Vec(44, 37), module, ABC::B1_LEVEL_PARAM, -1.0, 1.0, 0.0)); addParam(createParam(Vec(44, 107), module, ABC::C1_LEVEL_PARAM, -1.0, 1.0, 0.0)); diff --git a/src/Befaco.cpp b/src/Befaco.cpp index c0a4243..a985ed4 100644 --- a/src/Befaco.cpp +++ b/src/Befaco.cpp @@ -6,7 +6,7 @@ struct BefacoPlugin : Plugin { slug = "Befaco"; name = "Befaco"; createModel(this, "EvenVCO", "EvenVCO"); - // createModel(this, "Rampage", "Rampage"); + createModel(this, "Rampage", "Rampage"); createModel(this, "ABC", "A*B+C"); createModel(this, "SpringReverb", "Spring Reverb"); createModel(this, "Mixer", "Mixer"); diff --git a/src/DualAtenuverter.cpp b/src/DualAtenuverter.cpp index d8610d9..75ecc90 100644 --- a/src/DualAtenuverter.cpp +++ b/src/DualAtenuverter.cpp @@ -59,8 +59,8 @@ DualAtenuverterWidget::DualAtenuverterWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(15, 365))); addParam(createParam(Vec(19, 33), module, DualAtenuverter::ATEN1_PARAM, -1.0, 1.0, 0.0)); addParam(createParam(Vec(19, 91), module, DualAtenuverter::OFFSET1_PARAM, -10.0, 10.0, 0.0)); diff --git a/src/EvenVCO.cpp b/src/EvenVCO.cpp index b298b86..9809198 100644 --- a/src/EvenVCO.cpp +++ b/src/EvenVCO.cpp @@ -146,10 +146,10 @@ EvenVCOWidget::EvenVCOWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(15*6, 0))); - addChild(createScrew(Vec(15*6, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(15*6, 0))); + addChild(createScrew(Vec(15*6, 365))); addParam(createParam(Vec(24-4+2, 35-4+1), module, EvenVCO::OCTAVE_PARAM, -5.0, 4.0, 0.0)); addParam(createParam(Vec(72, 131), module, EvenVCO::TUNE_PARAM, -7.0, 7.0, 0.0)); diff --git a/src/Mixer.cpp b/src/Mixer.cpp index e5451db..6d5578a 100644 --- a/src/Mixer.cpp +++ b/src/Mixer.cpp @@ -60,8 +60,8 @@ MixerWidget::MixerWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(15, 365))); addParam(createParam(Vec(19, 32), module, Mixer::CH1_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(19, 85), module, Mixer::CH2_PARAM, 0.0, 1.0, 0.0)); diff --git a/src/Rampage.cpp b/src/Rampage.cpp index 90ceac2..3423b60 100644 --- a/src/Rampage.cpp +++ b/src/Rampage.cpp @@ -3,13 +3,49 @@ struct Rampage : Module { enum ParamIds { + RANGE_A_PARAM, + SHAPE_A_PARAM, + TRIGG_A_PARAM, + RISE_A_PARAM, + FALL_A_PARAM, + CYCLE_A_PARAM, + RANGE_B_PARAM, + SHAPE_B_PARAM, + TRIGG_B_PARAM, + RISE_B_PARAM, + FALL_B_PARAM, + CYCLE_B_PARAM, + BALANCE_PARAM, NUM_PARAMS }; enum InputIds { + IN_A_INPUT, + TRIGG_A_INPUT, + RISE_CV_A_INPUT, + FALL_CV_A_INPUT, + EXP_CV_A_INPUT, + CYCLE_A_INPUT, + IN_B_INPUT, + TRIGG_B_INPUT, + RISE_CV_B_INPUT, + FALL_CV_B_INPUT, + EXP_CV_B_INPUT, + CYCLE_B_INPUT, NUM_INPUTS }; enum OutputIds { - NUM_OUTPUTS + RISING_A_OUTPUT, + FALLING_A_OUTPUT, + EOC_A_OUTPUT, + OUT_A_OUTPUT, + RISING_B_OUTPUT, + FALLING_B_OUTPUT, + EOC_B_OUTPUT, + OUT_B_OUTPUT, + COMPARATOR_OUTPUT, + MIN_OUTPUT, + MAX_OUTPUT, + NUM_OUTPUTS, }; Rampage(); @@ -39,12 +75,47 @@ RampageWidget::RampageWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(box.size.x-30, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(box.size.x-30, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(box.size.x-30, 0))); + addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(box.size.x-30, 365))); - // addParam(createParam(Vec(0, 43), module, Rampage::RADIOACTIVITY_PARAM, 0.0, 1.0, 0.0)); - // addInput(createInput(Vec(10, 248), module, Rampage::RADIOACTIVITY_INPUT)); - // addOutput(createOutput(Vec(10, 306), module, Rampage::PULSE_OUTPUT)); + addInput(createInput(Vec(14-3, 30-3), module, Rampage::IN_A_INPUT)); + addInput(createInput(Vec(52-3, 37-3), module, Rampage::TRIGG_A_INPUT)); + addInput(createInput(Vec(8-3, 268-3), module, Rampage::RISE_CV_A_INPUT)); + addInput(createInput(Vec(67-3, 268-3), module, Rampage::FALL_CV_A_INPUT)); + addInput(createInput(Vec(38-3, 297-3), module, Rampage::EXP_CV_A_INPUT)); + addInput(createInput(Vec(102-3, 290-3), module, Rampage::CYCLE_A_INPUT)); + addInput(createInput(Vec(230-3, 30-3), module, Rampage::IN_B_INPUT)); + addInput(createInput(Vec(192-3, 37-3), module, Rampage::TRIGG_B_INPUT)); + addInput(createInput(Vec(176-3, 268-3), module, Rampage::RISE_CV_B_INPUT)); + addInput(createInput(Vec(237-3, 268-3), module, Rampage::FALL_CV_B_INPUT)); + addInput(createInput(Vec(207-3, 297-3), module, Rampage::EXP_CV_B_INPUT)); + addInput(createInput(Vec(142-3, 290-3), module, Rampage::CYCLE_B_INPUT)); + + addParam(createParam(Vec(96-2, 35-3), module, Rampage::RANGE_A_PARAM, 0.0, 2.0, 0.0)); + addParam(createParam(Vec(27, 91), module, Rampage::SHAPE_A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(72, 82), module, Rampage::TRIGG_A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(21-5, 140-5), module, Rampage::RISE_A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(62-5, 140-5), module, Rampage::FALL_A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(101, 240-2), module, Rampage::CYCLE_A_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(149-2, 35-3), module, Rampage::RANGE_B_PARAM, 0.0, 2.0, 0.0)); + addParam(createParam(Vec(217, 91), module, Rampage::SHAPE_B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(170, 82), module, Rampage::TRIGG_B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(202-5, 140-5), module, Rampage::RISE_B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(243-5, 140-5), module, Rampage::FALL_B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(141, 240-2), module, Rampage::CYCLE_B_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(117, 76), module, Rampage::BALANCE_PARAM, 0.0, 1.0, 0.0)); + + addOutput(createOutput(Vec(8-3, 326-3), module, Rampage::RISING_A_OUTPUT)); + addOutput(createOutput(Vec(67-3, 326-3), module, Rampage::FALLING_A_OUTPUT)); + addOutput(createOutput(Vec(104-3, 326-3), module, Rampage::EOC_A_OUTPUT)); + addOutput(createOutput(Vec(102-3, 195-3), module, Rampage::OUT_A_OUTPUT)); + addOutput(createOutput(Vec(176-3, 326-3), module, Rampage::RISING_B_OUTPUT)); + addOutput(createOutput(Vec(237-3, 326-3), module, Rampage::FALLING_B_OUTPUT)); + addOutput(createOutput(Vec(140-3, 326-3), module, Rampage::EOC_B_OUTPUT)); + addOutput(createOutput(Vec(142-3, 195-3), module, Rampage::OUT_B_OUTPUT)); + addOutput(createOutput(Vec(122-3, 133-3), module, Rampage::COMPARATOR_OUTPUT)); + addOutput(createOutput(Vec(89-3, 156-3), module, Rampage::MIN_OUTPUT)); + addOutput(createOutput(Vec(155-3, 156-3), module, Rampage::MAX_OUTPUT)); } diff --git a/src/SlewLimiter.cpp b/src/SlewLimiter.cpp index d64225b..afb31c3 100644 --- a/src/SlewLimiter.cpp +++ b/src/SlewLimiter.cpp @@ -75,13 +75,13 @@ SlewLimiterWidget::SlewLimiterWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(15, 365))); addParam(createParam(Vec(26, 39), module, SlewLimiter::SHAPE_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(17, 100), module, SlewLimiter::RISE_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(61, 100), module, SlewLimiter::FALL_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(15, 102), module, SlewLimiter::RISE_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(60, 102), module, SlewLimiter::FALL_PARAM, 0.0, 1.0, 0.0)); addInput(createInput(Vec(6, 270), module, SlewLimiter::RISE_INPUT)); addInput(createInput(Vec(52, 270), module, SlewLimiter::FALL_INPUT)); diff --git a/src/SpringReverb.cpp b/src/SpringReverb.cpp index 1701de7..8e2717d 100644 --- a/src/SpringReverb.cpp +++ b/src/SpringReverb.cpp @@ -272,15 +272,15 @@ SpringReverbWidget::SpringReverbWidget() { addChild(panel); } - addChild(createScrew(Vec(15, 0))); - addChild(createScrew(Vec(15, 365))); - addChild(createScrew(Vec(15*6, 0))); - addChild(createScrew(Vec(15*6, 365))); + addChild(createScrew(Vec(15, 0))); + addChild(createScrew(Vec(15, 365))); + addChild(createScrew(Vec(15*6, 0))); + addChild(createScrew(Vec(15*6, 365))); addParam(createParam(Vec(22, 29), module, SpringReverb::WET_PARAM, 0.0, 1.0, 0.5)); - addParam(createParam(Vec(13, 118-2), module, SpringReverb::LEVEL1_PARAM, 0.0, 1.0, 0.0)); - addParam(createParam(Vec(93, 118-2), module, SpringReverb::LEVEL2_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(12, 116), module, SpringReverb::LEVEL1_PARAM, 0.0, 1.0, 0.0)); + addParam(createParam(Vec(92, 116), module, SpringReverb::LEVEL2_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(41, 209), module, SpringReverb::HPF_PARAM, 0.0, 1.0, 0.5));