RPIZeroDuplexPOCSAG/rfm69
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactoring

Browse source
This commit is contained in:
Friedl Ulrich 2015-02-26 22:28:13 +01:00
parent 00c809a354
commit 944cef604c
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
handler.go
View file

@ -7,14 +7,15 @@ import (
) )
// Loop is the main receive and transmit handling loop // Loop is the main receive and transmit handling loop
func (r *Device) Loop() (chan *Data, chan bool) { func (r *Device) Loop() (rx chan *Data, tx chan *Data, quit chan bool) {
quit := make(chan bool) quit = make(chan bool)
ch := make(chan *Data, 5) rx = make(chan *Data, 5)
go r.loopInternal(ch, quit) tx = make(chan *Data, 5)
return ch, quit go r.loopInternal(rx, tx, quit)
return
} }
func (r *Device) loopInternal(ch chan *Data, quit chan bool) { func (r *Device) loopInternal(rx chan *Data, tx chan *Data, quit chan bool) {
irq := make(chan int) irq := make(chan int)
r.gpio.BeginWatch(gpio.EdgeRising, func() { r.gpio.BeginWatch(gpio.EdgeRising, func() {
irq <- 1 irq <- 1
@ -30,7 +31,7 @@ func (r *Device) loopInternal(ch chan *Data, quit chan bool) {
for { for {
select { select {
case dataToTransmit := <-ch: case dataToTransmit := <-tx:
// TODO: can send? // TODO: can send?
r.readWriteReg(REG_PACKETCONFIG2, 0xFB, RF_PACKET2_RXRESTART) // avoid RX deadlocks r.readWriteReg(REG_PACKETCONFIG2, 0xFB, RF_PACKET2_RXRESTART) // avoid RX deadlocks
err = r.SetModeAndWait(RF_OPMODE_STANDBY) err = r.SetModeAndWait(RF_OPMODE_STANDBY)
@ -80,7 +81,7 @@ func (r *Device) loopInternal(ch chan *Data, quit chan bool) {
log.Print(err) log.Print(err)
return return
} }
ch <- &data rx <- &data
err = r.SetMode(RF_OPMODE_RECEIVER) err = r.SetMode(RF_OPMODE_RECEIVER)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)