let recorders get the frappy cfg names (lowercase)
This commit is contained in:
@ -999,7 +999,9 @@ proc samenv args {
|
|||||||
addon delete [result device stick_name]
|
addon delete [result device stick_name]
|
||||||
}
|
}
|
||||||
device stick_name ""
|
device stick_name ""
|
||||||
|
device stick_label ""
|
||||||
device name none
|
device name none
|
||||||
|
device name_label NONE
|
||||||
device makeitem stickrot_hostport unconnected
|
device makeitem stickrot_hostport unconnected
|
||||||
|
|
||||||
stopall
|
stopall
|
||||||
@ -1161,6 +1163,7 @@ proc samenv args {
|
|||||||
default load
|
default load
|
||||||
|
|
||||||
device name $name
|
device name $name
|
||||||
|
device name_label [string toupper $name]
|
||||||
if {$name ne [silent 0 hval /device/confirmed]} {
|
if {$name ne [silent 0 hval /device/confirmed]} {
|
||||||
device makeitem confirmed ""
|
device makeitem confirmed ""
|
||||||
}
|
}
|
||||||
@ -1278,6 +1281,7 @@ proc addon args {
|
|||||||
addon delete [result device stick_name]
|
addon delete [result device stick_name]
|
||||||
}
|
}
|
||||||
device stick_name $name
|
device stick_name $name
|
||||||
|
device stick_label [string toupper $name]
|
||||||
default stick $name
|
default stick $name
|
||||||
set file ${name}.stick
|
set file ${name}.stick
|
||||||
set permanent_addon 0
|
set permanent_addon 0
|
||||||
@ -2428,10 +2432,10 @@ proc -addonGroup {} {
|
|||||||
|
|
||||||
proc webSelectGroup {} {
|
proc webSelectGroup {} {
|
||||||
# group name starting with '-': group is hidden until activated with button
|
# 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 ""
|
set u_stick ""
|
||||||
if {[result device stick_menu] ne ""} {
|
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"
|
clientput "-Tselect device"
|
||||||
Group webDevice "select device ($u_device)"
|
Group webDevice "select device ($u_device)"
|
||||||
@ -2465,13 +2469,13 @@ proc mainGroup {{forweb ""}} {
|
|||||||
Label [string toupper [result instrument]]
|
Label [string toupper [result instrument]]
|
||||||
NoNewline
|
NoNewline
|
||||||
|
|
||||||
set u_device [string toupper [result device name]]
|
set u_device [hval /device/name_label]
|
||||||
set lab "Device: $u_device"
|
set lab "Device: $u_device"
|
||||||
SelectButton -device $lab
|
SelectButton -device $lab
|
||||||
NoNewline
|
NoNewline
|
||||||
set u_stick ""
|
set u_stick ""
|
||||||
if {[result device stick_menu] ne ""} {
|
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"
|
SelectButton "-sticks" "Stick: $u_stick"
|
||||||
NoNewline
|
NoNewline
|
||||||
}
|
}
|
||||||
|
@ -145,5 +145,6 @@ backup
|
|||||||
|
|
||||||
array_init device name unknown changetime 0 stick_menu {} stick_name {} newdevice {} olddevice {} rack {} confirmed {}
|
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 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
|
connect_sics
|
||||||
|
@ -253,6 +253,54 @@ proc check_config {service args} {
|
|||||||
return [check_or_do 0 $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} {
|
proc frappy_remove {service} {
|
||||||
set cfgs [silent "" result device frappy_$service]
|
set cfgs [silent "" result device frappy_$service]
|
||||||
set config ""
|
set config ""
|
||||||
|
Reference in New Issue
Block a user