Merge pull request #77 from robmarkcole/update-mqtt

[EVA-2020-02-2.git] / library / enviroplus / noise.py

diff --git a/library/enviroplus/noise.py b/library/enviroplus/noise.py
index 2e7472d1ea8120eec7739efeee989d358d7e728f..7b6d5e283d2990b345149d6f01369fbd8d88f4b6 100644 (file)
--- a/library/enviroplus/noise.py
+++ b/library/enviroplus/noise.py
@@ -73,10 +73,10 @@ class Noise():
         high_start = mid_start + int(sample_count * mid)
         noise_ceiling = high_start + int(sample_count * high)
 
         high_start = mid_start + int(sample_count * mid)
         noise_ceiling = high_start + int(sample_count * high)
 

-        amp_low = numpy.mean(magnitude[self.noise_floor:mid_start])
+        amp_low = numpy.mean(magnitude[noise_floor:mid_start])

         amp_mid = numpy.mean(magnitude[mid_start:high_start])
         amp_high = numpy.mean(magnitude[high_start:noise_ceiling])
         amp_mid = numpy.mean(magnitude[mid_start:high_start])
         amp_high = numpy.mean(magnitude[high_start:noise_ceiling])

-        amp_total = (low + mid + high) / 3.0
+        amp_total = (amp_low + amp_mid + amp_high) / 3.0

 
         return amp_low, amp_mid, amp_high, amp_total
 
 
         return amp_low, amp_mid, amp_high, amp_total