Skip to content

Commit 9471e03

Browse files
KoenkkKoenkk
authored
fix!: Remove readAfterWriteTime (#8089)
1 parent df23a20 commit 9471e03

File tree

7 files changed

+50
-71
lines changed

7 files changed

+50
-71
lines changed

‎src/converters/toZigbee.ts

+37-46
Large diffs are not rendered by default.

‎src/devices/datek.ts

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@ const definitions: DefinitionWithExtend[] = [
167167
data.cluster === 'closuresDoorLock' &&
168168
data.data &&
169169
data.data.userid !== undefined &&
170-
// Don't read RF events, we can do this with retrieve_state
171170
(data.data.programeventsrc === undefined || constants.lockSourceName[data.data.programeventsrc] != 'rf')
172171
) {
173172
await device.endpoints[0].command('closuresDoorLock', 'getPinCode', {userid: data.data.userid}, {});

‎src/devices/develco.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ const develco = {
158158
key: ['pulse_configuration'],
159159
convertSet: async (entity, key, value, meta) => {
160160
await entity.write('seMetering', {develcoPulseConfiguration: value}, manufacturerOptions);
161-
return {readAfterWriteTime: 200, state: {pulse_configuration: value}};
161+
return {state: {pulse_configuration: value}};
162162
},
163163
convertGet: async (entity, key, meta) => {
164164
await entity.read('seMetering', ['develcoPulseConfiguration'], manufacturerOptions);
@@ -169,7 +169,7 @@ const develco = {
169169
convertSet: async (entity, key, value, meta) => {
170170
const payload = {develcoInterfaceMode: utils.getKey(constants.develcoInterfaceMode, value, undefined, Number)};
171171
await entity.write('seMetering', payload, manufacturerOptions);
172-
return {readAfterWriteTime: 200, state: {interface_mode: value}};
172+
return {state: {interface_mode: value}};
173173
},
174174
convertGet: async (entity, key, meta) => {
175175
await entity.read('seMetering', ['develcoInterfaceMode'], manufacturerOptions);

‎src/devices/inovelli.ts

-9
Original file line numberDiff line numberDiff line change
@@ -1416,8 +1416,6 @@ const tzLocal = {
14161416
}
14171417

14181418
const result = await inovelliOnOffConvertSet(entity, 'state', state, meta);
1419-
// @ts-expect-error ignore
1420-
result.readAfterWriteTime = 0;
14211419
if (result.state && result.state.state === 'ON' && meta.state.brightness === 0) {
14221420
// @ts-expect-error ignore
14231421
result.state.brightness = 1;
@@ -1442,18 +1440,11 @@ const tzLocal = {
14421440
utils.getOptions(meta.mapped, entity),
14431441
);
14441442

1445-
const defaultTransitionTime = await entity.read('manuSpecificInovelli', ['rampRateOnToOffRemote']);
1446-
14471443
return {
14481444
state: {
14491445
state: brightness === 0 ? 'OFF' : 'ON',
14501446
brightness: Number(brightness),
14511447
},
1452-
readAfterWriteTime:
1453-
transition.time === 0
1454-
? // @ts-expect-error ignore
1455-
defaultTransitionTime.rampRateOnToOffRemote * 100
1456-
: transition.time * 100, // need on speed
14571448
};
14581449
}
14591450
},

‎src/devices/sinope.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ const tzLocal = {
307307
// set timer to 12 sec in order to disable outdoor temperature
308308
await entity.write('manuSpecificSinope', {outdoorTempToDisplayTimeout: 12}, manuSinope);
309309
}
310-
return {readAfterWriteTime: 250, state: {enable_outdoor_temperature: value}};
310+
return {state: {enable_outdoor_temperature: value}};
311311
},
312312
convertGet: async (entity, key, meta) => {
313313
await entity.read('manuSpecificSinope', ['outdoorTempToDisplayTimeout'], manuSinope);
@@ -377,7 +377,7 @@ const tzLocal = {
377377
if (lookup[value] !== undefined) {
378378
await entity.write('manuSpecificSinope', {floorControlMode: utils.getFromLookup(value, lookup)});
379379
}
380-
return {readAfterWriteTime: 250, state: {floor_control_mode: value}};
380+
return {state: {floor_control_mode: value}};
381381
},
382382
convertGet: async (entity, key, meta) => {
383383
await entity.read('manuSpecificSinope', ['floorControlMode']);
@@ -391,7 +391,7 @@ const tzLocal = {
391391
if ((value >= 5 && value <= 36) || value == 'off') {
392392
// @ts-expect-error ignore
393393
await entity.write('manuSpecificSinope', {ambiantMaxHeatSetpointLimit: value == 'off' ? -32768 : value * 100});
394-
return {readAfterWriteTime: 250, state: {ambiant_max_heat_setpoint: value}};
394+
return {state: {ambiant_max_heat_setpoint: value}};
395395
}
396396
},
397397
convertGet: async (entity, key, meta) => {
@@ -406,7 +406,7 @@ const tzLocal = {
406406
if ((value >= 5 && value <= 34) || value == 'off') {
407407
// @ts-expect-error ignore
408408
await entity.write('manuSpecificSinope', {floorMinHeatSetpointLimit: value == 'off' ? -32768 : value * 100});
409-
return {readAfterWriteTime: 250, state: {floor_min_heat_setpoint: value}};
409+
return {state: {floor_min_heat_setpoint: value}};
410410
}
411411
},
412412
convertGet: async (entity, key, meta) => {
@@ -421,7 +421,7 @@ const tzLocal = {
421421
if ((value >= 7 && value <= 36) || value == 'off') {
422422
// @ts-expect-error ignore
423423
await entity.write('manuSpecificSinope', {floorMaxHeatSetpointLimit: value == 'off' ? -32768 : value * 100});
424-
return {readAfterWriteTime: 250, state: {floor_max_heat_setpoint: value}};
424+
return {state: {floor_max_heat_setpoint: value}};
425425
}
426426
},
427427
convertGet: async (entity, key, meta) => {
@@ -441,7 +441,7 @@ const tzLocal = {
441441
if (lookup[value] !== undefined) {
442442
await entity.write('manuSpecificSinope', {temperatureSensor: utils.getFromLookup(value, lookup)});
443443
}
444-
return {readAfterWriteTime: 250, state: {floor_temperature_sensor: value}};
444+
return {state: {floor_temperature_sensor: value}};
445445
},
446446
convertGet: async (entity, key, meta) => {
447447
await entity.read('manuSpecificSinope', ['temperatureSensor']);
@@ -451,7 +451,7 @@ const tzLocal = {
451451
key: ['time_format'],
452452
convertSet: async (entity, key, value, meta) => {
453453
await entity.write('manuSpecificSinope', {timeFormatToDisplay: utils.getFromLookup(value, {'24h': 0, '12h': 1})}, manuSinope);
454-
return {readAfterWriteTime: 250, state: {time_format: value}};
454+
return {state: {time_format: value}};
455455
},
456456
convertGet: async (entity, key, meta) => {
457457
await entity.read('manuSpecificSinope', ['timeFormatToDisplay'], manuSinope);
@@ -473,7 +473,7 @@ const tzLocal = {
473473
key: ['aux_connected_load'],
474474
convertSet: async (entity, key, value, meta) => {
475475
await entity.write('manuSpecificSinope', {auxConnectedLoad: value});
476-
return {readAfterWriteTime: 250, state: {aux_connected_load: value}};
476+
return {state: {aux_connected_load: value}};
477477
},
478478
convertGet: async (entity, key, meta) => {
479479
await entity.read('manuSpecificSinope', ['auxConnectedLoad']);
@@ -489,7 +489,7 @@ const tzLocal = {
489489
} else if (value.toLowerCase() == 'off') {
490490
await entity.write('manuSpecificSinope', {pumpProtection: 255});
491491
}
492-
return {readAfterWriteTime: 250, state: {pump_protection: value}};
492+
return {state: {pump_protection: value}};
493493
},
494494
convertGet: async (entity, key, meta) => {
495495
await entity.read('manuSpecificSinope', ['pumpProtection']);
@@ -555,7 +555,7 @@ const tzLocal = {
555555
if (number >= 0 && number <= 3000) {
556556
await entity.write('manuSpecificSinope', {minimumBrightness: number});
557557
}
558-
return {readAfterWriteTime: 250, state: {minimumBrightness: number}};
558+
return {state: {minimumBrightness: number}};
559559
},
560560
convertGet: async (entity, key, meta) => {
561561
await entity.read('manuSpecificSinope', ['minimumBrightness']);

‎src/devices/weiser.ts

-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const definitions: DefinitionWithExtend[] = [
3030
data.cluster === 'closuresDoorLock' &&
3131
data.data &&
3232
data.data.userid !== undefined &&
33-
// Don't read RF events, we can do this with retrieve_state
3433
(data.data.programeventsrc === undefined || constants.lockSourceName[data.data.programeventsrc] != 'rf')
3534
) {
3635
await device.endpoints[0].command('closuresDoorLock', 'getPinCode', {userid: data.data.userid}, {});
@@ -60,7 +59,6 @@ const definitions: DefinitionWithExtend[] = [
6059
data.cluster === 'closuresDoorLock' &&
6160
data.data &&
6261
data.data.userid !== undefined &&
63-
// Don't read RF events, we can do this with retrieve_state
6462
(data.data.programeventsrc === undefined || constants.lockSourceName[data.data.programeventsrc] != 'rf')
6563
) {
6664
await device.endpoints[0].command('closuresDoorLock', 'getPinCode', {userid: data.data.userid}, {});

‎src/lib/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ export namespace Tz {
327327
endpoint_name: string | undefined;
328328
membersState?: {[s: string]: KeyValue};
329329
}
330-
export type ConvertSetResult = {state?: KeyValue; readAfterWriteTime?: number; membersState?: {[s: string]: KeyValue}} | void;
330+
export type ConvertSetResult = {state?: KeyValue; membersState?: {[s: string]: KeyValue}} | void;
331331
export interface Converter {
332332
key?: string[];
333333
options?: Option[] | ((definition: Definition) => Option[]);

0 commit comments

Comments
 (0)