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

Cleanup

Browse source
This commit is contained in:
Friedl Ulrich 2015-02-27 20:22:23 +01:00
parent 944cef604c
commit 798a74bf43
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data.go Normal file
View file

@ -0,0 +1,19 @@
package rfm69
// Data is the data structure for the protocol
type Data struct {
ToAddress byte
FromAddress byte
Data []byte
RequestAck bool
SendAck bool
Rssi int
}
// ToAck creates an ack
func (d *Data) ToAck() *Data {
return &Data{
ToAddress: d.FromAddress,
SendAck: true,
}
}

28
device.go
View file

@ -14,7 +14,7 @@ const (
// Device RFM69 Device // Device RFM69 Device
type Device struct { type Device struct {
SpiDevice *spidev.SPIDevice spiDevice *spidev.SPIDevice
gpio gpio.Pin gpio gpio.Pin
mode byte mode byte
address byte address byte
@ -29,16 +29,6 @@ const (
MaxDataLen = 66 MaxDataLen = 66
) )
// Data is the data structure for the protocol
type Data struct {
ToAddress byte
FromAddress byte
Data []byte
RequestAck bool
SendAck bool
Rssi int
}
// NewDevice creates a new device // NewDevice creates a new device
func NewDevice(nodeID, networkID byte, isRfm69HW bool) (*Device, error) { func NewDevice(nodeID, networkID byte, isRfm69HW bool) (*Device, error) {
pin, err := getPin() pin, err := getPin()
@ -52,7 +42,7 @@ func NewDevice(nodeID, networkID byte, isRfm69HW bool) (*Device, error) {
} }
ret := &Device{ ret := &Device{
SpiDevice: spi, spiDevice: spi,
gpio: pin, gpio: pin,
network: networkID, network: networkID,
address: nodeID, address: nodeID,
@ -71,7 +61,7 @@ func (r *Device) Close() error {
if err != nil { if err != nil {
return err return err
} }
r.SpiDevice.Close() r.spiDevice.Close()
return err return err
} }
@ -80,7 +70,7 @@ func (r *Device) writeReg(addr, data byte) error {
tx[0] = addr | 0x80 tx[0] = addr | 0x80
tx[1] = data tx[1] = data
//log.Printf("write %x: %x", addr, data) //log.Printf("write %x: %x", addr, data)
_, err := r.SpiDevice.Xfer(tx) _, err := r.spiDevice.Xfer(tx)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }
@ -91,7 +81,7 @@ func (r *Device) readReg(addr byte) (byte, error) {
tx := make([]uint8, 2) tx := make([]uint8, 2)
tx[0] = addr & 0x7f tx[0] = addr & 0x7f
tx[1] = 0 tx[1] = 0
rx, err := r.SpiDevice.Xfer(tx) rx, err := r.spiDevice.Xfer(tx)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
} }
@ -190,7 +180,7 @@ func (r *Device) Encrypt(key []byte) error {
tx := make([]byte, 17) tx := make([]byte, 17)
tx[0] = REG_AESKEY1 | 0x80 tx[0] = REG_AESKEY1 | 0x80
copy(tx[1:], key) copy(tx[1:], key)
if _, err := r.SpiDevice.Xfer(tx); err != nil { if _, err := r.spiDevice.Xfer(tx); err != nil {
return err return err
} }
} }
@ -359,7 +349,7 @@ func (r *Device) writeFifo(data *Data) error {
tx[4] = 0x80 tx[4] = 0x80
} }
copy(tx[5:], data.Data[:buffersize]) copy(tx[5:], data.Data[:buffersize])
_, err := r.SpiDevice.Xfer(tx) _, err := r.spiDevice.Xfer(tx)
return err return err
} }
@ -372,7 +362,7 @@ func (r *Device) readFifo() (Data, error) {
} }
tx := new([67]byte) tx := new([67]byte)
tx[0] = REG_FIFO & 0x7f tx[0] = REG_FIFO & 0x7f
rx, err := r.SpiDevice.Xfer(tx[:3]) rx, err := r.spiDevice.Xfer(tx[:3])
if err != nil { if err != nil {
return data, err return data, err
} }
@ -381,7 +371,7 @@ func (r *Device) readFifo() (Data, error) {
if length > 66 { if length > 66 {
length = 66 length = 66
} }
rx, err = r.SpiDevice.Xfer(tx[:length+3]) rx, err = r.spiDevice.Xfer(tx[:length+3])
if err != nil { if err != nil {
return data, err return data, err
} }