fix: set key property for meter and sensor scales correctly (#7031)

zwave-js · Jul 19, 2024 · 936dec0 · 936dec0
1 parent 5db04cf
commit 936dec0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/cc/src/cc/HumidityControlSetpointCC.ts b/packages/cc/src/cc/HumidityControlSetpointCC.ts
@@ -10,7 +10,7 @@ import {
 	ZWaveError,
 	ZWaveErrorCodes,
 	encodeFloatWithScale,
-	getNamedScaleGroup,
+	getNamedScale,
 	getUnknownScale,
 	parseBitMask,
 	parseFloatWithScale,
@@ -103,9 +103,8 @@ export const HumidityControlSetpointCCValues = Object.freeze({
 	}),
 });
 
-const humidityScale = getNamedScaleGroup("humidity");
 function getScale(scale: number): Scale {
-	return (humidityScale as any)[scale] ?? getUnknownScale(scale);
+	return getNamedScale("humidity", scale as any) ?? getUnknownScale(scale);
 }
 function getSetpointUnit(scale: number): string {
 	return getScale(scale).unit ?? "";

diff --git a/packages/cc/src/cc/ThermostatSetpointCC.ts b/packages/cc/src/cc/ThermostatSetpointCC.ts
@@ -11,7 +11,7 @@ import {
 	ZWaveErrorCodes,
 	encodeBitMask,
 	encodeFloatWithScale,
-	getNamedScaleGroup,
+	getNamedScale,
 	getUnknownScale,
 	parseBitMask,
 	parseFloatWithScale,
@@ -73,9 +73,9 @@ const thermostatSetpointTypeMap = [
 	0x0f,
 ];
 
-const temperatureScale = getNamedScaleGroup("temperature");
 function getScale(scale: number): Scale {
-	return (temperatureScale as any)[scale] ?? getUnknownScale(scale);
+	return getNamedScale("temperature", scale as any)
+		?? getUnknownScale(scale);
 }
 function getSetpointUnit(scale: number): string {
 	return getScale(scale).unit ?? "";

diff --git a/packages/core/src/registries/Meters.ts b/packages/core/src/registries/Meters.ts
@@ -169,7 +169,7 @@ export function getMeterScale<
 	if (!scaleDef) return;
 
 	return {
-		key: type,
+		key: scale,
 		...scaleDef,
 	} satisfies MeterScale as any;
 }

diff --git a/packages/core/src/registries/Sensors.ts b/packages/core/src/registries/Sensors.ts
@@ -783,7 +783,7 @@ export function getSensorScale<
 	if (!scaleDef) return;
 
 	return {
-		key: type,
+		key: scale,
 		...scaleDef,
 	} satisfies Scale as any;
 }