[Emc-commit] emc2/src/emc/rs274ngc interp_convert.cc,1.27,1.28 interp_write.cc,1.7,1.8

[EMC C. s. <cv...@cv...>]

Modified file emc2/src/emc/rs274ngc/interp_convert.cc

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/emc/rs274ngc/interp_convert.cc?rev=1.28>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/emc/rs274ngc/interp_convert.cc.diff?r1=1.27;r2=1.28>

Branch: HEAD

Log:
revision 1.28
date: 2006/05/17 22:39:57;  author: alex_joni;  state: Exp;  lines: +5 -3
make G50/G61 appear in the list of current g-codes

--- interp_convert.cc	2006/05/17 22:26:44	1.27
+++ interp_convert.cc	2006/05/17 22:39:57	1.28
@@ -10,9 +10,9 @@
 * Copyright (c) 2004 All rights reserved.
 *
 * Last change:
-* $Revision: 1.27 $
+* $Revision: 1.28 $
 * $Author: alex_joni $
-* $Date: 2006/05/17 22:26:44 $
+* $Date: 2006/05/17 22:39:57 $
 ********************************************************************/
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
@@ -819,8 +819,10 @@
 
     if(g_code == G_50) {
         START_ADAPTIVE_FEED();
+	settings->adaptive_feed=1;
     } else if (g_code == G_51) {
         STOP_ADAPTIVE_FEED();
+	settings->adaptive_feed=0;
     } else
         ERM(NCE_BUG_CODE_NOT_G50_OR_G51);
 

Modified file emc2/src/emc/rs274ngc/interp_write.cc

Full file:
<http://cvs.linuxcnc.org/cvs/emc2/src/emc/rs274ngc/interp_write.cc?rev=1.8>

Difference:
<http://cvs.linuxcnc.org/cvs/emc2/src/emc/rs274ngc/interp_write.cc.diff?r1=1.7;r2=1.8>

Branch: HEAD

Log:
revision 1.8
date: 2006/05/17 22:39:57;  author: alex_joni;  state: Exp;  lines: +4 -4
make G50/G61 appear in the list of current g-codes

--- interp_write.cc	2006/05/17 19:58:18	1.7
+++ interp_write.cc	2006/05/17 22:39:57	1.8
@@ -10,9 +10,9 @@
 * Copyright (c) 2004 All rights reserved.
 *
 * Last change:
-* $Revision: 1.7 $
-* $Author: cradek $
-* $Date: 2006/05/17 19:58:18 $
+* $Revision: 1.8 $
+* $Author: alex_joni $
+* $Date: 2006/05/17 22:39:57 $
 ********************************************************************/
 #include <unistd.h>
 #include <stdio.h>
@@ -98,7 +98,7 @@
   gez[11] =
     (settings->control_mode == CANON_CONTINUOUS) ? G_64 :
     (settings->control_mode == CANON_EXACT_PATH) ? G_61 : G_61_1;
-  gez[12] = settings->adaptive_feed;
+  gez[12] = (settings->adaptive_feed != 0) ? G_50 : G_51;
 
   return INTERP_OK;
 }