Merge branch 'master' into heiman-occupancy

src/devices/heiman.ts

@@ -9,7 +9,6 @@
 const ea = exposes.access;
 import * as tuya from '../lib/tuya';
 import {light, battery, iasZoneAlarm, illuminance, occupancy, identify, ota, numeric} from '../lib/modernExtend';
-import {Zcl} from 'zigbee-herdsman';
 
 const definitions: Definition[] = [
     {
@@ -790,14 +789,14 @@
             numeric({
                 name: 'illuminance_threshold',
                 cluster: 'msIlluminanceMeasurement',
                 attribute: {ID: 0xF000, type: Zcl.DataType.INT16},
                 description: 'Controls illuminance threshold for sending commands',
                 valueMin: 0,
                 valueMax: 1000,
                 unit: 'lx',
                 entityCategory: 'config',
                 read: true,
                 zigbeeCommandOptions: {manufacturerCode: Zcl.ManufacturerCode.HEIMAN_TECHNOLOGY_CO_LTD},
             }),
             // radar settings (?)
             // diagnostics

src/lib/modernExtend.ts

@@ -1790,11 +1790,23 @@ export function enumLookup(args: EnumLookupArgs): ModernExtend {
 export type ScaleFunction = (value: number, type: 'from' | 'to') => number;
 
 export interface NumericArgs {
-    name: string, cluster: string | number, attribute: string | {ID: number, type: number}, description: string,
-    zigbeeCommandOptions?: {manufacturerCode?: number, disableDefaultResponse?: boolean}, access?: 'STATE' | 'STATE_GET' | 'ALL', unit?: string,
-    endpointNames?: string[], reporting?: ReportingConfigWithoutAttribute,
-    valueMin?: number, valueMax?: number, valueStep?: number, scale?: number | ScaleFunction, label?: string,
-    entityCategory?: 'config' | 'diagnostic', precision?: number, read?: boolean
+    name: string;
+    cluster: string | number;
+    attribute: string | {ID: number; type: number};
+    description: string;
+    zigbeeCommandOptions?: {manufacturerCode?: number; disableDefaultResponse?: boolean};
+    access?: 'STATE' | 'STATE_GET' | 'ALL';
+    unit?: string;
+    endpointNames?: string[];
+    reporting?: ReportingConfigWithoutAttribute;
+    valueMin?: number;
+    valueMax?: number;
+    valueStep?: number;
+    scale?: number | ScaleFunction;
+    label?: string;
+    entityCategory?: 'config' | 'diagnostic';
+    precision?: number;
+    read?: boolean;
 }
 export function numeric(args: NumericArgs): ModernExtend {
     const {