Refactor, optimize, change version numbers

teknico · Jan 21, 2023 · 2f181ff · 2f181ff
1 parent bfc3234
commit 2f181ff
Show file tree

Hide file tree

Showing 2 changed files with 107 additions and 108 deletions.
diff --git a/linnstrument-firmware.ino b/linnstrument-firmware.ino
@@ -56,8 +56,9 @@ For any questions about this, contact Roger Linn Design at support@rogerlinndesi
 
 /******************************************** CONSTANTS ******************************************/
 
-const char* OSVersion = "231.";
-const char* OSVersionBuild = ".066";
+// Version numbers for custom, unofficial changes by teknico
+const char* OSVersion = "t01";
+const char* OSVersionBuild = "001";
 
 // SPI addresses
 #define SPI_LEDS    10               // Arduino pin for LED control over SPI

diff --git a/ls_handleTouches.ino b/ls_handleTouches.ino
@@ -545,13 +545,111 @@ boolean hasYExpressiveNotes() {
     (Split[sensorSplit].expressionForY == timbrePolyPressure));
 }
 
+// Is this value higher than all other notes on this channel?
+// TODO: use a sorted multimap to avoid looping
+boolean isMaxY(short valueY) {
+  byte curVal = 0;
+
+  // iterate over all the rows...
+  byte beginRow = 0;
+  byte endRow = NUMROWS;
+  // ...or just this one when in ChannelPerRow mode
+  if (Split[sensorSplit].midiMode == channelPerRow) {
+    beginRow = sensorRow;
+    endRow = sensorRow + 1;
+  }
+
+  int32_t colsInRowTouched = 0;
+  for (byte row = beginRow; row < endRow; ++row) {
+    colsInRowTouched = colsInRowsTouched[row];
+
+    // exclude the current cell
+    if (row == sensorRow) {
+      colsInRowTouched = colsInRowTouched & ~(1 << sensorCol);
+    }
+
+    // continue while there are touched columns in the row
+    while (colsInRowTouched) {
+      byte touchedCol = 31 - __builtin_clz(colsInRowTouched);
+
+      // compare the Y value of the cell to the current maximum if the cell
+      // is on the same channel
+      curVal = cell(touchedCol, row).calibratedY();
+      if (cell(touchedCol, row).touched == touchedCell &&
+          cell(touchedCol, row).channel == sensorCell->channel) {
+
+        if (valueY < curVal) {
+          // Found a higher value already, no need to look at the other ones
+          return false;
+        }
+      }
+
+      // exclude the cell we just processed by flipping its bit
+      colsInRowTouched &= ~(1 << touchedCol);
+    }
+  }
+
+  // No higher value found, we're it
+  return true;
+}
+
 // Individually expressive notes on the same channel
 // only when there's just one note, or using PolyAT
 boolean hasZExpressiveNotes() {
   return ((countTouchesForMidiChannel(sensorSplit, sensorCol, sensorRow) == 1) ||
     (Split[sensorSplit].expressionForZ == loudnessPolyPressure));
 }
 
