timeout and retry improvements

js/msp.js

@@ -156,11 +156,6 @@ var MSP = {
             bufView,
             i;
 
-        /*
-         * For debug reasons, check how ofter MSP frames are executed
-         */
-        helper.eventFrequencyAnalyzer.put(code);
-
         // always reserve 6 bytes for protocol overhead !
         if (data) {
             var size = data.length + 6,

js/serial_queue.js

@@ -56,12 +56,18 @@ helper.mspQueue = (function (serial, MSP) {
      */
     publicScope.executor = function () {
 
+        /*
+         * Debug
+         */
+        helper.eventFrequencyAnalyzer.put("execute");
+
         privateScope.loadFilter.apply(privateScope.queue.length);
 
         /*
          * if port is blocked or there is no connection, do not process the queue
          */
         if (privateScope.portInUse || serial.connectionId === false) {
+            helper.eventFrequencyAnalyzer.put("port in use");
             return false;
         }
 
@@ -82,9 +88,17 @@ helper.mspQueue = (function (serial, MSP) {
                 MSP.removeCallback(request.code);
 
                 /*
-                 * Create new entry in the queue
+                 * To prevent infinite retry situation, allow retry only while counter is positive
                  */
-                publicScope.put(request);
+                if (request.retryCounter > 0) {
+                    request.retryCounter--;
+
+                    /*
+                     * Create new entry in the queue
+                     */
+                    publicScope.put(request);
+                }
+
             }, serial.getTimeout());
 
             if (request.sentOn === null) {

tabs/cli.js

@@ -14,6 +14,12 @@ TABS.cli.initialize = function (callback) {
         googleAnalytics.sendAppView('CLI');
     }
 
+    /*
+     * Flush MSP queue as well as all MSP registered callbacks
+     */
+    helper.mspQueue.flush();
+    MSP.callbacks_cleanup();
+
     $('#content').load("./tabs/cli.html", function () {
         // translate to user-selected language
         localize();