Update chirpstack-api package and set FDev.

Note that the BitRate to Datarate rename is backwards compatible when
using the Protobuf marshaler (as fields are numbered, not named over the
wire).

Author: brocaar

go.mod

@@ -3,7 +3,7 @@ module github.com/brocaar/chirpstack-gateway-bridge
 go 1.13
 
 require (
-	github.com/brocaar/chirpstack-api/go/v3 v3.0.1
+	github.com/brocaar/chirpstack-api/go/v3 v3.0.7
 	github.com/brocaar/lorawan v0.0.0-20190814113539-8eb2a8d6da09
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/eclipse/paho.mqtt.golang v1.2.0

go.sum

@@ -24,8 +24,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 h1:oMCHnXa6CCCafdPDbMh/lWRhRByN0VFLvv+g+ayx1SI=
 github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
-github.com/brocaar/chirpstack-api/go/v3 v3.0.1 h1:FEz8I2DRwRrDt2Am7lntUA5T29ZjRcufs1/ovCHFHi4=
-github.com/brocaar/chirpstack-api/go/v3 v3.0.1/go.mod h1:sCxojNSPGdUUIImu2OBwP/GRa6xrCEN7H8eP2AYr178=
+github.com/brocaar/chirpstack-api/go/v3 v3.0.7 h1:cE6f9cAH9SF+RHHB/QfI7acNQqeWmhdiPIrkm1Q1zQo=
+github.com/brocaar/chirpstack-api/go/v3 v3.0.7/go.mod h1:sCxojNSPGdUUIImu2OBwP/GRa6xrCEN7H8eP2AYr178=
 github.com/brocaar/lorawan v0.0.0-20190814113539-8eb2a8d6da09 h1:hV+axbeTsoTCa1tEkXzDjucdg1GPSX9j1fn95saTKBo=
 github.com/brocaar/lorawan v0.0.0-20190814113539-8eb2a8d6da09/go.mod h1:Fm+51pxK6mZoAQjIaWJqPmnRuXecozsM5Mf9c+kr/ko=
 github.com/caarlos0/ctrlc v1.0.0 h1:2DtF8GSIcajgffDFJzyG15vO+1PuBWOMUdFut7NnXhw=

internal/backend/basicstation/structs/downlink_message.go

@@ -86,8 +86,7 @@ func DownlinkFrameFromProto(loraBand band.Band, pb gw.DownlinkFrame) (DownlinkFr
 		}
 		dr, err = loraBand.GetDataRateIndex(false, band.DataRate{
 			Modulation: band.FSKModulation,
-			Bandwidth:  int(modInfo.Bandwidth),
-			BitRate:    int(modInfo.Bitrate),
+			BitRate:    int(modInfo.Datarate),
 		})
 		if err != nil {
 			return out, errors.Wrap(err, "get data-rate index error")

internal/backend/basicstation/structs/downlink_message_test.go

@@ -79,7 +79,7 @@ func TestDownlinkFrameFromProto(t *testing.T) {
 					Modulation: common.Modulation_FSK,
 					ModulationInfo: &gw.DownlinkTXInfo_FskModulationInfo{
 						FskModulationInfo: &gw.FSKModulationInfo{
-							Bitrate: 50000,
+							Datarate: 50000,
 						},
 					},
 					Timing: gw.DownlinkTiming_DELAY,

internal/backend/basicstation/structs/radio_meta_data.go

@@ -57,8 +57,7 @@ func SetRadioMetaDataToProto(loraBand band.Band, gatewayID lorawan.EUI64, rmd Ra
 		pb.TxInfo.Modulation = common.Modulation_FSK
 		pb.TxInfo.ModulationInfo = &gw.UplinkTXInfo_FskModulationInfo{
 			FskModulationInfo: &gw.FSKModulationInfo{
-				Bandwidth: uint32(dr.Bandwidth),
-				Bitrate:   uint32(dr.BitRate),
+				Datarate: uint32(dr.BitRate),
 			},
 		}
 	}

internal/backend/basicstation/structs/radio_meta_data_test.go

@@ -75,7 +75,7 @@ func TestSetRadioMetaDataToProto(t *testing.T) {
 					Modulation: common.Modulation_FSK,
 					ModulationInfo: &gw.UplinkTXInfo_FskModulationInfo{
 						FskModulationInfo: &gw.FSKModulationInfo{
-							Bitrate: 50000,
+							Datarate: 50000,
 						},
 					},
 				},

internal/backend/semtechudp/backend_test.go

@@ -17,10 +17,10 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 
-	"github.com/brocaar/chirpstack-gateway-bridge/internal/backend/semtechudp/packets"
-	"github.com/brocaar/chirpstack-gateway-bridge/internal/config"
 	"github.com/brocaar/chirpstack-api/go/v3/common"
 	"github.com/brocaar/chirpstack-api/go/v3/gw"
+	"github.com/brocaar/chirpstack-gateway-bridge/internal/backend/semtechudp/packets"
+	"github.com/brocaar/chirpstack-gateway-bridge/internal/config"
 	"github.com/brocaar/lorawan"
 )
 
@@ -467,7 +467,8 @@ func (ts *BackendTestSuite) TestSendDownlinkFrame() {
 					Modulation: common.Modulation_FSK,
 					ModulationInfo: &gw.DownlinkTXInfo_FskModulationInfo{
 						FskModulationInfo: &gw.FSKModulationInfo{
-							Bitrate: 50000,
+							Datarate:           50000,
+							FrequencyDeviation: 25000,
 						},
 					},
 					Board:   1,

internal/backend/semtechudp/packets/pull_resp.go

@@ -114,8 +114,8 @@ func GetPullRespPacket(protoVersion uint8, randomToken uint16, frame gw.Downlink
 		if modInfo == nil {
 			return packet, errors.New("gateway: fsk_modulation_info must not be nil")
 		}
-		packet.Payload.TXPK.DatR.FSK = modInfo.Bitrate
-		packet.Payload.TXPK.FDev = uint16(modInfo.Bitrate / 2) // TODO: is this correct?!
+		packet.Payload.TXPK.DatR.FSK = modInfo.Datarate
+		packet.Payload.TXPK.FDev = uint16(modInfo.FrequencyDeviation)
 	}
 
 	switch frame.TxInfo.Timing {

internal/backend/semtechudp/packets/pull_resp_test.go

@@ -115,7 +115,8 @@ func TestGetPullRespPacket(t *testing.T) {
 					Modulation: common.Modulation_FSK,
 					ModulationInfo: &gw.DownlinkTXInfo_FskModulationInfo{
 						FskModulationInfo: &gw.FSKModulationInfo{
-							Bitrate: 50000,
+							Datarate:           50000,
+							FrequencyDeviation: 25000,
 						},
 					},
 					Board:   1,

internal/backend/semtechudp/packets/push_data.go

@@ -226,7 +226,7 @@ func getUplinkFrame(gatewayID []byte, rxpk RXPK, FakeRxInfoTime bool) (gw.Uplink
 
 		frame.TxInfo.ModulationInfo = &gw.UplinkTXInfo_FskModulationInfo{
 			FskModulationInfo: &gw.FSKModulationInfo{
-				Bitrate: uint32(rxpk.DatR.FSK),
+				Datarate: uint32(rxpk.DatR.FSK),
 			},
 		}
 	}