From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Mon, 3 Jan 2011 18:29:05 +0000 (+0000)
Subject: hostside/measure-speeds: better recovery from unhelpful initial positions
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=7c160d27e38cdf6e780436305bba90e5f3e24e0f;p=trains.git

hostside/measure-speeds: better recovery from unhelpful initial positions
---

diff --git a/hostside/measure-speeds b/hostside/measure-speeds
index 3b8f20e..70844e7 100755
--- a/hostside/measure-speeds
+++ b/hostside/measure-speeds
@@ -39,7 +39,7 @@ proc startup {} {
     read -nonewline $rwy
     fileevent $rwy readable readable
     set buf {}
-    set last_fast_speed 0
+    set last_fast_speed -1
     set noise {}
     for {set i 0} {$i < 256} {incr i} { append noise \\x [hbytes random 1] }
 #    foreach f {funcs0to4 funcs5to8} {
@@ -240,6 +240,8 @@ 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 {
+	run-until 100 [list $segs(X5) $segs(X6)]
     }
     run-until -40 [list $segs(X7) $segs(X5)]
     run-until-not -40 $segs(X5) 600