Bug fixing

okyeron · Feb 29, 2024 · 7208e67 · 7208e67
1 parent 91b52d7
commit 7208e67
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/OMX-27-firmware/src/midifx/midifx_arpeggiator.cpp b/OMX-27-firmware/src/midifx/midifx_arpeggiator.cpp
@@ -9,8 +9,6 @@
 
 namespace midifx
 {
- Micros nextArpTriggerTime_ = 0;
-
  enum ArpPage
  {
  ARPPAGE_1,
@@ -162,6 +160,15 @@ namespace midifx
  }
  }
 
+ MidiFXArpeggiator::~MidiFXArpeggiator()
+ {
+ if (arpRunning_)
+ {
+ // Remove from this
+ seqConfig.numOfActiveArps--;
+ }
+ }
+
  int MidiFXArpeggiator::getFXType()
  {
  return MIDIFX_ARP;
@@ -641,7 +648,7 @@ namespace midifx
 
  void MidiFXArpeggiator::doPendingStart()
  {
- Serial.println("doPendingStart()");
+ // Serial.println("doPendingStart()");
 
  // stepMicroDelta_ = (clockConfig.step_micros * 16) * multiplier_;
  multiplierCalculated_ = false;
@@ -695,7 +702,7 @@ namespace midifx
 
  seqConfig.numOfActiveArps++;
 
- Serial.println("numOfActiveArps: " + String(seqConfig.numOfActiveArps));
+ // Serial.println("numOfActiveArps: " + String(seqConfig.numOfActiveArps));
  }
 
  void MidiFXArpeggiator::stopArp()
@@ -714,7 +721,7 @@ namespace midifx
 
  void MidiFXArpeggiator::doPendingStop()
  {
- Serial.println("doPendingStop");
+ // Serial.println("doPendingStop");
  if (arpRunning_)
  {
  // Stop clocks if last arp
@@ -729,7 +736,7 @@ namespace midifx
  pendingStart_ = false;
  pendingStop_ = false;
 
- Serial.println("numOfActiveArps: " + String(seqConfig.numOfActiveArps));
+ // Serial.println("numOfActiveArps: " + String(seqConfig.numOfActiveArps));
  }
 
  bool MidiFXArpeggiator::insertMidiNoteQueue(MidiNoteGroup note)
@@ -1216,7 +1223,7 @@ namespace midifx
 
  uint8_t quantIndex = quantizedRateIndex_ < 0 ? clockConfig.globalQuantizeStepIndex : quantizedRateIndex_; // Use global or local quantize rate?
 
- bool isQuantizedStep = seqConfig.currentClockTick % (96 * 4 / kArpRates[quantIndex]) == 0;
+ bool isQuantizedStep = seqConfig.currentClockTick % ((96 * 4) / kArpRates[quantIndex]) == 0;
 
  // Move pending notes to active
  if(isQuantizedStep)

diff --git a/OMX-27-firmware/src/midifx/midifx_arpeggiator.h b/OMX-27-firmware/src/midifx/midifx_arpeggiator.h
@@ -67,7 +67,7 @@ namespace midifx
  {
  public:
  MidiFXArpeggiator();
- ~MidiFXArpeggiator() {}
+ ~MidiFXArpeggiator();
 
  int getFXType() override;
  const char *getName() override;
@@ -228,6 +228,8 @@ namespace midifx
 
  bool pendingStart_ = false;
  bool pendingStop_ = false;
+ Micros nextArpTriggerTime_;
+
  // Micros pendingStartTime_;
  // uint8_t pendingStopCount_ = 0;
 

diff --git a/OMX-27-firmware/src/midifx/midifx_repeat.cpp b/OMX-27-firmware/src/midifx/midifx_repeat.cpp
@@ -63,7 +63,15 @@ namespace midifx
  encoderSelect_ = true;
  }
 
- int MidiFXRepeat::getFXType()
+ MidiFXRepeat::~MidiFXRepeat()
+ {
+ if (seqRunning_)
+ {
+ seqConfig.numOfActiveArps--;
+ }
+ }
+
+ int MidiFXRepeat::getFXType()
  {
  return MIDIFX_REPEAT;
  }

diff --git a/OMX-27-firmware/src/midifx/midifx_repeat.h b/OMX-27-firmware/src/midifx/midifx_repeat.h
@@ -9,7 +9,7 @@ namespace midifx
  {
  public:
  MidiFXRepeat();
- ~MidiFXRepeat() {}
+ ~MidiFXRepeat();
 
  int getFXType() override;
  const char *getName() override;