Merged in-situ modifications for Release 2.5 candidate 5

r2895 | ffr | 2010-04-29 16:02:15 +1000 (Thu, 29 Apr 2010) | 2 lines
2010-04-29 16:02:15 +10:00
parent a2ca46ab67
commit e6e3c3be52
24 changed files with 478 additions and 363 deletions
--- a/site_ansto/instrument/hrpd/config/environment/robby_configuration.tcl
+++ b/site_ansto/instrument/hrpd/config/environment/robby_configuration.tcl
@@ -3,7 +3,7 @@ namespace eval robot {
 		MakeAsyncProtocol robot
 		MakeAsyncQueue robby robot 137.157.201.26 6000
 		robby delay 500
-		robby timeout 5000
+		robby timeout 50000
 		drive sx 0 sy 0 som 0
 	}
 }