Update THD calculation

billthefarmer · Nov 23, 2023 · ad5c53b · ad5c53b
1 parent 0a89eaa
commit ad5c53b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/billthefarmer/scope/SpectrumActivity.java b/src/main/java/org/billthefarmer/scope/SpectrumActivity.java
@@ -701,7 +701,7 @@ protected void processAudio()
                         sumf += xa[i] * xa[i];
 
                     // Sum the harmonics
-                    else if (Math.IEEEremainder(xf[i], frequency) <
+                    else if (Math.abs(Math.IEEEremainder(xf[i], frequency)) <
                              Math.round(xf[i] / frequency) * fps)
                         sumh += xa[i] * xa[i];
 
@@ -726,10 +726,11 @@ else if (Math.IEEEremainder(xf[i], frequency) <
                 if (max > MIN)
                 {
                     final String s = String.format(Locale.getDefault(),
-                                                   "%1.0f%% %1.1fHz  %1.1fdB",
+                                                   "%1.0f%%  %1.1fHz  %1.1fdB",
                                                    thd, frequency, dB);
                     text.post(() -> text.setText(s));
                 }
+
                 else
                 {
                     frequency = 0.0;