yikestone/ros_arduino_bridge
1
0
Fork 0
mirror of https://github.com/YikeStone/ros_arduino_bridge.git synced 2025-08-04 11:44:08 +05:30
Code Issues Projects Releases Wiki Activity

Fixed #elif statement for ARDUINO_ENC_COUNTER

Browse Source
This commit is contained in:
Patrick Goebel 2015-12-07 07:01:11 -08:00
parent 5a4affcfba
commit 56686b53d2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ros_arduino_firmware/src/libraries/ROSArduinoBridge/ROSArduinoBridge.ino
View File

@ -45,8 +45,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/ *********************************************************************/
//#define USE_BASE // Enable the base controller code //#define USE_BASE // Enable/disable the base controller code
#undef USE_BASE // Disable the base controller code
/* Define the motor controller and encoder library you are using */ /* Define the motor controller and encoder library you are using */
#ifdef USE_BASE #ifdef USE_BASE

2
ros_arduino_firmware/src/libraries/ROSArduinoBridge/encoder_driver.ino
View File

@ -27,7 +27,7 @@
if (i == LEFT) return encoders.YAxisReset(); if (i == LEFT) return encoders.YAxisReset();
else return encoders.XAxisReset(); else return encoders.XAxisReset();
} }
#elif ARDUINO_ENC_COUNTER #elif defined(ARDUINO_ENC_COUNTER)
volatile long left_enc_pos = 0L; volatile long left_enc_pos = 0L;
volatile long right_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 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