Merge pull request #8067 from pcdiem/device-groups-4

Call XdrvCall even for power. Fix devgrp index mask in xdrv_04_light
This commit is contained in:
Theo Arends 2020-04-05 08:43:02 +02:00 committed by GitHub
commit 14030df1f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -601,9 +601,7 @@ void ProcessDeviceGroupMessage(char * packet, int packet_length)
} }
} }
} }
else { XdrvCall(FUNC_DEVICE_GROUP_ITEM);
XdrvCall(FUNC_DEVICE_GROUP_ITEM);
}
} }
} }

View File

@ -2135,7 +2135,7 @@ void LightHandleDeviceGroupItem(void)
bool more_to_come; bool more_to_come;
uint32_t value = XdrvMailbox.payload; uint32_t value = XdrvMailbox.payload;
#ifdef USE_PWM_DIMMER_REMOTE #ifdef USE_PWM_DIMMER_REMOTE
if (XdrvMailbox.index & 0xff00) return; // Ignore updates from other device groups if (XdrvMailbox.index & 0xff0000) return; // Ignore updates from other device groups
#endif // USE_PWM_DIMMER_REMOTE #endif // USE_PWM_DIMMER_REMOTE
switch (XdrvMailbox.command_code) { switch (XdrvMailbox.command_code) {
case DGR_ITEM_EOL: case DGR_ITEM_EOL: