commit 488005dc5192777fa0bb0b3b25f058876ce76ec3
author Brian Silverman <brians> Sun Mar 15 14:05:42 2015 -0700
committer Brian Silverman <brians> Sun Mar 15 14:21:48 2015 -0700
tree ee2062588ddac7e0b5d3c2bf4096cedb2586fdb8
parent a18a472b5e514265c14d56ab0e3e08679fb59075

don't complain about not having a driver's station while disabled

Change-Id: Ice436e7eaeae16e0912cf8a918c7fd423abf6596

aos/common/controls/control_loop-tmpl.h

diff --git a/aos/common/controls/control_loop-tmpl.h b/aos/common/controls/control_loop-tmpl.h
index 449ffea..9bf395e 100644
--- a/aos/common/controls/control_loop-tmpl.h
+++ b/aos/common/controls/control_loop-tmpl.h
@@ -75,9 +75,10 @@
     } else if (::aos::joystick_state->enabled) {
       LOG(WARNING, "outputs disabled while enabled\n");
     }
-  } else if (::aos::joystick_state.IsNewerThanMS(kDSPacketTimeoutMs) &&
-             ::aos::joystick_state->enabled) {
-    outputs_enabled = true;
+  } else if (::aos::joystick_state.IsNewerThanMS(kDSPacketTimeoutMs)) {
+    if (::aos::joystick_state->enabled) {
+      outputs_enabled = true;
+    }
   } else {
     if (::aos::joystick_state.get()) {
       LOG_INTERVAL(driver_station_old_);