mirror of
https://github.com/chirpstack/chirpstack.git
synced 2025-06-12 20:48:09 +00:00
Refactor uplink / downlink GW <> NS messages.
This includes: * Changing the modulation parameters to its own type. * Changing the timing parameters to its own type. * Change the gateway_id to string. As the json encoding for bytes fields is base64, this was confusing some users. * Change the uplink / downlink id to uint32 from uuid. A string representation of the UUID field (for the same reason as the gateway id) would consome quite some additional bytes. An uint32 provides sufficient uniqueness for the purpose of uplink / downlink.
This commit is contained in:
Orne Brocaar
40
api/go/api/frame_log.pb.go
vendored
40
api/go/api/frame_log.pb.go
vendored
@ -31,9 +31,9 @@ type UplinkFrameLog struct {
|
||||
// PHYPayload.
|
||||
PhyPayload []byte `protobuf:"bytes,1,opt,name=phy_payload,json=phyPayload,proto3" json:"phy_payload,omitempty"`
|
||||
// TX meta-data.
|
||||
TxInfo *gw.UplinkTXInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
TxInfo *gw.UplinkTxInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
// RX meta-data.
|
||||
RxInfo []*gw.UplinkRXInfo `protobuf:"bytes,3,rep,name=rx_info,json=rxInfo,proto3" json:"rx_info,omitempty"`
|
||||
RxInfo []*gw.UplinkRxInfo `protobuf:"bytes,3,rep,name=rx_info,json=rxInfo,proto3" json:"rx_info,omitempty"`
|
||||
// Message type.
|
||||
MType common.MType `protobuf:"varint,4,opt,name=m_type,json=mType,proto3,enum=common.MType" json:"m_type,omitempty"`
|
||||
// Device address (optional).
|
||||
@ -83,14 +83,14 @@ func (x *UplinkFrameLog) GetPhyPayload() []byte {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *UplinkFrameLog) GetTxInfo() *gw.UplinkTXInfo {
|
||||
func (x *UplinkFrameLog) GetTxInfo() *gw.UplinkTxInfo {
|
||||
if x != nil {
|
||||
return x.TxInfo
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *UplinkFrameLog) GetRxInfo() []*gw.UplinkRXInfo {
|
||||
func (x *UplinkFrameLog) GetRxInfo() []*gw.UplinkRxInfo {
|
||||
if x != nil {
|
||||
return x.RxInfo
|
||||
}
|
||||
@ -135,9 +135,9 @@ type DownlinkFrameLog struct {
|
||||
// PHYPayload.
|
||||
PhyPayload []byte `protobuf:"bytes,2,opt,name=phy_payload,json=phyPayload,proto3" json:"phy_payload,omitempty"`
|
||||
// TX meta-data.
|
||||
TxInfo *gw.DownlinkTXInfo `protobuf:"bytes,3,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
// Downlink ID (UUID).
|
||||
DownlinkId string `protobuf:"bytes,4,opt,name=downlink_id,json=downlinkId,proto3" json:"downlink_id,omitempty"`
|
||||
TxInfo *gw.DownlinkTxInfo `protobuf:"bytes,3,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
// Downlink ID.
|
||||
DownlinkId uint32 `protobuf:"varint,4,opt,name=downlink_id,json=downlinkId,proto3" json:"downlink_id,omitempty"`
|
||||
// Gateway ID (EUI64).
|
||||
GatewayId string `protobuf:"bytes,5,opt,name=gateway_id,json=gatewayId,proto3" json:"gateway_id,omitempty"`
|
||||
// Message type.
|
||||
@ -194,18 +194,18 @@ func (x *DownlinkFrameLog) GetPhyPayload() []byte {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DownlinkFrameLog) GetTxInfo() *gw.DownlinkTXInfo {
|
||||
func (x *DownlinkFrameLog) GetTxInfo() *gw.DownlinkTxInfo {
|
||||
if x != nil {
|
||||
return x.TxInfo
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DownlinkFrameLog) GetDownlinkId() string {
|
||||
func (x *DownlinkFrameLog) GetDownlinkId() uint32 {
|
||||
if x != nil {
|
||||
return x.DownlinkId
|
||||
}
|
||||
return ""
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DownlinkFrameLog) GetGatewayId() string {
|
||||
@ -249,10 +249,10 @@ var file_api_frame_log_proto_rawDesc = []byte{
|
||||
0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x68, 0x79, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x68, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61,
|
||||
0x64, 0x12, 0x29, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x58,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x78,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x29, 0x0a, 0x07,
|
||||
0x72, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
|
||||
0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x58, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x06, 0x72, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x06, 0x6d, 0x5f, 0x74, 0x79, 0x70,
|
||||
0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
|
||||
0x2e, 0x4d, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a,
|
||||
@ -270,9 +270,9 @@ var file_api_frame_log_proto_rawDesc = []byte{
|
||||
0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x68, 0x79,
|
||||
0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x2b, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x67, 0x77, 0x2e, 0x44, 0x6f,
|
||||
0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x58, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78,
|
||||
0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b,
|
||||
0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
|
||||
0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
|
||||
0x69, 0x6e, 0x6b, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
|
||||
0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x61, 0x74, 0x65, 0x77,
|
||||
0x61, 0x79, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x6d, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06,
|
||||
@ -305,19 +305,19 @@ var file_api_frame_log_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
|
||||
var file_api_frame_log_proto_goTypes = []interface{}{
|
||||
(*UplinkFrameLog)(nil), // 0: api.UplinkFrameLog
|
||||
(*DownlinkFrameLog)(nil), // 1: api.DownlinkFrameLog
|
||||
(*gw.UplinkTXInfo)(nil), // 2: gw.UplinkTXInfo
|
||||
(*gw.UplinkRXInfo)(nil), // 3: gw.UplinkRXInfo
|
||||
(*gw.UplinkTxInfo)(nil), // 2: gw.UplinkTxInfo
|
||||
(*gw.UplinkRxInfo)(nil), // 3: gw.UplinkRxInfo
|
||||
(common.MType)(0), // 4: common.MType
|
||||
(*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp
|
||||
(*gw.DownlinkTXInfo)(nil), // 6: gw.DownlinkTXInfo
|
||||
(*gw.DownlinkTxInfo)(nil), // 6: gw.DownlinkTxInfo
|
||||
}
|
||||
var file_api_frame_log_proto_depIdxs = []int32{
|
||||
2, // 0: api.UplinkFrameLog.tx_info:type_name -> gw.UplinkTXInfo
|
||||
3, // 1: api.UplinkFrameLog.rx_info:type_name -> gw.UplinkRXInfo
|
||||
2, // 0: api.UplinkFrameLog.tx_info:type_name -> gw.UplinkTxInfo
|
||||
3, // 1: api.UplinkFrameLog.rx_info:type_name -> gw.UplinkRxInfo
|
||||
4, // 2: api.UplinkFrameLog.m_type:type_name -> common.MType
|
||||
5, // 3: api.UplinkFrameLog.time:type_name -> google.protobuf.Timestamp
|
||||
5, // 4: api.DownlinkFrameLog.time:type_name -> google.protobuf.Timestamp
|
||||
6, // 5: api.DownlinkFrameLog.tx_info:type_name -> gw.DownlinkTXInfo
|
||||
6, // 5: api.DownlinkFrameLog.tx_info:type_name -> gw.DownlinkTxInfo
|
||||
4, // 6: api.DownlinkFrameLog.m_type:type_name -> common.MType
|
||||
7, // [7:7] is the sub-list for method output_type
|
||||
7, // [7:7] is the sub-list for method input_type
|
||||
|
||||
2857
api/go/gw/gw.pb.go
vendored
2857
api/go/gw/gw.pb.go
vendored
File diff suppressed because it is too large
Load Diff
40
api/go/integration/integration.pb.go
vendored
40
api/go/integration/integration.pb.go
vendored
@ -303,9 +303,9 @@ type UplinkEvent struct {
|
||||
// Note that this is only set when a codec is configured in the Device Profile.
|
||||
Object *structpb.Struct `protobuf:"bytes,11,opt,name=object,proto3" json:"object,omitempty"`
|
||||
// Receiving gateway RX info.
|
||||
RxInfo []*gw.UplinkRXInfo `protobuf:"bytes,12,rep,name=rx_info,json=rxInfo,proto3" json:"rx_info,omitempty"`
|
||||
RxInfo []*gw.UplinkRxInfo `protobuf:"bytes,12,rep,name=rx_info,json=rxInfo,proto3" json:"rx_info,omitempty"`
|
||||
// TX info.
|
||||
TxInfo *gw.UplinkTXInfo `protobuf:"bytes,13,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
TxInfo *gw.UplinkTxInfo `protobuf:"bytes,13,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
}
|
||||
|
||||
func (x *UplinkEvent) Reset() {
|
||||
@ -417,14 +417,14 @@ func (x *UplinkEvent) GetObject() *structpb.Struct {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *UplinkEvent) GetRxInfo() []*gw.UplinkRXInfo {
|
||||
func (x *UplinkEvent) GetRxInfo() []*gw.UplinkRxInfo {
|
||||
if x != nil {
|
||||
return x.RxInfo
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *UplinkEvent) GetTxInfo() *gw.UplinkTXInfo {
|
||||
func (x *UplinkEvent) GetTxInfo() *gw.UplinkTxInfo {
|
||||
if x != nil {
|
||||
return x.TxInfo
|
||||
}
|
||||
@ -611,8 +611,8 @@ type TxAckEvent struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
// Downlink ID (UUID).
|
||||
DownlinkId string `protobuf:"bytes,1,opt,name=downlink_id,json=downlinkId,proto3" json:"downlink_id,omitempty"`
|
||||
// Downlink ID.
|
||||
DownlinkId uint32 `protobuf:"varint,1,opt,name=downlink_id,json=downlinkId,proto3" json:"downlink_id,omitempty"`
|
||||
// Timestamp.
|
||||
Time *timestamppb.Timestamp `protobuf:"bytes,2,opt,name=time,proto3" json:"time,omitempty"`
|
||||
// Device info.
|
||||
@ -624,7 +624,7 @@ type TxAckEvent struct {
|
||||
// Gateway ID.
|
||||
GatewayId string `protobuf:"bytes,6,opt,name=gateway_id,json=gatewayId,proto3" json:"gateway_id,omitempty"`
|
||||
// TX info.
|
||||
TxInfo *gw.DownlinkTXInfo `protobuf:"bytes,7,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
TxInfo *gw.DownlinkTxInfo `protobuf:"bytes,7,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
}
|
||||
|
||||
func (x *TxAckEvent) Reset() {
|
||||
@ -659,11 +659,11 @@ func (*TxAckEvent) Descriptor() ([]byte, []int) {
|
||||
return file_integration_integration_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *TxAckEvent) GetDownlinkId() string {
|
||||
func (x *TxAckEvent) GetDownlinkId() uint32 {
|
||||
if x != nil {
|
||||
return x.DownlinkId
|
||||
}
|
||||
return ""
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *TxAckEvent) GetTime() *timestamppb.Timestamp {
|
||||
@ -701,7 +701,7 @@ func (x *TxAckEvent) GetGatewayId() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *TxAckEvent) GetTxInfo() *gw.DownlinkTXInfo {
|
||||
func (x *TxAckEvent) GetTxInfo() *gw.DownlinkTxInfo {
|
||||
if x != nil {
|
||||
return x.TxInfo
|
||||
}
|
||||
@ -1151,10 +1151,10 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74,
|
||||
0x52, 0x06, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x29, 0x0a, 0x07, 0x72, 0x78, 0x5f, 0x69,
|
||||
0x6e, 0x66, 0x6f, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x67, 0x77, 0x2e, 0x55,
|
||||
0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x58, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x72, 0x78, 0x49,
|
||||
0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x72, 0x78, 0x49,
|
||||
0x6e, 0x66, 0x6f, 0x12, 0x29, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x0d,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b,
|
||||
0x54, 0x58, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xbb,
|
||||
0x54, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xbb,
|
||||
0x01, 0x0a, 0x09, 0x4a, 0x6f, 0x69, 0x6e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10,
|
||||
0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63,
|
||||
@ -1185,7 +1185,7 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x64, 0x6f, 0x77, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x66, 0x43, 0x6e, 0x74,
|
||||
0x44, 0x6f, 0x77, 0x6e, 0x22, 0xa5, 0x02, 0x0a, 0x0a, 0x54, 0x78, 0x41, 0x63, 0x6b, 0x45, 0x76,
|
||||
0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x5f,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x6f, 0x77, 0x6e, 0x6c, 0x69,
|
||||
0x6e, 0x6b, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x04,
|
||||
@ -1200,7 +1200,7 @@ var file_integration_integration_proto_rawDesc = []byte{
|
||||
0x12, 0x1d, 0x0a, 0x0a, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f, 0x69, 0x64, 0x18, 0x06,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x49, 0x64, 0x12,
|
||||
0x2b, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x12, 0x2e, 0x67, 0x77, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x58,
|
||||
0x32, 0x12, 0x2e, 0x67, 0x77, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x78,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x92, 0x03, 0x0a,
|
||||
0x08, 0x4c, 0x6f, 0x67, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x64,
|
||||
0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
@ -1335,9 +1335,9 @@ var file_integration_integration_proto_goTypes = []interface{}{
|
||||
nil, // 12: integration.LogEvent.ContextEntry
|
||||
(*timestamppb.Timestamp)(nil), // 13: google.protobuf.Timestamp
|
||||
(*structpb.Struct)(nil), // 14: google.protobuf.Struct
|
||||
(*gw.UplinkRXInfo)(nil), // 15: gw.UplinkRXInfo
|
||||
(*gw.UplinkTXInfo)(nil), // 16: gw.UplinkTXInfo
|
||||
(*gw.DownlinkTXInfo)(nil), // 17: gw.DownlinkTXInfo
|
||||
(*gw.UplinkRxInfo)(nil), // 15: gw.UplinkRxInfo
|
||||
(*gw.UplinkTxInfo)(nil), // 16: gw.UplinkTxInfo
|
||||
(*gw.DownlinkTxInfo)(nil), // 17: gw.DownlinkTxInfo
|
||||
(*common.Location)(nil), // 18: common.Location
|
||||
}
|
||||
var file_integration_integration_proto_depIdxs = []int32{
|
||||
@ -1345,15 +1345,15 @@ var file_integration_integration_proto_depIdxs = []int32{
|
||||
13, // 1: integration.UplinkEvent.time:type_name -> google.protobuf.Timestamp
|
||||
2, // 2: integration.UplinkEvent.device_info:type_name -> integration.DeviceInfo
|
||||
14, // 3: integration.UplinkEvent.object:type_name -> google.protobuf.Struct
|
||||
15, // 4: integration.UplinkEvent.rx_info:type_name -> gw.UplinkRXInfo
|
||||
16, // 5: integration.UplinkEvent.tx_info:type_name -> gw.UplinkTXInfo
|
||||
15, // 4: integration.UplinkEvent.rx_info:type_name -> gw.UplinkRxInfo
|
||||
16, // 5: integration.UplinkEvent.tx_info:type_name -> gw.UplinkTxInfo
|
||||
13, // 6: integration.JoinEvent.time:type_name -> google.protobuf.Timestamp
|
||||
2, // 7: integration.JoinEvent.device_info:type_name -> integration.DeviceInfo
|
||||
13, // 8: integration.AckEvent.time:type_name -> google.protobuf.Timestamp
|
||||
2, // 9: integration.AckEvent.device_info:type_name -> integration.DeviceInfo
|
||||
13, // 10: integration.TxAckEvent.time:type_name -> google.protobuf.Timestamp
|
||||
2, // 11: integration.TxAckEvent.device_info:type_name -> integration.DeviceInfo
|
||||
17, // 12: integration.TxAckEvent.tx_info:type_name -> gw.DownlinkTXInfo
|
||||
17, // 12: integration.TxAckEvent.tx_info:type_name -> gw.DownlinkTxInfo
|
||||
13, // 13: integration.LogEvent.time:type_name -> google.protobuf.Timestamp
|
||||
2, // 14: integration.LogEvent.device_info:type_name -> integration.DeviceInfo
|
||||
0, // 15: integration.LogEvent.level:type_name -> integration.LogLevel
|
||||
|
||||
30
api/go/meta/meta.pb.go
vendored
30
api/go/meta/meta.pb.go
vendored
@ -30,9 +30,9 @@ type UplinkMeta struct {
|
||||
// Device EUI (EUI64).
|
||||
DevEui string `protobuf:"bytes,1,opt,name=dev_eui,json=devEui,proto3" json:"dev_eui,omitempty"`
|
||||
// TX meta-data.
|
||||
TxInfo *gw.UplinkTXInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
TxInfo *gw.UplinkTxInfo `protobuf:"bytes,2,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
// RX meta-data.
|
||||
RxInfo []*gw.UplinkRXInfo `protobuf:"bytes,3,rep,name=rx_info,json=rxInfo,proto3" json:"rx_info,omitempty"`
|
||||
RxInfo []*gw.UplinkRxInfo `protobuf:"bytes,3,rep,name=rx_info,json=rxInfo,proto3" json:"rx_info,omitempty"`
|
||||
// PHYPayload byte count.
|
||||
PhyPayloadByteCount uint32 `protobuf:"varint,4,opt,name=phy_payload_byte_count,json=phyPayloadByteCount,proto3" json:"phy_payload_byte_count,omitempty"`
|
||||
// MAC-Command byte count.
|
||||
@ -82,14 +82,14 @@ func (x *UplinkMeta) GetDevEui() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *UplinkMeta) GetTxInfo() *gw.UplinkTXInfo {
|
||||
func (x *UplinkMeta) GetTxInfo() *gw.UplinkTxInfo {
|
||||
if x != nil {
|
||||
return x.TxInfo
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *UplinkMeta) GetRxInfo() []*gw.UplinkRXInfo {
|
||||
func (x *UplinkMeta) GetRxInfo() []*gw.UplinkRxInfo {
|
||||
if x != nil {
|
||||
return x.RxInfo
|
||||
}
|
||||
@ -134,7 +134,7 @@ type DownlinkMeta struct {
|
||||
// Multicast Group ID (UUID).
|
||||
MulticastGroupId string `protobuf:"bytes,2,opt,name=multicast_group_id,json=multicastGroupId,proto3" json:"multicast_group_id,omitempty"`
|
||||
// TX meta-data.
|
||||
TxInfo *gw.DownlinkTXInfo `protobuf:"bytes,3,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
TxInfo *gw.DownlinkTxInfo `protobuf:"bytes,3,opt,name=tx_info,json=txInfo,proto3" json:"tx_info,omitempty"`
|
||||
// PHYPayload byte count.
|
||||
PhyPayloadByteCount uint32 `protobuf:"varint,4,opt,name=phy_payload_byte_count,json=phyPayloadByteCount,proto3" json:"phy_payload_byte_count,omitempty"`
|
||||
// MAC-Command byte count.
|
||||
@ -193,7 +193,7 @@ func (x *DownlinkMeta) GetMulticastGroupId() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DownlinkMeta) GetTxInfo() *gw.DownlinkTXInfo {
|
||||
func (x *DownlinkMeta) GetTxInfo() *gw.DownlinkTxInfo {
|
||||
if x != nil {
|
||||
return x.TxInfo
|
||||
}
|
||||
@ -245,10 +245,10 @@ var file_meta_meta_proto_rawDesc = []byte{
|
||||
0x6c, 0x69, 0x6e, 0x6b, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x17, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x5f,
|
||||
0x65, 0x75, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x76, 0x45, 0x75,
|
||||
0x69, 0x12, 0x29, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x58,
|
||||
0x28, 0x0b, 0x32, 0x10, 0x2e, 0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x78,
|
||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x29, 0x0a, 0x07,
|
||||
0x72, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e,
|
||||
0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x58, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x67, 0x77, 0x2e, 0x55, 0x70, 0x6c, 0x69, 0x6e, 0x6b, 0x52, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||
0x06, 0x72, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x33, 0x0a, 0x16, 0x70, 0x68, 0x79, 0x5f, 0x70,
|
||||
0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
|
||||
0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x70, 0x68, 0x79, 0x50, 0x61, 0x79, 0x6c,
|
||||
@ -271,7 +271,7 @@ var file_meta_meta_proto_rawDesc = []byte{
|
||||
0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x61, 0x73, 0x74, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64,
|
||||
0x12, 0x2b, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x12, 0x2e, 0x67, 0x77, 0x2e, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x54,
|
||||
0x58, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x33, 0x0a,
|
||||
0x78, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x74, 0x78, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x33, 0x0a,
|
||||
0x16, 0x70, 0x68, 0x79, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x62, 0x79, 0x74,
|
||||
0x65, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x13, 0x70,
|
||||
0x68, 0x79, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x79, 0x74, 0x65, 0x43, 0x6f, 0x75,
|
||||
@ -312,16 +312,16 @@ var file_meta_meta_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
|
||||
var file_meta_meta_proto_goTypes = []interface{}{
|
||||
(*UplinkMeta)(nil), // 0: meta.UplinkMeta
|
||||
(*DownlinkMeta)(nil), // 1: meta.DownlinkMeta
|
||||
(*gw.UplinkTXInfo)(nil), // 2: gw.UplinkTXInfo
|
||||
(*gw.UplinkRXInfo)(nil), // 3: gw.UplinkRXInfo
|
||||
(*gw.UplinkTxInfo)(nil), // 2: gw.UplinkTxInfo
|
||||
(*gw.UplinkRxInfo)(nil), // 3: gw.UplinkRxInfo
|
||||
(common.MType)(0), // 4: common.MType
|
||||
(*gw.DownlinkTXInfo)(nil), // 5: gw.DownlinkTXInfo
|
||||
(*gw.DownlinkTxInfo)(nil), // 5: gw.DownlinkTxInfo
|
||||
}
|
||||
var file_meta_meta_proto_depIdxs = []int32{
|
||||
2, // 0: meta.UplinkMeta.tx_info:type_name -> gw.UplinkTXInfo
|
||||
3, // 1: meta.UplinkMeta.rx_info:type_name -> gw.UplinkRXInfo
|
||||
2, // 0: meta.UplinkMeta.tx_info:type_name -> gw.UplinkTxInfo
|
||||
3, // 1: meta.UplinkMeta.rx_info:type_name -> gw.UplinkRxInfo
|
||||
4, // 2: meta.UplinkMeta.message_type:type_name -> common.MType
|
||||
5, // 3: meta.DownlinkMeta.tx_info:type_name -> gw.DownlinkTXInfo
|
||||
5, // 3: meta.DownlinkMeta.tx_info:type_name -> gw.DownlinkTxInfo
|
||||
4, // 4: meta.DownlinkMeta.message_type:type_name -> common.MType
|
||||
5, // [5:5] is the sub-list for method output_type
|
||||
5, // [5:5] is the sub-list for method input_type
|
||||
|
||||
Reference in New Issue
Block a user