+
+// Is this value higher than all other notes on this channel?
+// TODO: isMaxY and isMaxZ could be collapsed by adding a getPressureZ method to TouchInfo
+boolean isMaxZ(unsigned short valueZHi) {
+  unsigned short curVal = 0;
+
+  // iterate over all the rows...
+  byte beginRow = 0;
+  byte endRow = NUMROWS;
+  // ...or just this one when in ChannelPerRow mode
+  if (Split[sensorSplit].midiMode == channelPerRow) {
+    beginRow = sensorRow;
+    endRow = sensorRow + 1;
+  }
+
+  int32_t colsInRowTouched = 0;
+  for (byte row = beginRow; row < endRow; ++row) {
+    colsInRowTouched = colsInRowsTouched[row];
+
+    // exclude the current cell
+    if (row == sensorRow) {
+      colsInRowTouched = colsInRowTouched & ~(1 << sensorCol);
+    }
+
+    // continue while there are touched columns in the row
+    while (colsInRowTouched) {
+      byte touchedCol = 31 - __builtin_clz(colsInRowTouched);
+
+      // compare the Z value of the cell to the current maximum if the cell
+      // is on the same channel
+      curVal = cell(touchedCol, row).pressureZ;
+      if (cell(touchedCol, row).touched == touchedCell &&
+          cell(touchedCol, row).channel == sensorCell->channel &&
+          curVal != INVALID_DATA) {
+
+        if (valueZHi < curVal) {
+          // Found a higher value already, no need to look at the other ones
+          return false;
+        }
+      }
+
+      // exclude the cell we just processed by flipping its bit
+      colsInRowTouched &= ~(1 << touchedCol);
+    }
+  }
+
+  // No higher value found, we're it
+  return true;
+}
+
 byte takeChannel(byte split, byte row) {
   switch (Split[split].midiMode)
   {
@@ -1029,59 +1127,9 @@ boolean handleXYZupdate() {
 
       // if Y-axis movements are enabled and it's a candidate for
       // X/Y expression based on the MIDI mode and the currently held down cells
-      if (valueY != INVALID_DATA && Split[sensorSplit].sendY) {
-        if (hasYExpressiveNotes()) {
-          preSendTimbre(sensorSplit, valueY, sensorCell->note, sensorCell->channel);
-        }
-        // Check all notes, not just the last played one (focused)
-        else {
-          // Only send this value if it's the highest on this channel
-          unsigned short maxTimbre = 0;
-          unsigned short curTimbre = 0;
-
-          // iterate over all the rows...
-          byte beginRow = 0;
-          byte endRow = NUMROWS;
-          // ...or just this one when in ChannelPerRow mode
-          if (Split[sensorSplit].midiMode == channelPerRow) {
-            beginRow = sensorRow;
-            endRow = sensorRow + 1;
-          }
-
-          int32_t colsInRowTouched = 0;
-          for (byte row = beginRow; row < endRow; ++row) {
-            colsInRowTouched = colsInRowsTouched[row];
-
-            // exclude the current sensor
-            if (row == sensorRow) {
-              colsInRowTouched = colsInRowTouched & ~(1 << sensorCol);
-            }
-
-            // continue while there are touched columns in the row
-            while (colsInRowTouched) {
-              byte touchedCol = 31 - __builtin_clz(colsInRowTouched);
-
-              // compare the Y value of the cell to the current maximum if the cell
-              // is on the same channel
-              curTimbre = cell(touchedCol, row).calibratedY();
-              if (cell(touchedCol, row).touched == touchedCell &&
-                  cell(touchedCol, row).channel == sensorCell->channel &&
-                  curTimbre != INVALID_DATA) {
-
-                if (curTimbre > maxTimbre) {
-                  maxTimbre = curTimbre;
-                }
-              }
-
-              // exclude the cell we just processed by flipping its bit
-              colsInRowTouched &= ~(1 << touchedCol);
-            }
-          }
-
-          if (valueY > maxTimbre) {
-            preSendTimbre(sensorSplit, valueY, sensorCell->note, sensorCell->channel);
-          }
-        }
+      // Check the max value for each note against all others, not just the last played one (focused)
+      if (valueY != INVALID_DATA && Split[sensorSplit].sendY && (hasYExpressiveNotes() || isMaxY(valueY))) {
+        preSendTimbre(sensorSplit, valueY, sensorCell->note, sensorCell->channel);
       }
 
       // send the note on if this in a newly calculated velocity
@@ -1102,59 +1150,9 @@ boolean handleXYZupdate() {
 
       // if sensing Z is enabled...
       // send different pressure update depending on midiMode
-      if (Split[sensorSplit].sendZ) {
-        if (hasZExpressiveNotes()) {
-          preSendLoudness(sensorSplit, valueZ, valueZHi, sensorCell->note, sensorCell->channel);
-        }
-        // Check all notes, not just the last played one (focused)
-        else {
-          // Only send this value if it's the highest on this channel
-          unsigned short maxLoudnessHi = 0;
-          unsigned short curLoudnessHi = 0;
-
-          // iterate over all the rows...
-          byte beginRow = 0;
-          byte endRow = NUMROWS;
-          // ...or just this one when in ChannelPerRow mode
-          if (Split[sensorSplit].midiMode == channelPerRow) {
-            beginRow = sensorRow;
-            endRow = sensorRow + 1;
-          }
-
-          int32_t colsInRowTouched = 0;
-          for (byte row = beginRow; row < endRow; ++row) {
-            colsInRowTouched = colsInRowsTouched[row];
-
-            // exclude the current sensor
-            if (row == sensorRow) {
-              colsInRowTouched = colsInRowTouched & ~(1 << sensorCol);
-            }
-
-            // continue while there are touched columns in the row
-            while (colsInRowTouched) {
-              byte touchedCol = 31 - __builtin_clz(colsInRowTouched);
-
-              // compare the Z value of the cell to the current maximum if the cell
-              // is on the same channel
-              curLoudnessHi = cell(touchedCol, row).pressureZ;
-              if (cell(touchedCol, row).touched == touchedCell &&
-                  cell(touchedCol, row).channel == sensorCell->channel &&
-                  curLoudnessHi != INVALID_DATA) {
-
-                if (curLoudnessHi > maxLoudnessHi) {
-                  maxLoudnessHi = curLoudnessHi;
-                }
-              }
-
-              // exclude the cell we just processed by flipping its bit
-              colsInRowTouched &= ~(1 << touchedCol);
-            }
-          }
-
-          if (valueZHi > maxLoudnessHi) {
-            preSendLoudness(sensorSplit, valueZ, valueZHi, sensorCell->note, sensorCell->channel);
-          }
-        }
+      // Check the max value for each note against all others, not just the last played one (focused)
+      if (Split[sensorSplit].sendZ && (hasZExpressiveNotes() || isMaxZ(valueZHi))) {
+        preSendLoudness(sensorSplit, valueZ, valueZHi, sensorCell->note, sensorCell->channel);
       }
 
       // after the initial velocity, new velocity values are continuously being calculated simply based