From 84c9254bde3773a81bf6d4fda11974b9013c58ed Mon Sep 17 00:00:00 2001 From: Rob Giseburt Date: Mon, 18 Nov 2019 11:07:58 -0600 Subject: [PATCH] Added a missing "ENABLE_INTERLOCK_AND_ESTOP" ifdef --- g2core/controller.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/g2core/controller.cpp b/g2core/controller.cpp index 5bae3d38..8f3f4331 100644 --- a/g2core/controller.cpp +++ b/g2core/controller.cpp @@ -155,13 +155,12 @@ void controller_init() din_handlers[INPUT_ACTION_SHUTDOWN].registerHandler(&_shutdown_input_handler); din_handlers[INPUT_ACTION_LIMIT].registerHandler(&_limit_input_handler); din_handlers[INPUT_ACTION_INTERLOCK].registerHandler(&_interlock_input_handler); +#ifdef ENABLE_INTERLOCK_AND_ESTOP if (gpio_read_input(INTERLOCK_SWITCH_INPUT) == INPUT_ACTIVE) { // cm1.safety_interlock_disengaged = INTERLOCK_SWITCH_INPUT; cm1.safety_state |= SAFETY_INTERLOCK_OPEN; } - // if (gpio_read_input(ESTOP_SWITCH_INPUT) == INPUT_ACTIVE) { - // cm1.estop_state = ESTOP_PRESSED | ESTOP_UNACKED | ESTOP_ACTIVE; - // } +#endif } void controller_request_enquiry()