From c63ef39f17b9dab2ca565091aa076bf219085d7f Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 16 Feb 2018 13:06:36 -0600 Subject: NonzeroSpeed: Check trust determination sensors Only include defined trust determination sensors in checking the group trust. Tested: Current trust group associations & reactions are unchanged Combination of sensors included and excluded in trust determination Change-Id: I0f610b2910ffda849871a9ac9be95f2c056d8248 Signed-off-by: Matthew Barth --- monitor/nonzero_speed_trust.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'monitor/nonzero_speed_trust.hpp') diff --git a/monitor/nonzero_speed_trust.hpp b/monitor/nonzero_speed_trust.hpp index 7e6a85a..c5b67fd 100644 --- a/monitor/nonzero_speed_trust.hpp +++ b/monitor/nonzero_speed_trust.hpp @@ -42,7 +42,8 @@ class NonzeroSpeed : public Group /** * Determines if the group is trusted by checking - * if any sensor has a nonzero speed. If all speeds + * if any sensor included in the trust determination + * has a nonzero speed. If all the speeds of these sensors * are zero, then no sensors in the group are trusted. * * @return bool - if group is trusted or not @@ -54,7 +55,7 @@ class NonzeroSpeed : public Group _sensors.end(), [](const auto& s) { - return s.sensor->getInput() != 0; + return s.inTrust && s.sensor->getInput() != 0; }); } }; -- cgit v1.2.1