Merge pull request #491 from bw1129/SpectralTool

betaflight · Jan 5, 2021 · 973f354 · 973f354
2 parents dfbbcc5 + 7b44038
commit 973f354
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/js/graph_spectrum_calc.js b/js/graph_spectrum_calc.js
@@ -87,13 +87,14 @@ GraphSpectrumCalc.dataLoadFrequencyVsThrottle = function() {
 
         var fftInput = flightSamples.samples.slice(fftChunkIndex, fftChunkIndex + fftChunkLength);
         var fftOutput = new Float64Array(fftChunkLength * 2);
-
-        fft.simple(fftOutput, fftInput, 'real');
-
+
+        // Hanning window applied to input data
         if(userSettings.analyserHanning) {
-            this._hanningWindow(fftOutput, fftChunkLength * 2);
+            this._hanningWindow(fftInput, fftChunkLength);
         }
 
+        fft.simple(fftOutput, fftInput, 'real');
+
         fftOutput = fftOutput.slice(0, fftChunkLength);
 
         // Use only abs values

diff --git a/js/user_settings_dialog.js b/js/user_settings_dialog.js
@@ -60,7 +60,7 @@ function UserSettingsDialog(dialog, onLoad, onSave) {
         graphExpoOverride   : true,             // Ability to toggle Expo off=normal/ on=force 100%
         graphGridOverride   : true,             // Ability to toggle Grid off=normal/ on=force disabled
 		analyserSampleRate	: 2000/*Hz*/,  		// the loop time for the log
-		analyserHanning	    : false,  			// use a hanning window on the analyser sample data
+		analyserHanning	    : true,  			// use a hanning window on the analyser sample data
 		eraseBackground		: true,           	// Set to false if you want the graph to draw on top of an existing canvas image
 		spectrumType        : 0,                // By default, frequency Spectrum
 		overdrawSpectrumType: 0,                // By default, show all filters