[Emc-commit] emc2/src/emc/task taskintf.cc,1.31,1.32

[Alex J. <ale...@us...>]

Update of /cvsroot/emc/emc2/src/emc/task
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3165

Modified Files:
	taskintf.cc 
Log Message:
added a call to  emcTrajDisable() before emcTrajHalt(), this way the amps get disabled before shutdown

Index: taskintf.cc
===================================================================
RCS file: /cvsroot/emc/emc2/src/emc/task/taskintf.cc,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** taskintf.cc	24 Nov 2005 03:41:39 -0000	1.31
--- taskintf.cc	27 Nov 2005 22:02:10 -0000	1.32
***************
*** 1300,1305 ****
  int emcMotionHalt()
  {
!     int r1;
!     int r2;
      int t;
  
--- 1300,1304 ----
  int emcMotionHalt()
  {
!     int r1, r2, r3;
      int t;
  
***************
*** 1311,1319 ****
      }
  
!     r2 = emcTrajHalt();
  
      emcmotion_initialized = 0;
  
!     return (r1 == 0 && r2 == 0) ? 0 : -1;
  }
  
--- 1310,1319 ----
      }
  
!     r2 = emcTrajDisable();
!     r3 = emcTrajHalt();
  
      emcmotion_initialized = 0;
  
!     return (r1 == 0 && r2 == 0 && r3 == 0) ? 0 : -1;
  }