homebridge-virtual-accessories 3.15.0 → 3.15.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/config.schema.json +7 -22
- package/dist/configuration/configurationMeasurementSensor.d.ts +0 -1
- package/dist/configuration/configurationMeasurementSensor.js +0 -15
- package/dist/configuration/configurationMeasurementSensor.js.map +1 -1
- package/dist/sensors/measurementSensor.js +0 -1
- package/dist/sensors/measurementSensor.js.map +1 -1
- package/dist/sensors/virtualSensorTemperature.d.ts +2 -1
- package/dist/sensors/virtualSensorTemperature.js +14 -0
- package/dist/sensors/virtualSensorTemperature.js.map +1 -1
- package/package.json +1 -1
package/config.schema.json
CHANGED
|
@@ -913,20 +913,18 @@
|
|
|
913
913
|
"properties": {
|
|
914
914
|
"type": {
|
|
915
915
|
"title": "Type *",
|
|
916
|
-
"description": "
|
|
916
|
+
"description": "Measurement sensor type",
|
|
917
917
|
"type": "string",
|
|
918
918
|
"oneOf": [
|
|
919
919
|
{ "title": "Humidity", "enum": ["humidity"] },
|
|
920
920
|
{ "title": "Temperature", "enum": ["temperature"] }
|
|
921
921
|
]
|
|
922
922
|
},
|
|
923
|
-
"
|
|
924
|
-
"title": "
|
|
925
|
-
"
|
|
926
|
-
"
|
|
927
|
-
|
|
928
|
-
{ "title": "Fahrenheit (ºF)", "enum": ["fahrenheit"] }
|
|
929
|
-
],
|
|
923
|
+
"": {
|
|
924
|
+
"title": " ",
|
|
925
|
+
"description": "Note: Temperature units are set in Homebridge UI under Settings - Display (default: Celsius).",
|
|
926
|
+
"type": "object",
|
|
927
|
+
"properties": {},
|
|
930
928
|
"condition": {
|
|
931
929
|
"functionBody": "return model.devices[arrayIndices].measurement && model.devices[arrayIndices].measurement.type === 'temperature';"
|
|
932
930
|
}
|
|
@@ -934,20 +932,7 @@
|
|
|
934
932
|
},
|
|
935
933
|
"condition": {
|
|
936
934
|
"functionBody": "return model.devices[arrayIndices].accessoryType === 'measurement';"
|
|
937
|
-
}
|
|
938
|
-
"allOf": [
|
|
939
|
-
{
|
|
940
|
-
"if": {
|
|
941
|
-
"properties": {
|
|
942
|
-
"type": { "const": "temperature" }
|
|
943
|
-
},
|
|
944
|
-
"required": [ "type" ]
|
|
945
|
-
},
|
|
946
|
-
"then": {
|
|
947
|
-
"required": [ "temperatureUnits" ]
|
|
948
|
-
}
|
|
949
|
-
}
|
|
950
|
-
]
|
|
935
|
+
}
|
|
951
936
|
},
|
|
952
937
|
"resetTimer": {
|
|
953
938
|
"title": "Reset Timer",
|
|
@@ -4,7 +4,6 @@ import { Validatable } from './validatable.js';
|
|
|
4
4
|
*/
|
|
5
5
|
export declare class MeasurementSensorConfiguration implements Validatable {
|
|
6
6
|
type: string;
|
|
7
|
-
units: string;
|
|
8
7
|
private errorFields;
|
|
9
8
|
readonly fieldNames: { [P in keyof this]?: P | undefined; };
|
|
10
9
|
isValid(prefix: string): [boolean, string[]];
|
|
@@ -1,22 +1,11 @@
|
|
|
1
1
|
/* eslint-disable curly */
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
2
|
import { MeasurementSensorType } from './schema.js';
|
|
12
3
|
import { Utils } from '../utils/utils.js';
|
|
13
|
-
import { Name } from 'typeserializer';
|
|
14
4
|
/**
|
|
15
5
|
*
|
|
16
6
|
*/
|
|
17
7
|
export class MeasurementSensorConfiguration {
|
|
18
8
|
type;
|
|
19
|
-
units = '';
|
|
20
9
|
errorFields = [];
|
|
21
10
|
fieldNames = Utils.proxiedPropertiesOf(this);
|
|
22
11
|
isValid(prefix) {
|
|
@@ -31,8 +20,4 @@ export class MeasurementSensorConfiguration {
|
|
|
31
20
|
];
|
|
32
21
|
}
|
|
33
22
|
}
|
|
34
|
-
__decorate([
|
|
35
|
-
Name('temperatureUnits'),
|
|
36
|
-
__metadata("design:type", String)
|
|
37
|
-
], MeasurementSensorConfiguration.prototype, "units", void 0);
|
|
38
23
|
//# sourceMappingURL=configurationMeasurementSensor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurationMeasurementSensor.js","sourceRoot":"","sources":["../../src/configuration/configurationMeasurementSensor.ts"],"names":[],"mappings":"AAAA,0BAA0B
|
|
1
|
+
{"version":3,"file":"configurationMeasurementSensor.js","sourceRoot":"","sources":["../../src/configuration/configurationMeasurementSensor.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAG1B,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C;;GAEG;AACH,MAAM,OAAO,8BAA8B;IACzC,IAAI,CAAU;IAEN,WAAW,GAAa,EAAE,CAAC;IAE1B,UAAU,GAAG,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAEtD,OAAO,CAAC,MAAc;QACpB,MAAM,WAAW,GAAY,CAC3B,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YACzB,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAChD,CAAC;QAEF,kCAAkC;QAClC,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE7E,OAAO;YACL,CAAC,WAAW,CAAC;YACb,IAAI,CAAC,WAAW;SACjB,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -11,7 +11,6 @@ export class MeasurementSensor extends Accessory {
|
|
|
11
11
|
this.MeasurementCharacteristic = measurementCharacteristic;
|
|
12
12
|
// First configure the device based on the accessory details
|
|
13
13
|
SensorValue = this.getDefaultValue();
|
|
14
|
-
this.SensorUnits = this.accessoryConfiguration.measurement.units;
|
|
15
14
|
// Update the initial state of the accessory
|
|
16
15
|
this.log.debug(`[${this.accessoryName}] Setting Sensor Current Value: ${SensorValue}`);
|
|
17
16
|
this.service.setCharacteristic(this.MeasurementCharacteristic, (SensorValue));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measurementSensor.js","sourceRoot":"","sources":["../../src/sensors/measurementSensor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAIxD;;GAEG;AACH,MAAM,OAAgB,iBAAkB,SAAQ,SAAS;IAE7C,yBAAyB,CAAwC;IAEjE,WAAW,GAAW,EAAE,CAAC;IAEnC,YACE,QAAoC,EACpC,SAA4B,EAC5B,sBAA8C,EAC9C,WAAqC,EACrC,yBAAgE;QAEhE,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,sBAAsB,EAAE,WAAW,CAAC,CAAC;QAEhE,IAAI,WAAW,GAAW,CAAC,CAAC;QAE5B,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;QAE3D,4DAA4D;QAC5D,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"measurementSensor.js","sourceRoot":"","sources":["../../src/sensors/measurementSensor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAIxD;;GAEG;AACH,MAAM,OAAgB,iBAAkB,SAAQ,SAAS;IAE7C,yBAAyB,CAAwC;IAEjE,WAAW,GAAW,EAAE,CAAC;IAEnC,YACE,QAAoC,EACpC,SAA4B,EAC5B,sBAA8C,EAC9C,WAAqC,EACrC,yBAAgE;QAEhE,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,sBAAsB,EAAE,WAAW,CAAC,CAAC;QAEhE,IAAI,WAAW,GAAW,CAAC,CAAC;QAE5B,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;QAE3D,4DAA4D;QAC5D,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAErC,4CAA4C;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,mCAAmC,WAAW,EAAE,CAAC,CAAC;QACvF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;QAE9E,yBAAyB;QAEzB,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,yBAAyB,CAAC;aAC3D,KAAK,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,cAAc;QACZ,OAAO,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,yBAAyB,CAAW,CAAC;IAC/E,CAAC;IAED,EAAE;IACF,yEAAyE;IACzE,EAAE;IAEF,cAAc;IAEd,KAAK,CAAC,qBAAqB;QACzB,MAAM,WAAW,GAAW,IAAI,CAAC,cAAc,EAAE,CAAC;QAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,mCAAmC,WAAW,EAAE,CAAC,CAAC;QAEvF,OAAO,WAAW,CAAC;IACrB,CAAC;IAIS,YAAY;QACpB,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IAC5B,CAAC;CAKF"}
|
|
@@ -6,10 +6,11 @@ import { MeasurementSensor } from './measurementSensor.js';
|
|
|
6
6
|
* TemperatureSensor - Sensor implementation
|
|
7
7
|
*/
|
|
8
8
|
export declare class TemperatureSensor extends MeasurementSensor {
|
|
9
|
-
static readonly DEFAULT_TEMPERATURE_CELSIUS
|
|
9
|
+
static readonly DEFAULT_TEMPERATURE_CELSIUS: number;
|
|
10
10
|
constructor(platform: VirtualAccessoriesPlatform, accessory: PlatformAccessory, accessoryConfiguration: AccessoryConfiguration);
|
|
11
11
|
protected getDefaultValue(): number;
|
|
12
12
|
private getDegreeUnits;
|
|
13
13
|
private toCelsius;
|
|
14
|
+
private getPlatformTemperatureUnits;
|
|
14
15
|
updateMeasurementSensor(value: number, accessoryId: string): void;
|
|
15
16
|
}
|
|
@@ -2,6 +2,7 @@ import { CharacteristicType, ServiceType } from '../platform.js';
|
|
|
2
2
|
import { MeasurementSensor } from './measurementSensor.js';
|
|
3
3
|
import { InvalidSensorValueType, SensorValueUpdateNotAllowed } from '../errors.js';
|
|
4
4
|
import { TemperatureUnit } from '../configuration/schema.js';
|
|
5
|
+
import { readFileSync } from 'fs';
|
|
5
6
|
/**
|
|
6
7
|
* TemperatureSensor - Sensor implementation
|
|
7
8
|
*/
|
|
@@ -9,6 +10,7 @@ export class TemperatureSensor extends MeasurementSensor {
|
|
|
9
10
|
static DEFAULT_TEMPERATURE_CELSIUS = 20;
|
|
10
11
|
constructor(platform, accessory, accessoryConfiguration) {
|
|
11
12
|
super(platform, accessory, accessoryConfiguration, ServiceType.TemperatureSensor, CharacteristicType.CurrentTemperature);
|
|
13
|
+
this.SensorUnits = this.getPlatformTemperatureUnits();
|
|
12
14
|
}
|
|
13
15
|
getDefaultValue() {
|
|
14
16
|
return TemperatureSensor.DEFAULT_TEMPERATURE_CELSIUS;
|
|
@@ -38,6 +40,18 @@ export class TemperatureSensor extends MeasurementSensor {
|
|
|
38
40
|
const temperatureCelsius = (this.SensorUnits === TemperatureUnit.Celsius) ? temperature : (temperature - 32) * 5 / 9;
|
|
39
41
|
return Math.round(temperatureCelsius * 10) / 10;
|
|
40
42
|
}
|
|
43
|
+
getPlatformTemperatureUnits() {
|
|
44
|
+
let sensorUnits = TemperatureUnit.Celsius;
|
|
45
|
+
try {
|
|
46
|
+
const hbConfig = JSON.parse(readFileSync(this.platform.api.user.configPath(), 'utf8'));
|
|
47
|
+
const uiConfig = hbConfig.platforms?.find((platform) => platform.platform === 'config');
|
|
48
|
+
sensorUnits = uiConfig?.tempUnits?.toLowerCase() === 'f' ? TemperatureUnit.Fahrenheit : TemperatureUnit.Celsius;
|
|
49
|
+
}
|
|
50
|
+
catch (error) {
|
|
51
|
+
this.log.error(`[${this.accessoryName}] Unable to read temperature units; defaulting to Celsius: ${String(error)}`);
|
|
52
|
+
}
|
|
53
|
+
return sensorUnits;
|
|
54
|
+
}
|
|
41
55
|
// Updatable Sensor interface
|
|
42
56
|
updateMeasurementSensor(value, accessoryId) {
|
|
43
57
|
this.log.debug(`[${this.accessoryName}] Request update temperature sensor to ${value}${this.getDegreeUnits()}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"virtualSensorTemperature.js","sourceRoot":"","sources":["../../src/sensors/virtualSensorTemperature.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAA8B,MAAM,gBAAgB,CAAC;AAE7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,iBAAiB;IAEtD,MAAM,CAAU,2BAA2B,
|
|
1
|
+
{"version":3,"file":"virtualSensorTemperature.js","sourceRoot":"","sources":["../../src/sensors/virtualSensorTemperature.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "homebridge-virtual-accessories",
|
|
3
3
|
"displayName": "Virtual Accessories for Homebridge",
|
|
4
4
|
"type": "module",
|
|
5
|
-
"version": "3.15.
|
|
5
|
+
"version": "3.15.1",
|
|
6
6
|
"description": "Virtual HomeKit accessories for Homebridge.",
|
|
7
7
|
"author": "justjam2013",
|
|
8
8
|
"license": "MIT",
|