endpoint.configureReporting does not take into account attribute specific manufacturerCode ?

[sjorge]

zigbee-herdsman/src/controller/model/endpoint.ts

Line 619 in 599b3e9

public async configureReporting(

I'm debugging a weird issue I'm seeing on a Ubisys H1, it looks like when I send:

mosquitto_pub -t zigbee2mqtt/bridge/request/device/configure_reporting -m '{"attribute":"ubisysVacationMode","cluster":"hvacThermostat","id":"trv/office/1","maximum_report_interval":3600,"minimum_report_interval":0,"reportable_change":0}'

It ends up configuring occupiedHeatingSetpoint for reporting not ubisysVacationMode, it seems it somehow ignores the manufactureringCode specified in the definitions.ts for the ubisysVacationMode attribute.

I'm not sure yet why or how though.

[sjorge]

@Koenkk I think we need to update options.manufacturerCode in this block if attribute.manufacturerCode exists ?

zigbee-herdsman/src/controller/model/endpoint.ts

Lines 632 to 636 in 599b3e9

	if (cluster.hasAttribute(item.attribute)) {
	const attribute = cluster.getAttribute(item.attribute);
	dataType = attribute.type;
	attrId = attribute.ID;
	}

Or am I missing something ?

I think I'm missing something:

diff --git a/src/controller/model/endpoint.ts b/src/controller/model/endpoint.ts
index 9ec931b..6182ad6 100644
--- a/src/controller/model/endpoint.ts
+++ b/src/controller/model/endpoint.ts
@@ -627,12 +627,14 @@ class Endpoint extends Entity {
             if (typeof item.attribute === 'object') {
                 dataType = item.attribute.type;
                 attrId = item.attribute.ID;
+                if (item.attribute.hasOwnProperty('manufacturerCode')) options.manufacturerCode = item.attribute.manufacturerCode;
             } else {
                 /* istanbul ignore else */
                 if (cluster.hasAttribute(item.attribute)) {
                     const attribute = cluster.getAttribute(item.attribute);
                     dataType = attribute.type;
                     attrId = attribute.ID;
+                    if (attribute.hasOwnProperty('manufacturerCode')) options.manufacturerCode = attribute.manufacturerCode;
                 }
             }

Doesn't seem to work, I seem to have completely broken it now.

Edit: maybe not, am messing with the tests and it seems to work but my new test may be bad, let me fiddle some more and open a PR.