commit 45b528fff17902f3bd6d44548463a32b8c2c7bad
parent 45e62acc06e9173bd3ea312d1e29827a388a57d8
Author: Matt Demanett <matt@demanett.net>
Date: Tue, 23 Jan 2018 01:31:26 -0500
Detune: fixes.
Diffstat:
3 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/res-src/Detune-src.svg b/res-src/Detune-src.svg
@@ -100,9 +100,8 @@
<polyline points="0,0 45,0 45,380 0,380 0,0" stroke="#f2f2f2" stroke-width="1" fill="none" />
<!-- <polyline points="22.5,0 22.5,380" stroke-width="0.5" stroke="#0f0" /> -->
- <!-- <rect width="45" height="15" fill="#0f0" transform="translate(0 63)" /> -->
- <!-- <rect width="45" height="15" fill="#0f0" transform="translate(0 129)" /> -->
- <!-- <rect width="45" height="7" fill="#0f0" transform="translate(0 159)" /> -->
+ <!-- <rect width="45" height="10" fill="#0f0" transform="translate(0 64)" /> -->
+ <!-- <rect width="45" height="10" fill="#0f0" transform="translate(0 125)" /> -->
<g transform="rotate(-90) translate(-376 13)">
<text class="title" font-size="7pt" letter-spacing="2.5px">DETUNE</text>
@@ -114,11 +113,11 @@
<g transform="translate(0 25)">
<text font-size="6pt" letter-spacing="2px" transform="translate(5.5 0)">CENTS</text>
- <use id="CENTS_PARAM" xlink:href="#knob" transform="translate(0 -3)" />
- <use xlink:href="#knobguide" transform="translate(0 -3)" />
+ <use id="CENTS_PARAM" xlink:href="#knob" transform="translate(0 -2)" />
+ <use xlink:href="#knobguide" transform="translate(0 -2)" />
</g>
- <g transform="translate(5.5 73)">
+ <g transform="translate(5.5 74)">
<rect width="34" height="51" rx="5" fill="#fafafa" />
<use id="CV_INPUT" xlink:href="#input" transform="translate(5 3)" />
<text font-size="5pt" letter-spacing="2px" transform="translate(11 35)">CV</text>
@@ -129,7 +128,7 @@
</g>
</g>
- <g transform="translate(0 134)">
+ <g transform="translate(0 135)">
<g transform="translate(5.5 0)">
<rect width="34" height="10" fill="#fafafa" transform="translate(0 28)" />
<rect width="34" height="35" rx="5" fill="#fafafa" />
diff --git a/res/Detune.svg b/res/Detune.svg
Binary files differ.
diff --git a/src/Detune.cpp b/src/Detune.cpp
@@ -37,6 +37,7 @@ struct Detune : Module {
};
void Detune::step() {
+ lights[QUANTIZE_LIGHT].value = params[QUANTIZE_PARAM].value > 0.5;
if (!(outputs[OUT_PLUS_OUTPUT].active || outputs[OUT_MINUS_OUTPUT].active || outputs[THRU_OUTPUT].active)) {
return;
}
@@ -64,21 +65,16 @@ void Detune::step() {
}
}
else {
- const float frequency = 440.0;
- const float cv = frequencyToCV(frequency);
- const float semitone = frequencyToSemitone(frequency);
- outputs[THRU_OUTPUT].value = cv;
+ outputs[THRU_OUTPUT].value = 0.0;
if (cents < 0.001) {
- outputs[OUT_PLUS_OUTPUT].value = cv;
- outputs[OUT_MINUS_OUTPUT].value = cv;
+ outputs[OUT_PLUS_OUTPUT].value = 0.0;
+ outputs[OUT_MINUS_OUTPUT].value = 0.0;
}
else {
- outputs[OUT_PLUS_OUTPUT].value = semitoneToCV(semitone + cents);
- outputs[OUT_MINUS_OUTPUT].value = semitoneToCV(semitone - cents);
+ outputs[OUT_PLUS_OUTPUT].value = semitoneToCV(referenceSemitone + cents);
+ outputs[OUT_MINUS_OUTPUT].value = semitoneToCV(referenceSemitone - cents);
}
}
-
- lights[QUANTIZE_LIGHT].value = params[QUANTIZE_PARAM].value > 0.5;
}
@@ -98,17 +94,17 @@ DetuneWidget::DetuneWidget() {
addChild(createScrew<ScrewSilver>(Vec(box.size.x - 15, 365)));
// generated by svg_widgets.rb
- auto centsParamPosition = Vec(9.5, 31.5);
- auto quantizeParamPosition = Vec(26.9, 111.9);
+ auto centsParamPosition = Vec(9.5, 32.5);
+ auto quantizeParamPosition = Vec(26.9, 112.9);
- auto cvInputPosition = Vec(10.5, 76.0);
- auto inInputPosition = Vec(10.5, 137.0);
+ auto cvInputPosition = Vec(10.5, 77.0);
+ auto inInputPosition = Vec(10.5, 138.0);
- auto thruOutputPosition = Vec(10.5, 175.0);
- auto outPlusOutputPosition = Vec(10.5, 211.0);
- auto outMinusOutputPosition = Vec(10.5, 247.0);
+ auto thruOutputPosition = Vec(10.5, 176.0);
+ auto outPlusOutputPosition = Vec(10.5, 212.0);
+ auto outMinusOutputPosition = Vec(10.5, 248.0);
- auto quantizeLightPosition = Vec(21.0, 115.0);
+ auto quantizeLightPosition = Vec(21.0, 116.0);
// end generated by svg_widgets.rb
{
