[Emc-commit] emc2/src/emc/iotask ioControl.cc,1.24,1.25

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

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

Modified Files:
	ioControl.cc 
Log Message:
reverted the previous change, tried a different approach. this still needs to be user-setable

Index: ioControl.cc
===================================================================
RCS file: /cvsroot/emc/emc2/src/emc/iotask/ioControl.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ioControl.cc	27 Nov 2005 22:40:36 -0000	1.24
--- ioControl.cc	27 Nov 2005 23:23:26 -0000	1.25
***************
*** 689,701 ****
  /********************************************************************
  *
! * Description: hal_abort_pins(void)
  *
! * Side Effects: Sets HAL pins default values on any abort (TRAJ abort)
! *               Doesn't include ESTOP and other safety relevant pins 
  *
! * Called By: main, hal_init_pins
  ********************************************************************/
! void hal_abort_pins(void)
  {
      *(iocontrol_data->coolant_mist)=0;		/* coolant mist output pin */
      *(iocontrol_data->coolant_flood)=0;		/* coolant flood output pin */
--- 689,702 ----
  /********************************************************************
  *
! * Description: hal_init_pins(void)
  *
! * Side Effects: Sets HAL pins default values.
  *
! * Called By: main
  ********************************************************************/
! void hal_init_pins(void)
  {
+     *(iocontrol_data->user_enable_out)=0;	/* output, FALSE when EMC wants stop */
+     *(iocontrol_data->user_request_enable)=0;	/* output, used to reset HAL latch */
      *(iocontrol_data->coolant_mist)=0;		/* coolant mist output pin */
      *(iocontrol_data->coolant_flood)=0;		/* coolant flood output pin */
***************
*** 711,747 ****
      *(iocontrol_data->spindle_brake)=0;		/* spindle brake output */
      *(iocontrol_data->spindle_speed_out)=0.0;	/* spindle speed output */
- 
-     // abort all emcstatus pins too
-     emcioStatus.tool.toolPrepped = -1;
-     emcioStatus.tool.toolInSpindle = 0;
-     emcioStatus.spindle.speed = 0.0;
-     emcioStatus.spindle.direction = 0;
-     emcioStatus.spindle.brake = 1;
-     emcioStatus.spindle.increasing = 0;
-     emcioStatus.spindle.enabled = 1;
-     emcioStatus.coolant.mist = 0;
-     emcioStatus.coolant.flood = 0;
-     emcioStatus.lube.on = 0;
-     emcioStatus.lube.level = 1;
- }
- 
- 
- /********************************************************************
- *
- * Description: hal_init_pins(void)
- *
- * Side Effects: Sets HAL pins default values.
- *
- * Called By: main
- ********************************************************************/
- void hal_init_pins(void)
- {
-     *(iocontrol_data->user_enable_out)=0;	/* output, FALSE when EMC wants stop */
-     *(iocontrol_data->user_request_enable)=0;	/* output, used to reset HAL latch */
-     hal_abort_pins();
  }
  
  
- 
  /********************************************************************
  *
--- 712,718 ----
***************
*** 963,969 ****
  
  	case EMC_TOOL_ABORT_TYPE:
! 	    // this gets sent on any Task abort, so it might be safe to stop everything to default values
! 	    rtapi_print_msg(RTAPI_MSG_DBG, "EMC_TOOL_ABORT\n");
! 	    hal_abort_pins(); //resets all HAL pins to safe value
  	    break;
  
--- 934,955 ----
  
  	case EMC_TOOL_ABORT_TYPE:
! 	    // this gets sent on any Task Abort, so it might be safer to stop
! 	    // the spindle  and coolant
! 	    rtapi_print_msg(RTAPI_MSG_ERR, "EMC_TOOL_ABORT\n");
! 
! 	    emcioStatus.spindle.speed = 0.0;
! 	    emcioStatus.spindle.direction = 0;
! 	    emcioStatus.spindle.brake = 1;
! 	    emcioStatus.coolant.mist = 0;
! 	    emcioStatus.coolant.flood = 0;
! 	    *(iocontrol_data->coolant_mist)=0;		/* coolant mist output pin */
!     	    *(iocontrol_data->coolant_flood)=0;		/* coolant flood output pin */
! 	    *(iocontrol_data->spindle_on)=0;		/* spindle spin output */
! 	    *(iocontrol_data->spindle_forward)=0;	/* spindle spin-forward output */
! 	    *(iocontrol_data->spindle_reverse)=0;	/* spindle spin-reverse output */
! 	    *(iocontrol_data->spindle_incr_speed)=0;	/* spindle spin-increase output */
! 	    *(iocontrol_data->spindle_decr_speed)=0;	/* spindle spin-decrease output */
! 	    *(iocontrol_data->spindle_brake)=0;		/* spindle brake output */
! 	    *(iocontrol_data->spindle_speed_out)=0.0;	/* spindle speed output */    
  	    break;