commit 538817a5f18b4ff81257da2b7c891372245f4548
parent a2033c875f36fccd2f5ab48cb51ce35b81faffca
Author: Matt Demanett <matt@demanett.net>
Date: Sun, 5 May 2019 00:05:02 -0400
8:1, 1:8, ADDR-SEQ: make 1 an option for sequence length. #46
Diffstat:
9 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/res-src/AddrSeq-src.svg b/res-src/AddrSeq-src.svg
@@ -54,12 +54,13 @@
<symbol id="knobguide-steps" viewBox="0 0 40px 40px">
<g transform="translate(20 20)">
- <text font-size="5.0pt" transform="rotate(-240) translate(13 0) rotate(240) translate(-2 2)">2</text>
- <text font-size="5.0pt" transform="rotate(-190) translate(13 0) rotate(190) translate(-2 2)">3</text>
- <text font-size="5.0pt" transform="rotate(-140) translate(13 0) rotate(140) translate(-2 2)">4</text>
- <text font-size="5.0pt" transform="rotate(-90) translate(13 0) rotate(90) translate(-2 2)">5</text>
- <text font-size="5.0pt" transform="rotate(-40) translate(13 0) rotate(40) translate(-2 2)">6</text>
- <text font-size="5.0pt" transform="rotate(10) translate(13 0) rotate(-10) translate(-2 2)">7</text>
+ <text font-size="5.0pt" transform="rotate(-240) translate(13 0) rotate(240) translate(-2 2)">1</text>
+ <text font-size="5.0pt" transform="rotate(-197.1) translate(13 0) rotate(197.1) translate(-2 2)">2</text>
+ <text font-size="5.0pt" transform="rotate(-154.3) translate(13 0) rotate(154.3) translate(-2 2)">3</text>
+ <text font-size="5.0pt" transform="rotate(-111.4) translate(13 0) rotate(111.4) translate(-2 2)">4</text>
+ <text font-size="5.0pt" transform="rotate(-68.6) translate(13 0) rotate(68.6) translate(-2 2)">5</text>
+ <text font-size="5.0pt" transform="rotate(-25.7) translate(13 0) rotate(25.7) translate(-2 2)">6</text>
+ <text font-size="5.0pt" transform="rotate(17.1) translate(13 0) rotate(-17.1) translate(-2 2)">7</text>
<text font-size="5.0pt" transform="rotate(60) translate(13 0) rotate(-60) translate(-2 2)">8</text>
</g>
</symbol>
diff --git a/res-src/EightOne-src.svg b/res-src/EightOne-src.svg
@@ -54,12 +54,13 @@
<symbol id="knobguide-steps" viewBox="0 0 40px 40px">
<g transform="translate(20 20)">
- <text font-size="5.0pt" transform="rotate(-240) translate(13 0) rotate(240) translate(-2 2)">2</text>
- <text font-size="5.0pt" transform="rotate(-190) translate(13 0) rotate(190) translate(-2 2)">3</text>
- <text font-size="5.0pt" transform="rotate(-140) translate(13 0) rotate(140) translate(-2 2)">4</text>
- <text font-size="5.0pt" transform="rotate(-90) translate(13 0) rotate(90) translate(-2 2)">5</text>
- <text font-size="5.0pt" transform="rotate(-40) translate(13 0) rotate(40) translate(-2 2)">6</text>
- <text font-size="5.0pt" transform="rotate(10) translate(13 0) rotate(-10) translate(-2 2)">7</text>
+ <text font-size="5.0pt" transform="rotate(-240) translate(13 0) rotate(240) translate(-2 2)">1</text>
+ <text font-size="5.0pt" transform="rotate(-197.1) translate(13 0) rotate(197.1) translate(-2 2)">2</text>
+ <text font-size="5.0pt" transform="rotate(-154.3) translate(13 0) rotate(154.3) translate(-2 2)">3</text>
+ <text font-size="5.0pt" transform="rotate(-111.4) translate(13 0) rotate(111.4) translate(-2 2)">4</text>
+ <text font-size="5.0pt" transform="rotate(-68.6) translate(13 0) rotate(68.6) translate(-2 2)">5</text>
+ <text font-size="5.0pt" transform="rotate(-25.7) translate(13 0) rotate(25.7) translate(-2 2)">6</text>
+ <text font-size="5.0pt" transform="rotate(17.1) translate(13 0) rotate(-17.1) translate(-2 2)">7</text>
<text font-size="5.0pt" transform="rotate(60) translate(13 0) rotate(-60) translate(-2 2)">8</text>
</g>
</symbol>
diff --git a/res-src/OneEight-src.svg b/res-src/OneEight-src.svg
@@ -54,12 +54,13 @@
<symbol id="knobguide-steps" viewBox="0 0 40px 40px">
<g transform="translate(20 20)">
- <text font-size="5.0pt" transform="rotate(-240) translate(13 0) rotate(240) translate(-2 2)">2</text>
- <text font-size="5.0pt" transform="rotate(-190) translate(13 0) rotate(190) translate(-2 2)">3</text>
- <text font-size="5.0pt" transform="rotate(-140) translate(13 0) rotate(140) translate(-2 2)">4</text>
- <text font-size="5.0pt" transform="rotate(-90) translate(13 0) rotate(90) translate(-2 2)">5</text>
- <text font-size="5.0pt" transform="rotate(-40) translate(13 0) rotate(40) translate(-2 2)">6</text>
- <text font-size="5.0pt" transform="rotate(10) translate(13 0) rotate(-10) translate(-2 2)">7</text>
+ <text font-size="5.0pt" transform="rotate(-240) translate(13 0) rotate(240) translate(-2 2)">1</text>
+ <text font-size="5.0pt" transform="rotate(-197.1) translate(13 0) rotate(197.1) translate(-2 2)">2</text>
+ <text font-size="5.0pt" transform="rotate(-154.3) translate(13 0) rotate(154.3) translate(-2 2)">3</text>
+ <text font-size="5.0pt" transform="rotate(-111.4) translate(13 0) rotate(111.4) translate(-2 2)">4</text>
+ <text font-size="5.0pt" transform="rotate(-68.6) translate(13 0) rotate(68.6) translate(-2 2)">5</text>
+ <text font-size="5.0pt" transform="rotate(-25.7) translate(13 0) rotate(25.7) translate(-2 2)">6</text>
+ <text font-size="5.0pt" transform="rotate(17.1) translate(13 0) rotate(-17.1) translate(-2 2)">7</text>
<text font-size="5.0pt" transform="rotate(60) translate(13 0) rotate(-60) translate(-2 2)">8</text>
</g>
</symbol>
diff --git a/res/AddrSeq.svg b/res/AddrSeq.svg
Binary files differ.
diff --git a/res/EightOne.svg b/res/EightOne.svg
Binary files differ.
diff --git a/res/OneEight.svg b/res/OneEight.svg
Binary files differ.
diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp
@@ -19,7 +19,7 @@ void AddrSeq::step() {
bool timer = _timer.next();
bool clock = _clock.process(inputs[CLOCK_INPUT].value) && !timer;
- int steps = clamp(params[STEPS_PARAM].value, 2.0f, 8.0f);
+ int steps = clamp(params[STEPS_PARAM].value, 1.0f, 8.0f);
int reverse = 1 - 2 * (params[DIRECTION_PARAM].value == 0.0f);
_step = (_step + reverse * clock) % steps;
_step += (_step < 0) * steps;
@@ -82,7 +82,7 @@ struct AddrSeqWidget : ModuleWidget {
// end generated by svg_widgets.rb
{
- auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, AddrSeq::STEPS_PARAM, 2.0, 8.0, 8.0);
+ auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, AddrSeq::STEPS_PARAM, 1.0, 8.0, 8.0);
dynamic_cast<Knob*>(w)->snap = true;
addParam(w);
}
diff --git a/src/EightOne.cpp b/src/EightOne.cpp
@@ -19,7 +19,7 @@ void EightOne::step() {
bool timer = _timer.next();
bool clock = _clock.process(inputs[CLOCK_INPUT].value) && !timer;
- int steps = clamp(params[STEPS_PARAM].value, 2.0f, 8.0f);
+ int steps = clamp(params[STEPS_PARAM].value, 1.0f, 8.0f);
int reverse = 1 - 2 * (params[DIRECTION_PARAM].value == 0.0f);
_step = (_step + reverse * clock) % steps;
_step += (_step < 0) * steps;
@@ -82,7 +82,7 @@ struct EightOneWidget : ModuleWidget {
// end generated by svg_widgets.rb
{
- auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, EightOne::STEPS_PARAM, 2.0, 8.0, 8.0);
+ auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, EightOne::STEPS_PARAM, 1.0, 8.0, 8.0);
dynamic_cast<Knob*>(w)->snap = true;
addParam(w);
}
diff --git a/src/OneEight.cpp b/src/OneEight.cpp
@@ -19,7 +19,7 @@ void OneEight::step() {
bool timer = _timer.next();
bool clock = _clock.process(inputs[CLOCK_INPUT].value) && !timer;
- int steps = clamp(params[STEPS_PARAM].value, 2.0f, 8.0f);
+ int steps = clamp(params[STEPS_PARAM].value, 1.0f, 8.0f);
int reverse = 1 - 2 * (params[DIRECTION_PARAM].value == 0.0f);
_step = (_step + reverse * clock) % steps;
_step += (_step < 0) * steps;
@@ -81,7 +81,7 @@ struct OneEightWidget : ModuleWidget {
// end generated by svg_widgets.rb
{
- auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, OneEight::STEPS_PARAM, 2.0, 8.0, 8.0);
+ auto w = ParamWidget::create<Knob16>(stepsParamPosition, module, OneEight::STEPS_PARAM, 1.0, 8.0, 8.0);
dynamic_cast<Knob*>(w)->snap = true;
addParam(w);
}