summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2016-03-26 20:32:41 (GMT)
committerChristian Pointner <equinox@spreadspace.org>2016-03-26 20:32:41 (GMT)
commit455ae83f0f9c5a303c5393d5763ea7df7e715cd3 (patch)
tree7b8303ad531475daa67e551ea8442d5b62302658
parentaf3c3e7cf792eb21e5fe9c96237723561644b7c4 (diff)
reading from audio switch serial works now
-rw-r--r--src/rhctl/audio_switch.go12
-rw-r--r--src/rhctl/serial_port.go3
2 files changed, 8 insertions, 7 deletions
diff --git a/src/rhctl/audio_switch.go b/src/rhctl/audio_switch.go
index 5fc9fac..4464a10 100644
--- a/src/rhctl/audio_switch.go
+++ b/src/rhctl/audio_switch.go
@@ -35,11 +35,13 @@ func (sw *AudioSwitch) Run() {
stop := make(chan bool)
sw.port.Run(stop)
- select {
- case <-stop:
- return
- case data := <-sw.port.rx:
- rhl.Printf("got data from audio switch: %q", data)
+ for {
+ select {
+ case <-stop:
+ return
+ case data := <-sw.port.rx:
+ rhl.Printf("got data from audio switch: %q", data)
+ }
}
}
diff --git a/src/rhctl/serial_port.go b/src/rhctl/serial_port.go
index e809484..7a0af2c 100644
--- a/src/rhctl/serial_port.go
+++ b/src/rhctl/serial_port.go
@@ -146,11 +146,10 @@ func serialReader(c chan<- string, port *sio.Port, stop chan<- bool) {
if len(data) == 0 {
continue
}
- c <- string(data)
+ c <- data
}
if err := scanner.Err(); err != nil {
rhl.Printf("device(%s): read error: %s", port.LocalAddr(), err)
- panic(err.Error())
} else {
rhl.Printf("device(%s): closed", port.LocalAddr())
}