From df499953d91ff960ed715260258d80dca0ded8b1 Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Tue, 17 Jun 2025 08:56:24 +0200 Subject: [PATCH] let recorders get the frappy cfg names (lowercase) --- tcl/seacom.tcl | 12 +++++++---- tcl/seainit.tcl | 1 + tcl/startup/frappy.tcl | 48 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) diff --git a/tcl/seacom.tcl b/tcl/seacom.tcl index 4144de0..9197b54 100644 --- a/tcl/seacom.tcl +++ b/tcl/seacom.tcl @@ -999,7 +999,9 @@ proc samenv args { addon delete [result device stick_name] } device stick_name "" + device stick_label "" device name none + device name_label NONE device makeitem stickrot_hostport unconnected stopall @@ -1161,6 +1163,7 @@ proc samenv args { default load device name $name + device name_label [string toupper $name] if {$name ne [silent 0 hval /device/confirmed]} { device makeitem confirmed "" } @@ -1278,6 +1281,7 @@ proc addon args { addon delete [result device stick_name] } device stick_name $name + device stick_label [string toupper $name] default stick $name set file ${name}.stick set permanent_addon 0 @@ -2428,10 +2432,10 @@ proc -addonGroup {} { proc webSelectGroup {} { # group name starting with '-': group is hidden until activated with button - set u_device [string toupper [result device name]] + set u_device [hval /device/name_label] set u_stick "" if {[result device stick_menu] ne ""} { - set u_stick [string toupper [result device stick_name]] + set u_stick [hval /device/stick_label] } clientput "-Tselect device" Group webDevice "select device ($u_device)" @@ -2465,13 +2469,13 @@ proc mainGroup {{forweb ""}} { Label [string toupper [result instrument]] NoNewline - set u_device [string toupper [result device name]] + set u_device [hval /device/name_label] set lab "Device: $u_device" SelectButton -device $lab NoNewline set u_stick "" if {[result device stick_menu] ne ""} { - set u_stick [string toupper [result device stick_name]] + set u_stick [hval /device/sitck_label] SelectButton "-sticks" "Stick: $u_stick" NoNewline } diff --git a/tcl/seainit.tcl b/tcl/seainit.tcl index c7c2c67..57d3604 100644 --- a/tcl/seainit.tcl +++ b/tcl/seainit.tcl @@ -145,5 +145,6 @@ backup array_init device name unknown changetime 0 stick_menu {} stick_name {} newdevice {} olddevice {} rack {} confirmed {} array_init device frappy_u_config 0 frappy_u_stick 0 frappy_u_addon 0 frappy_main {} frappy_stick {} frappy_addons {} +array_init device name_label NONE stick_label {} connect_sics diff --git a/tcl/startup/frappy.tcl b/tcl/startup/frappy.tcl index 4621fa6..bd3b570 100644 --- a/tcl/startup/frappy.tcl +++ b/tcl/startup/frappy.tcl @@ -253,6 +253,54 @@ proc check_config {service args} { return [check_or_do 0 $service $args] } +proc activate_stick {} { + set name [hval /device/stick_label] + frappy_config stick secop.stick + # stick_label was changed - set it again + device stick_label $name +} + +proc activate_addon {} { + frappy_config addons secop.addon +} + +proc sea_recorder {main stick addons} { + set defer 0 + if {$main ne "0"} { + lassign [split $main /] uri name + if {$name eq ""} { set name $uri } + samenv none + cfg_env makeitem _secop $uri + frappy_config stick secop.config + device name_label $name + set defer _secop + } + if {$stick ne "0"} { + lassign [split $stick /] uri name + if {$name eq ""} { set name $uri } + addon stick none + cfg_env makeitem _secopstick $uri + device stick_label $name + if {$defer eq "0"} { + set defer _secopstick + frappy_config stick secop.stick + } else { + hsetprop /sics/$defer activate_stick 1 + } + } + if {$addons ne "0"} { + lassign [split $addons /] uri name + addon delete secop + cfg_env makeitem _secopaddon $uri + # device addon_label $name + if {$defer eq "0"} { + frappy_config addons secop.addon + } else { + hsetprop /sics/$defer activate_addon 1 + } + } +} + proc frappy_remove {service} { set cfgs [silent "" result device frappy_$service] set config ""