diff --git a/src/ABC.cpp b/src/ABC.cpp index deb4f22..4cad863 100644 --- a/src/ABC.cpp +++ b/src/ABC.cpp @@ -82,14 +82,14 @@ ABCWidget::ABCWidget() { addParam(createParam(Vec(45, 204), module, ABC::B2_LEVEL_PARAM, -1.0, 1.0, 0.0)); addParam(createParam(Vec(45, 274), module, ABC::C2_LEVEL_PARAM, -1.0, 1.0, 0.0)); - addInput(createInput(Vec(3, 24), module, ABC::A1_INPUT)); - addInput(createInput(Vec(3, 66), module, ABC::B1_INPUT)); - addInput(createInput(Vec(3, 108), module, ABC::C1_INPUT)); - addOutput(createOutput(Vec(3, 150), module, ABC::OUT1_OUTPUT)); - addInput(createInput(Vec(3, 191), module, ABC::A2_INPUT)); - addInput(createInput(Vec(3, 233), module, ABC::B2_INPUT)); - addInput(createInput(Vec(3, 275), module, ABC::C2_INPUT)); - addOutput(createOutput(Vec(3, 317), module, ABC::OUT2_OUTPUT)); + addInput(createInput(Vec(7, 28), module, ABC::A1_INPUT)); + addInput(createInput(Vec(7, 70), module, ABC::B1_INPUT)); + addInput(createInput(Vec(7, 112), module, ABC::C1_INPUT)); + addOutput(createOutput(Vec(7, 154), module, ABC::OUT1_OUTPUT)); + addInput(createInput(Vec(7, 195), module, ABC::A2_INPUT)); + addInput(createInput(Vec(7, 237), module, ABC::B2_INPUT)); + addInput(createInput(Vec(7, 279), module, ABC::C2_INPUT)); + addOutput(createOutput(Vec(7, 321), module, ABC::OUT2_OUTPUT)); addChild(createValueLight>(Vec(38, 162), &module->lights[0])); addChild(createValueLight>(Vec(38, 330), &module->lights[1])); diff --git a/src/DualAtenuverter.cpp b/src/DualAtenuverter.cpp index fcca528..d9dab7b 100644 --- a/src/DualAtenuverter.cpp +++ b/src/DualAtenuverter.cpp @@ -1,7 +1,6 @@ #include "Befaco.hpp" -/** Yes, in English this would be spelled "Attenuverter", but since attenuator is "atenuador" in Spanish, I suppose they (accidentally or not) went with one "t". */ struct DualAtenuverter : Module { enum ParamIds { ATEN1_PARAM, @@ -61,11 +60,11 @@ DualAtenuverterWidget::DualAtenuverterWidget() { addParam(createParam(Vec(20, 201), module, DualAtenuverter::ATEN2_PARAM, -1.0, 1.0, 0.0)); addParam(createParam(Vec(20, 260), module, DualAtenuverter::OFFSET2_PARAM, -10.0, 10.0, 0.0)); - addInput(createInput(Vec(4, 149), module, DualAtenuverter::IN1_INPUT)); - addOutput(createOutput(Vec(39, 149), module, DualAtenuverter::OUT1_OUTPUT)); + addInput(createInput(Vec(7, 152), module, DualAtenuverter::IN1_INPUT)); + addOutput(createOutput(Vec(43, 152), module, DualAtenuverter::OUT1_OUTPUT)); - addInput(createInput(Vec(4, 316), module, DualAtenuverter::IN2_INPUT)); - addOutput(createOutput(Vec(39, 316), module, DualAtenuverter::OUT2_OUTPUT)); + addInput(createInput(Vec(7, 319), module, DualAtenuverter::IN2_INPUT)); + addOutput(createOutput(Vec(43, 319), module, DualAtenuverter::OUT2_OUTPUT)); addChild(createValueLight>(Vec(33, 143), &module->lights[0])); addChild(createValueLight>(Vec(33, 311), &module->lights[1])); diff --git a/src/EvenVCO.cpp b/src/EvenVCO.cpp index d49c0ea..3d3a175 100644 --- a/src/EvenVCO.cpp +++ b/src/EvenVCO.cpp @@ -148,20 +148,20 @@ EvenVCOWidget::EvenVCOWidget() { 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(22, 32), module, EvenVCO::OCTAVE_PARAM, -5.0, 4.0, 0.0)); addParam(createParam(Vec(73, 131), module, EvenVCO::TUNE_PARAM, -7.0, 7.0, 0.0)); addParam(createParam(Vec(16, 230), module, EvenVCO::PWM_PARAM, -1.0, 1.0, 0.0)); - addInput(createInput(Vec(13-7-1, 124-7), module, EvenVCO::PITCH1_INPUT)); - addInput(createInput(Vec(22-7, 162-7-1), module, EvenVCO::PITCH2_INPUT)); - addInput(createInput(Vec(51-7, 188-7-1), module, EvenVCO::FM_INPUT)); - addInput(createInput(Vec(88-7, 193-7), module, EvenVCO::SYNC_INPUT)); + addInput(createInput(Vec(8, 120), module, EvenVCO::PITCH1_INPUT)); + addInput(createInput(Vec(19, 157), module, EvenVCO::PITCH2_INPUT)); + addInput(createInput(Vec(48, 183), module, EvenVCO::FM_INPUT)); + addInput(createInput(Vec(86, 189), module, EvenVCO::SYNC_INPUT)); - addInput(createInput(Vec(76-7, 240-7), module, EvenVCO::PWM_INPUT)); + addInput(createInput(Vec(72, 236), module, EvenVCO::PWM_INPUT)); - addOutput(createOutput(Vec(12-7, 285-7), module, EvenVCO::TRI_OUTPUT)); - addOutput(createOutput(Vec(88-7+1, 285-7), module, EvenVCO::SINE_OUTPUT)); - addOutput(createOutput(Vec(50-7+1, 308-7), module, EvenVCO::EVEN_OUTPUT)); - addOutput(createOutput(Vec(12-7, 329-7), module, EvenVCO::SAW_OUTPUT)); - addOutput(createOutput(Vec(88-7+1, 329-7), module, EvenVCO::SQUARE_OUTPUT)); + addOutput(createOutput(Vec(10, 283), module, EvenVCO::TRI_OUTPUT)); + addOutput(createOutput(Vec(87, 283), module, EvenVCO::SINE_OUTPUT)); + addOutput(createOutput(Vec(48, 306), module, EvenVCO::EVEN_OUTPUT)); + addOutput(createOutput(Vec(10, 327), module, EvenVCO::SAW_OUTPUT)); + addOutput(createOutput(Vec(87, 327), module, EvenVCO::SQUARE_OUTPUT)); } diff --git a/src/Mixer.cpp b/src/Mixer.cpp index 3b596ee..d6fe965 100644 --- a/src/Mixer.cpp +++ b/src/Mixer.cpp @@ -62,14 +62,14 @@ MixerWidget::MixerWidget() { addParam(createParam(Vec(19, 137), module, Mixer::CH3_PARAM, 0.0, 1.0, 0.0)); addParam(createParam(Vec(19, 190), module, Mixer::CH4_PARAM, 0.0, 1.0, 0.0)); - addInput(createInput(Vec(4, 239), module, Mixer::IN1_INPUT)); - addInput(createInput(Vec(40, 239), module, Mixer::IN2_INPUT)); + addInput(createInput(Vec(7, 242), module, Mixer::IN1_INPUT)); + addInput(createInput(Vec(43, 242), module, Mixer::IN2_INPUT)); - addInput(createInput(Vec(4, 278), module, Mixer::IN3_INPUT)); - addInput(createInput(Vec(40, 278), module, Mixer::IN4_INPUT)); + addInput(createInput(Vec(7, 281), module, Mixer::IN3_INPUT)); + addInput(createInput(Vec(43, 281), module, Mixer::IN4_INPUT)); - addOutput(createOutput(Vec(4, 321), module, Mixer::OUT1_OUTPUT)); - addOutput(createOutput(Vec(40, 321), module, Mixer::OUT2_OUTPUT)); + addOutput(createOutput(Vec(7, 324), module, Mixer::OUT1_OUTPUT)); + addOutput(createOutput(Vec(43, 324), module, Mixer::OUT2_OUTPUT)); addChild(createValueLight>(Vec(31, 309), &module->lights[0])); } diff --git a/src/Rampage.cpp b/src/Rampage.cpp index a6e7c28..18c77c5 100644 --- a/src/Rampage.cpp +++ b/src/Rampage.cpp @@ -186,18 +186,18 @@ RampageWidget::RampageWidget() { addChild(createScrew(Vec(15, 365))); addChild(createScrew(Vec(box.size.x-30, 365))); - addInput(createInput(Vec(11, 27), module, Rampage::IN_A_INPUT)); - addInput(createInput(Vec(49, 34), module, Rampage::TRIGG_A_INPUT)); - addInput(createInput(Vec(5, 265), module, Rampage::RISE_CV_A_INPUT)); - addInput(createInput(Vec(64, 265), module, Rampage::FALL_CV_A_INPUT)); - addInput(createInput(Vec(35, 294), module, Rampage::EXP_CV_A_INPUT)); - addInput(createInput(Vec(99, 287), module, Rampage::CYCLE_A_INPUT)); - addInput(createInput(Vec(227, 27), module, Rampage::IN_B_INPUT)); - addInput(createInput(Vec(189, 34), module, Rampage::TRIGG_B_INPUT)); - addInput(createInput(Vec(173, 265), module, Rampage::RISE_CV_B_INPUT)); - addInput(createInput(Vec(234, 265), module, Rampage::FALL_CV_B_INPUT)); - addInput(createInput(Vec(204, 294), module, Rampage::EXP_CV_B_INPUT)); - addInput(createInput(Vec(139, 287), module, Rampage::CYCLE_B_INPUT)); + addInput(createInput(Vec(14, 30), module, Rampage::IN_A_INPUT)); + addInput(createInput(Vec(52, 37), module, Rampage::TRIGG_A_INPUT)); + addInput(createInput(Vec(8, 268), module, Rampage::RISE_CV_A_INPUT)); + addInput(createInput(Vec(67, 268), module, Rampage::FALL_CV_A_INPUT)); + addInput(createInput(Vec(38, 297), module, Rampage::EXP_CV_A_INPUT)); + addInput(createInput(Vec(102, 290), module, Rampage::CYCLE_A_INPUT)); + addInput(createInput(Vec(229, 30), module, Rampage::IN_B_INPUT)); + addInput(createInput(Vec(192, 37), module, Rampage::TRIGG_B_INPUT)); + addInput(createInput(Vec(176, 268), module, Rampage::RISE_CV_B_INPUT)); + addInput(createInput(Vec(237, 268), module, Rampage::FALL_CV_B_INPUT)); + addInput(createInput(Vec(207, 297), module, Rampage::EXP_CV_B_INPUT)); + addInput(createInput(Vec(143, 290), module, Rampage::CYCLE_B_INPUT)); addParam(createParam(Vec(94, 32), module, Rampage::RANGE_A_PARAM, 0.0, 2.0, 0.0)); addParam(createParam(Vec(27, 90), module, Rampage::SHAPE_A_PARAM, -1.0, 1.0, 0.0)); @@ -213,17 +213,17 @@ RampageWidget::RampageWidget() { addParam(createParam(Vec(141, 238), 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.5)); - addOutput(createOutput(Vec(5, 323), module, Rampage::RISING_A_OUTPUT)); - addOutput(createOutput(Vec(65, 323), module, Rampage::FALLING_A_OUTPUT)); - addOutput(createOutput(Vec(101, 323), module, Rampage::EOC_A_OUTPUT)); - addOutput(createOutput(Vec(99, 192), module, Rampage::OUT_A_OUTPUT)); - addOutput(createOutput(Vec(173, 323), module, Rampage::RISING_B_OUTPUT)); - addOutput(createOutput(Vec(234, 323), module, Rampage::FALLING_B_OUTPUT)); - addOutput(createOutput(Vec(137, 323), module, Rampage::EOC_B_OUTPUT)); - addOutput(createOutput(Vec(139, 192), module, Rampage::OUT_B_OUTPUT)); - addOutput(createOutput(Vec(119, 130), module, Rampage::COMPARATOR_OUTPUT)); - addOutput(createOutput(Vec(86, 153), module, Rampage::MIN_OUTPUT)); - addOutput(createOutput(Vec(152, 153), module, Rampage::MAX_OUTPUT)); + addOutput(createOutput(Vec(8, 326), module, Rampage::RISING_A_OUTPUT)); + addOutput(createOutput(Vec(68, 326), module, Rampage::FALLING_A_OUTPUT)); + addOutput(createOutput(Vec(104, 326), module, Rampage::EOC_A_OUTPUT)); + addOutput(createOutput(Vec(102, 195), module, Rampage::OUT_A_OUTPUT)); + addOutput(createOutput(Vec(177, 326), module, Rampage::RISING_B_OUTPUT)); + addOutput(createOutput(Vec(237, 326), module, Rampage::FALLING_B_OUTPUT)); + addOutput(createOutput(Vec(140, 326), module, Rampage::EOC_B_OUTPUT)); + addOutput(createOutput(Vec(142, 195), module, Rampage::OUT_B_OUTPUT)); + addOutput(createOutput(Vec(122, 133), module, Rampage::COMPARATOR_OUTPUT)); + addOutput(createOutput(Vec(89, 157), module, Rampage::MIN_OUTPUT)); + addOutput(createOutput(Vec(155, 157), module, Rampage::MAX_OUTPUT)); addChild(createValueLight>(Vec(131, 167), &module->outputs[Rampage::COMPARATOR_LIGHT].value)); addChild(createValueLight>(Vec(122, 174), &module->outputs[Rampage::MIN_LIGHT].value)); diff --git a/src/SlewLimiter.cpp b/src/SlewLimiter.cpp index 0f71ab4..f31b2c9 100644 --- a/src/SlewLimiter.cpp +++ b/src/SlewLimiter.cpp @@ -77,9 +77,9 @@ SlewLimiterWidget::SlewLimiterWidget() { 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(7, 270), module, ::SlewLimiter::RISE_INPUT)); - addInput(createInput(Vec(52, 270), module, ::SlewLimiter::FALL_INPUT)); + addInput(createInput(Vec(10, 273), module, ::SlewLimiter::RISE_INPUT)); + addInput(createInput(Vec(55, 273), module, ::SlewLimiter::FALL_INPUT)); - addInput(createInput(Vec(7, 320), module, ::SlewLimiter::IN_INPUT)); - addOutput(createOutput(Vec(52, 320), module, ::SlewLimiter::OUT_OUTPUT)); + addInput(createInput(Vec(10, 323), module, ::SlewLimiter::IN_INPUT)); + addOutput(createOutput(Vec(55, 323), module, ::SlewLimiter::OUT_OUTPUT)); } diff --git a/src/SpringReverb.cpp b/src/SpringReverb.cpp index 6865d7e..5f330b2 100644 --- a/src/SpringReverb.cpp +++ b/src/SpringReverb.cpp @@ -283,14 +283,14 @@ SpringReverbWidget::SpringReverbWidget() { addParam(createParam(Vec(42, 210), module, SpringReverb::HPF_PARAM, 0.0, 1.0, 0.5)); - addInput(createInput(Vec(4, 240), module, SpringReverb::CV1_INPUT)); - addInput(createInput(Vec(84, 240), module, SpringReverb::CV2_INPUT)); - addInput(createInput(Vec(24, 278), module, SpringReverb::IN1_INPUT)); - addInput(createInput(Vec(63, 278), module, SpringReverb::IN2_INPUT)); - - addOutput(createOutput(Vec(4, 314), module, SpringReverb::MIX_OUTPUT)); - addInput(createInput(Vec(44, 321), module, SpringReverb::MIX_CV_INPUT)); - addOutput(createOutput(Vec(85, 314), module, SpringReverb::WET_OUTPUT)); + addInput(createInput(Vec(7, 243), module, SpringReverb::CV1_INPUT)); + addInput(createInput(Vec(88, 243), module, SpringReverb::CV2_INPUT)); + addInput(createInput(Vec(27, 281), module, SpringReverb::IN1_INPUT)); + addInput(createInput(Vec(67, 281), module, SpringReverb::IN2_INPUT)); + + addOutput(createOutput(Vec(7, 317), module, SpringReverb::MIX_OUTPUT)); + addInput(createInput(Vec(47, 324), module, SpringReverb::MIX_CV_INPUT)); + addOutput(createOutput(Vec(88, 317), module, SpringReverb::WET_OUTPUT)); addChild(createValueLight>(Vec(56, 114), &module->vuLights[0])); addChild(createValueLight>(Vec(56, 127), &module->vuLights[1]));