fix conflicts

Author: nerdCopter

.github/workflows/deploy-preview.yml

@@ -38,7 +38,7 @@ jobs:
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
           accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-          command: pages deploy src/dist --project-name=${{ vars.CLOUDFLARE_PROJECT_NAME }} --branch ${{ github.head_ref }} --commit-dirty=true
+          command: pages deploy dist --project-name=${{ vars.CLOUDFLARE_PROJECT_NAME }} --branch ${{ github.head_ref }} --commit-dirty=true
 
       - name: Add deployment comment
         uses: thollander/actions-comment-pull-request@v3

src/graph_spectrum_calc.js

@@ -490,7 +490,6 @@ GraphSpectrumCalc._getFlightSamplesFreqVsX = function(vsFieldNames, minValue = I
     console.log("Adjusted FreqVsX range due to invalid calculation: min=%f, max=%f", minValue, maxValue);
   }
 
-
   return {
     samples  : samples,
     vsValues : vsValues,
@@ -527,8 +526,8 @@ GraphSpectrumCalc._getFlightSamplesPidErrorVsSetpoint = function(axisIndex) {
   }
 
   return {
-    piderror: piderror.slice(0, samplesCount),
-    setpoint: setpoint.slice(0, samplesCount),
+    piderror,
+    setpoint,
     maxSetpoint,
     count: samplesCount,
   };