File tree 1 file changed +4
-6
lines changed
1 file changed +4
-6
lines changed Original file line number Diff line number Diff line change @@ -40,15 +40,13 @@ bool ActuationState::is_consistent() const {
40
40
case ActuationLevel::None:
41
41
// fallthrough, because none looks the same as standby
42
42
case ActuationLevel::Standby:
43
- return aeb && !(acceleration || steering_angle || steering_torque);
43
+ return aeb || !(acceleration || steering_angle || steering_torque);
44
44
case ActuationLevel::Long:
45
- return aeb && (acceleration && !steering_angle && !steering_torque);
45
+ return aeb || (acceleration && !steering_angle && !steering_torque);
46
46
case ActuationLevel::Lat:
47
- return aeb && (!acceleration && (steering_angle || steering_torque) &&
48
- !(steering_angle && steering_torque));
47
+ return aeb || (!acceleration && (steering_angle != steering_torque);
49
48
case ActuationLevel::LatLong:
50
- return aeb && (acceleration && (steering_angle || steering_torque) &&
51
- !(steering_angle && steering_torque));
49
+ return aeb || (acceleration && (steering_angle != steering_torque));
52
50
default :
53
51
// Assuming that AEB is active even when the function is not.
54
52
return aeb;
You can’t perform that action at this time.
0 commit comments