Skip to content

ESPProvision/Add dynamic properties field to ORConfigChannelProtoco #51

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
dominiquekleeven wants to merge 1 commit into from
Closed

ESPProvision/Add dynamic properties field to ORConfigChannelProtoco #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions ORLib/src/main/java/io/openremote/orlib/service/espprovision/DeviceConnection.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel:
mqttBrokerUrl: String,
mqttUser: String,
mqttPassword: String,
assetId: String
assetId: String,
properties: Map<String, String> = emptyMap()
) {
if (!isConnected) {
throw ESPProviderException(
Expand All @@ -114,7 +115,8 @@ class DeviceConnection(val deviceRegistry: DeviceRegistry, var callbackChannel:
mqttBrokerUrl = mqttBrokerUrl,
mqttUser = mqttUser,
mqttPassword = mqttPassword,
assetId = assetId
assetId = assetId,
properties = properties
)
} catch (e: Exception) {
throw ESPProviderException(
Expand Down
4 changes: 3 additions & 1 deletion ORLib/src/main/java/io/openremote/orlib/service/espprovision/ORConfigChannel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,16 @@ class ORConfigChannel(private val device: ESPDevice) {
mqttUser: String,
mqttPassword: String,
realm: String = "master",
assetId: String
assetId: String,
properties: Map<String, String> = emptyMap()
) {
val config = Request.OpenRemoteConfig.newBuilder()
.setMqttBrokerUrl(mqttBrokerUrl)
.setUser(mqttUser)
.setMqttPassword(mqttPassword)
.setAssetId(assetId)
.setRealm(realm)
.putAllProperties(properties)
.build()

val request = Request.newBuilder()
Expand Down
1 change: 1 addition & 0 deletions protobuf/src/main/proto/ORConfigChannelProtocol.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ message Request {
string mqtt_password = 3;
string realm = 4;
string asset_id = 5;
map<string, string> properties = 6;
}
message ExitProvisioning {};
string id = 1;
Expand Down