bcc/rigol-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make go lint happy, minor performance increase

Browse source
This commit is contained in:
Ben Charlton 2018-07-11 17:38:34 +01:00
parent 9afb315779
commit 1b938031f3
1 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

52
rigol.go
View file

@ -16,14 +16,14 @@ var host = flag.String("host", "rigol", "hostname or IP address")
var port = flag.Int("port", 5555, "tcp port to use") var port = flag.Int("port", 5555, "tcp port to use")
var interval = flag.Int("interval", 1, "number of seconds between readings") var interval = flag.Int("interval", 1, "number of seconds between readings")
var count = flag.Int("count", -1, "number of measurements to take. -1 = no limit") var count = flag.Int("count", -1, "number of measurements to take. -1 = no limit")
var f_vavg = flag.Bool("vavg", true, "include Vavg") var fVavg = flag.Bool("vavg", true, "include Vavg")
var f_vmin = flag.Bool("vmin", true, "include Vmin") var fVmin = flag.Bool("vmin", false, "include Vmin")
var f_vmax = flag.Bool("vmax", true, "include Vmax") var fVmax = flag.Bool("vmax", false, "include Vmax")
var f_vpp = flag.Bool("vpp", false, "include Vpp") var fVpp = flag.Bool("vpp", false, "include Vpp")
var f_vrms = flag.Bool("vrms", false, "include Vrms") var fVrms = flag.Bool("vrms", false, "include Vrms")
var f_freq = flag.Bool("freq", false, "include frequency") var fFreq = flag.Bool("freq", false, "include frequency")
var f_screen = flag.Bool("screen", false, "collect screenshots in PNG format") var fScreen = flag.Bool("screen", false, "collect screenshots in PNG format")
var f_clear = flag.Bool("clear", false, "clear stats after collection") var fClear = flag.Bool("clear", false, "clear stats after collection")
func main() { func main() {
@ -51,7 +51,7 @@ func main() {
result = strings.Replace(result, ";", ", ", -1) result = strings.Replace(result, ";", ", ", -1)
// Collect and write screenshot if the screen flag is set. // Collect and write screenshot if the screen flag is set.
if *f_screen { if *fScreen {
img := getScreenshot(conn) img := getScreenshot(conn)
if img != nil { if img != nil {
writeScreenshot(img) writeScreenshot(img)
@ -59,13 +59,13 @@ func main() {
} }
// Clear history // Clear history
if *f_clear { if *fClear {
fmt.Fprintf(conn, ":CLE\n") fmt.Fprintf(conn, ":CLE;MEAS:STAT:RES\n")
} }
tdone := time.Now() tdone := time.Now()
taken := tdone.Sub(tstart) taken := tdone.Sub(tstart)
takenms := int64(taken/time.Millisecond) takenms := int64(taken / time.Millisecond)
fmt.Printf("%s, %s, %d\n", tdone.Format(time.RFC3339), result, takenms) fmt.Printf("%s, %s, %d\n", tdone.Format(time.RFC3339), result, takenms)
@ -73,7 +73,7 @@ func main() {
// but if the time taken is longer than the interval, no need to sleep at all. // but if the time taken is longer than the interval, no need to sleep at all.
intervalms := int64(*interval * 1000) intervalms := int64(*interval * 1000)
if takenms < intervalms { if takenms < intervalms {
sleeptime := time.Duration(intervalms - takenms) * time.Millisecond sleeptime := time.Duration(intervalms-takenms) * time.Millisecond
time.Sleep(sleeptime) time.Sleep(sleeptime)
} }
@ -96,34 +96,34 @@ func buildQuery() (string, string) {
// 2 channels, 4 measurements resulted in 3.9 vs 3.5 seconds on my DS1054Z. // 2 channels, 4 measurements resulted in 3.9 vs 3.5 seconds on my DS1054Z.
// Tell the scope which channel the following commands are for // Tell the scope which channel the following commands are for
command = append(command, fmt.Sprintf(":MEAS:SOUR CHAN%d", i+1)) //command = append(command, fmt.Sprintf(":MEAS:SOUR CHAN%d", i+1))
// Query measurement unit. // Query measurement unit.
command = append(command, fmt.Sprintf(":CHAN%d:UNIT?", i+1)) command = append(command, fmt.Sprintf(":CHAN%d:UNIT?", i+1))
header = append(header, fmt.Sprintf("CH%d Unit", i+1)) header = append(header, fmt.Sprintf("CH%d Unit", i+1))
if *f_vavg { if *fVavg {
command = append(command, ":MEAS:ITEM? VAVG") command = append(command, fmt.Sprintf(":MEAS:ITEM? VAVG,CHAN%d", i+1))
header = append(header, fmt.Sprintf("CH%d Vavg", i+1)) header = append(header, fmt.Sprintf("CH%d Vavg", i+1))
} }
if *f_vmin { if *fVmin {
command = append(command, ":MEAS:ITEM? VMIN") command = append(command, fmt.Sprintf(":MEAS:ITEM? VMIN,CHAN%d", i+1))
header = append(header, fmt.Sprintf("CH%d Vmin", i+1)) header = append(header, fmt.Sprintf("CH%d Vmin", i+1))
} }
if *f_vmax { if *fVmax {
command = append(command, ":MEAS:ITEM? VMAX") command = append(command, fmt.Sprintf(":MEAS:ITEM? VMAX,CHAN%d", i+1))
header = append(header, fmt.Sprintf("CH%d Vmax", i+1)) header = append(header, fmt.Sprintf("CH%d Vmax", i+1))
} }
if *f_vpp { if *fVpp {
command = append(command, ":MEAS:ITEM? VPP") command = append(command, fmt.Sprintf(":MEAS:ITEM? VPP,CHAN%d", i+1))
header = append(header, fmt.Sprintf("CH%d Vpp", i+1)) header = append(header, fmt.Sprintf("CH%d Vpp", i+1))
} }
if *f_vrms { if *fVrms {
command = append(command, ":MEAS:ITEM? VRMS") command = append(command, fmt.Sprintf(":MEAS:ITEM? VRMS,CHAN%d", i+1))
header = append(header, fmt.Sprintf("CH%d Vrms", i+1)) header = append(header, fmt.Sprintf("CH%d Vrms", i+1))
} }
if *f_freq { if *fFreq {
command = append(command, ":MEAS:ITEM? FREQ") command = append(command, fmt.Sprintf(":MEAS:ITEM? FREQ,CHAN%d", i+1))
header = append(header, fmt.Sprintf("CH%d freq", i+1)) header = append(header, fmt.Sprintf("CH%d freq", i+1))
} }
} }