tinygo-org/drivers
1
0
Fork 0
mirror of https://github.com/tinygo-org/drivers.git synced 2026-08-17 13:23:26 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

sx126x/sx27x: Reduce spi buffer size, add missing select when using channels

Browse Source
This commit is contained in:
Olivier Fauchon
2023-02-23 21:33:37 +01:00
committed by Ron Evans
parent 56208a28d5
commit 94017b5437
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sx126x/sx126x.go
+16 -8
View File
@@ -702,25 +702,33 @@ func (d *Device) HandleInterrupt() {
d.ClearIrqStatus(SX126X_IRQ_ALL) d.ClearIrqStatus(SX126X_IRQ_ALL)
if (st & SX126X_IRQ_RX_DONE) > 0 { if (st & SX126X_IRQ_RX_DONE) > 0 {
e := lora.RadioEvent{lora.RadioEventRxDone, uint16(st), nil} select {
d.radioEventChan <- e case d.radioEventChan <- lora.RadioEvent{lora.RadioEventRxDone, uint16(st), nil}:
default:
}
} }
if (st & SX126X_IRQ_TX_DONE) > 0 { if (st & SX126X_IRQ_TX_DONE) > 0 {
e := lora.RadioEvent{lora.RadioEventTxDone, uint16(st), nil} select {
d.radioEventChan <- e case d.radioEventChan <- lora.RadioEvent{lora.RadioEventTxDone, uint16(st), nil}:
default:
}
} }
if (st & SX126X_IRQ_TIMEOUT) > 0 { if (st & SX126X_IRQ_TIMEOUT) > 0 {
e := lora.RadioEvent{lora.RadioEventTimeout, uint16(st), nil} select {
d.radioEventChan <- e case d.radioEventChan <- lora.RadioEvent{lora.RadioEventTimeout, uint16(st), nil}:
default:
}
} }
if (st & SX126X_IRQ_CRC_ERR) > 0 { if (st & SX126X_IRQ_CRC_ERR) > 0 {
e := lora.RadioEvent{lora.RadioEventCrcError, uint16(st), nil} select {
d.radioEventChan <- e case d.radioEventChan <- lora.RadioEvent{lora.RadioEventCrcError, uint16(st), nil}:
default:
}
} }
} }
sx127x/sx127x.go
+11 -12
View File
@@ -16,7 +16,7 @@ import (
// So we can keep track of the origin of interruption // So we can keep track of the origin of interruption
const ( const (
RADIOEVENTCHAN_SIZE = 1 RADIOEVENTCHAN_SIZE = 1
SPI_BUFFER_SIZE = 256 SPI_BUFFER_SIZE = 5
) )
// Device wraps an SPI connection to a SX127x device. // Device wraps an SPI connection to a SX127x device.
@@ -86,13 +86,10 @@ func (d *Device) ReadRegister(reg uint8) uint8 {
//d.spiTxBuf = []byte{reg & 0x7f} //d.spiTxBuf = []byte{reg & 0x7f}
d.spiTxBuf = d.spiTxBuf[:0] d.spiTxBuf = d.spiTxBuf[:0]
d.spiTxBuf = append(d.spiTxBuf, byte(reg&0x7f)) d.spiTxBuf = append(d.spiTxBuf, byte(reg&0x7f))
//println("R1 : ", len(d.spiTxBuf))
d.spi.Tx(d.spiTxBuf, nil) d.spi.Tx(d.spiTxBuf, nil)
// Read value // Read value
//d.spiRxBuf = []byte{reg & 0x00}
d.spiRxBuf = d.spiRxBuf[:0] d.spiRxBuf = d.spiRxBuf[:0]
d.spiRxBuf = append(d.spiRxBuf, 0) d.spiRxBuf = append(d.spiRxBuf, 0)
//println("R2 : ", len(d.spiTxBuf))
d.spi.Tx(nil, d.spiRxBuf) d.spi.Tx(nil, d.spiRxBuf)
d.controller.SetNss(true) d.controller.SetNss(true)
return d.spiRxBuf[0] return d.spiRxBuf[0]
@@ -529,27 +526,29 @@ func (d *Device) HandleInterrupt() {
d.WriteRegister(SX127X_REG_IRQ_FLAGS, 0xFF) d.WriteRegister(SX127X_REG_IRQ_FLAGS, 0xFF)
if (st & SX127X_IRQ_LORA_RXDONE_MASK) > 0 { if (st & SX127X_IRQ_LORA_RXDONE_MASK) > 0 {
e := lora.RadioEvent{lora.RadioEventRxDone, uint16(st), nil} select {
d.radioEventChan <- e case d.radioEventChan <- lora.RadioEvent{lora.RadioEventRxDone, uint16(st), nil}:
default:
}
} }
if (st & SX127X_IRQ_LORA_TXDONE_MASK) > 0 { if (st & SX127X_IRQ_LORA_TXDONE_MASK) > 0 {
e := lora.RadioEvent{lora.RadioEventTxDone, uint16(st), nil} select {
d.radioEventChan <- e case d.radioEventChan <- lora.RadioEvent{lora.RadioEventTxDone, uint16(st), nil}:
default:
}
} }
if (st & SX127X_IRQ_LORA_RXTOUT_MASK) > 0 { if (st & SX127X_IRQ_LORA_RXTOUT_MASK) > 0 {
e := lora.RadioEvent{lora.RadioEventTimeout, uint16(st), nil}
select { select {
case d.radioEventChan <- e: case d.radioEventChan <- lora.RadioEvent{lora.RadioEventTimeout, uint16(st), nil}:
default: default:
} }
} }
if (st & SX127X_IRQ_LORA_CRCERR_MASK) > 0 { if (st & SX127X_IRQ_LORA_CRCERR_MASK) > 0 {
e := lora.RadioEvent{lora.RadioEventCrcError, uint16(st), nil}
select { select {
case d.radioEventChan <- e: case d.radioEventChan <- lora.RadioEvent{lora.RadioEventCrcError, uint16(st), nil}:
default: default:
} }
} }