From d45f18b054ad3f6274ea81758cfc7ca7f2948d63 Mon Sep 17 00:00:00 2001 From: Alsey Coleman Miller Date: Wed, 13 Mar 2024 05:26:47 -0400 Subject: [PATCH] Updated dependencies --- Package.resolved | 2 +- .../GoveeThermometerAccessory.swift | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Package.resolved b/Package.resolved index 8f35f99..b898336 100644 --- a/Package.resolved +++ b/Package.resolved @@ -42,7 +42,7 @@ "location" : "https://github.com/MillerTechnologyPeru/Govee.git", "state" : { "branch" : "master", - "revision" : "b4440fb9ef4ddcb20013eb2e9be40bedf87e687e" + "revision" : "d681e837edc832fc877a409c7d9d967afda8f416" } }, { diff --git a/Sources/TempSensorHomeKit/GoveeThermometerAccessory.swift b/Sources/TempSensorHomeKit/GoveeThermometerAccessory.swift index e5dfaa2..a95f095 100644 --- a/Sources/TempSensorHomeKit/GoveeThermometerAccessory.swift +++ b/Sources/TempSensorHomeKit/GoveeThermometerAccessory.swift @@ -27,13 +27,10 @@ final class GoveeThermometerAccessory: HAP.Accessory.Thermometer, SensorAccessor let battery = BatteryService() - init(peripheral: NativeCentral.Peripheral, advertisement: GoveeAdvertisement.Thermometer, configuration: SensorConfiguration.Sensor?) { + init(peripheral: NativeCentral.Peripheral, advertisement: GoveeAccessory.Thermometer, configuration: SensorConfiguration.Sensor?) { self.peripheral = peripheral self.configuration = configuration - let id = advertisement.name.address.rawValue - #if os(Linux) - assert(id == peripheral.description) - #endif + let id = advertisement.name.rawValue let info = Service.Info.Info( name: configuration?.name ?? "Govee Thermometer Sensor", serialNumber: id, @@ -58,13 +55,13 @@ final class GoveeThermometerAccessory: HAP.Accessory.Thermometer, SensorAccessor self.update(advertisement: advertisement) } - func update(advertisement: GoveeAdvertisement.Thermometer) { + func update(advertisement: GoveeAccessory.Thermometer) { self.lastSeen = Date() self.reachable = true - self.battery.batteryLevel?.value = advertisement.manufacturingData.batteryLevel - self.battery.statusLowBattery.value = advertisement.manufacturingData.batteryLevel < 25 ? .batteryLow : .batteryNormal - self.temperatureSensor.currentTemperature.value = advertisement.manufacturingData.temperature + (configuration?.calibration?.temperature ?? 0.0) - self.humidity.currentRelativeHumidity.value = advertisement.manufacturingData.humidity + (configuration?.calibration?.humidity ?? 0.0) + self.battery.batteryLevel?.value = advertisement.manufacturerData.batteryLevel + self.battery.statusLowBattery.value = advertisement.manufacturerData.batteryLevel < 25 ? .batteryLow : .batteryNormal + self.temperatureSensor.currentTemperature.value = advertisement.manufacturerData.temperature + (configuration?.calibration?.temperature ?? 0.0) + self.humidity.currentRelativeHumidity.value = advertisement.manufacturerData.humidity + (configuration?.calibration?.humidity ?? 0.0) } } @@ -87,7 +84,7 @@ extension GoveeThermometerAccessory { } } -extension GoveeAdvertisement.Thermometer: SensorAdvertisement { +extension GoveeAccessory.Thermometer: SensorAdvertisement { public static var sensorType: String { "com.Govee.Thermometer" } }