michael/swift-mqtt-dewpoint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Cleaned up publish sensor and fixed default sensor topics.

Browse Source
This commit is contained in:
Michael Housh
2021-10-30 22:57:32 -04:00
parent e971db67b8
commit 7181476aaf
2 changed files with 81 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Sources/Models/Topics.swift
View File

@@ -41,12 +41,11 @@ public struct Topics: Codable, Equatable {
public var returnAirSensor: TemperatureAndHumiditySensor<State.Sensors.Return>
public var supplyAirSensor: TemperatureAndHumiditySensor<State.Sensors.Supply>
// TODO: Fix defaults.
public init(
mixedAirSensor: TemperatureAndHumiditySensor<State.Sensors.Mixed> = .init(),
postCoilSensor: TemperatureAndHumiditySensor<State.Sensors.PostCoil> = .init(),
returnAirSensor: TemperatureAndHumiditySensor<State.Sensors.Return> = .init(),
supplyAirSensor: TemperatureAndHumiditySensor<State.Sensors.Supply> = .init()
mixedAirSensor: TemperatureAndHumiditySensor<State.Sensors.Mixed> = .default(location: "mixed=air"),
postCoilSensor: TemperatureAndHumiditySensor<State.Sensors.PostCoil> = .default(location: "post-coil"),
returnAirSensor: TemperatureAndHumiditySensor<State.Sensors.Return> = .default(location: "return"),
supplyAirSensor: TemperatureAndHumiditySensor<State.Sensors.Supply> = .default(location: "supply")
) {
self.mixedAirSensor = mixedAirSensor
self.postCoilSensor = postCoilSensor
@@ -54,31 +53,6 @@ public struct Topics: Codable, Equatable {
self.supplyAirSensor = supplyAirSensor
}
// /// The temperature sensor topic.
// public var temperature: String
//
// /// The humidity sensor topic.
// public var humidity: String
//
// /// The dew point topic (we write / publish this data from the application).
// public var dewPoint: String
//
// /// Create a new sensor topic container.
// ///
// /// - Parameters:
// /// - temperature: The temperature sensor topic.
// /// - humidity: The humidity sensor topic.
// /// - dewPoint: The dew point sensor topic.
// public init(
// temperature: String = "sensors/temperature",
// humidity: String = "sensors/humidity",
// dewPoint: String = "sensors/dew_point"
// ) {
// self.temperature = temperature
// self.humidity = humidity
// self.dewPoint = dewPoint
// }
public struct TemperatureAndHumiditySensor<Location>: Codable, Equatable {
public var temperature: String
public var humidity: String
@@ -92,10 +66,10 @@ public struct Topics: Codable, Equatable {
/// - humidity: The humidity sensor topic.
/// - dewPoint: The dew point sensor topic.
public init(
temperature: String = "sensors/temperature",
humidity: String = "sensors/humidity",
dewPoint: String = "sensors/dew_point",
enthalpy: String = "sensors/enthalpy"
temperature: String,
humidity: String,
dewPoint: String,
enthalpy: String
) {
self.temperature = temperature
self.humidity = humidity
@@ -281,3 +255,15 @@ public struct Topics: Codable, Equatable {
}
}
}
// MARK: Helpers
extension Topics.Sensors.TemperatureAndHumiditySensor {
public static func `default`(location: String) -> Self {
.init(
temperature: "sensors/\(location)/temperature",
humidity: "sensors/\(location)/humidity",
dewPoint: "sensors/\(location)/dew-point",
enthalpy: "sensors/\(location)/enthalpy"
)
}
}