Added getCount() to rms and peak

Author: boblark

analyze_peak_f32.cpp

@@ -64,6 +64,7 @@ void AudioAnalyzePeak_F32::update(void) {
 	min_sample = min;
 	max_sample = max;
 	new_output = true;    // Tell available() that data is available
+	count++;              // Number of blocks involved in peak determination
     AudioStream_F32::release(blockIn);
  }
 
@@ -77,6 +78,7 @@ float AudioAnalyzePeak_F32::read(void)  {
         min = abs(min);
         max = abs(max);
         if (min > max) max = min;
+        count = 0;     // Reset
         return max;
     }
 
@@ -86,5 +88,6 @@ float AudioAnalyzePeak_F32:: readPeakToPeak(void) {
         float32_t min = min_sample;
         float32_t max = max_sample;
         __enable_irq();
+        count = 0;       // Reset
         return (max - min);
     }

analyze_peak_f32.h

@@ -81,6 +81,11 @@ class AudioAnalyzePeak_F32 : public AudioStream_F32 {
         errorPrint = e;
     }
 
+    // Returns the number blocks included in peak calculation.
+    uint32_t getCount(void) {
+        return count;
+    }
+
     virtual void update(void);
     float32_t read(void);
     float32_t readPeakToPeak(void);
@@ -92,7 +97,8 @@ class AudioAnalyzePeak_F32 : public AudioStream_F32 {
     volatile bool just_read = true;
     float32_t min_sample;
     float32_t max_sample;
-
+    uint32_t count = 0;
+    
     // Control error printing in update().  Should never be enabled
     // until all audio objects have been initialized.
     // Only used as 0 or 1 now, but 16 bits are available.

analyze_rms_f32.h

@@ -78,10 +78,17 @@ class AudioAnalyzeRMS_F32 : public AudioStream_F32 {
         return count > 0;
     }
 
+    // Returns the number of 128 sample blocks included in rms calculation.
+    uint32_t getCount(void) {
+        return count;
+    }
+
     void showError(uint16_t e) {  // 0/1 Disables/Enables printing of update() errors
         errorPrint = e;
     }
 
+    // Returns the square root of average power over count blocks of 128 power samples.
+    // Also clears the power accumulator and can be used for this.
     float read(void);
 
     virtual void update(void);
@@ -93,7 +100,7 @@ class AudioAnalyzeRMS_F32 : public AudioStream_F32 {
     // whereas float range for positive numbers is 2^23 =~ 1E7 so double is easily justified for accuracy. 
     // The timing 7 microseconds per 128, includes using double for accum, so the price is reasonable.
     double accum = 0.0;
-       uint32_t count = 0;
+    uint32_t count = 0;
 
     // Control error printing in update().  Should never be enabled
     // until all audio objects have been initialized.