mirror of
https://github.com/meshtastic/Meshtastic-Apple.git
synced 2026-04-20 22:13:56 +00:00
Dont use environment variables
This commit is contained in:
parent
44c73a6c53
commit
4062c677ab
3 changed files with 32 additions and 3 deletions
|
|
@ -8224,6 +8224,17 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"device.role.name.routerlate" : {
|
||||
"extractionState" : "manual",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Router Late"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"device.role.name.sensor" : {
|
||||
"extractionState" : "manual",
|
||||
"localizations" : {
|
||||
|
|
@ -8487,6 +8498,17 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"device.role.routerlate" : {
|
||||
"extractionState" : "manual",
|
||||
"localizations" : {
|
||||
"en" : {
|
||||
"stringUnit" : {
|
||||
"state" : "translated",
|
||||
"value" : "Infrastructure node that always rebroadcasts packets once but only after all other modes, ensuring additional coverage for local clusters. Visible in Nodes list."
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"device.role.sensor" : {
|
||||
"extractionState" : "migrated",
|
||||
"localizations" : {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ enum DeviceRoles: Int, CaseIterable, Identifiable {
|
|||
case repeater = 4
|
||||
case router = 2
|
||||
case routerClient = 3
|
||||
case routerLate = 11
|
||||
|
||||
var id: Int { self.rawValue }
|
||||
var name: String {
|
||||
|
|
@ -48,6 +49,8 @@ enum DeviceRoles: Int, CaseIterable, Identifiable {
|
|||
return "device.role.name.clientHidden".localized
|
||||
case .lostAndFound:
|
||||
return "device.role.name.lostAndFound".localized
|
||||
case .routerLate:
|
||||
return "device.role.name.routerlate".localized
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -75,6 +78,8 @@ enum DeviceRoles: Int, CaseIterable, Identifiable {
|
|||
return "device.role.clienthidden".localized
|
||||
case .lostAndFound:
|
||||
return "device.role.lostandfound".localized
|
||||
case .routerLate:
|
||||
return "device.role.routerlate".localized
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -84,7 +89,7 @@ enum DeviceRoles: Int, CaseIterable, Identifiable {
|
|||
return "apps.iphone"
|
||||
case .clientMute:
|
||||
return "speaker.slash"
|
||||
case .router, .routerClient:
|
||||
case .router, .routerClient, .routerLate:
|
||||
return "wifi.router"
|
||||
case .repeater:
|
||||
return "repeat"
|
||||
|
|
@ -127,6 +132,8 @@ enum DeviceRoles: Int, CaseIterable, Identifiable {
|
|||
return Config.DeviceConfig.Role.clientHidden
|
||||
case .lostAndFound:
|
||||
return Config.DeviceConfig.Role.lostAndFound
|
||||
case .routerLate:
|
||||
return Config.DeviceConfig.Role.routerLate
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@ class MqttClientProxyManager {
|
|||
var password = node.mqttConfig?.password
|
||||
if host == defaultServerAddress {
|
||||
|
||||
username = ProcessInfo.processInfo.environment["publicMqttUsername"]
|
||||
password = ProcessInfo.processInfo.environment["publicMqttPsk"]
|
||||
// username = ProcessInfo.processInfo.environment["publicMqttUsername"]
|
||||
// password = ProcessInfo.processInfo.environment["publicMqttPsk"]
|
||||
useSsl = false
|
||||
}
|
||||
let root = node.mqttConfig?.root?.count ?? 0 > 0 ? node.mqttConfig?.root : "msh"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue