[Emc-commit] emc/src/emcnml initraj.cc,1.6,1.7

[Paul C. <pa...@us...>]

Update of /cvsroot/emc/emc/src/emcnml
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7307

Modified Files:
	initraj.cc 
Log Message:
Move reading of DEFAULT_ACCELERATION down in the order else MAX_ACCELERATION is not honoured.

Index: initraj.cc
===================================================================
RCS file: /cvsroot/emc/emc/src/emcnml/initraj.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** initraj.cc	7 May 2003 19:49:52 -0000	1.6
--- initraj.cc	15 Aug 2005 14:28:30 -0000	1.7
***************
*** 214,243 ****
    }
  
-   if (NULL != (inistring = trajInifile->find("DEFAULT_ACCELERATION", "TRAJ"))) {
-     if (1 == sscanf(inistring, "%lf", &acc)) {
-       // found, and valid
-     }
-     else {
-       // found, but invalid
-       if (EMC_DEBUG & EMC_DEBUG_INVALID) {
-         rcs_print("invalid inifile value for [TRAJ] DEFAULT_ACCELERATION: %s\n", inistring);
-       }
-       acc = 1.0;                // default
-     }
-   }
-   else {
-     // not found at all
-     if (EMC_DEBUG & EMC_DEBUG_DEFAULTS) {
-       rcs_print("can't find [TRAJ] DEFAULT_ACCELERATION, using default\n");
-     }
-     acc = 1.0;          // default
-   }
-   if (0 != emcTrajSetAcceleration(acc)) {
-     if (EMC_DEBUG & EMC_DEBUG_CONFIG) {
-       rcs_print("bad return value from emcTrajSetAcceleration\n");
-     }
-     return -1;
-   }
- 
    if (NULL != (inistring = trajInifile->find("MAX_VELOCITY", "TRAJ"))) {
      if (1 == sscanf(inistring, "%lf", &vel)) {
--- 214,217 ----
***************
*** 301,304 ****
--- 275,304 ----
    }
  
+   if (NULL != (inistring = trajInifile->find("DEFAULT_ACCELERATION", "TRAJ"))) {
+     if (1 == sscanf(inistring, "%lf", &acc)) {
+       // found, and valid
+     }
+     else {
+       // found, but invalid
+       if (EMC_DEBUG & EMC_DEBUG_INVALID) {
+         rcs_print("invalid inifile value for [TRAJ] DEFAULT_ACCELERATION: %s\n", inistring);
+       }
+       acc = 1.0;                // default
+     }
+   }
+   else {
+     // not found at all
+     if (EMC_DEBUG & EMC_DEBUG_DEFAULTS) {
+       rcs_print("can't find [TRAJ] DEFAULT_ACCELERATION, using default\n");
+     }
+     acc = 1.0;          // default
+   }
+   if (0 != emcTrajSetAcceleration(acc)) {
+     if (EMC_DEBUG & EMC_DEBUG_CONFIG) {
+       rcs_print("bad return value from emcTrajSetAcceleration\n");
+     }
+     return -1;
+   }
+ 
    // set coordinateMark[] to hold 1's for each coordinate present,
    // so that home position can be interpreted properly