Tradfri bulbs also loses other configuration like color_options.execute_if_off

[sjorge]

I ran into this while looking up something:

zigbee-herdsman-converters/devices/ikea.js

Line 16 in e078805

const bulbOnEvent = async (type, data, device) => {

I have a work around in my devicequirks extension to restore color_options.execute_if_off when it's found in the state.

It probably makes sense to add it here too, I'll try to do so during the next weekend.

[sjorge]

@Koenkk I had a quick look at it today but can't seem to find where the device state is when buldOnEvent is called..

I'm basically trying to replicate:

               if (!this.state.exists(device)) return;
                state = this.state.get(device);
                if (state.color_options.execute_if_off === true) {
                    this.logger.debug(`Restoring execute_if_off for '${device.zh.ieeeAddr}' because cached state was 'true' ...`);
                    device.zh.endpoints[0].write('lightingColorCtrl', {'options':1});
                }

[Koenkk]

@sjorge it is not passed yet, but this can easily be done by changing https://github.com/Koenkk/zigbee2mqtt/blob/3f6a13786e67445840521cf8f41b030221a24dee/lib/extension/onEvent.ts#L46 to await device.definition.onEvent(type, data, device.zh, device.options, this.state.get(device));

[sjorge]

Aha! That would explain why I couldn’t find it at all, I’ll do the change locally while working on this and do 2 PR’s the.

[sjorge]

Hmmm looks like it's not happy with that change:

lib/extension/onEvent.ts:46:84 - error TS2554: Expected 4 arguments, but got 5.

46             await device.definition.onEvent(type, data, device.zh, device.options, this.state.get(device));
                                                                                      ~~~~~~~~~~~~~~~~~~~~~~


Found 1 error in lib/extension/onEvent.ts:46

I'm guessing that there is some definition somewhere I missed that is making tsc complian.

Edit: I think I found it, it's in lib/types/types.d.ts, lets see if it is happy now

tsc is now happy, but oh buy that broke so many tests and I don't think the extra param makes it into zhc as it has it's own definition that is also missing the device options which are currently already present in z2m.

Edit2: Ok looks like I will need to split this up into z2m changes that I will open for review first because although I am making some progress, I am not really sure what I am doing is correct.

[sjorge]

z2m pr: Koenkk/zigbee2mqtt#12407
zhc pr: #4217

[Koenkk]

Merged, thanks!