All pastes #765246 Raw Edit

Someone

public text v1 · immutable
#765246 ·published 2007-11-07 22:02 UTC
rendered paste body
Index: rs274ngc_pre.cc
===================================================================
RCS file: /cvs/emc2/src/emc/rs274ngc/rs274ngc_pre.cc,v
retrieving revision 1.49
diff -u -p -r1.49 rs274ngc_pre.cc
--- rs274ngc_pre.cc	2 Nov 2007 20:13:39 -0000	1.49
+++ rs274ngc_pre.cc	7 Nov 2007 22:02:02 -0000
@@ -402,8 +402,12 @@ int Interp::init()
   CHP(restore_parameters(filename));
   pars = _setup.parameters;
   _setup.origin_index = (int) (pars[5220] + 0.0001);
-  CHK(((_setup.origin_index < 1) || (_setup.origin_index > 9)),
-      NCE_COORDINATE_SYSTEM_INDEX_PARAMETER_5220_OUT_OF_RANGE);
+  if(_setup.origin_index < 1 || _setup.origin_index > 9) {
+      fprintf(stderr, "fix origin\n");
+      _setup.origin_index = 1;
+      pars[5220] = 1.0;
+  }
+
   k = (5200 + (_setup.origin_index * 20));
   SET_ORIGIN_OFFSETS(USER_TO_PROGRAM_LEN(pars[k + 1] + pars[5211]),
                      USER_TO_PROGRAM_LEN(pars[k + 2] + pars[5212]), 
@@ -886,16 +890,12 @@ int Interp::restore_parameters(const cha
           break;
         } else                  // if (k < variable)
         {
-          if (k == required)
-            ERM(NCE_REQUIRED_PARAMETER_MISSING);
-          else
-            pars[k] = 0;
+          pars[k] = 0;
         }
       }
     }
   }
   fclose(infile);
-  CHK((required != RS274NGC_MAX_PARAMETERS), NCE_REQUIRED_PARAMETER_MISSING);
   for (; k < RS274NGC_MAX_PARAMETERS; k++) {
     pars[k] = 0;
   }