Merge branch 'master' into psd_impromement

demvlad · web-flow · commit ea0e0235ac0c · 2025-07-16T08:43:53.000+03:00
diff --git a/index.html b/index.html
@@ -2994,6 +2994,29 @@ <h4 class="modal-title">Advanced User Settings</h4>
                                                 <p>%</p>
                                             </td>
                                         </tr>
+                                        <tr>
+                                            <td>
+                                                <label>Legend</label>
+                                            </td>
+                                            <td class="position">
+                                                <label>Top</label>
+                                                <input name="analyser-legend-top" type="number" step="1" min="0"
+                                                    max="100" />
+                                                <p>%</p>
+                                            </td>
+                                            <td class="position">
+                                                <label>Left</label>
+                                                <input name="analyser-legend-left" type="number" step="1" min="0"
+                                                    max="100" />
+                                                <p>%</p>
+                                            </td>
+                                            <td class="position">
+                                                <label>Width</label>
+                                                <input name="analyser-legend-width" type="number" step="1" min="0"
+                                                    max="100" />
+                                                <p>%</p>
+                                            </td>
+                                        </tr>
                                     </table>
                                 </div>
                             </div>
diff --git a/public/js/webworkers/spectrum-export-worker.js b/public/js/webworkers/spectrum-export-worker.js
@@ -1,11 +1,11 @@
 onmessage = function(event) {
   const columnDelimiter = event.data.opts.columnDelimiter;
   const fftOutput = event.data.fftOutput;
-  const spectrumDataLength = fftOutput.length / 2;
+  const spectrumDataLength = fftOutput.length;
   const frequencyStep = 0.5 * event.data.blackBoxRate / spectrumDataLength;
 
-  let outText = "freq" + columnDelimiter + "value" + "\n";
-  for (let index = 0; index < spectrumDataLength; index += 10) {
+  let outText = "x" + columnDelimiter + "y" + "\n";
+  for (let index = 0; index < spectrumDataLength; index++) {
     const frequency = frequencyStep * index;
     outText += frequency.toString() + columnDelimiter + fftOutput[index].toString() + "\n";
   }
diff --git a/src/flightlog_fielddefs.js b/src/flightlog_fielddefs.js
@@ -550,6 +550,12 @@ export function adjustFieldDefsList(firmwareType, firmwareVersion) {
       DEBUG_MODE.push('WING_SETPOINT');
       DEBUG_MODE.push('AUTOPILOT_POSITION');
     }
+    if (semver.gte(firmwareVersion, "4.6.0")) {
+      //rename DUAL_GYRO_ to MULTI_GYRO
+      DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_RAW"), 1, "MULTI_GYRO_RAW");
+      DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_DIFF"), 1, "MULTI_GYRO_DIFF");
+      DEBUG_MODE.splice(DEBUG_MODE.indexOf("DUAL_GYRO_SCALED"), 1, "MULTI_GYRO_SCALED");
+    }
 
     ACC_HARDWARE = makeReadOnly(ACC_HARDWARE);
     DEBUG_MODE = makeReadOnly(DEBUG_MODE);
diff --git a/src/flightlog_fields_presenter.js b/src/flightlog_fields_presenter.js
@@ -1397,6 +1397,39 @@ FlightLogFieldPresenter.adjustDebugDefsList = function (
         'debug[4]': 'Processed flow rates Y',
         'debug[5]': 'Delta time',
       };
+      DEBUG_FRIENDLY_FIELD_NAMES.MULTI_GYRO_RAW = {
+        'debug[all]': 'Debug Multi Gyro Raw',
+        'debug[0]': 'Gyro 1 Raw [roll]',
+        'debug[1]': 'Gyro 1 Raw [pitch]',
+        'debug[2]': 'Gyro 2 Raw [roll]',
+        'debug[3]': 'Gyro 2 Raw [pitch]',
+        'debug[4]': 'Gyro 3 Raw [roll]',
+        'debug[5]': 'Gyro 3 Raw [pitch]',
+        'debug[6]': 'Gyro 4 Raw [roll]',
+        'debug[7]': 'Gyro 4 Raw [pitch]',
+      };
+      DEBUG_FRIENDLY_FIELD_NAMES.MULTI_GYRO_DIFF = {
+        'debug[all]': 'Debug Multi Gyro Diff',
+        'debug[0]': 'Gyro 1 Diff [roll]',
+        'debug[1]': 'Gyro 1 Diff [pitch]',
+        'debug[2]': 'Gyro 2 Diff [roll]',
+        'debug[3]': 'Gyro 2 Diff [pitch]',
+        'debug[4]': 'Gyro 3 Diff [roll]',
+        'debug[5]': 'Gyro 3 Diff [pitch]',
+        'debug[6]': 'Gyro 4 Diff [roll]',
+        'debug[7]': 'Gyro 4 Diff [pitch]',
+      };
+      DEBUG_FRIENDLY_FIELD_NAMES.MULTI_GYRO_SCALED = {
+        'debug[all]': 'Multi Gyro Scaled',
+        'debug[0]': 'Gyro 1 [roll]',
+        'debug[1]': 'Gyro 1 [pitch]',
+        'debug[2]': 'Gyro 2 [roll]',
+        'debug[3]': 'Gyro 2 [pitch]',
+        'debug[4]': 'Gyro 3 [roll]',
+        'debug[5]': 'Gyro 3 [pitch]',
+        'debug[6]': 'Gyro 4 [roll]',
+        'debug[7]': 'Gyro 4 [pitch]',
+      };
       DEBUG_FRIENDLY_FIELD_NAMES.AUTOPILOT_POSITION = {
         'debug[all]': 'Autopilot Position',
         'debug[0]': 'Distance',
@@ -1840,6 +1873,9 @@ FlightLogFieldPresenter.decodeDebugFieldToFriendly = function (
       case "DUAL_GYRO_COMBINED":
       case "DUAL_GYRO_DIFF":
       case "DUAL_GYRO_RAW":
+      case "MULTI_GYRO_DIFF":
+      case "MULTI_GYRO_RAW":
+      case "MULTI_GYRO_SCALED":
       case "NOTCH":
       case "GYRO_SAMPLE":
         return `${Math.round(flightLog.gyroRawToDegreesPerSecond(value))} °/s`;
@@ -2538,6 +2574,9 @@ FlightLogFieldPresenter.ConvertDebugFieldValue = function (
       case "DUAL_GYRO_COMBINED":
       case "DUAL_GYRO_DIFF":
       case "DUAL_GYRO_RAW":
+      case "MULTI_GYRO_DIFF":
+      case "MULTI_GYRO_RAW":
+      case "MULTI_GYRO_SCALED":
       case "NOTCH":
       case "GYRO_SAMPLE":
         return toFriendly
diff --git a/src/flightlog_parser.js b/src/flightlog_parser.js
@@ -446,6 +446,12 @@ export function FlightLogParser(logData) {
       chirp_frequency_start_deci_hz : "chirp_frequency_start_deci_hz",
       chirp_frequency_end_deci_hz : "chirp_frequency_end_deci_hz",
       chirp_time_seconds : "chirp_time_seconds",
+      // MULTI_GYRO to DUAL_GYRO debug mode aliases
+      multi_gyro: "dual_gyro",
+      multi_gyro_raw: "dual_gyro_raw", 
+      multi_gyro_combined: "dual_gyro_combined",
+      multi_gyro_diff: "dual_gyro_diff",
+      multi_gyro_scaled: "dual_gyro_scaled",
     },
     frameTypes,
     // Blackbox state:
diff --git a/src/graph_imported_curves.js b/src/graph_imported_curves.js
@@ -0,0 +1,75 @@
+export function ImportedCurves(curvesChanged) {
+  const maxImportCount = 5;
+  this._curvesData = [];
+  const _that = this;
+  this.minX = Number.MAX_VALUE;
+  this.maxX = -Number.MAX_VALUE;
+  this.minY = Number.MAX_VALUE;
+  this.maxY = -Number.MAX_VALUE;
+  
+  this.curvesCount = function() {
+    return this._curvesData.length;
+  };
+
+  this.importCurvesFromCSV = function(files) {
+      let importsLeft = maxImportCount - this._curvesData.length;
+
+      for (const file of files) {
+        if (importsLeft-- == 0) {
+          break;
+        }
+        const reader = new FileReader();
+        reader.onload = function (e) {
+          try {
+            const stringRows = e.target.result.split("\n");
+
+            const header = stringRows[0].split(",");
+            if (header.length != 2 || header[0] != "x" || header[1] != "y") {
+              throw new SyntaxError("Wrong curves CSV data format");
+            }
+
+            stringRows.shift();
+            //remove bad last row
+            if (stringRows.at(-1) == "") {
+              stringRows.pop();
+            }
+
+            const curvesData = stringRows.map( function(row) {
+              const data = row.split(","),
+                    x = parseFloat(data[0]),
+                    y = parseFloat(data[1]);
+              _that.minX = Math.min(x, _that.minX);
+              _that.maxX = Math.max(x, _that.maxX);
+              _that.minY = Math.min(y, _that.minY);
+              _that.maxY = Math.max(y, _that.maxY);
+              return {
+                x: x,
+                y: y,
+              };
+            });
+
+            const curve = {
+              name: file.name.split('.')[0],
+              points: curvesData,
+            };
+            _that._curvesData.push(curve);
+            curvesChanged();
+          } catch (e) {
+            alert('Curves data import error: ' + e.message);
+            return;
+          }
+        };
+
+        reader.readAsText(file);
+      }
+    };
+
+  this.removeCurves = function() {
+    this._curvesData.length = 0;
+    this.minX = Number.MAX_VALUE;
+    this.maxX = -Number.MAX_VALUE;
+    this.minY = Number.MAX_VALUE;
+    this.maxY = -Number.MAX_VALUE;
+    curvesChanged();
+  };
+}
diff --git a/src/graph_spectrum.js b/src/graph_spectrum.js
@@ -399,7 +399,9 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
           !psdCurveSelected,
         );
 
-        $("#spectrumComparison").css("visibility", (optionSelected == 0 ? "visible" : "hidden"));
+
+        const showSpectrumsComparisonPanel = optionSelected === SPECTRUM_TYPE.FREQUENCY || optionSelected === SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY;
+        $("#spectrumComparison").css("visibility", (showSpectrumsComparisonPanel ? "visible" : "hidden"));
       })
       .change();
 
@@ -464,48 +466,27 @@ export function FlightLogAnalyser(flightLog, canvas, analyserCanvas) {
     };
 
     this.importSpectrumFromCSV = function(files) {
-      const maxImportCount = 5;
-      let importsLeft = maxImportCount - GraphSpectrumPlot.getImportedSpectrumCount();
+      GraphSpectrumPlot.importCurvesFromCSV(files);
+    };
 
-      for (const file of files) {
-        if (importsLeft-- == 0) {
-          break;
-        }
-        const reader = new FileReader();
-        reader.onload = function (e) {
-          try {
-            const stringRows = e.target.result.split("\n");
-
-            const header = stringRows[0].split(",");
-            if (header.length != 2 || header[0] != "freq" || header[1] != "value") {
-              throw new SyntaxError("Wrong spectrum CSV data format");
-            }
-
-            stringRows.shift();
-            const spectrumData = stringRows.map( function(row) {
-              const data = row.split(",");
-              return {
-                freq: parseFloat(data[0]),
-                value: parseFloat(data[1]),
-              };
-            });
-
-            GraphSpectrumPlot.addImportedSpectrumData(spectrumData, file.name);
-          } catch (e) {
-            alert('Spectrum data import error: ' + e.message);
-            return;
-          }
-        };
+    this.removeImportedSpectrums = function() {
+      GraphSpectrumPlot.removeImportedCurves();
+    };
 
-        reader.readAsText(file);
+    this.getExportedFileName = function() {
+      let fileName = $(".log-filename").text().split(".")[0];
+      switch (userSettings.spectrumType) {
+        case SPECTRUM_TYPE.FREQUENCY:
+          fileName = fileName + "_sp";
+          break;
+        case SPECTRUM_TYPE.POWER_SPECTRAL_DENSITY:
+          fileName = fileName + "_psd";
+          break;
       }
+      return fileName;
     };
 
   } catch (e) {
     console.error(`Failed to create analyser... error: ${e}`);
   }
-
-  this.clearImportedSpectrums = function() {
-    GraphSpectrumPlot.clearImportedSpectrums();
-  };
 }
diff --git a/src/graph_spectrum_calc.js b/src/graph_spectrum_calc.js
@@ -133,8 +133,8 @@ GraphSpectrumCalc.dataLoadPSD = function(analyserZoomY) {
   const psdData = {
     fieldIndex   : this._dataBuffer.fieldIndex,
     fieldName  : this._dataBuffer.fieldName,
-    psdLength  : psd.psdOutput.length,
-    psdOutput  : psd.psdOutput,
+    fftLength  : psd.psdOutput.length,
+    fftOutput  : psd.psdOutput,
     blackBoxRate : this._blackBoxRate,
     minimum: psd.min,
     maximum: psd.max,
diff --git a/src/graph_spectrum_plot.js b/src/graph_spectrum_plot.js
diff --git a/src/main.js b/src/main.js
diff --git a/src/user_settings_dialog.js b/src/user_settings_dialog.js
