Skip to content

Commit

Permalink
fix #1024
Browse files Browse the repository at this point in the history
  • Loading branch information
donavanbecker committed Sep 19, 2024
1 parent 2620b09 commit 4a881ce
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/device/hub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ export class Hub extends deviceBase {

async BLEparseStatus(): Promise<void> {
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`)
}

Expand Down
4 changes: 2 additions & 2 deletions src/device/iosensor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export class IOSensor extends deviceBase {

async BLEparseStatus(): Promise<void> {
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
Expand All @@ -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`)
}
Expand Down
4 changes: 2 additions & 2 deletions src/device/meter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export class Meter extends deviceBase {

async BLEparseStatus(): Promise<void> {
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) {
Expand All @@ -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`)
}
Expand Down
4 changes: 2 additions & 2 deletions src/device/meterplus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export class MeterPlus extends deviceBase {

async BLEparseStatus(): Promise<void> {
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) {
Expand All @@ -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`)
}
Expand Down
8 changes: 4 additions & 4 deletions src/types/bledevicestatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4a881ce

Please sign in to comment.