computerscare-vcv-modules

commit bfc30dd9a961635a10246fcfe4b17abbe3e3fb10
parent 60a5728f62d6703aa75cbd06cb93239adbc42b9a
Author: Adam M <[email protected]>
Date:   Sat,  5 Jan 2019 22:53:38 -0600

move the display over, tighten the wiggle

Diffstat:
M
src/ComputerscareILoveCookies.cpp
 | 
2
+-
M
src/ComputerscareLaundrySoup.cpp
 | 
15
++++++++++-----

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/ComputerscareILoveCookies.cpp b/src/ComputerscareILoveCookies.cpp
@@ -166,7 +166,7 @@ ComputerscareILoveCookies() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LI
    for(int i = 0; i < numKnobs; i++) {
       float prev = params[KNOB_PARAM+i].value;
       if(randomUniform() < 0.7) {
-        float rv = (10*randomUniform()+prev)/2;
+        float rv = (10*randomUniform()+2*prev)/3;
         this->smallLetterKnobs[i]->setValue(rv);
         params[KNOB_PARAM+i].value = rv;
       }
diff --git a/src/ComputerscareLaundrySoup.cpp b/src/ComputerscareLaundrySoup.cpp
@@ -286,18 +286,23 @@ void ComputerscareLaundrySoup::step() {
       }
 
       atFirstStep = (this->laundrySequences[i].readHead == 0);
-
-      if((currentResetActive && currentResetTriggered) || (!currentResetActive && globalResetTriggered) || globalManualResetClicked || currentManualResetClicked) {
+      if(globalManualResetClicked || currentManualResetClicked) {
+        setChangeImminent(i,true);
         checkIfShouldChange(i);
         resetOneOfThem(i);
       }
+      if( (currentResetActive && currentResetTriggered) || (!currentResetActive && globalResetTriggered)) {
+        
+        setChangeImminent(i,false);
+        checkIfShouldChange(i);
+        resetOneOfThem(i);
+
+      }
       else {
         if(atFirstStep && !currentResetActive && !inputs[GLOBAL_RESET_INPUT].active) {
           checkIfShouldChange(i);
         }
       }
-        //activeStep = true;
-      //activeStep = (this->laundrySequences[i].peekWorkingStep() == 1);
     }
 
     if(inputs[CLOCK_INPUT + i].active) {
@@ -368,7 +373,7 @@ struct ComputerscareLaundrySoupWidget : ModuleWidget {
 
       // active / total steps display
       smallLetterDisplay = new SmallLetterDisplay();
-      smallLetterDisplay->box.pos = mm2px(Vec(20,verticalStart - 9.2 +verticalSpacing*i));
+      smallLetterDisplay->box.pos = mm2px(Vec(22,verticalStart - 9.2 +verticalSpacing*i));
       smallLetterDisplay->box.size = Vec(60, 30);
       smallLetterDisplay->value = std::to_string(3);
       smallLetterDisplay->baseColor = COLOR_COMPUTERSCARE_LIGHT_GREEN;