path-setting

[trains.git] / hostside / stopgap-controller

diff --git a/hostside/stopgap-controller b/hostside/stopgap-controller
index 8f89014266a1690a171dcb6f4cfaf3a217a3c982..3b3348f24d2ab92ccfc0a7f2d381ef884f074451 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
 
@@ -41,8 +43,9 @@ proc gui {m} {
 proc gui_init {} {
     global watchdog polarity segdetect
     gui "M A2 0"
-#    gui "M A5 0 J"
-#    gui "M A6 0 J"
+    gui "M A5 0 J"
+    gui "M A6 0 J"
+    gui "EOE"
     if {[info exists watchdog]} { gui "P 1" }
     gui_polarity
     foreach seg [array names segdetect] {
@@ -90,7 +93,7 @@ proc fail {m} {
     catch { after cancel $watchdog; unset watchdog }
     puts "failing $m"
     tellpic 9801 ;# 16ms
-    after 10000 fail_now
+    after 1000 fail_now
     fileevent $p readable {}
 }
 
@@ -143,6 +146,12 @@ proc pt_ifthenmust {ifpoint ifposwant thenpoint thenpos} {
     pt_must $thenpoint $thenpos
 }
 
+proc badwatchdog {} {
+    global pq
+    puts "watchdog - oh well"
+    if {![info exists pq]} { set pq {} }
+}
+
 proc pm_charged {} {
     global pq
     if {[llength $pq]} {
@@ -163,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
 }
@@ -315,6 +336,7 @@ proc frompic {m} {
        01 - 02 { tellnmra $m }
        09 { fp $m; pm_hello }
        07 { puts "short circuit"; exit 1 }
+       0d { fp $m; badwatchdog }
        28 { fp $m; pm_charged }
        9[0-7] { fp $m; pm_maydetect 0 $v }
        9? { fp $m; pm_maydetect 1 $v }
@@ -458,12 +480,17 @@ proc ask_fast {} {
     global speeddirn_fixed; set speeddirn_fixed {speed126 2 126 0}
 }
 proc ask_slow {} {
-    global speeddirn_fixed; set speeddirn_fixed {speed126 2 126 10}
+    global speeddirn_fixed; set speeddirn_fixed {speed126 2 10 0}
 }
 proc ask_randspeed {} {
     global speeddirn_fixed; catch { unset speeddirn_fixed }
 }    
 
+proc ask_manual {rightp} { global pointasked; set pointasked M$rightp }
+proc ask_figureeightt {rightp} { global pointasked; set pointasked 0 }
+proc ask_loop {rightp} { global pointasked; set pointasked 1 }
+proc ask_randpath {rightp} { global pointasked; catch { unset pointasked } }
+
 setup
 gui_init
 vwait end