diff --git a/CHANGELOG.md b/CHANGELOG.md index 0573b5de..39c3a1f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 1.1.1 + +* Rename DataRate to BitRate (FSK modulation) + ## 1.1.0 Note that the changes below are incompatible with LoRa Server diff --git a/gateway/backend.go b/gateway/backend.go index 13d8b440..46c0395d 100644 --- a/gateway/backend.go +++ b/gateway/backend.go @@ -446,7 +446,7 @@ func newDataRateFromDatR(d DatR) (band.DataRate, error) { if d.FSK != 0 { dr.Modulation = band.FSKModulation - dr.DataRate = int(d.FSK) + dr.BitRate = int(d.FSK) return dr, nil } @@ -461,6 +461,6 @@ func newDatRfromDataRate(d band.DataRate) DatR { } return DatR{ - FSK: uint32(d.DataRate), + FSK: uint32(d.BitRate), } } diff --git a/vendor/github.com/brocaar/lorawan/band/band.go b/vendor/github.com/brocaar/lorawan/band/band.go index d75c7e81..7edaa27d 100644 --- a/vendor/github.com/brocaar/lorawan/band/band.go +++ b/vendor/github.com/brocaar/lorawan/band/band.go @@ -15,7 +15,7 @@ type DataRate struct { Modulation Modulation `json:"modulation"` SpreadFactor int `json:"spreadFactor,omitempty"` // used for LoRa Bandwidth int `json:"bandwidth,omitempty"` // in kHz, used for LoRa - DataRate int `json:"dataRate,omitempty"` // bits per second, used for FSK + BitRate int `json:"bitRate,omitempty"` // bits per second, used for FSK } // MaxPayloadSize defines the max payload size diff --git a/vendor/github.com/brocaar/lorawan/band/band_eu863_870.go b/vendor/github.com/brocaar/lorawan/band/band_eu863_870.go index 1488f00f..05ed901d 100644 --- a/vendor/github.com/brocaar/lorawan/band/band_eu863_870.go +++ b/vendor/github.com/brocaar/lorawan/band/band_eu863_870.go @@ -16,7 +16,7 @@ var DataRateConfiguration = [...]DataRate{ {Modulation: LoRaModulation, SpreadFactor: 8, Bandwidth: 125}, {Modulation: LoRaModulation, SpreadFactor: 7, Bandwidth: 125}, {Modulation: LoRaModulation, SpreadFactor: 7, Bandwidth: 250}, - {Modulation: FSKModulation, DataRate: 50000}, + {Modulation: FSKModulation, BitRate: 50000}, } // DefaultTXPower defines the default TX power in dBm diff --git a/vendor/vendor.json b/vendor/vendor.json index d13654de..c463fde2 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -21,11 +21,11 @@ "revisionTime": "2016-04-16T09:33:49Z" }, { - "checksumSHA1": "JhsEl+poxTkTUc4HyjvI7KTnIiw=", + "checksumSHA1": "Aj6/AlM74fTWzev+Li6Si9KynJU=", "origin": "github.com/brocaar/lora-semtech-bridge/vendor/github.com/brocaar/lorawan/band", "path": "github.com/brocaar/lorawan/band", - "revision": "61f52e3008626c275b62a72090a7ef13a6294764", - "revisionTime": "2016-04-16T09:33:49Z" + "revision": "701d895780c438307bba7f70991be16b6b4955a3", + "revisionTime": "2016-04-17T10:01:52Z" }, { "path": "github.com/codegangsta/cli",