[Emc-commit] documents/lyx EMC2_Code_Notes.lyx,1.3,1.4

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

Update of /cvsroot/emc/documents/lyx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26536

Modified Files:
	EMC2_Code_Notes.lyx 
Log Message:
Removed duplicate descriptions for some of the commands

Index: EMC2_Code_Notes.lyx
===================================================================
RCS file: /cvsroot/emc/documents/lyx/EMC2_Code_Notes.lyx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EMC2_Code_Notes.lyx	19 Jul 2004 02:51:19 -0000	1.3
--- EMC2_Code_Notes.lyx	23 Jul 2004 15:10:52 -0000	1.4
***************
*** 534,558 ****
   If not, the controller is enabled.
   Queues and interpolators are flushed.
- \layout Subsection
- 
- ENABLE
- \layout Standard
- 
- The ENABLE command enables the motion controller.
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- If the controller is already enabled, nothing.
-  If not, the controller is enabled.
-  Queues and interpolators are flushed.
   Any movement or homing operations are terminated.
   The amp-enable outputs are turned on.
--- 534,537 ----
***************
*** 586,663 ****
  \layout Subsection
  
- DISABLE
- \layout Standard
- 
- The DISABLE command disables the motion controller.
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- If the controller is already disabled, nothing.
-  If not, the controller is disabled.
-  Queues and interpolators are flushed.
-  Any movement or homing operations are terminated.
-  The amp-enable outputs associated with active joints are turned off.
-  If forward kinematics are not available, the machine is switched to free
-  mode.
- \layout Subsection
- 
- ENABLE_AMPLIFIER
- \layout Standard
- 
- The ENABLE_AMPLIFIER command turns on the amp enable output for a single
-  joint, without changing anything else.
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- Currently, nothing.
-  (A call to the old extAmpEnable function is currently commented out.) Eventually
-  it will set the amp enable HAL pin true.
- \layout Subsection
- 
  ENABLE_AMPLIFIER
  \layout Standard
  
  The ENABLE_AMPLIFIER command turns on the amp enable output for a single
!  joint, without changing anything else.
! \layout Subsubsection
! 
! Requirements
! \layout Standard
! 
! None.
!  The command can be issued at any time, and will always be accepted.
! \layout Subsubsection
! 
! Results
! \layout Standard
! 
! Currently, nothing.
!  (A call to the old extAmpEnable function is currently commented out.) Eventually
!  it will set the amp enable HAL pin true.
! \layout Subsection
! 
! ENABLE_AMPLIFIER
! \layout Standard
! 
! The ENABLE_AMPLIFIER command turns on the amp enable output for a single
!  joint, without changing anything else.
  \layout Subsubsection
  
--- 565,574 ----
  \layout Subsection
  
  ENABLE_AMPLIFIER
  \layout Standard
  
  The ENABLE_AMPLIFIER command turns on the amp enable output for a single
!  output amplifier, without changing anything else.
!  Can be used to enable a spindle speed controller.
  \layout Subsubsection
  
***************
*** 681,707 ****
  
  The DISABLE_AMPLIFIER command turns off the amp enable output for a single
!  joint, without changing anything else.
! \layout Subsubsection
! 
! Requirements
! \layout Standard
! 
! None.
!  The command can be issued at any time, and will always be accepted.
! \layout Subsubsection
! 
! Results
! \layout Standard
! 
! Currently, nothing.
!  (A call to the old extAmpEnable function is currently commented out.) Eventually
!  it will set the amp enable HAL pin false.
! \layout Subsection
! 
! DISABLE_AMPLIFIER
! \layout Standard
! 
! The DISABLE_AMPLIFIER command turns off the amp enable output for a single
!  joint, without changing anything else.
  \layout Subsubsection
  
--- 592,597 ----
  
  The DISABLE_AMPLIFIER command turns off the amp enable output for a single
!  amplifier, without changing anything else.
!  Again, useful for spindle speed controllers.
  \layout Subsubsection
  
***************
*** 743,790 ****
  \layout Subsection
  
- ACTIVATE_JOINT
- \layout Standard
- 
- The ACTIVATE_JOINT command turns on all the calculations associated with
-  a single joint, but does not change the joint's amp enable output pin.
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- Calculations for the specified joint are enabled.
-  The amp enable pin is not changed, however, any subsequent ENABLE or DISABLE
-  commands will modify the joint's amp enable pin.
- \layout Subsection
- 
- DEACTIVATE_JOINT
- \layout Standard
- 
- The DEACTIVATE_JOINT command turns off all the calculations associated with
-  a single joint, but does not change the joint's amp enable output pin.
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- Calculations for the specified joint are enabled.
-  The amp enable pin is not changed, and subsequent ENABLE or DISABLE commands
-  will not modify the joint's amp enable pin.
- \layout Subsection
- 
  DEACTIVATE_JOINT
  \layout Standard
--- 633,636 ----
***************
*** 830,875 ****
  \layout Subsection
  
- ENABLE_WATCHDOG
- \layout Standard
- 
- The ENABLE_WATCHDOG command enables a hardware based watchdog (if present).
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- Currently nothing.
-  The old watchdog was a strange thing that used a specific sound card.
-  A new watchdog interface may be designed in the future.
- \layout Subsection
- 
- DISABLE_WATCHDOG
- \layout Standard
- 
- The DISABLE_WATCHDOG command disables a hardware based watchdog (if present).
- \layout Subsubsection
- 
- Requirements
- \layout Standard
- 
- None.
-  The command can be issued at any time, and will always be accepted.
- \layout Subsubsection
- 
- Results
- \layout Standard
- 
- Currently nothing.
-  The old watchdog was a strange thing that used a specific sound card.
-  A new watchdog interface may be designed in the future.
- \layout Subsection
- 
  DISABLE_WATCHDOG
  \layout Standard
--- 676,679 ----