Merge remote-tracking branch 'swoopx/tradfri'

manup · manup · commit 29ec9ff77727 · 2021-06-13T23:55:29.000+02:00
diff --git a/de_web_plugin.cpp b/de_web_plugin.cpp
@@ -4608,7 +4608,7 @@ void DeRestPluginPrivate::checkSensorButtonEvent(Sensor *sensor, const deCONZ::A
                         }
                     }
                 }
-                else if (ind.clusterId() == ONOFF_CLUSTER_ID && sensor->manufacturer() == QLatin1String("IKEA of Sweden") && sensor->previousCommandId == 0x09)
+                else if (ind.clusterId() == ONOFF_CLUSTER_ID && sensor->modelId() == QLatin1String("Remote Control N2") && sensor->previousCommandId == 0x09)
                 {
                     ok = false;
                 }

Original file line number	Diff line number	Diff line change
`@@ -4608,7 +4608,7 @@ void DeRestPluginPrivate::checkSensorButtonEvent(Sensor *sensor, const deCONZ::A`
`4608`	`4608`	`}`
`4609`	`4609`	`}`
`4610`	`4610`	`}`
`4611`		`- else if (ind.clusterId() == ONOFF_CLUSTER_ID && sensor->manufacturer() == QLatin1String("IKEA of Sweden") && sensor->previousCommandId == 0x09)`
	`4611`	`+ else if (ind.clusterId() == ONOFF_CLUSTER_ID && sensor->modelId() == QLatin1String("Remote Control N2") && sensor->previousCommandId == 0x09)`
`4612`	`4612`	`{`
`4613`	`4613`	`ok = false;`
`4614`	`4614`	`}`