[Emc-commit] emc generic.ini,1.15,1.16

[<ray...@us...>]

Update of /cvsroot/emc/emc
In directory sc8-pr-cvs1:/tmp/cvs-serv20786

Modified Files:
	generic.ini 
Log Message:
add lube and lower some values

Index: generic.ini
===================================================================
RCS file: /cvsroot/emc/emc/generic.ini,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** generic.ini	21 Jul 2003 02:51:32 -0000	1.15
--- generic.ini	23 Dec 2003 00:57:10 -0000	1.16
***************
*** 12,16 ****
  
  ; Name of NML file to use, default is emc.nml
! NML_FILE =              emc.nml
  
  ; Debug level, 0 means no messages. See emc/src/emcnml/emcglb.h for others
--- 12,16 ----
  
  ; Name of NML file to use, default is emc.nml
! NML_FILE =              generic.nml
  
  ; Debug level, 0 means no messages. See emc/src/emcnml/emcglb.h for others
***************
*** 33,36 ****
--- 33,37 ----
  ; DISPLAY =             keystick
  ; DISPLAY =             emcpanel
+ ; DISPLAY =               mini
  
  ; Cycle time, in seconds, that display will sleep between polls
***************
*** 86,90 ****
  
  ; File containing interpreter variables
! PARAMETER_FILE =        emc.var
  
  ; Motion control section ------------------------------------------------------
--- 87,91 ----
  
  ; File containing interpreter variables
! PARAMETER_FILE =        generic.var
  
  ; Motion control section ------------------------------------------------------
***************
*** 96,101 ****
  
  ; Name of motion control program
! ; EMCMOT =                smdromod.o
  EMCMOT =              freqmod.o
  ; EMCMOT =              stgmod.o
  ; EMCMOT =              stg8mod.o
--- 97,103 ----
  
  ; Name of motion control program
! ; EMCMOT =              smdromod.o
  EMCMOT =              freqmod.o
+ ; EMCMOT =              steppermod.o
  ; EMCMOT =              stgmod.o
  ; EMCMOT =              stg8mod.o
***************
*** 130,134 ****
  ; Base task period, in seconds
  ; Don't use this if steppermot is being used
! PERIOD =                0.000020
  
  ; Address for motion IO, synchronized with motion start/end
--- 132,136 ----
  ; Base task period, in seconds
  ; Don't use this if steppermot is being used
! PERIOD =                0.000024
  
  ; Address for motion IO, synchronized with motion start/end
***************
*** 146,150 ****
  CYCLE_TIME =            0.010
  DEFAULT_VELOCITY =      0.0167
! MAX_VELOCITY =          2.5
  DEFAULT_ACCELERATION =  20.0
  MAX_ACCELERATION =      20.0
--- 148,152 ----
  CYCLE_TIME =            0.010
  DEFAULT_VELOCITY =      0.0167
! MAX_VELOCITY =          1.0
  DEFAULT_ACCELERATION =  20.0
  MAX_ACCELERATION =      20.0
***************
*** 160,164 ****
  UNITS =                         0.03937007874016
  HOME =                          0.000
! MAX_VELOCITY =                  2.5
  P = 1000.000
  I = 0.000
--- 162,166 ----
  UNITS =                         0.03937007874016
  HOME =                          0.000
! MAX_VELOCITY =                  1.0
  P = 1000.000
  I = 0.000
***************
*** 170,174 ****
  BIAS = 0.000
  MAX_ERROR = 0.000
! DEADBAND = 0.000
  CYCLE_TIME =                    0.001000
  INPUT_SCALE =                   1000    0
--- 172,176 ----
  BIAS = 0.000
  MAX_ERROR = 0.000
! DEADBAND = 0.0006
  CYCLE_TIME =                    0.001000
  INPUT_SCALE =                   1000    0
***************
*** 213,217 ****
  UNITS =                         0.03937007874016
  HOME =                          0.000
! MAX_VELOCITY =                  2.5
  P = 1000.000
  I = 0.000
--- 215,219 ----
  UNITS =                         0.03937007874016
  HOME =                          0.000
! MAX_VELOCITY =                  1.0
  P = 1000.000
  I = 0.000
***************
*** 223,227 ****
  BIAS = 0.000
  MAX_ERROR = 0.000
! DEADBAND = 0.000
  CYCLE_TIME =                    0.001000
  INPUT_SCALE =                   1000    0
--- 225,229 ----
  BIAS = 0.000
  MAX_ERROR = 0.000
! DEADBAND = 0.0006
  CYCLE_TIME =                    0.001000
  INPUT_SCALE =                   1000    0
***************
*** 266,270 ****
  UNITS =                         0.03937007874016
  HOME =                          0.000
! MAX_VELOCITY =                  2.5
  P = 1000.000
  I = 0.000
--- 268,272 ----
  UNITS =                         0.03937007874016
  HOME =                          0.000
! MAX_VELOCITY =                  1.0
  P = 1000.000
  I = 0.000
***************
*** 276,280 ****
  BIAS = 0.000
  MAX_ERROR = 0.000
! DEADBAND = 0.000
  CYCLE_TIME =                    0.001000
  INPUT_SCALE =                   1000    0
--- 278,282 ----
  BIAS = 0.000
  MAX_ERROR = 0.000
! DEADBAND = 0.0006
  CYCLE_TIME =                    0.001000
  INPUT_SCALE =                   1000    0
***************
*** 328,332 ****
  
  ; tool table file
! TOOL_TABLE =    emc.tbl
  
  ; address for parallel port used for auxiliary IO
--- 330,334 ----
  
  ; tool table file
! TOOL_TABLE =    generic.tbl
  
  ; address for parallel port used for auxiliary IO
***************
*** 360,363 ****
--- 362,366 ----
  ESTOP_WRITE_INDEX         =     10
  SPINDLE_BRAKE_INDEX       =     11
+ LUBE_WRITE_INDEX          =     5
  
  ; analog out bits
***************
*** 379,382 ****
--- 382,387 ----
  SPINDLE_BRAKE_POLARITY    =     0
  SPINDLE_ENABLE_POLARITY   =     1
+ LUBE_WRITE_POLARITY       =     1
+ 
  
  ; section for external NML server parameters ----------------------------------