Merge branch 'master' into 20250613_AI_ensure_poweres_of_two

Author: nerdCopter

index.html

@@ -459,7 +459,6 @@ <h4>Workspace</h4>
                                 <option value="1">Freq. vs Throttle</option>
                                 <option value="3">Freq. vs RPM</option>
                                 <option value="2">Error vs Setpoint</option>
-                                <option value="4">Power spectral density</option>
                             </select>
                         </div>
 

src/graph_spectrum.js

@@ -116,10 +116,6 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
           fftData = GraphSpectrumCalc.dataLoadPidErrorVsSetpoint();
           break;
 
-        case SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY:
-          fftData = GraphSpectrumCalc.dataLoadPSD(analyserZoomY);
-          break;
-
         case SPECTRUM_TYPE.FREQUENCY:
         default:
           fftData = GraphSpectrumCalc.dataLoadFrequency();
@@ -191,11 +187,6 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
         debounce(100, function () {
           analyserZoomY = 1 / (analyserZoomYElem.val() / 100);
           GraphSpectrumPlot.setZoom(analyserZoomX, analyserZoomY);
-          // Recalculate PSD with updated samples per segment count
-          if (userSettings.spectrumType == SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY) {
-            dataLoad();
-            GraphSpectrumPlot.setData(fftData, userSettings.spectrumType);
-          }
           that.refresh();
         })
       )

src/graph_spectrum_calc.js

@@ -385,7 +385,7 @@ GraphSpectrumCalc._getFlightChunks = function() {
   return allChunks;
 };
 
