Skip to content

Correct illuminance formula and treat special cases #11868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andrei-lazarov wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Correct illuminance formula and treat special cases #11868

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48e578e
Treat special cases of illuminance (0 and 0xffff)
andrei-lazarov Apr 3, 2026
a163d2b
fix
andrei-lazarov Apr 4, 2026
224f362
fix2
andrei-lazarov Apr 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions src/lib/modernExtend.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,15 +804,19 @@ export function customTimeResponse(start: "1970_UTC" | "2000_LOCAL"): ModernExte

// #region Measurement and Sensing

export function illuminance(args: Partial<NumericArgs<"msIlluminanceMeasurement">> = {}): ModernExtend {
const luxScale: ScaleFunction = (value: number, type: "from" | "to") => {
let result = value;
if (type === "from") {
result = 10 ** ((result - 1) / 10000);
}
return result;
};
const luxScale: ScaleFunction = (value: number, type: "from" | "to") => {
let result = value;
if (type === "from") {
if (result === 0x0000) return 0;

if (Number.isNaN(result)) return undefined;

result = 10 ** ((result - 1) / 10000);
}
return result;
};

export function illuminance(args: Partial<NumericArgs<"msIlluminanceMeasurement">> = {}): ModernExtend {
const result = numeric({
name: "illuminance",
cluster: "msIlluminanceMeasurement",
Expand Down Expand Up @@ -2679,7 +2683,7 @@ export function enumLookup<Cl extends string | number, Custom extends TCustomClu
}

// type provides a way to distinguish between fromZigbee and toZigbee value conversions if they are asymmetrical
export type ScaleFunction = (value: number, type: "from" | "to") => number;
export type ScaleFunction = (value: number, type: "from" | "to") => number | undefined;

export interface NumericArgs<Cl extends string | number, Custom extends TCustomCluster | undefined = undefined>
extends ClusterWithAttribute<Cl, Custom> {
Expand Down
Loading