Merge from Quokka sans sct_flipper, environment, motor_config

This commit is contained in:
Douglas Clowes
2014-06-25 16:41:54 +10:00
parent 7d36bb0508
commit d404bdbb06
3 changed files with 22 additions and 17 deletions

View File

@@ -146,6 +146,9 @@ proc ::scobj::rfgen::set_frequency {basePath} {
##
# @brief Request a state report from the RF generator
proc ::scobj::rfgen::rqStatFunc {} {
set basePath [sct]
hdelprop $basePath geterror
sct send "L:[sct address]"
return rdState
}
@@ -161,6 +164,7 @@ proc ::scobj::rfgen::rdStatFunc {} {
variable MAXVOLTAGE
set basePath [sct]
hdelprop $basePath error_in_::scobj::rfgen::rdStatFunc
set currSuperState [sct ramping]
set updateFlipper 0
@@ -176,7 +180,7 @@ proc ::scobj::rfgen::rdStatFunc {} {
lappend temp "$k $v"
continue
}
if {[string is integer $v]} {
if {[string is integer [string trimleft $v 0]]} {
lappend temp "$k $v"
} else {
lappend temp "$k -1"