-GraphSpectrumCalc._getFlightSamplesFreq = function(scaled = true) {
+GraphSpectrumCalc._getFlightSamplesFreq = function() {
 
   const allChunks = this._getFlightChunks();
 
@@ -395,11 +395,7 @@ GraphSpectrumCalc._getFlightSamplesFreq = function(scaled = true) {
   let samplesCount = 0;
   for (const chunk of allChunks) {
     for (const frame of chunk.frames) {
-      if (scaled) {
-        samples[samplesCount] = this._dataBuffer.curve.lookupRaw(frame[this._dataBuffer.fieldIndex]);
-      } else {
-        samples[samplesCount] = frame[this._dataBuffer.fieldIndex];
-      }
+      samples[samplesCount] = (this._dataBuffer.curve.lookupRaw(frame[this._dataBuffer.fieldIndex]));
       samplesCount++;
     }
   }

src/graph_spectrum_plot.js

@@ -17,7 +17,6 @@ export const SPECTRUM_TYPE = {
   FREQ_VS_THROTTLE: 1,
   PIDERROR_VS_SETPOINT: 2,
   FREQ_VS_RPM: 3,
-  POWER_SPECTRAL_DENSITY: 4,
 };
 
 export const SPECTRUM_OVERDRAW_TYPE = {
@@ -172,10 +171,6 @@ GraphSpectrumPlot._drawGraph = function (canvasCtx) {
     case SPECTRUM_TYPE.PIDERROR_VS_SETPOINT:
       this._drawPidErrorVsSetpointGraph(canvasCtx);
       break;
-
-    case SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY:
-      this._drawPowerSpectralDensityGraph(canvasCtx);
-      break;
   }
 };
 
@@ -299,64 +294,7 @@ GraphSpectrumPlot._drawFrequencyGraph = function (canvasCtx) {
     this._fftData.fieldName,
     WIDTH - 4,
     HEIGHT - 6,
-    "right",
-  );
-  this._drawHorizontalGridLines(
-    canvasCtx,
-    PLOTTED_BLACKBOX_RATE / 2,
-    LEFT,
-    TOP,
-    WIDTH,
-    HEIGHT,
-    MARGIN,
-    "Hz",
-  );
-};
-
-GraphSpectrumPlot._drawPowerSpectralDensityGraph = function (canvasCtx) {
-  const HEIGHT = canvasCtx.canvas.height - MARGIN;
-  const ACTUAL_MARGIN_LEFT = this._getActualMarginLeft();
-  const WIDTH = canvasCtx.canvas.width - ACTUAL_MARGIN_LEFT;
-  const LEFT = canvasCtx.canvas.offsetLeft + ACTUAL_MARGIN_LEFT;
-  const TOP = canvasCtx.canvas.offsetTop;
-
-  const PLOTTED_BLACKBOX_RATE = this._fftData.blackBoxRate / this._zoomX;
-
-  canvasCtx.save();
-  canvasCtx.translate(LEFT, TOP);
-  this._drawGradientBackground(canvasCtx, WIDTH, HEIGHT);
-
-  const pointsCount = this._fftData.psdLength;
-  const scaleX = 2 * WIDTH / PLOTTED_BLACKBOX_RATE * this._zoomX;
-  canvasCtx.beginPath();
-  canvasCtx.lineWidth = 1;
-  canvasCtx.strokeStyle = "white";
-
-  // Allign y axis range by 10db
-  const dbStep = 10;
-  const minY = Math.floor(this._fftData.minimum / dbStep) * dbStep;
-  const maxY = (Math.floor(this._fftData.maximum / dbStep) + 1) * dbStep;
-  const ticksCount = (maxY - minY) / dbStep;
-  const scaleY = HEIGHT / (maxY - minY);
-  //Store vsRange for _drawMousePosition
-  this._fftData.vsRange = {
-    min: minY,
-    max: maxY,
-  };
-  canvasCtx.moveTo(0, 0);
-  for (let pointNum = 0; pointNum < pointsCount; pointNum++) {
-    const freq = PLOTTED_BLACKBOX_RATE / 2 * pointNum / pointsCount;
-    const y = HEIGHT - (this._fftData.psdOutput[pointNum] - minY) * scaleY;
-    canvasCtx.lineTo(freq * scaleX, y);
-  }
-  canvasCtx.stroke();
-
-  this._drawAxisLabel(
-    canvasCtx,
-    this._fftData.fieldName,
-    WIDTH - 4,
-    HEIGHT - 6,
-    "right",
+    "right"
   );
   this._drawHorizontalGridLines(
     canvasCtx,
@@ -366,33 +304,8 @@ GraphSpectrumPlot._drawPowerSpectralDensityGraph = function (canvasCtx) {
     WIDTH,
     HEIGHT,
     MARGIN,
-    "Hz",
-  );
-  this._drawVerticalGridLines(
-    canvasCtx,
-    LEFT,
-    TOP,
-    WIDTH,
-    HEIGHT,
-    minY,
-    maxY,
-    "dBm/Hz",
-    ticksCount,
-  );
-  const offset = 1;
-  this._drawInterestFrequency(
-    canvasCtx,
-    this._fftData.maxNoiseIdx,
-    PLOTTED_BLACKBOX_RATE,
-    "Max noise",
-    WIDTH,
-    HEIGHT,
-    15 * offset + MARGIN,
-    "rgba(255,0,0,0.50)",
-    3,
+    "Hz"
   );
-
-  canvasCtx.restore();
 };
 
 GraphSpectrumPlot._drawFrequencyVsXGraph = function (canvasCtx) {
@@ -949,7 +862,7 @@ GraphSpectrumPlot._drawFiltersAndMarkers = function (canvasCtx) {
       canvasCtx,
       this._fftData.maxNoiseIdx,
       PLOTTED_BLACKBOX_RATE,
-      "Max noise",
+      "Max motor noise",
       WIDTH,
       HEIGHT,
       15 * offset + MARGIN,
@@ -1080,30 +993,30 @@ GraphSpectrumPlot._drawVerticalGridLines = function (
   HEIGHT,
   minValue,
   maxValue,
-  label,
-  ticks = 5,
+  label
 ) {
+  const TICKS = 5;
 
-  for (let i = 0; i <= ticks; i++) {
+  for (let i = 0; i <= TICKS; i++) {
     canvasCtx.beginPath();
     canvasCtx.lineWidth = 1;
     canvasCtx.strokeStyle = "rgba(255,255,255,0.25)";
 
-    const verticalPosition = i * (HEIGHT / ticks);
+    const verticalPosition = i * (HEIGHT / TICKS);
     canvasCtx.moveTo(0, verticalPosition);
     canvasCtx.lineTo(WIDTH, verticalPosition);
 
     canvasCtx.stroke();
     const verticalAxisValue = (
-      (maxValue - minValue) * ((ticks - i) / ticks) +
+      (maxValue - minValue) * ((TICKS - i) / TICKS) +
       minValue
     ).toFixed(0);
     let textBaseline;
     switch (i) {
       case 0:
         textBaseline = "top";
         break;
-      case ticks:
+      case TICKS:
         textBaseline = "bottom";
         break;
       default:
@@ -1216,8 +1129,8 @@ GraphSpectrumPlot._drawGradientBackground = function (
   );
 
   if (this._isFullScreen) {
-    backgroundGradient.addColorStop(1, "rgba(0,0,0,1)");
-    backgroundGradient.addColorStop(0, "rgba(0,0,0,0.9)");
+    backgroundGradient.addColorStop(1, "rgba(0,0,0,0.9)");
+    backgroundGradient.addColorStop(0, "rgba(0,0,0,0.7)");
   } else {
     backgroundGradient.addColorStop(1, "rgba(255,255,255,0.25)");
     backgroundGradient.addColorStop(0, "rgba(255,255,255,0)");
@@ -1446,8 +1359,7 @@ GraphSpectrumPlot._drawMousePosition = function (
   if (
     this._spectrumType === SPECTRUM_TYPE.FREQUENCY ||
     this._spectrumType === SPECTRUM_TYPE.FREQ_VS_THROTTLE ||
-    this._spectrumType === SPECTRUM_TYPE.FREQ_VS_RPM ||
-    this._spectrumType === SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY
+    this._spectrumType === SPECTRUM_TYPE.FREQ_VS_RPM
   ) {
     // Calculate frequency at mouse
     const sampleRate = this._fftData.blackBoxRate / this._zoomX;
@@ -1479,9 +1391,6 @@ GraphSpectrumPlot._drawMousePosition = function (
       case SPECTRUM_TYPE.FREQ_VS_RPM:
         unitLabel = "Hz";
         break;
-      case SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY:
-        unitLabel = "dBm/Hz";
-        break;
       default:
         unitLabel = null;
         break;
@@ -1557,7 +1466,6 @@ GraphSpectrumPlot._getActualMarginLeft = function () {
   switch (this._spectrumType) {
     case SPECTRUM_TYPE.FREQ_VS_THROTTLE:
     case SPECTRUM_TYPE.FREQ_VS_RPM:
-    case SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY:
       actualMarginLeft = this._isFullScreen
         ? MARGIN_LEFT_FULLSCREEN
         : MARGIN_LEFT;