From 56686b53d2086210c3fb3a596e090156f324c8f5 Mon Sep 17 00:00:00 2001 From: Patrick Goebel Date: Mon, 7 Dec 2015 07:01:11 -0800 Subject: [PATCH] Fixed #elif statement for ARDUINO_ENC_COUNTER --- .../src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino | 3 +-- .../src/libraries/ROSArduinoBridge/encoder_driver.ino | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino b/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino index d34af00..420be6d 100644 --- a/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino +++ b/ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino @@ -45,8 +45,7 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ -//#define USE_BASE // Enable the base controller code -#undef USE_BASE // Disable the base controller code +//#define USE_BASE // Enable/disable the base controller code /* Define the motor controller and encoder library you are using */ #ifdef USE_BASE diff --git a/ros_arduino_firmware/src/libraries/ROSArduinoBridge/encoder_driver.ino b/ros_arduino_firmware/src/libraries/ROSArduinoBridge/encoder_driver.ino index 85d401d..ef2b8b1 100644 --- a/ros_arduino_firmware/src/libraries/ROSArduinoBridge/encoder_driver.ino +++ b/ros_arduino_firmware/src/libraries/ROSArduinoBridge/encoder_driver.ino @@ -27,7 +27,7 @@ if (i == LEFT) return encoders.YAxisReset(); else return encoders.XAxisReset(); } -#elif ARDUINO_ENC_COUNTER +#elif defined(ARDUINO_ENC_COUNTER) volatile long left_enc_pos = 0L; volatile long right_enc_pos = 0L; static const int8_t ENC_STATES [] = {0,1,-1,0,-1,0,0,1,1,0,0,-1,0,-1,1,0}; //encoder lookup table