bugfixes

[trains.git] / hostside / stopgap-controller

diff --git a/hostside/stopgap-controller b/hostside/stopgap-controller
index 0c4f3342c2e3846e6b58429e665cecfc22a77c45..12959e7fc414a65e72116cb3ede0de3a6ae62d23 100755 (executable)
--- a/hostside/stopgap-controller
+++ b/hostside/stopgap-controller
@@ -12,8 +12,10 @@ set ch(speeddirnevery) 30
 set ch(scale) 1
 
 set ch(minint) 5000
-# unset always
-# set always 0
+
+#unset pointasked
+# 0 1 (settings) M0 M1 (manual, settings) unset (random) M (manual)
+
 set nmrawhich 0
 set lastptchosen xx
 
@@ -170,15 +172,27 @@ proc randbyte {} {
 }
 
 proc pt_maybe {point oneisright} {
-    global always lastptchosen
-    if {[info exists always]} {
-       set pos $always
-    } else {
+    global pointasked lastptchosen
+    if {![info exists pointasked]} {
        if {![string compare $point $lastptchosen]} return
        set lastptchosen $point
        set x [randbyte]
        set pos [expr [regexp {^[89a-f]} $x] ? 1 : 0]
        debug "chose point $point pos=$pos (x=$x)"
+    } elseif {[regexp {^M([01])$} $pointasked dummy pos]} {
+       if {[lsearch -exact {40 02} [lindex $point 0]] >= 0} {
+           set pos [expr {!$pos}]
+           debug "chose point $point pos=$pos manual-rl"
+       } else {
+           debug "chose point $point pos=$pos manual-lr"
+       }
+       set pointasked M
+    } elseif {![string compare $pointasked M]} {
+       debug "leave point $point pos=$pos manual"
+       return
+    } else {
+       debug "fixed point $point pos=$pos"
+       set pos $pointasked
     }
     pt_must $point $pos
 }
@@ -376,19 +390,23 @@ proc newfuncs {} {
     return "funcs5to8 2 $value"
 }
 
-proc maybechange {thing} {
+proc maybechange {thing force} {
     global $thing ch
     upvar #0 ${thing}_fixed fixed
     if {![info exists fixed]} {
-       set rb 0x[randbyte][randbyte]
-       if {
-           $rb / 65536.0 >
-           1.0 / (($ch(${thing}every) - $ch(minint)*0.001) * $ch(scale))
-       } {
-           debug "maybechange $thing rb=$rb no"
-           return 0
+       if {$force} {
+           debug "maybechange $thing forced ..."
+       } else {
+           set rb 0x[randbyte][randbyte]
+           if {
+               $rb / 65536.0 >
+               1.0 / (($ch(${thing}every) - $ch(minint)*0.001) * $ch(scale))
+           } {
+               debug "maybechange $thing rb=$rb no"
+               return 0
+           }
+           debug "maybechange $thing rb=$rb yes ..."
        }
-       debug "maybechange $thing rb=$rb yes ..."
        set l [new$thing]
     } else {
        debug "fixed $thing $fixed"
@@ -405,7 +423,7 @@ proc maybechange {thing} {
 proc changewhat {} {
     global ch chwa
     catch { after cancel $chwa }
-    if {[maybechange speeddirn] || [maybechange funcs]} {
+    if {[maybechange speeddirn 0] || [maybechange funcs 0]} {
        set interval $ch(minint)
     } else {
        set interval 1000
@@ -462,16 +480,24 @@ proc setup_complete {} {
 #----------
 # for keyboard control
 
-proc ask_fast {} {
-    global speeddirn_fixed; set speeddirn_fixed {speed126 2 126 0}
-}
-proc ask_slow {} {
-    global speeddirn_fixed; set speeddirn_fixed {speed126 2 10 0}
+proc ask_speed_now {l} {
+    global speeddirn_fixed
+    set speeddirn_fixed $l
+    maybechange speeddirn 1
 }
+
+proc ask_fast {} { ask_speed_now {speed126 2 126 0} }
+proc ask_slow {} { ask_speed_now {speed126 2 10 0} }
 proc ask_randspeed {} {
     global speeddirn_fixed; catch { unset speeddirn_fixed }
+    maybechange speeddirn 1
 }    
 
+proc ask_manual {rightp} { global pointasked; set pointasked M$rightp }
+proc ask_figureeightt {} { global pointasked; set pointasked 0 }
+proc ask_loop {} { global pointasked; set pointasked 1 }
+proc ask_randpath {} { global pointasked; catch { unset pointasked } }
+
 setup
 gui_init
 vwait end