Skip to content

brd value change to uint32 #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

brd value change to uint32 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19fbd3c
ref brocaar/lora-app-server#277
Dec 12, 2018
148f0cb
Merge remote-tracking branch 'upstream/master'
Mar 5, 2019
413ca75
ref #104 allow brd value with value upper than 255
Mar 5, 2019
a2a0c47
ref #104 fix non-necessary conversion + code formatting
Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/gateway/semtech/packets/pull_resp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ type TXPK struct {
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 uint8 `json:"brd"` // Concentrator board used for RX (unsigned integer)
Brd uint32 `json:"brd"` // Concentrator board used for RX (unsigned integer)
Ant uint8 `json:"ant"` // Antenna number on which signal has been received
}

Expand All @@ -95,7 +95,7 @@ func GetPullRespPacket(protoVersion uint8, randomToken uint16, frame gw.Downlink
Size: uint16(len(frame.PhyPayload)),
Data: frame.PhyPayload,
Ant: uint8(frame.TxInfo.Antenna),
Brd: uint8(frame.TxInfo.Board),
Brd: uint32(frame.TxInfo.Board),
},
},
}
Expand Down
2 changes: 1 addition & 1 deletion internal/gateway/semtech/packets/push_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ type RXPK struct {
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 uint8 `json:"brd"` // Concentrator board used for RX (unsigned integer)
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)
Expand Down
6 changes: 3 additions & 3 deletions internal/legacy/gateway/pf_structs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ type RXPK struct {
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 uint8 `json:"brd"` // Concentrator board used for RX (unsigned integer)
Brd uint32 `json:"brd"` // Concentrator board used for RX (unsigned integer)
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
Expand Down Expand Up @@ -445,7 +445,7 @@ type TXPK struct {
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 string `json:"data"` // Base64 encoded RF packet payload, padding optional
Brd uint8 `json:"brd"` // Concentrator board used for RX (unsigned integer)
Brd uint32 `json:"brd"` // Concentrator board used for RX (unsigned integer)
Ant uint8 `json:"ant"` // Antenna number on which signal has been received
}

Expand Down Expand Up @@ -560,7 +560,7 @@ func newTXPKFromTXPacket(txPacket gw.TXPacketBytes) (TXPK, error) {
Size: uint16(len(txPacket.PHYPayload)),
Data: base64.StdEncoding.EncodeToString(txPacket.PHYPayload),
Ant: uint8(txPacket.TXInfo.Antenna),
Brd: uint8(txPacket.TXInfo.Board),
Brd: txPacket.TXInfo.Board,
}

if txPacket.TXInfo.TimeSinceGPSEpoch != nil {
Expand Down