From: ian <ian>
Date: Sun, 8 Jun 2008 00:50:26 +0000 (+0000)
Subject: train * speed command_ing_
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=b9365e4f56ed6fb4aaa2dfbe16881e8f78a779ae;p=trains.git

train * speed command_ing_
---

diff --git a/hostside/gui b/hostside/gui
index c083ef4..47f92bb 100755
--- a/hostside/gui
+++ b/hostside/gui
@@ -441,8 +441,8 @@ proc speedw-train-problem {w train} {
     speedw-inhibit $w
 }
 
-register-event ?train_*_speed_commanded {train speed} \
-	{^.train (\w+) speed commanded (\d+) } {
+register-event ?train_*_speed_commanding {train speed} \
+	{^.train (\w+) speed commanding (\d+) } {
     upvar #0 train_commanded($train) cmd
     set cmd $speed
 }
@@ -708,10 +708,7 @@ register-event {} {} {^\+nack } { error "multiplexer does not understand" }
 append event_dispatch_body {
     debug "ignored $l"
 }
-proc train-event-inputline {sconn l} "
-puts stderr \"<<<\$l\"
-$event_dispatch_body
-"
+proc train-event-inputline {sconn l} $event_dispatch_body
 proc register-event {args} { error "too late!" }
 
 proc engage-server {} {
diff --git a/hostside/multiplex b/hostside/multiplex
index 9415dd1..e82c0ea 100755
--- a/hostside/multiplex
+++ b/hostside/multiplex
@@ -562,7 +562,7 @@ proc realtime-inputline {dummy l} {
 	set pri 55
     } elseif {[regexp -expanded {
 	^( movpos \s \S+ \s (?: feat \s \S+ | position) |
-	   train  \s \S+ \s (?: has | at | speed \s commanded ) |
+	   train  \s \S+ \s (?: has | at | speed \s commanding ) |
 	   picio  \s out \s polarity
 	) \s (.*) $
               } $l dummy key value]} {