From 40487dcb3193ac194aaa620a1548343c0797d3c8 Mon Sep 17 00:00:00 2001 From: sans Date: Tue, 26 Nov 2024 15:25:31 +0100 Subject: [PATCH 1/3] ma11: remove alarm on VTI_pt --- tcl/ma11.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcl/ma11.config b/tcl/ma11.config index 462136b..7930c2b 100644 --- a/tcl/ma11.config +++ b/tcl/ma11.config @@ -6,7 +6,7 @@ device stick_menu "ma11 ma11t hvolt dil2 dil3 dil4 coil" makenv tt -driver [lsdriver] { lsc_sensor tm B -sensor x14667 -sensorname VTI lsc_sensor ts C -sensorname sample - lsc_sensor tm_pt A -sensor pt-100 -sensorname VTI_pt -color hidden + lsc_sensor tm_pt A -sensor pt-100 -sensorname VTI_pt -color hidden -alarm 0 lsc_sensor ts_2 D -sensor code -sensorname sample2 # lsc_sensor ts_2 D -sensor x63166 -sensorname sample2 -color hidden lsc_loop set -loop 1 -channel B -maxheater 80W -resist 40Ohm -color green From 6fa7cf88673a0fda0b2973e678cfd0d62a64e182 Mon Sep 17 00:00:00 2001 From: dmc Date: Tue, 22 Oct 2024 10:28:58 +0200 Subject: [PATCH 2/3] dblctrl: smart selection of mode (up, down, stable) when switching from inactive to active --- tcl/drivers/trun.tcl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tcl/drivers/trun.tcl b/tcl/drivers/trun.tcl index 7390b86..6597218 100644 --- a/tcl/drivers/trun.tcl +++ b/tcl/drivers/trun.tcl @@ -447,7 +447,16 @@ proc trun::read_run {} { } if {$dblctrl} { if {[hval [sct]/dblctrl/mode] == 0} { # inactive -> stable - hupdate [sct]/dblctrl/mode 1 + set tol [hvali [sct]/tolerance] + set tg [silent $tsample sct target] + if {$tg > $tsample + $tol} { + set dmode 2 ;# up + } elseif {$tg < $tsample - $tol} { + set dmode 3 ;# down + } else { + set dmode 1 ;# stable + } + hupdate [sct]/dblctrl/mode $dmode } set value $tsample } else { From 510f6b563e49150bfb49ef7b5d5ac6a865aab32e Mon Sep 17 00:00:00 2001 From: dmc Date: Wed, 11 Dec 2024 10:30:45 +0100 Subject: [PATCH 3/3] add varioxb.stick --- tcl/varioxb.stick | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tcl/varioxb.stick diff --git a/tcl/varioxb.stick b/tcl/varioxb.stick new file mode 100644 index 0000000..687c755 --- /dev/null +++ b/tcl/varioxb.stick @@ -0,0 +1,13 @@ +stickDesc = VarioxB stick Frappy history recorder + +set ::secop_version 4 + +set ins [result instrument] +if {[string match "prep*" $ins]} { + set nr [string range $ins end end] + makenv frappy_stick -driver secop -port localhost:1521$nr +} elseif {[lindex [split [info hostname] .] 0] ne $ins} { + error "runs on instruments or prep0-9 only" +} else { + makenv frappy_stick -driver secop -port localhost:15201 +}