meshtastic/Meshtastic-Apple
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Apple.git synced 2026-04-20 22:13:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Connect to mqtt on the right topic

Browse source
This commit is contained in:
Garth Vander Houwen 2023-08-06 22:31:19 -07:00
parent 81f824c79c
commit 8afc76ea2a
3 changed files with 35 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meshtastic/Enums/LoraConfigEnums.swift
View file

@ -135,6 +135,26 @@ enum ModemPresets: Int, CaseIterable, Identifiable {
return "Short Range - Fast"
}
}
var name: String {
switch self {
case .longFast:
return "LongFast"
case .longSlow:
return "LongSlow"
case .longModerate:
return "LongModerate"
case .vLongSlow:
return "VLongFast"
case .medSlow:
return "MediumSlow"
case .medFast:
return "MediumFast"
case .shortSlow:
return "ShortSlow"
case .shortFast:
return "ShortFast"
}
}
func snrLimit() -> Float {
switch self {
case .longFast:

2
Meshtastic/Helpers/BLEManager.swift
View file

@ -586,7 +586,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
//Subscribe to Mqtt Client Proxy if enabled
if fetchedNodeInfo[0].mqttConfig?.proxyToClientEnabled ?? false {
mqttManager.connectFromConfigSettings(config: fetchedNodeInfo[0].mqttConfig!, metadata: fetchedNodeInfo[0].metadata!)
mqttManager.connectFromConfigSettings(node: fetchedNodeInfo[0])
}
}
} catch {

22
Meshtastic/Helpers/Mqtt/MqttClientProxyManager.swift
View file

@ -35,23 +35,24 @@ class MqttClientProxyManager {
}
func connectFromConfigSettings(config: MQTTConfigEntity, metadata: DeviceMetadataEntity) {
func connectFromConfigSettings(node: NodeInfoEntity) {
let defaultServerAddress = "mqtt.meshtastic.org"
let defaultServerPort = 1883
//let
var host = config.address
var host = node.mqttConfig?.address
if host == nil || host!.isEmpty {
host = defaultServerAddress
}
if let host = host {
let port = defaultServerPort
let username = config.username
let password = config.password
let username = node.mqttConfig?.username
let password = node.mqttConfig?.password
var root = config.root?.count ?? 0 > 0 ? config.root : "msh"
var prefix = root! + "/2" //+ metadata.firmwareVersion!
var root = node.mqttConfig?.root?.count ?? 0 > 0 ? node.mqttConfig?.root : "msh"
let preset = ModemPresets(rawValue: Int(node.loRaConfig?.modemPreset ?? 0))
var prefix = root! + "/c/\(preset?.name ?? "LongFast")"
var topic = prefix + "/#"
let qos = CocoaMQTTQoS(rawValue :UInt8(2))!
connect(host: host, port: port, username: username, password: password, topic: topic, qos: qos, cleanSession: true)
@ -70,7 +71,9 @@ class MqttClientProxyManager {
mqttClient.password = password
mqttClient.keepAlive = 60
mqttClient.cleanSession = cleanSession
#if DEBUG
mqttClient.logLevel = .debug
#endif
mqttClient.willMessage = CocoaMQTTMessage(topic: "/will", string: "dieout")
mqttClient.autoReconnect = true
mqttClient.delegate = self
@ -89,16 +92,18 @@ class MqttClientProxyManager {
func subscribe(topic: String, qos: MqttQos) {
let qos = CocoaMQTTQoS(rawValue :UInt8(qos.rawValue))!
mqttClient?.subscribe(topic, qos: qos)
print("MQTT Client Proxy subscribed to: " + topic)
print("📲 MQTT Client Proxy subscribed to: " + topic)
}
func unsubscribe(topic: String) {
mqttClient?.unsubscribe(topic)
print("📲 MQTT Client Proxy unsubscribe for: " + topic)
}
func publish(message: String, topic: String, qos: MqttQos) {
let qos = CocoaMQTTQoS(rawValue :UInt8(qos.rawValue))!
mqttClient?.publish(topic, withString: message, qos: qos)
print("📲 MQTT Client Proxy publish for: " + topic)
}
func disconnect() {
@ -107,6 +112,7 @@ class MqttClientProxyManager {
if let client = mqttClient {
status = .disconnecting
client.disconnect()
print("📲 MQTT Client Proxy Disconnected")
} else {
status = .disconnected
}
@ -121,7 +127,7 @@ extension MqttClientProxyManager: CocoaMQTTDelegate {
func mqtt(_ mqtt: CocoaMQTT, didConnectAck ack: CocoaMQTTConnAck) {
print("didConnectAck: \(ack)")
print("📲 MQTT Client Proxy didConnectAck: \(ack)")
if ack == .accept {
//delegate?.onMqttConnected()