[Emc-developers] [PATCH] Added side queue for MDI commands

[Pavel Shramov]

If execution of MDI command is active don't interpret subsequent
commands but store them in mdi_execute_queue. On errors flush it.
Now commands sequences like G38.2 Z-2 F10 && G0 Z[#5063+1] works.

Signed-off-by: Pavel Shramov <shra...@mexmat.net>
---
 src/emc/task/emctaskmain.cc |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/emc/task/emctaskmain.cc b/src/emc/task/emctaskmain.cc
index 62a7298..ad412eb 100644
--- a/src/emc/task/emctaskmain.cc
+++ b/src/emc/task/emctaskmain.cc
@@ -390,6 +390,8 @@ static int mdi_execute_level = -1;
 static int mdi_execute_next = 0;
 // Wait after interrupted command
 static int mdi_execute_wait = 0;
+// Side queue to store MDI commands
+static NML_INTERP_LIST mdi_execute_queue;
 
 /*
   checkInterpList(NML_INTERP_LIST *il, EMC_STAT *stat) takes a pointer
@@ -629,6 +631,8 @@ static void mdi_execute_abort(void)
     mdi_execute_level = -1;
     mdi_execute_wait = 0;
     mdi_execute_next = 0;
+
+    mdi_execute_queue.clear();
 }
 
 static void mdi_execute_hook(void)
@@ -646,6 +650,12 @@ static void mdi_execute_hook(void)
        return;
     }
 
+    if (mdi_execute_level < 0 && !mdi_execute_wait && mdi_execute_queue.len()) 
{
+       printf("Rescheduling back");
+       interp_list.append(mdi_execute_queue.get());
+       return;
+    }
+
     if (!mdi_execute_next) return;
 
     if (interp_list.len() > EMC_TASK_INTERP_MAX_LEN) return;
@@ -2004,17 +2014,25 @@ static int emcTaskIssueCommand(NMLmsg * cmd)
             break;
         }
        if (execute_msg->command[0] != 0) {
+           char * command = execute_msg->command;
+           if (command[0] == (char) 0xff) {
+               // Empty command recieved. Consider it is NULL
+               command = NULL;
+           }
+
+           if ((mdi_execute_level >= 0 || mdi_execute_wait) && command) {
+               printf("Reschedule command %s\n", command);
+               mdi_execute_queue.append(execute_msg);
+               break;
+           }
+
            int level = emcTaskPlanLevel();
            if (emcStatus->task.mode == EMC_TASK_MODE_MDI) {
                interp_list.set_line_number(++pseudoMdiLineNumber);
                if (mdi_execute_level < 0)
                    mdi_execute_level = level;
            }
-           char * command = execute_msg->command;
-           if (command[0] == (char) 0xff) {
-               // Empty command recieved. Consider it is NULL
-               command = NULL;
-           }
+
            execRetval = emcTaskPlanExecute(command, pseudoMdiLineNumber);
 
            level = emcTaskPlanLevel();
-- 
1.7.1

------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers