commander state machine helper fix style and remove unused

This commit is contained in:
Daniel Agar
2017-02-12 10:29:59 +01:00
committed by Lorenz Meier
parent d0b188f585
commit feda5caac2
4 changed files with 63 additions and 78 deletions
@@ -477,7 +477,6 @@ bool StateMachineHelperTest::mainStateTransitionTest()
bool StateMachineHelperTest::isSafeTest()
{
struct vehicle_status_s current_state = {};
struct safety_s safety = {};
struct actuator_armed_s armed = {};
@@ -485,31 +484,31 @@ bool StateMachineHelperTest::isSafeTest()
armed.lockdown = false;
safety.safety_switch_available = true;
safety.safety_off = false;
ut_compare("is safe: not armed", is_safe(&current_state, &safety, &armed), true);
ut_compare("is safe: not armed", is_safe(&safety, &armed), true);
armed.armed = false;
armed.lockdown = true;
safety.safety_switch_available = true;
safety.safety_off = true;
ut_compare("is safe: software lockdown", is_safe(&current_state, &safety, &armed), true);
ut_compare("is safe: software lockdown", is_safe(&safety, &armed), true);
armed.armed = true;
armed.lockdown = false;
safety.safety_switch_available = true;
safety.safety_off = true;
ut_compare("not safe: safety off", is_safe(&current_state, &safety, &armed), false);
ut_compare("not safe: safety off", is_safe(&safety, &armed), false);
armed.armed = true;
armed.lockdown = false;
safety.safety_switch_available = true;
safety.safety_off = false;
ut_compare("is safe: safety off", is_safe(&current_state, &safety, &armed), true);
ut_compare("is safe: safety off", is_safe(&safety, &armed), true);
armed.armed = true;
armed.lockdown = false;
safety.safety_switch_available = false;
safety.safety_off = false;
ut_compare("not safe: no safety switch", is_safe(&current_state, &safety, &armed), false);
ut_compare("not safe: no safety switch", is_safe(&safety, &armed), false);
return true;
}