Skip to content
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.

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

Associate MAC settings profile #7515

Draft
wants to merge 4 commits into
base: v3.34
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions api/ttn/lorawan/v3/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -4048,6 +4048,7 @@ SDKs are responsible for combining (if desired) the three.
| `last_seen_at` | [`google.protobuf.Timestamp`](#google.protobuf.Timestamp) | | Timestamp when a device uplink has been last observed. This field is set by the Application Server and stored in the Identity Server. |
| `serial_number` | [`string`](#string) | | |
| `lora_alliance_profile_ids` | [`LoRaAllianceProfileIdentifiers`](#ttn.lorawan.v3.LoRaAllianceProfileIdentifiers) | | |
| `mac_settings_profile_ids` | [`MACSettingsProfileIdentifiers`](#ttn.lorawan.v3.MACSettingsProfileIdentifiers) | | MAC settings profile identifiers. |

#### Field Rules

Expand Down
24 changes: 24 additions & 0 deletions api/ttn/lorawan/v3/api.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -21953,6 +21953,10 @@
},
"lora_alliance_profile_ids": {
"$ref": "#/definitions/v3LoRaAllianceProfileIdentifiers"
},
"mac_settings_profile_ids": {
"$ref": "#/definitions/v3MACSettingsProfileIdentifiers",
"description": "MAC settings profile identifiers."
}
},
"description": "Defines an End Device registration and its state on the network.\nThe persistence of the EndDevice is divided between the Network Server, Application Server and Join Server.\nSDKs are responsible for combining (if desired) the three."
Expand Down Expand Up @@ -23388,6 +23392,10 @@
},
"lora_alliance_profile_ids": {
"$ref": "#/definitions/v3LoRaAllianceProfileIdentifiers"
},
"mac_settings_profile_ids": {
"$ref": "#/definitions/v3MACSettingsProfileIdentifiers",
"description": "MAC settings profile identifiers."
}
},
"description": "Defines an End Device registration and its state on the network.\nThe persistence of the EndDevice is divided between the Network Server, Application Server and Join Server.\nSDKs are responsible for combining (if desired) the three."
Expand Down Expand Up @@ -23868,6 +23876,10 @@
},
"lora_alliance_profile_ids": {
"$ref": "#/definitions/v3LoRaAllianceProfileIdentifiers"
},
"mac_settings_profile_ids": {
"$ref": "#/definitions/v3MACSettingsProfileIdentifiers",
"description": "MAC settings profile identifiers."
}
},
"description": "Defines an End Device registration and its state on the network.\nThe persistence of the EndDevice is divided between the Network Server, Application Server and Join Server.\nSDKs are responsible for combining (if desired) the three."
Expand Down Expand Up @@ -24171,6 +24183,10 @@
},
"lora_alliance_profile_ids": {
"$ref": "#/definitions/v3LoRaAllianceProfileIdentifiers"
},
"mac_settings_profile_ids": {
"$ref": "#/definitions/v3MACSettingsProfileIdentifiers",
"description": "MAC settings profile identifiers."
}
},
"description": "Defines an End Device registration and its state on the network.\nThe persistence of the EndDevice is divided between the Network Server, Application Server and Join Server.\nSDKs are responsible for combining (if desired) the three."
Expand Down Expand Up @@ -25862,6 +25878,10 @@
},
"lora_alliance_profile_ids": {
"$ref": "#/definitions/v3LoRaAllianceProfileIdentifiers"
},
"mac_settings_profile_ids": {
"$ref": "#/definitions/v3MACSettingsProfileIdentifiers",
"description": "MAC settings profile identifiers."
}
},
"description": "Defines an End Device registration and its state on the network.\nThe persistence of the EndDevice is divided between the Network Server, Application Server and Join Server.\nSDKs are responsible for combining (if desired) the three."
Expand Down Expand Up @@ -27891,6 +27911,10 @@
},
"lora_alliance_profile_ids": {
"$ref": "#/definitions/v3LoRaAllianceProfileIdentifiers"
},
"mac_settings_profile_ids": {
"$ref": "#/definitions/v3MACSettingsProfileIdentifiers",
"description": "MAC settings profile identifiers."
}
},
"description": "Defines an End Device registration and its state on the network.\nThe persistence of the EndDevice is divided between the Network Server, Application Server and Join Server.\nSDKs are responsible for combining (if desired) the three."
Expand Down
5 changes: 4 additions & 1 deletion api/ttn/lorawan/v3/end_device.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © 2019 The Things Network Foundation, The Things Industries B.V.

Check warning on line 1 in api/ttn/lorawan/v3/end_device.proto

View workflow job for this annotation

GitHub Actions / Check Mergeability

api/ttn/lorawan/v3/end_device.proto has a conflict when merging TheThingsNetwork/lorawan-stack:v3.34.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1208,7 +1208,10 @@

LoRaAllianceProfileIdentifiers lora_alliance_profile_ids = 56;

// next: 57;
// MAC settings profile identifiers.
MACSettingsProfileIdentifiers mac_settings_profile_ids = 57;

// next: 58;
}

message EndDevices {
Expand Down
4 changes: 2 additions & 2 deletions config/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -8258,7 +8258,7 @@
},
"description": {
"package": "pkg/networkserver",
"file": "grpc_deviceregistry.go"
"file": "device_state.go"
}
},
"error:pkg/networkserver:field_not_zero": {
Expand All @@ -8267,7 +8267,7 @@
},
"description": {
"package": "pkg/networkserver",
"file": "grpc_deviceregistry.go"
"file": "device_state.go"
}
},
"error:pkg/networkserver:field_value": {
Expand Down
Loading
Loading