IP addresses changed. reduced by 2

r2081 | dbx | 2007-07-20 10:35:09 +1000 (Fri, 20 Jul 2007) | 2 lines
2007-07-20 10:35:09 +10:00
parent 85d58121a5
commit 1d35fb41b4
4 changed files with 40 additions and 40 deletions
--- a/site_ansto/instrument/sans/DMC2280/controller1.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller1.txt
@@ -1,7 +1,7 @@
 NO TE: QUOKKA - CONTROLLER 1
 NO TE:
-NO TE: $Revision: 1.4 $
-NO TE: $Date: 2007-05-31 06:33:10 $
+NO TE: $Revision: 1.5 $
+NO TE: $Date: 2007-07-20 00:35:09 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -21,10 +21,10 @@ MO;' FIRST TIME MOTOR OFF
 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,69;' 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,50000,25000,25000,25000,25000;' SET SPEED
+IA 137,157,202,67;' CONFIGURES IP ADDRESS
+AC 25000,25000,25000,25000,100000,25000,25000,25000;' SET ACELERATION
+DC 25000,25000,25000,25000,100000,25000,25000,25000;' SET DECELERATION
+SP 25000,25000,25000,50000,200000,25000,25000,25000;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIC=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
@@ -51,8 +51,8 @@ ENDIF
 IF (_SPD>100000)
 SPD=100000
 ENDIF
-IF (_SPE>50000)
-SPE=50000
+IF (_SPE>200000)
+SPE=200000
 ENDIF
 IF (_SPF>50000)
 SPF=50000
@@ -111,7 +111,7 @@ DCD=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STD
 ENDIF
 IF (_LFE = 0) | (_LRE = 0)
-DCE=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCE=400000;' DECEL FOR LIMIT HIT OCCURENCE
 STE
 ENDIF
 IF (_LFF = 0) | (_LRF = 0)
--- 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.2 $
-NO TE: $Date: 2007-04-09 22:08:20 $
+NO TE: $Revision: 1.3 $
+NO TE: $Date: 2007-07-20 00:35:09 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -21,7 +21,7 @@ MO;' FIRST TIME MOTOR OFF
 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,70;' CONFIGURES IP ADDRESS
+IA 137,157,202,68;' 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
--- 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.2 $
-NO TE: $Date: 2007-04-09 22:08:20 $
+NO TE: $Revision: 1.3 $
+NO TE: $Date: 2007-07-20 00:35:09 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -11,8 +11,8 @@ NO TE: C-SOURCE END CHAMBER - PENTAPRISM
 NO TE: D-SOURCE END CHAMBER - SRC APERTURES
 NO TE: E-SAMPLE END CHAMBER - X APETURE
 NO TE: F-SAMPLE END CHAMBER - Y APETURE
-NO TE: G-SPARE
-NO TE: H-ROTARY ATTENUATOR
+NO TE: G-ROTARY ATTENUATOR
+NO TE: H-SPARE
 NO ----------------------------------------
 #AUTO
 NO TE: THIS IS THE PROGRAM THAT RUNS AUTOMATICALLY ON CONTROLLER STARTUP
@@ -21,18 +21,18 @@ MO;' FIRST TIME MOTOR OFF
 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,71;' CONFIGURES IP ADDRESS
-AC 25000,25000,25000,25000,25000,25000,,25000;' SET ACELERATION
-DC 25000,25000,25000,25000,25000,25000,,25000;' SET DECELERATION
-SP 25000,25000,25000,25000,25000,25000,,25000;' SET SPEED
+IA 137,157,202,69;' CONFIGURES IP ADDRESS
+AC 25000,25000,25000,25000,25000,25000,25000,;' SET ACELERATION
+DC 25000,25000,25000,25000,25000,25000,25000,;' SET DECELERATION
+SP 25000,25000,25000,25000,25000,25000,25000,;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 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 ROQ425
-SIG=0,25,13,0<-2>2;'NOT USED
-SIH=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
+SIG=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
+SIH=0,25,13,0<-2>2;'NOT USED
 JS #THREAD0
 EN
 NO ----------------------------------------
@@ -57,12 +57,12 @@ ENDIF
 IF (_SPF>50000)
 SPF=50000
 ENDIF
-NO IF (_SPG>50000) COMMENTED OUT, NOT USED
-NO SPG=50000
-NO ENDIF
-IF (_SPH>50000)
-SPH=50000
+IF (_SPG>50000)
+SPG=50000
 ENDIF
+NO IF (_SPH>50000)
+NO SPH=50000
+NO ENDIF
 JP #THREAD0
 EN
 NO ----------------------------------------
@@ -86,8 +86,8 @@ OLDDCC=_DCC
 OLDDCD=_DCD
 OLDDCE=_DCE
 OLDDCF=_DCF
-NO OLDDCG=_DCG COMMENTED OUT, NOT USED
-OLDDCH=_DCH
+OLDDCG=_DCG
+NO OLDDCH=_DCH
 IF (_LFA = 0) | (_LRA = 0)
 DCA=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STA
@@ -113,12 +113,12 @@ DCF=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STF
 ENDIF
 IF (_LFG = 0) | (_LRG = 0)
-NO DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
-NO STG
-NO ENDIF
-IF (_LFH = 0) | (_LRH = 0)
-DCH=100000;' DECEL FOR LIMIT HIT OCCURENCE
-STH
+DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
+STG
+ENDIF
+NO IF (_LFH = 0) | (_LRH = 0)
+NO DCH=100000;' DECEL FOR LIMIT HIT OCCURENCE
+NO STH
 ENDIF
 AM ABCDEFGH;' AFTER ALL AXES STOPPED
 DCA=OLDDCA;' RESET DECEL TO OLD VALUE
@@ -127,6 +127,6 @@ DCC=OLDDCC
 DCD=OLDDCD
 DCE=OLDDCE
 DCF=OLDDCF
-NO DCG=OLDDCG COMMENTED OUT, NOT USED
-DCH=OLDDCH
+DCG=OLDDCG
+NO DCH=OLDDCH
 RE
--- 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.3 $
-NO TE: $Date: 2007-04-09 22:08:20 $
+NO TE: $Revision: 1.4 $
+NO TE: $Date: 2007-07-20 00:35:09 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -21,7 +21,7 @@ MO;' FIRST TIME MOTOR OFF
 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
+IA 137,157,202,70;' CONFIGURES IP ADDRESS
 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