fix bug in SX1278 read received message

sx127x/registers.go

@@ -76,13 +76,13 @@ const (
 	regPA_RAMP              = 0x0a
 	regOCP                  = 0x0b
 	regLNA                  = 0x0c
-	regFIFO_ADDR_PTR        = 0x0d
-	regFIFO_TX_BASE_ADDR    = 0x0e
-	regFIFO_RX_BASE_ADDR    = 0x0f
-	regFIFO_RX_CURRENT_ADDR = 0x10
+	regFIFO_ADDR_PTR        = 0x0d // FIFO SPI Pointer.
+	regFIFO_TX_BASE_ADDR    = 0x0e // Start of Tx data. May overlap with Rx data.
+	regFIFO_RX_BASE_ADDR    = 0x0f // Start of Rx data. May overlap with Tx data.
+	regFIFO_RX_CURRENT_ADDR = 0x10 // Start address of last packet received.
 	regIRQ_FLAGS_MASK       = 0x11
 	regIRQ_FLAGS            = 0x12
-	regRX_NB_BYTES          = 0x13
+	regRX_NB_BYTES          = 0x13 // Number of received bytes.
 	regPKT_SNR_VALUE        = 0x19
 	regPKT_RSSI_VALUE       = 0x1a
 	regRSSI_VALUE           = 0x1b
@@ -94,6 +94,7 @@ const (
 	regPAYLOAD_LENGTH       = 0x22
 	regMAX_PAYLOAD_LENGTH   = 0x23
 	regHOP_PERIOD           = 0x24
+	regFIFO_RX_BYTE_ADDR    = 0x25 // Address of last byte received in FIFO.
 	regMODEM_CONFIG_3       = 0x26
 	regFREQ_ERROR_MSB       = 0x28
 	regFREQ_ERROR_MID       = 0x29

sx127x/sx127x.go

@@ -1067,10 +1067,7 @@ func (d *DeviceLoRa) readerToLastPacket() (_ *fifoReader, err error) {
 	}
 
 	// We now know that the packet has been received succesfully. Proceed to read.
-	curraddr, err := d.read8(regFIFO_RX_CURRENT_ADDR)
-	if err != nil {
-		return nil, err
-	}
+	// RxNbBytes indicates the number of received bytes thus far.
 	numBytes, err := d.read8(regRX_NB_BYTES)
 	if err != nil {
 		return nil, err
@@ -1078,16 +1075,30 @@ func (d *DeviceLoRa) readerToLastPacket() (_ *fifoReader, err error) {
 	if numBytes == 0 {
 		return nil, errors.New("readerToNextPacket called with RX_NB_BYTES=0")
 	}
+	// FIFORxCurrentAddr is the location in the FIFO of the last packet received.
+	curraddr, err := d.read8(regFIFO_RX_CURRENT_ADDR)
+	if err != nil {
+		return nil, err
+	}
+	byteAddr, err := d.read8(regFIFO_RX_BYTE_ADDR)
+	if err != nil {
+		return nil, err
+	}
+	calcNumBytes := byteAddr - curraddr
+	if calcNumBytes != numBytes {
+		println("inconsistent numBytes", numBytes, "calcNumBytes", calcNumBytes)
+	}
 	err = d.Write8(regFIFO_ADDR_PTR, curraddr)
 	if err != nil {
 		return nil, err
 	}
-	return &fifoReader{d: d, leftToRead: numBytes}, nil
+	return &fifoReader{D: d, BTR: numBytes}, nil
 }
 
 type fifoReader struct {
-	d          *DeviceLoRa
-	leftToRead uint8
+	D *DeviceLoRa
+	// Bytes to read.
+	BTR uint8
 }
 
 func (f *fifoReader) Read(buf []byte) (int, error) {
@@ -1096,20 +1107,20 @@ func (f *fifoReader) Read(buf []byte) (int, error) {
 }
 
 func (f *fifoReader) readInternal(buf []byte) (_ uint8, err error) {
-	if f.leftToRead == 0 {
+	if f.BTR == 0 {
 		return 0, io.EOF
 	}
-	toRead := f.leftToRead
+	toRead := f.BTR
 	if int(toRead) > len(buf) {
 		toRead = uint8(len(buf))
 	}
-	for i := uint8(0); i < toRead; i-- {
-		buf[i], err = f.d.read8(regFIFO)
+	for i := uint8(0); i < toRead; i++ {
+		buf[i], err = f.D.read8(regFIFO)
 		if err != nil {
 			return i, err
 		}
 	}
-	f.leftToRead -= toRead
+	f.BTR -= toRead
 	return toRead, nil
 }