cleanup

Puara · Jan 7, 2025 · bca9c96 · bca9c96
1 parent f98fc2c
commit bca9c96
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 37 deletions.
diff --git a/exampleProjects/touch/.gitignore b/exampleProjects/touch/.gitignore
diff --git a/include/puara/descriptors/touch.h b/include/puara/descriptors/touch.h
@@ -41,17 +41,17 @@ class Touch
 {
 public:
   static constexpr int maxNumBlobs = BlobDetector::maxNumBlobs;
-  float touchAll{};                 // f, 0--1
-  float touchTop{};                 // f, 0--1
-  float touchMiddle{};              // f, 0--1
-  float touchBottom{};              // f, 0--1
+  float touchAll{};    // f, 0--1
+  float touchTop{};    // f, 0--1
+  float touchMiddle{}; // f, 0--1
+  float touchBottom{}; // f, 0--1
 
   /** brush: direction and intensity of capsense brush motion in ~cm/s (distance between stripes = ~1.5cm) */
-  float brush{};               // f, 0--? (~cm/s)
+  float brush{};
   Brush brushes[maxNumBlobs];
 
   /** rub: intensity of rub motion in ~cm/s (distance between stripes = ~1.5cm) */
-  float rub{};                 // f, 0--? (~cm/s)
+  float rub{};
   Rub rubs[maxNumBlobs];
 
   // touch array

diff --git a/include/puara/utils.h b/include/puara/utils.h
@@ -35,32 +35,6 @@ inline unsigned long long getCurrentTimeMicroseconds()
   return duration.count();
 }
 
-/**
- * @brief Legacy function used to calculate 1D blob detection in older
- * digital musical instruments
- */
-inline void bitShiftArrayL(int* origArray, int* shiftedArray, int arraySize, int shift)
-{
-  for(int i = 0; i < arraySize; ++i)
-  {
-    shiftedArray[i] = origArray[i];
-  }
-  for(int k = 0; k < shift; ++k)
-  {
-    for(int i = 0; i < arraySize; ++i)
-    {
-      if(i == (arraySize - 1))
-      {
-        shiftedArray[i] = (shiftedArray[i] << 1);
-      }
-      else
-      {
-        shiftedArray[i] = (shiftedArray[i] << 1) | (shiftedArray[i + 1] >> 7);
-      }
-    }
-  }
-}
-
 /**
  * @brief Computes the average of elements in an array over a specified range.
  *
@@ -140,6 +114,32 @@ inline double arrayAverageZero(T* Array, int ArraySize)
   return output;
 }
 
+/**
+ * @brief Legacy function used to calculate 1D blob detection in older
+ * digital musical instruments
+ */
+inline void bitShiftArrayL(int* origArray, int* shiftedArray, int arraySize, int shift)
+{
+  for(int i = 0; i < arraySize; ++i)
+  {
+    shiftedArray[i] = origArray[i];
+  }
+  for(int k = 0; k < shift; ++k)
+  {
+    for(int i = 0; i < arraySize; ++i)
+    {
+      if(i == (arraySize - 1))
+      {
+        shiftedArray[i] = (shiftedArray[i] << 1);
+      }
+      else
+      {
+        shiftedArray[i] = (shiftedArray[i] << 1) | (shiftedArray[i + 1] >> 7);
+      }
+    }
+  }
+}
+
 namespace convert
 {