Merge pull request #5547 from Staars/development

always check for vars_events and mems_events
This commit is contained in:
Theo Arends 2019-04-05 13:30:47 +02:00 committed by GitHub
commit 2c227b8f75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -486,7 +486,8 @@ void RulesEvery50ms(void)
event_data[0] ='\0';
}
}
else if (vars_event) {
else if (vars_event || mems_event){
if (vars_event) {
for (uint8_t i = 0; i < MAX_RULE_VARS-1; i++) {
if (bitRead(vars_event, i)) {
bitClear(vars_event, i);
@ -496,7 +497,7 @@ void RulesEvery50ms(void)
}
}
}
else if (mems_event) {
if (mems_event) {
for (uint8_t i = 0; i < MAX_RULE_MEMS-1; i++) {
if (bitRead(mems_event, i)) {
bitClear(mems_event, i);
@ -506,6 +507,7 @@ void RulesEvery50ms(void)
}
}
}
}
else if (rules_flag.data) {
uint16_t mask = 1;
for (uint8_t i = 0; i < MAX_RULES_FLAG; i++) {