From: Ian Jackson Date: Mon, 3 Jan 2011 19:58:20 +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=d9686a412ace0ec2c19e96fc5a72af063a4f007c;p=trains.git hostside/measure-speeds: when positioning for slow, when we have just done slow speed, look for X7 too --- diff --git a/hostside/measure-speeds b/hostside/measure-speeds index c71dd84..4c22870 100755 --- a/hostside/measure-speeds +++ b/hostside/measure-speeds @@ -242,9 +242,10 @@ proc timing-finish {{now {}}} { proc goto-slow-start-position {speed} { global last_fast_speed segs - if {$last_fast_speed >= 0} { + if {$last_fast_speed > 0} { run-until -100 [list $segs(X5) $segs(X6)] - set last_fast_speed -1 + } elseif {$last_fast_speed == 0} { + run-until -100 [list $segs(X5) $segs(X6) $segs(X7)] } elseif {$last_fast_speed < 0} { run-until 100 [list $segs(X5) $segs(X6) $segs(X8)] }