get rid of drop ratio and PID controller

iNavFlight · Apr 26, 2024 · c50c289 · c50c289
1 parent 9f9aa84
commit c50c289
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 159 deletions.
diff --git a/index.html b/index.html
@@ -339,9 +339,6 @@ <h2 class="groundstation-telemetry__header" data-i18n="gsTelemetry"></h2>
             <div>
                 <span id="hardware-roundtrip"> </span>
             </div>
-            <div>
-                <span id="drop-rate"> </span>
-            </div>
             <div>
                 <span data-i18n="statusbar_arming_flags"></span> <span class="arming-flags">-</span>
             </div>

diff --git a/js/pid_controller.js b/js/pid_controller.js
diff --git a/js/serial_backend.js b/js/serial_backend.js
@@ -477,7 +477,6 @@ var SerialBackend = (function () {
                     $('#msp-load').text("MSP load: " + mspQueue.getLoad().toFixed(1));
                     $('#msp-roundtrip').text("MSP round trip: " + mspQueue.getRoundtrip().toFixed(0));
                     $('#hardware-roundtrip').text("HW round trip: " + mspQueue.getHardwareRoundtrip().toFixed(0));
-                    $('#drop-rate').text("Drop ratio: " + mspQueue.getDropRatio().toFixed(0) + "%");
                 }, 100);
 
                 interval.add('global_data_refresh', periodicStatusUpdater.run, periodicStatusUpdater.getUpdateInterval(CONFIGURATOR.connection.bitrate), false);

diff --git a/js/serial_queue.js b/js/serial_queue.js
@@ -3,7 +3,6 @@
 const CONFIGURATOR = require('./data_storage');
 const MSPCodes = require('./msp/MSPCodes');
 const SimpleSmoothFilter = require('./simple_smooth_filter');
-const PidController = require('./pid_controller');
 const eventFrequencyAnalyzer = require('./eventFrequencyAnalyzer');
 const mspDeduplicationQueue = require('./msp/mspDeduplicationQueue');
 
@@ -28,29 +27,9 @@ var mspQueue = function () {
 
     privateScope.currentLoad = 0;
 
-    /**
-     * PID controller used to perform throttling
-     * @type {PidController}
-     */
-    privateScope.loadPidController = new PidController();
-    privateScope.loadPidController.setTarget(privateScope.targetLoad);
-    privateScope.loadPidController.setOutput(0, 99, 0);
-    privateScope.loadPidController.setGains(5, 6, 3);
-    privateScope.loadPidController.setItermLimit(0, 90);
-
-    privateScope.dropRatio = 0;
-
     privateScope.removeCallback = null;
     privateScope.putCallback = null;
 
-    publicScope.computeDropRatio = function () {
-        privateScope.dropRatio = privateScope.loadPidController.run(publicScope.getLoad());
-    };
-
-    publicScope.getDropRatio = function () {
-        return privateScope.dropRatio;
-    };
-
     privateScope.queue = [];
 
     privateScope.softLock = false;
@@ -229,12 +208,10 @@ var mspQueue = function () {
      */
     publicScope.put = function (mspRequest) {
 
-        console.log('Received message ', mspRequest.code);
-
         const isMessageInQueue = mspDeduplicationQueue.check(mspRequest.code);
 
         if (isMessageInQueue) {
-            console.log('Message already in queue: ' + mspRequest.code);
+            eventFrequencyAnalyzer.put('MSP Duplicate ' + mspRequest.code);
             return false;
         }
 
@@ -286,7 +263,6 @@ var mspQueue = function () {
 
     publicScope.balancer = function () {
         privateScope.currentLoad = privateScope.loadFilter.get();
-        publicScope.computeDropRatio();
 
         /*
          * Also, check if port lock if hanging. Free is so