Skip to content

Commit dc0290e

Browse files
committed
Code refactoring: use two different function to compute frequency by RPM and PSD by RPM
1 parent 64be79d commit dc0290e

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/graph_spectrum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
139139
break;
140140

141141
case SPECTRUM_TYPE.PSD_VS_RPM:
142-
fftData = GraphSpectrumCalc.dataLoadFrequencyVsRpm(true);
142+
fftData = GraphSpectrumCalc.dataLoadPowerSpectralDensityVsRpm();
143143
break;
144144

145145
case SPECTRUM_TYPE.PIDERROR_VS_SETPOINT:

src/graph_spectrum_calc.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,9 +308,15 @@ GraphSpectrumCalc.dataLoadPowerSpectralDensityVsThrottle = function() {
308308
return this._dataLoadPowerSpectralDensityVsX(FIELD_THROTTLE_NAME, 0, 100);
309309
};
310310

311-
GraphSpectrumCalc.dataLoadFrequencyVsRpm = function(drawPSD = false) {
312-
const fftData = drawPSD ? this._dataLoadPowerSpectralDensityVsX(FIELD_RPM_NAMES, 0) :
313-
this._dataLoadFrequencyVsX(FIELD_RPM_NAMES, 0);
311+
GraphSpectrumCalc.dataLoadFrequencyVsRpm = function() {
312+
const fftData = this._dataLoadFrequencyVsX(FIELD_RPM_NAMES, 0);
313+
fftData.vsRange.max *= 3.333 / this._motorPoles;
314+
fftData.vsRange.min *= 3.333 / this._motorPoles;
315+
return fftData;
316+
};
317+
318+
GraphSpectrumCalc.dataLoadPowerSpectralDensityVsRpm = function() {
319+
const fftData = this._dataLoadPowerSpectralDensityVsX(FIELD_RPM_NAMES, 0);
314320
fftData.vsRange.max *= 3.333 / this._motorPoles;
315321
fftData.vsRange.min *= 3.333 / this._motorPoles;
316322
return fftData;

0 commit comments

Comments
 (0)