Fix detection of GIRA/JUNG switches
The modelid change was never made, since the buttonmap check bailed out too early.
@@ -4470,6 +4470,8 @@ void DeRestPluginPrivate::checkSensorButtonEvent(Sensor *sensor, const deCONZ::A
if (!temp.empty() && !temp.key(zclFrame.commandId()).isEmpty()) { cmd = temp.key(zclFrame.commandId()) + " (" + cmd + ")"; }
}
+ checkInstaModelId(sensor);
+
if (!buttonMapEntry || buttonMapEntry->buttons.empty())
{
DBG_Printf(DBG_INFO_L2, "[INFO] - No button map for: %s%s, endpoint: 0x%02X, cluster: %s, command: %s, payload: %s, zclSeq: %u\n",
@@ -4477,8 +4479,6 @@ void DeRestPluginPrivate::checkSensorButtonEvent(Sensor *sensor, const deCONZ::A
return;
}
- checkInstaModelId(sensor);
-
// DE Lighting Switch: probe for mode changes
if (sensor->modelId() == QLatin1String("Lighting Switch") && ind.dstAddressMode() == deCONZ::ApsGroupAddress)
{
