Merge remote-tracking branch 'origin/master' into v3

Author: brocaar

README.md

@@ -15,18 +15,18 @@ project.
 
 ### Component links
 
-* [LoRa Gateway Bridge](https://docs.loraserver.io/lora-gateway-bridge)
-* [LoRa Gateway Config](https://docs.loraserver/lora-gateway-config)
-* [LoRa Server](https://docs.loraserver.io/loraserver/)
-* [LoRa App Server](https://docs.loraserver.io/lora-app-server/)
+* [LoRa Gateway Bridge](https://www.loraserver.io/lora-gateway-bridge)
+* [LoRa Gateway Config](https://www.loraserver.io/lora-gateway-bridge/install/config)
+* [LoRa Server](https://www.loraserver.io/loraserver)
+* [LoRa App Server](https://www.loraserver.io/lora-app-server)
 
 ## Links
-
-* [Downloads](https://docs.loraserver.io/lora-gateway-bridge/overview/downloads/)
+****
+* [Downloads](https://www.loraserver.io/lora-gateway-bridge/overview/downloads/)
 * [Docker image](https://hub.docker.com/r/loraserver/lora-gateway-bridge/)
-* [Documentation](https://docs.loraserver.io/lora-gateway-bridge/)
-* [Building from source](https://docs.loraserver.io/lora-gateway-bridge/community/source/)
-* [Contributing](https://docs.loraserver.io/lora-gateway-bridge/community/contribute/)
+* [Documentation](https://www.loraserver.io/lora-gateway-bridge/)
+* [Building from source](https://www.loraserver.io/lora-gateway-bridge/community/source/)
+* [Contributing](https://www.loraserver.io/lora-gateway-bridge/community/contribute/)
 * Support
   * [Support forum](https://forum.loraserver.io)
   * [Bug or feature requests](https://github.com/brocaar/lora-gateway-bridge/issues)

internal/backend/semtechudp/packets/pull_resp.go

@@ -63,22 +63,22 @@ type PullRespPayload struct {
 // TXPK contains a RF packet to be emitted and associated metadata.
 type TXPK struct {
 	Imme bool    `json:"imme"`           // Send packet immediately (will ignore tmst & time)
+	RFCh uint8   `json:"rfch"`           // Concentrator "RF chain" used for TX (unsigned integer)
+	Powe uint8   `json:"powe"`           // TX output power in dBm (unsigned integer, dBm precision)
+	Ant  uint8   `json:"ant"`            // Antenna number on which signal has been received
+	Brd  uint32  `json:"brd"`            // Concentrator board used for RX (unsigned integer)
 	Tmst *uint32 `json:"tmst,omitempty"` // Send packet on a certain timestamp value (will ignore time)
 	Tmms *int64  `json:"tmms,omitempty"` // Send packet at a certain GPS time (GPS synchronization required)
 	Freq float64 `json:"freq"`           // TX central frequency in MHz (unsigned float, Hz precision)
-	RFCh uint8   `json:"rfch"`           // Concentrator "RF chain" used for TX (unsigned integer)
-	Powe uint8   `json:"powe"`           // TX output power in dBm (unsigned integer, dBm precision)
 	Modu string  `json:"modu"`           // Modulation identifier "LORA" or "FSK"
 	DatR DatR    `json:"datr"`           // LoRa datarate identifier (eg. SF12BW500) || FSK datarate (unsigned, in bits per second)
 	CodR string  `json:"codr,omitempty"` // LoRa ECC coding rate identifier
 	FDev uint16  `json:"fdev,omitempty"` // FSK frequency deviation (unsigned integer, in Hz)
+	NCRC bool    `json:"ncrc,omitempty"` // If true, disable the CRC of the physical layer (optional)
 	IPol bool    `json:"ipol"`           // Lora modulation polarization inversion
 	Prea uint16  `json:"prea,omitempty"` // RF preamble size (unsigned integer)
 	Size uint16  `json:"size"`           // RF packet payload size in bytes (unsigned integer)
-	NCRC bool    `json:"ncrc,omitempty"` // If true, disable the CRC of the physical layer (optional)
 	Data []byte  `json:"data"`           // Base64 encoded RF packet payload, padding optional
-	Brd  uint32  `json:"brd"`            // Concentrator board used for RX (unsigned integer)
-	Ant  uint8   `json:"ant"`            // Antenna number on which signal has been received
 }
 
 // GetPullRespPacket returns a PullRespPacket for the given gw.DownlinkFrame.

internal/backend/semtechudp/packets/push_data.go

@@ -246,18 +246,18 @@ type RXPK struct {
 	Time *CompactTime `json:"time"` // UTC time of pkt RX, us precision, ISO 8601 'compact' format (e.g. 2013-03-31T16:21:17.528002Z)
 	Tmms *int64       `json:"tmms"` // GPS time of pkt RX, number of milliseconds since 06.Jan.1980
 	Tmst uint32       `json:"tmst"` // Internal timestamp of "RX finished" event (32b unsigned)
-	Freq float64      `json:"freq"` // RX central frequency in MHz (unsigned float, Hz precision)
-	Brd  uint32       `json:"brd"`  // Concentrator board used for RX (unsigned integer)
 	AESK uint8        `json:"aesk"` //AES key index used for encrypting fine timestamps
 	Chan uint8        `json:"chan"` // Concentrator "IF" channel used for RX (unsigned integer)
 	RFCh uint8        `json:"rfch"` // Concentrator "RF chain" used for RX (unsigned integer)
 	Stat int8         `json:"stat"` // CRC status: 1 = OK, -1 = fail, 0 = no CRC
-	Modu string       `json:"modu"` // Modulation identifier "LORA" or "FSK"
+	Freq float64      `json:"freq"` // RX central frequency in MHz (unsigned float, Hz precision)
+	Brd  uint32       `json:"brd"`  // Concentrator board used for RX (unsigned integer)
+	RSSI int16        `json:"rssi"` // RSSI in dBm (signed integer, 1 dB precision)
+	Size uint16       `json:"size"` // RF packet payload size in bytes (unsigned integer)
 	DatR DatR         `json:"datr"` // LoRa datarate identifier (eg. SF12BW500) || FSK datarate (unsigned, in bits per second)
+	Modu string       `json:"modu"` // Modulation identifier "LORA" or "FSK"
 	CodR string       `json:"codr"` // LoRa ECC coding rate identifier
-	RSSI int16        `json:"rssi"` // RSSI in dBm (signed integer, 1 dB precision)
 	LSNR float64      `json:"lsnr"` // Lora SNR ratio in dB (signed float, 0.1 dB precision)
-	Size uint16       `json:"size"` // RF packet payload size in bytes (unsigned integer)
 	Data []byte       `json:"data"` // Base64 encoded RF packet payload, padded
 	RSig []RSig       `json:"rsig"` // Received signal information, per antenna (Optional)
 }