Update chirpstack-api. Add channel and rf_chain fields back.

Author: brocaar

go.mod

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/brocaar/lorawan v0.0.0-20220207095711-d675789e16ab
-	github.com/chirpstack/chirpstack/api/go/v4 v4.0.0-test.13
+	github.com/chirpstack/chirpstack/api/go/v4 v4.0.0-test.18
 	github.com/eclipse/paho.mqtt.golang v1.4.1
 	github.com/go-zeromq/zmq4 v0.7.0
 	github.com/golang-jwt/jwt/v4 v4.4.2

go.sum

@@ -99,8 +99,8 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chirpstack/chirpstack/api/go/v4 v4.0.0-test.13 h1:u3KJS4qsiFOnD26ZjbCAofLOsxBPbcP3u17qjxDqXTM=
-github.com/chirpstack/chirpstack/api/go/v4 v4.0.0-test.13/go.mod h1:KBW7imf70O9ifrMmoFH8+dn0+MUFS1PdC5shXH7W3dI=
+github.com/chirpstack/chirpstack/api/go/v4 v4.0.0-test.18 h1:g2BxW0Py9Y04tTar7I4zyFZJbXfU0Dia3tzYiF24bVM=
+github.com/chirpstack/chirpstack/api/go/v4 v4.0.0-test.18/go.mod h1:KBW7imf70O9ifrMmoFH8+dn0+MUFS1PdC5shXH7W3dI=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

internal/backend/semtechudp/backend_test.go

@@ -769,6 +769,8 @@ func (ts *BackendTestSuite) TestPushData() {
 						TimeSinceGpsEpoch: durationpb.New(time.Second),
 						Rssi:              -51,
 						Snr:               7,
+						Channel:           2,
+						RfChain:           1,
 						Context:           []byte{0x2a, 0x33, 0x7a, 0xb3},
 					},
 				},

internal/backend/semtechudp/packets/push_data.go

@@ -115,6 +115,7 @@ func (p PushDataPacket) GetUplinkFrames(FakeRxInfoTime bool) ([]*gw.UplinkFrame,
 
 func setUplinkFrameRSig(frame *gw.UplinkFrame, rxPK RXPK, rSig RSig) *gw.UplinkFrame {
 	frame.RxInfo.Antenna = uint32(rSig.Ant)
+	frame.RxInfo.Channel = uint32(rSig.Chan)
 	frame.RxInfo.Rssi = int32(rSig.RSSIC)
 	frame.RxInfo.Snr = rSig.LSNR
 
@@ -135,6 +136,8 @@ func getUplinkFrame(gatewayID lorawan.EUI64, rxpk RXPK, FakeRxInfoTime bool) (*g
 			GatewayId: gatewayID.String(),
 			Rssi:      int32(rxpk.RSSI),
 			Snr:       float32(rxpk.LSNR),
+			RfChain:   uint32(rxpk.RFCh),
+			Channel:   uint32(rxpk.Chan),
 			Board:     uint32(rxpk.Brd),
 			Context:   make([]byte, 4),
 		},

internal/backend/semtechudp/packets/push_data_test.go

@@ -235,6 +235,8 @@ func TestGetUplinkFrame(t *testing.T) {
 						TimeSinceGpsEpoch: durationpb.New(10 * time.Minute),
 						Rssi:              -60,
 						Snr:               5.5,
+						Channel:           1,
+						RfChain:           3,
 						Board:             2,
 						Antenna:           0,
 						Context:           []byte{0x00, 0x0f, 0x42, 0x40},
@@ -307,6 +309,8 @@ func TestGetUplinkFrame(t *testing.T) {
 						TimeSinceGpsEpoch: durationpb.New(10 * time.Minute),
 						Rssi:              -70,
 						Snr:               6.6,
+						Channel:           9,
+						RfChain:           3,
 						Board:             2,
 						Antenna:           8,
 						Context:           []byte{0x00, 0x0f, 0x42, 0x40},
@@ -333,6 +337,8 @@ func TestGetUplinkFrame(t *testing.T) {
 						TimeSinceGpsEpoch: durationpb.New(10 * time.Minute),
 						Rssi:              -80,
 						Snr:               7.7,
+						Channel:           10,
+						RfChain:           3,
 						Board:             2,
 						Antenna:           9,
 						Context:           []byte{0x00, 0x0f, 0x42, 0x40},
@@ -440,6 +446,8 @@ func TestGetUplinkFrame(t *testing.T) {
 						FineTimeSinceGpsEpoch: ft,
 						Rssi:                  -60,
 						Snr:                   5.5,
+						Channel:               1,
+						RfChain:               3,
 						Board:                 2,
 						Antenna:               0,
 						Context:               []byte{0x00, 0x0f, 0x42, 0x40},