train * speed command_ing_

diff --git a/hostside/gui b/hostside/gui
index c083ef483f0bcb225c9906048d218eef314f483d..47f92bbf8d5aed6832053fe61374c4bb964020c7 100755 (executable)
--- 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 9415dd193d4a250273afa2c78307458307a6bee8..e82c0ea4bb35d82d20b368d4fc408dd9e83482fc 100755 (executable)
--- 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]} {