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

Added ability to load topics from a configuration file in the root directory. Dew point calculation seems to be off though.

Browse Source
This commit is contained in:
Michael Housh
2021-10-17 18:24:36 -04:00
parent 3f78a53014
commit d8734913e0
8 changed files with 255 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Sources/EnvVars/EnvVars.swift
View File

@@ -24,15 +24,6 @@ public struct EnvVars: Codable, Equatable {
/// The MQTT user password.
public var password: String?
// MARK: TODO Move Topics to their own file that can be loaded.
// Topics
public var dehumidificationStage1Relay: String
public var dehumidificationStage2Relay: String
public var dewPointTopic: String
public var humidificationRelay: String
public var humiditySensor: String
public var temperatureSensor: String
/// Create a new ``EnvVars``
///
/// - Parameters:
@@ -48,13 +39,7 @@ public struct EnvVars: Codable, Equatable {
port: String? = "1883",
identifier: String = "dewPoint-controller",
userName: String? = "mqtt_user",
password: String? = "secret!",
dehumidificationStage1Relay: String = "relays/dehumidification_1",
dehumidificationStage2Relay: String = "relays/dehumidification_2",
dewPointTopic: String = "sensors/dew_point",
humidificationRelay: String = "relays/humidification",
humiditySensor: String = "sensors/humidity",
temperatureSensor: String = "sensors/temperature"
password: String? = "secret!"
){
self.appEnv = appEnv
self.host = host
@@ -62,12 +47,6 @@ public struct EnvVars: Codable, Equatable {
self.identifier = identifier
self.userName = userName
self.password = password
self.dehumidificationStage1Relay = dehumidificationStage1Relay
self.dehumidificationStage2Relay = dehumidificationStage2Relay
self.dewPointTopic = dewPointTopic
self.humidificationRelay = humidificationRelay
self.humiditySensor = humiditySensor
self.temperatureSensor = temperatureSensor
}
/// Custom coding keys.
@@ -78,12 +57,6 @@ public struct EnvVars: Codable, Equatable {
case identifier = "MQTT_IDENTIFIER"
case userName = "MQTT_USERNAME"
case password = "MQTT_PASSWORD"
case dehumidificationStage1Relay = "DEHUMIDIFICATION_STAGE_1_RELAY"
case dehumidificationStage2Relay = "DEHUMIDIFICATION_STAGE_2_RELAY"
case dewPointTopic = "DEW_POINT_TOPIC"
case humidificationRelay = "HUMIDIFICATION_RELAY"
case humiditySensor = "HUMIDITY_SENSOR"
case temperatureSensor = "TEMPERATURE_SENSOR"
}
/// Represents the different app environments.