From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Mon, 3 Jan 2011 19:32:44 +0000 (+0000)
Subject: hostside/measure-speeds: when positioning for slow, when we have just done slow speed... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=7a8f2f8db97054920226a71c7a0feb8d1089eac0;p=trains.git

hostside/measure-speeds: when positioning for slow, when we have just done slow speed, do not bother with forward movement towards X8 et al
---

diff --git a/hostside/measure-speeds b/hostside/measure-speeds
index 958f9e2..c71dd84 100755
--- a/hostside/measure-speeds
+++ b/hostside/measure-speeds
@@ -245,7 +245,7 @@ proc goto-slow-start-position {speed} {
     if {$last_fast_speed >= 0} {
 	run-until -100 [list $segs(X5) $segs(X6)]
 	set last_fast_speed -1
-    } else {
+    } elseif {$last_fast_speed < 0} {
 	run-until 100 [list $segs(X5) $segs(X6) $segs(X8)]
     }
     run-until -40 [list $segs(X7) $segs(X5)]
@@ -262,12 +262,13 @@ proc begin-slow-test {speed} {
 }
 
 proc slow-speed-test {speed} {
-    global segs
+    global segs last_fast_speed
     begin-slow-test $speed
     timing-start
     run-until $speed $segs(X6)
     record-mm-per-s S $speed 231 [timing-finish]
     instruct-stop-for 100
+    set last_fast_speed 0
 }
 
 proc slow-stop-test {speed} {