diff --git a/site_ansto/instrument/sans/DMC2280/controller2.txt b/site_ansto/instrument/sans/DMC2280/controller2.txt index 6135cba4..b1ba90a2 100644 --- a/site_ansto/instrument/sans/DMC2280/controller2.txt +++ b/site_ansto/instrument/sans/DMC2280/controller2.txt @@ -1,7 +1,7 @@ NO TE: QUOKKA - CONTROLLER 2 NO TE: -NO TE: $Revision: 1.1 $ -NO TE: $Date: 2007-03-31 02:58:27 $ +NO TE: $Revision: 1.2 $ +NO TE: $Date: 2007-04-09 22:08:20 $ NO TE: Author: Dan Bartlett NO TE: Last revision by: $Author: dbx $ NO TE: @@ -30,9 +30,9 @@ SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIC=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SID=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIE=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 -SIF=1,25,13,0<-2>2;'HEIDENHAIN RCN425 -SIG=1,25,13,0<-2>2;'HEIDENHAIN RCN425 -SIH=1,25,13,0<-2>2;'HEIDENHAIN RCN425 +SIF=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 +SIG=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 +SIH=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 JS #THREAD0 EN NO ---------------------------------------- diff --git a/site_ansto/instrument/sans/DMC2280/controller3.txt b/site_ansto/instrument/sans/DMC2280/controller3.txt index 1823a1eb..a35ae98e 100644 --- a/site_ansto/instrument/sans/DMC2280/controller3.txt +++ b/site_ansto/instrument/sans/DMC2280/controller3.txt @@ -1,7 +1,7 @@ NO TE: QUOKKA - CONTROLLER 3 NO TE: -NO TE: $Revision: 1.1 $ -NO TE: $Date: 2007-03-31 02:58:27 $ +NO TE: $Revision: 1.2 $ +NO TE: $Date: 2007-04-09 22:08:20 $ NO TE: Author: Dan Bartlett NO TE: Last revision by: $Author: dbx $ NO TE: @@ -30,9 +30,9 @@ SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIC=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SID=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIE=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 -SIF=1,25,13,0<-2>2;'HEIDENHAIN RCN425 +SIF=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIG=0,25,13,0<-2>2;'NOT USED -SIH=1,25,13,0<-2>2;'HEIDENHAIN RCN425 +SIH=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 JS #THREAD0 EN NO ---------------------------------------- diff --git a/site_ansto/instrument/sans/DMC2280/controller4.txt b/site_ansto/instrument/sans/DMC2280/controller4.txt index 944b01d2..36c16c8a 100644 --- a/site_ansto/instrument/sans/DMC2280/controller4.txt +++ b/site_ansto/instrument/sans/DMC2280/controller4.txt @@ -1,7 +1,7 @@ NO TE: QUOKKA - CONTROLLER 4 NO TE: -NO TE: $Revision: 1.2 $ -NO TE: $Date: 2007-03-31 04:21:59 $ +NO TE: $Revision: 1.3 $ +NO TE: $Date: 2007-04-09 22:08:20 $ NO TE: Author: Dan Bartlett NO TE: Last revision by: $Author: dbx $ NO TE: @@ -22,9 +22,9 @@ CN 1;' CONFIGURES LIMIT SWITCHES TO ACCEPT NC CONTACTS II 8,,,0;' CONFIGURES THE 8TH INPUT TO ACTIVATE THE #ININT ROUTINE OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF IA 137,157,202,72;' CONFIGURES IP ADDRESS -AC 25000,25000,25000,25000,25000,25000,25000,25000;' SET ACELERATION -DC 25000,25000,25000,25000,25000,25000,25000,25000;' SET DECELERATION -SP 25000,25000,25000,25000,25000,25000,25000,25000;' SET SPEED +AC 25000,100000,15000,15000,15000,15000,15000,25000;' SET ACELERATION +DC 25000,100000,15000,15000,15000,15000,15000,25000;' SET DECELERATION +SP 25000,100000,30000,40000,40000,40000,40000,25000;' SET SPEED SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 SIC=0,25,13,0<-2>2;'NO ENCODER @@ -32,7 +32,7 @@ SID=0,25,13,0<-2>2;'NO ENCODER SIE=0,25,13,0<-2>2;'NO ENCODER SIF=0,25,13,0<-2>2;'NO ENCODER SIG=0,25,13,0<-2>2;'NO ENCODER -SIH=1,25,13,0<-2>2;'HEIDENHAIN RCN425 +SIH=1,25,13,0<-2>2;'HEIDENHAIN ROQ425 JS #THREAD0 EN NO ---------------------------------------- @@ -42,8 +42,8 @@ NO TE: CHECKS IF SPEEDS ARE ABOVE MAXIMUM ALLOWED IF (_SPA>50000) SPA=50000 ENDIF -IF (_SPB>50000) -SPB=50000 +IF (_SPB>100000) +SPB=100000 ENDIF IF (_SPC>50000) SPC=50000 @@ -65,9 +65,9 @@ SPH=50000 ENDIF NO TE: CONTROLS THE BEAM STOPS RAISE ELECTRO-MECHANICAL BRAKE IF (_MOB=0) -CB 9;' MOTOR ON = BRAKE ENERGISED = UNLOCKED +CB 10;' MOTOR ON = BRAKE ENERGISED = UNLOCKED ELSE -SB 9;' MOTOR OFF = BRAKE DENERGISED = LOCKED +SB 10;' MOTOR OFF = BRAKE DENERGISED = LOCKED ENDIF JP #THREAD0 EN @@ -99,7 +99,7 @@ DCA=100000;' DECEL FOR LIMIT HIT OCCURENCE STA ENDIF IF (_LFB = 0) | (_LRB = 0) -DCB=100000;' DECEL FOR LIMIT HIT OCCURENCE +DCB=200000;' DECEL FOR LIMIT HIT OCCURENCE STB ENDIF IF (_LFC = 0) | (_LRC = 0)