-#!/usr/bin/tclsh8.2
+#!/usr/bin/tclsh8.3
# used like this:
# liberator:hostside> ssh bessar 'cd things/trains-bessar/hostside && ./stopgap-controller' | ./gui-displayer -
set ch(minint) 5000
-#unset pointasked
-# 0 1 (settings) M0 M1 (manual, settings) unset (random) M (manual)
+set pointprobs {0 0x020 0x080 0x0e0 0x100}
+set pointprobix 0
+set pointabs 1 ;# 0 or 1
set nmrawhich 0
set lastptchosen xx
+set pointprob [lindex $pointprobs $pointprobix]
set polmsg(l) 908000
set polmsg(x) 90f802
set segsasgot {xx yy}
set pq {} ;# unset: cdu charged and waiting
set speeddirn ff7f
-#unset askspeedix
-set askspeeds {10 30 50 80 100 126}
+set askspeedix -1
+set askspeeds {1 30 50 80 100 126}
#set speeddirn ffff80c3fbcced7f
#set speeddirn_fixed {speed126 2 80 0}
set speeddirn_fixed {}
# unset segdetect($seg) ;# unset: shown D0; {}: shown D1; or: after id, D1->0
set funcsr1 {0x061 0x020 0x000 0x040 0x060}
-set funcsl1 {0x181 0x080 0x000 0x100 0x180}
+set funcsl1 {0x182 0x080 0x000 0x100 0x180}
set funcsr2 {0x021 0x020 0x000}
-set funcsl2 {0x041 0x040 0x000}
+set funcsl2 {0x042 0x040 0x000}
set funcsval 0x000
proc gui {m} {
}
proc pt_maybe {point oneisright} {
- 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 manual"
- return
+ upvar #0 pointpos($point) oldpos
+ global lastptchosen pointprob pointabs
+ if {![string compare $point $lastptchosen]} return
+ set lastptchosen $point
+ set x 0x[randbyte]
+ set pos [expr {$x < $pointprob ? 1 : 0}]
+ if {$pointabs} {
+ debug "chose point $point $pos (abs x=$x prob=$pointprob)"
+ set pos [expr {!$pos}]
+ } elseif {[info exists oldpos] && !$oldpos} {
+ debug "chose point $point $pos (0-> x=$x prob=$pointprob)"
} else {
- set pos $pointasked
- debug "fixed point $point pos=$pos"
+ set pos [expr {!$pos}]
+ debug "chose point $point $pos (1-> x=$x prob=$pointprob)"
}
pt_must $point $pos
}
}
proc newspeeddirn {} {
- global loco
+ global loco askspeedix
+ set maxspeed [expr {$askspeedix == -1 ? 126.0 : 50.0}]
+ set minspeed 26.0
set b1 0x[randbyte]
- set speed [expr {round(($b1 * $b1) / 65535.0 * 100.0 + 26.0)}]
+ set speed [expr {
+ round(($b1 * $b1) / 65535.0 * ($maxspeed - $minspeed) + $minspeed)
+ }]
set b2 0x[randbyte]
set dirn [expr {$b2 / 128}]
set dirn 0
set headent [lindex $list 0]
set val $funcsval
set add $headent
- if {$add & 0x01} {
+ if {$add & 0x02} {
set rand 0x[randbyte]0
set add [expr {$add & $rand}]
set val [expr {$val | $add}]
}
proc setup {} {
- global port p testonly
+ global port p testonly stateshowpipe
fconfigure stdout -buffering none
if {!$testonly} {
set p [open $port {RDWR NONBLOCK} 0]
fileevent $p readable onreadp
fconfigure stdin -blocking false
fileevent stdin readable onreadcmd
+ set stateshowpipe [open /tmp/train-state w]
+ fconfigure $stateshowpipe -buffering none
} else {
set p stdin
fconfigure stdin -blocking false
fileevent stdin readable onreadp_test
+ set stateshowpipe [open /dev/null w]
}
after 250 setup_complete
proc setup_complete {} {
global rand
-# exec [xset s off]
+ exec xset s off
set rand [open /dev/urandom {RDONLY} 0]
fconfigure $rand -encoding binary -translation binary
tellpic 0a
#----------
# for keyboard control
-proc ask_speed {updown} {
- global speeddirn_fixed askspeeds askspeedix loco
- set ll [llength $askspeeds]
- if {![info exists askspeedix]} {
- set askspeedix [expr {
+proc updownfromlist {wholelistv ixv updown} {
+ upvar #0 $wholelistv wholelist
+ upvar #0 $ixv ix
+ set ll [llength $wholelist]
+ if {![info exists ix]} {
+ set old ?
+ set ix [expr {
int($ll * 0.5 - 0.5 + 0.5 * $updown)
}]
} else {
- incr askspeedix $updown
- if {$askspeedix < 0} { set askspeedix 0 }
- if {$askspeedix >= $ll} { set askspeedix [expr {$ll - 1}] }
+ set old $ix
+ incr ix $updown
+ if {$ix < 0} { set ix 0 }
+ if {$ix >= $ll} { set ix [expr {$ll - 1}] }
}
- set speed [lindex $askspeeds $askspeedix]
+ set val [lindex $wholelist $ix]
+ debug "updownfromlist ix:$old->$ix /$ll $val ($wholelist)"
+ return $val
+}
+
+proc ask_speed {updown} {
+ global speeddirn_fixed loco askspeedix
+ if {$askspeedix < 0} { unset askspeedix }
+ set speed [updownfromlist askspeeds askspeedix $updown]
set speeddirn_fixed [list speed126 $loco $speed 0]
maybechange speeddirn 1
}
proc ask_randspeed {} {
global speeddirn_fixed askspeedix
+ set askspeedix [expr {$askspeedix == -1 ? -2 : -1}]
catch { unset speeddirn_fixed }
- catch { unset askspeedix }
maybechange speeddirn 1
}
+proc ask_loco {} {
+ global loco
+ set loco [expr {$loco==1 ? 2 : 1}]
+}
+
proc ask_funcs {lr} {
global loco
upvar #0 funcs${lr}${loco} list
nmrachange funcs [funcsnmralist]
}
-proc ask_figureeight {} { global pointasked; set pointasked 0 }
-proc ask_loop {} { global pointasked; set pointasked 1 }
-proc ask_randpath {} { global pointasked; catch { unset pointasked } }
+proc ask_pointprob {updown} {
+ global pointprob
+ set pointprob [updownfromlist pointprobs pointprobix $updown]
+}
+
+proc ask_pointrelabs {} {
+ global pointabs
+ set pointabs [expr {!$pointabs}]
+}
+
+proc ask_show {} {
+ global loco stateshowpipe pointprob pointabs askspeedix
+ upvar #0 funcsr$loco fr
+ upvar #0 funcsl$loco fl
+ puts -nonewline $stateshowpipe [format \
+ "\nL$loco P%03x%s F%03x S%s" \
+ $pointprob [lindex {R A} $pointabs] \
+ [expr {[lindex $fr 0] | [lindex $fl 0]}] \
+ $askspeedix]
+}
setup
gui_init
+ask_show
vwait end
~ijackson / trains.git / blobdiff