clang-tidy readability-simplify-boolean-expr

This commit is contained in:
Daniel Agar
2017-04-23 18:00:57 -04:00
parent 3c06641897
commit 64ed96d81a
12 changed files with 36 additions and 95 deletions

View File

@@ -351,12 +351,7 @@ bool is_safe(const struct safety_s *safety, const struct actuator_armed_s *armed
// 3) Safety switch is present AND engaged -> actuators locked
const bool lockdown = (armed->lockdown || armed->manual_lockdown);
if (!armed->armed || (armed->armed && lockdown) || (safety->safety_switch_available && !safety->safety_off)) {
return true;
} else {
return false;
}
return !armed->armed || (armed->armed && lockdown) || (safety->safety_switch_available && !safety->safety_off);
}
transition_result_t