[Emc-commit] emc/src/emctask bridgeporttaskintf.cc,1.23,1.24 emctaskmain.cc,1.29,1.30 minimilltaskintf.cc,1.23,1.24

[<ms...@us...>]

Update of /cvsroot/emc/emc/src/emctask
In directory sc8-pr-cvs1:/tmp/cvs-serv20968/src/emctask

Modified Files:
	bridgeporttaskintf.cc emctaskmain.cc minimilltaskintf.cc 
Log Message:
Substantial changes to freqmod and new ini file variables

Index: bridgeporttaskintf.cc
===================================================================
RCS file: /cvsroot/emc/emc/src/emctask/bridgeporttaskintf.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** bridgeporttaskintf.cc	17 Nov 2002 00:38:00 -0000	1.23
--- bridgeporttaskintf.cc	21 Jul 2003 02:51:34 -0000	1.24
***************
*** 6,9 ****
--- 6,10 ----
    Modification history:
    
+   18-Jul-2003  MGS added emcAxisSetStepParams stuff.
    9-Nov-2002 P.C. Ensured spindle speed is passed to bridgeportio.
    17-Aug-2001  FMP added emcMotionSetDout, LASER stuff
***************
*** 486,489 ****
--- 487,505 ----
    }
  #endif
+ 
+   return usrmotWriteEmcmotCommand(&emcmotCommand);
+ }
+ 
+ int emcAxisSetStepParams(int axis, double setup_time, double hold_time)
+ {
+   if (axis < 0 || axis >= EMCMOT_MAX_AXIS)
+   {
+     return 0;
+   }
+ 
+   emcmotCommand.command = EMCMOT_SET_STEP_PARAMS;
+   emcmotCommand.axis = axis;
+   emcmotCommand.setup_time = setup_time;
+   emcmotCommand.hold_time = hold_time;
  
    return usrmotWriteEmcmotCommand(&emcmotCommand);

Index: emctaskmain.cc
===================================================================
RCS file: /cvsroot/emc/emc/src/emctask/emctaskmain.cc,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** emctaskmain.cc	27 Mar 2003 20:11:39 -0000	1.29
--- emctaskmain.cc	21 Jul 2003 02:51:34 -0000	1.30
***************
*** 6,9 ****
--- 6,10 ----
    Modification history:
  
+   18-Jul-2003  MGS added EMC_SET_AXIS_STEP_PARAMS stuff
    17-Aug-2001  FMP added EMC_MOTION_SET_DOUT stuff
    31-May-2001  FMP added EMC_SET_DEBUG
***************
*** 402,405 ****
--- 403,407 ----
  static EMC_AXIS_LOAD_COMP *axis_load_comp_msg;
  static EMC_AXIS_ALTER *axis_alter_msg;
+ static EMC_AXIS_SET_STEP_PARAMS *set_step_params_msg;
  
  static EMC_TRAJ_SET_SCALE *emcTrajSetScaleMsg;
***************
*** 588,591 ****
--- 590,594 ----
        case EMC_AXIS_LOAD_COMP_TYPE:
        case EMC_AXIS_ALTER_TYPE:
+       case EMC_AXIS_SET_STEP_PARAMS_TYPE:
        case EMC_TRAJ_SET_SCALE_TYPE:
        case EMC_TRAJ_SET_VELOCITY_TYPE:
***************
*** 678,681 ****
--- 681,685 ----
        case EMC_AXIS_SET_MAX_POSITION_LIMIT_TYPE:
        case EMC_AXIS_SET_MIN_POSITION_LIMIT_TYPE:
+       case EMC_AXIS_SET_STEP_PARAMS_TYPE:
        case EMC_AXIS_ABORT_TYPE:
        case EMC_AXIS_HALT_TYPE:
***************
*** 777,780 ****
--- 781,785 ----
          case EMC_AXIS_SET_OUTPUT_TYPE:
          case EMC_AXIS_ALTER_TYPE:
+         case EMC_AXIS_SET_STEP_PARAMS_TYPE:
          case EMC_TRAJ_PAUSE_TYPE:
          case EMC_TRAJ_RESUME_TYPE:
***************
*** 867,870 ****
--- 872,876 ----
          case EMC_AXIS_SET_OUTPUT_TYPE:
          case EMC_AXIS_ALTER_TYPE:
+         case EMC_AXIS_SET_STEP_PARAMS_TYPE:
          case EMC_TRAJ_PAUSE_TYPE:
          case EMC_TRAJ_RESUME_TYPE:
***************
*** 1026,1029 ****
--- 1032,1036 ----
          case EMC_AXIS_SET_OUTPUT_TYPE:
          case EMC_AXIS_ALTER_TYPE:
+         case EMC_AXIS_SET_STEP_PARAMS_TYPE:
          case EMC_TRAJ_PAUSE_TYPE:
          case EMC_TRAJ_RESUME_TYPE:
***************
*** 1107,1110 ****
--- 1114,1118 ----
          case EMC_AXIS_SET_OUTPUT_TYPE:
          case EMC_AXIS_ALTER_TYPE:
+         case EMC_AXIS_SET_STEP_PARAMS_TYPE:
          case EMC_TRAJ_PAUSE_TYPE:
          case EMC_TRAJ_RESUME_TYPE:
***************
*** 1204,1207 ****
--- 1212,1216 ----
        case EMC_AXIS_SET_OUTPUT_TYPE:
        case EMC_AXIS_ALTER_TYPE:
+       case EMC_AXIS_SET_STEP_PARAMS_TYPE:
        case EMC_TRAJ_SET_SCALE_TYPE:
        case EMC_SPINDLE_ON_TYPE:
***************
*** 1550,1553 ****
--- 1559,1569 ----
      retval = emcAxisAlter(axis_alter_msg->axis,
                            axis_alter_msg->alter);
+     break;
+ 
+   case EMC_AXIS_SET_STEP_PARAMS_TYPE:
+     set_step_params_msg = (EMC_AXIS_SET_STEP_PARAMS *) cmd;
+     retval = emcAxisSetStepParams(set_step_params_msg->axis,
+                                   set_step_params_msg->setup_time,
+                                   set_step_params_msg->hold_time);
      break;
  

Index: minimilltaskintf.cc
===================================================================
RCS file: /cvsroot/emc/emc/src/emctask/minimilltaskintf.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** minimilltaskintf.cc	17 Nov 2002 00:38:00 -0000	1.23
--- minimilltaskintf.cc	21 Jul 2003 02:51:34 -0000	1.24
***************
*** 12,15 ****
--- 12,16 ----
    Modification history:
    
+   18-Jul-2003  MGS added emcAxisSetStepParams stuff.
    9-Nov-2002 P.C. Fixed a bug with spindle speed output to a spare DAC.
    17-Aug-2001  FMP added emcMotionSetDout
***************
*** 499,502 ****
--- 500,518 ----
      }
  #endif
+ 
+   return usrmotWriteEmcmotCommand(&emcmotCommand);
+ }
+ 
+ int emcAxisSetStepParams(int axis, double setup_time, double hold_time)
+ {
+   if (axis < 0 || axis >= EMCMOT_MAX_AXIS)
+   {
+     return 0;
+   }
+ 
+   emcmotCommand.command = EMCMOT_SET_STEP_PARAMS;
+   emcmotCommand.axis = axis;
+   emcmotCommand.setup_time = setup_time;
+   emcmotCommand.hold_time = hold_time;
  
    return usrmotWriteEmcmotCommand(&emcmotCommand);