From 4a881cea5998a24655df465531a0afdce8018381 Mon Sep 17 00:00:00 2001 From: Donavan Becker Date: Thu, 19 Sep 2024 08:15:03 -0400 Subject: [PATCH] fix #1024 --- src/device/hub.ts | 4 ++-- src/device/iosensor.ts | 4 ++-- src/device/meter.ts | 4 ++-- src/device/meterplus.ts | 4 ++-- src/types/bledevicestatus.ts | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/device/hub.ts b/src/device/hub.ts index 0ea6a8ea..3fac786a 100644 --- a/src/device/hub.ts +++ b/src/device/hub.ts @@ -178,11 +178,11 @@ export class Hub extends deviceBase { async BLEparseStatus(): Promise { await this.debugLog('BLEparseStatus') - await this.debugLog(`(temperature, humidity, lightLevel) = BLE:(${this.serviceData.celcius}, ${this.serviceData.humidity}, ${this.serviceData.lightLevel}), current:(${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity}, ${this.LightSensor?.CurrentAmbientLightLevel})`) + await this.debugLog(`(temperature, humidity, lightLevel) = BLE:(${this.serviceData.celsius}, ${this.serviceData.humidity}, ${this.serviceData.lightLevel}), current:(${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity}, ${this.LightSensor?.CurrentAmbientLightLevel})`) // CurrentTemperature if (!this.device.hub?.hide_temperature && this.TemperatureSensor?.Service) { - this.TemperatureSensor.CurrentTemperature = this.serviceData.celcius + this.TemperatureSensor.CurrentTemperature = this.serviceData.celsius await this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`) } diff --git a/src/device/iosensor.ts b/src/device/iosensor.ts index 4d9b39f2..163b5e87 100644 --- a/src/device/iosensor.ts +++ b/src/device/iosensor.ts @@ -180,7 +180,7 @@ export class IOSensor extends deviceBase { async BLEparseStatus(): Promise { await this.debugLog('BLEparseStatus') - await this.debugLog(`(battery, temperature, humidity) = BLE:(${this.serviceData.battery}, ${this.serviceData.celcius}, ${this.serviceData.humidity}), current:(${this.Battery.BatteryLevel}, ${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`) + await this.debugLog(`(battery, temperature, humidity) = BLE:(${this.serviceData.battery}, ${this.serviceData.celsius}, ${this.serviceData.humidity}), current:(${this.Battery.BatteryLevel}, ${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`) // BatteryLevel this.Battery.BatteryLevel = this.serviceData.battery @@ -200,7 +200,7 @@ export class IOSensor extends deviceBase { // Current Temperature if (!this.device.meter?.hide_temperature && this.TemperatureSensor?.Service) { - const CELSIUS = this.serviceData.celcius < 0 ? 0 : this.serviceData.celcius > 100 ? 100 : this.serviceData.celcius + const CELSIUS = this.serviceData.celsius < 0 ? 0 : this.serviceData.celsius > 100 ? 100 : this.serviceData.celsius this.TemperatureSensor.CurrentTemperature = CELSIUS await this.debugLog(`Temperature: ${this.TemperatureSensor.CurrentTemperature}°c`) } diff --git a/src/device/meter.ts b/src/device/meter.ts index 0b81a3f7..d6e354b0 100644 --- a/src/device/meter.ts +++ b/src/device/meter.ts @@ -173,7 +173,7 @@ export class Meter extends deviceBase { async BLEparseStatus(): Promise { await this.debugLog('BLEparseStatus') - await this.debugLog(`(scale, temperature, humidity) = BLE:(${this.serviceData.fahrenheit}, ${this.serviceData.celcius}, ${this.serviceData.humidity}), current:(${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`) + await this.debugLog(`(scale, temperature, humidity) = BLE:(${this.serviceData.fahrenheit}, ${this.serviceData.celsius}, ${this.serviceData.humidity}), current:(${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`) // CurrentRelativeHumidity if (!this.device.iosensor?.hide_humidity && this.HumiditySensor?.Service) { @@ -183,7 +183,7 @@ export class Meter extends deviceBase { // Current Temperature if (!this.device.meter?.hide_temperature && this.TemperatureSensor?.Service) { - const CELSIUS = this.serviceData.celcius < 0 ? 0 : this.serviceData.celcius > 100 ? 100 : this.serviceData.celcius + const CELSIUS = this.serviceData.celsius < 0 ? 0 : this.serviceData.celsius > 100 ? 100 : this.serviceData.celsius this.TemperatureSensor.CurrentTemperature = CELSIUS await this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`) } diff --git a/src/device/meterplus.ts b/src/device/meterplus.ts index 66539ba9..2e81ca0d 100644 --- a/src/device/meterplus.ts +++ b/src/device/meterplus.ts @@ -178,7 +178,7 @@ export class MeterPlus extends deviceBase { async BLEparseStatus(): Promise { await this.debugLog('BLEparseStatus') - await this.debugLog(`(temperature, humidity) = BLE:(${this.serviceData.celcius}, ${this.serviceData.humidity}), current:(${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`) + await this.debugLog(`(temperature, humidity) = BLE:(${this.serviceData.celsius}, ${this.serviceData.humidity}), current:(${this.TemperatureSensor?.CurrentTemperature}, ${this.HumiditySensor?.CurrentRelativeHumidity})`) // CurrentRelativeHumidity if (!this.device.iosensor?.hide_humidity && this.HumiditySensor?.Service) { @@ -187,7 +187,7 @@ export class MeterPlus extends deviceBase { } // Current Temperature if (!this.device.meter?.hide_temperature && this.TemperatureSensor?.Service) { - const CELSIUS = this.serviceData.celcius < 0 ? 0 : this.serviceData.celcius > 100 ? 100 : this.serviceData.celcius + const CELSIUS = this.serviceData.celsius < 0 ? 0 : this.serviceData.celsius > 100 ? 100 : this.serviceData.celsius this.TemperatureSensor.CurrentTemperature = CELSIUS await this.debugLog(`CurrentTemperature: ${this.TemperatureSensor.CurrentTemperature}°c`) } diff --git a/src/types/bledevicestatus.ts b/src/types/bledevicestatus.ts index f9db5876..440387a5 100644 --- a/src/types/bledevicestatus.ts +++ b/src/types/bledevicestatus.ts @@ -140,7 +140,7 @@ export type meterServiceData = serviceData & { model: SwitchBotBLEModel.Meter modelName: SwitchBotBLEModelName.Meter modelFriendlyName: SwitchBotBLEModelFriendlyName.Meter - celcius: number + celsius: number fahrenheit: number fahrenheit_mode: boolean humidity: number @@ -151,7 +151,7 @@ export type meterPlusServiceData = serviceData & { model: SwitchBotBLEModel.MeterPlus modelName: SwitchBotBLEModelName.MeterPlus modelFriendlyName: SwitchBotBLEModelFriendlyName.MeterPlus - celcius: number + celsius: number fahrenheit: number fahrenheit_mode: boolean humidity: number @@ -162,7 +162,7 @@ export type outdoorMeterServiceData = serviceData & { model: SwitchBotBLEModel.OutdoorMeter modelName: SwitchBotBLEModelName.OutdoorMeter modelFriendlyName: SwitchBotBLEModelFriendlyName.OutdoorMeter - celcius: number + celsius: number fahrenheit: number fahrenheit_mode: boolean humidity: number @@ -260,7 +260,7 @@ export type hub2ServiceData = serviceData & { model: SwitchBotBLEModel.Hub2 modelName: SwitchBotBLEModelName.Hub2 modelFriendlyName: SwitchBotBLEModelFriendlyName.Hub2 - celcius: number + celsius: number fahrenheit: number fahrenheit_mode: boolean humidity: number