commit 7ca67699a501cef724f3a809d845e09d9fcc2d9e
parent 8468586b6cf60b45ae265e25c870ee1549b95b96
Author: Matt Demanett <matt@demanett.net>
Date: Wed, 28 Mar 2018 22:47:59 -0400
8FO fixes.
Diffstat:
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/res-src/EightFO-src.svg b/res-src/EightFO-src.svg
@@ -101,20 +101,20 @@
</g>
<g transform="translate(14 8)">
<!-- <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" />
+ <polyline points="0,8 12,0 12,8" stroke-width="1" stroke="#333" fill="none" />
</g>
<g transform="translate(33.5 13.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" />
+ <polyline points="0,8 0,0 12,8" stroke-width="1" stroke="#333" fill="none" />
</g>
<g transform="translate(39 31)">
<!-- <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" />
+ <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(33.5 48.5)">
<!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
- <polyline points="0,8 0,0 12,8" stroke-width="1" stroke="#333" fill="none" />
+ <polyline points="0,4 3,0 9,8 12,4" stroke-width="1" stroke="#333" fill="none" />
</g>
<g transform="translate(14 54)">
<!-- <rect width="12" height="8" fill="none" stroke-width="1" stroke="#0f0" /> -->
@@ -276,6 +276,7 @@
<!-- <polyline points="0,0 170,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(10 13)" /> -->
<g transform="translate(10 0)">
<use id="WAVE_PARAM" xlink:href="#knob-smallest" transform="translate(0 5)" />
+ <!-- <rect width="60" height="60" fill="none" stroke="#0f0" transform="translate(-10 -30) translate(8 13)" /> -->
</g>
<g transform="translate(70 0)">
<!-- <polyline points="0,0 170,0" stroke="#f00" stroke-width="1" fill="none" transform="translate(-10 -10)" /> -->
@@ -332,6 +333,7 @@
<use id="PHASE1_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
</g>
<g transform="translate(0 280)">
+ <!-- <polyline points="0,0 200,0" stroke="#0f0" stroke-width="1" fill="none" transform="translate(0 12)" /> -->
<use id="PHASE0_PARAM" xlink:href="#knob-smallest" transform="translate(4 4)" />
</g>
</g>
diff --git a/res/EightFO.svg b/res/EightFO.svg
Binary files differ.
diff --git a/src/EightFO.cpp b/src/EightFO.cpp
@@ -210,11 +210,12 @@ struct EightFOWidget : ModuleWidget {
addParam(ParamWidget::create<Knob68>(frequencyParamPosition, module, EightFO::FREQUENCY_PARAM, 0.0f, 1.0f, 0.5f));
{
- auto w = ParamWidget::create<Knob16>(waveParamPosition, module, EightFO::WAVE_PARAM, 1.0, 5.0, 5.0);
+ auto w = ParamWidget::create<Knob16>(waveParamPosition, module, EightFO::WAVE_PARAM, 1.0, 5.0, 3.0);
auto k = dynamic_cast<SVGKnob*>(w);
k->snap = true;
k->minAngle = 0.0;
k->maxAngle = M_PI;
+ k->speed = 2.0;
addParam(w);
}
addParam(ParamWidget::create<StatefulButton9>(slowParamPosition, module, EightFO::SLOW_PARAM, 0.0, 1.0, 0.0));
diff --git a/src/EightFO.hpp b/src/EightFO.hpp
@@ -64,10 +64,10 @@ struct EightFO : Module {
enum Wave {
NO_WAVE,
- SINE_WAVE,
- TRIANGLE_WAVE,
RAMP_UP_WAVE,
RAMP_DOWN_WAVE,
+ SINE_WAVE,
+ TRIANGLE_WAVE,
SQUARE_WAVE
};
