From 646b3234aa3e79e8b2449b067670990b32f5c930 Mon Sep 17 00:00:00 2001 From: Patrick Goebel Date: Mon, 7 Dec 2015 07:18:41 -0800 Subject: [PATCH 1/4] Fixed #elif statement for ARDUINO_ENC_COUNTER --- .../src/libraries/ROSArduinoBridge/encoder_driver.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ef3a749bf3cbd74727ce08e49e1363c8011992f8 Mon Sep 17 00:00:00 2001 From: Patrick Goebel Date: Mon, 7 Dec 2015 07:24:46 -0800 Subject: [PATCH 2/4] Updated README to include requirement for Arduino IDE 1.6.6 or higher --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 408cc70..9be584b 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,8 @@ or $ sudo easy_install -U pyserial +**Arduino IDE 1.6.6 or Higher** +Note that the preprocessing of conditional #include statements is broken in earlier versions of the Arduino IDE. To ensure that the ROS Arduino Bridge firmware compiles correctly, be sure to install version 1.6.6 or higher of the Arduino IDE. You can download the IDE from https://www.arduino.cc/en/Main/Software. The stack should work with any Arduino-compatible controller for reading sensors and controlling PWM servos. However, to use the base controller, you will need a supported motor controller and encoder hardware as described above. If you do not have this hardware, you can still try the package for reading sensors and controlling servos. See the NOTES section at the end of this document for instructions on how to do this. From e49f0b139f9a17a56e0f04276617d1b2489767f5 Mon Sep 17 00:00:00 2001 From: Patrick Goebel Date: Mon, 7 Dec 2015 07:26:47 -0800 Subject: [PATCH 3/4] Tweaked README format --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9be584b..ff4ce2c 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,11 @@ or $ sudo easy_install -U pyserial -**Arduino IDE 1.6.6 or Higher** +**Arduino IDE 1.6.6 or Higher:** Note that the preprocessing of conditional #include statements is broken in earlier versions of the Arduino IDE. To ensure that the ROS Arduino Bridge firmware compiles correctly, be sure to install version 1.6.6 or higher of the Arduino IDE. You can download the IDE from https://www.arduino.cc/en/Main/Software. +**Hardware** + The stack should work with any Arduino-compatible controller for reading sensors and controlling PWM servos. However, to use the base controller, you will need a supported motor controller and encoder hardware as described above. If you do not have this hardware, you can still try the package for reading sensors and controlling servos. See the NOTES section at the end of this document for instructions on how to do this. To use the base controller you must also install the appropriate libraries for your motor controller and encoders. For the Pololu VNH5019 Dual Motor Shield, the library can be found at: From 9e3ae7c939ec67ec32b37652e87de75036b74462 Mon Sep 17 00:00:00 2001 From: Patrick Goebel Date: Mon, 7 Dec 2015 07:28:09 -0800 Subject: [PATCH 4/4] Tweaked README --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ff4ce2c..10366ea 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,8 @@ or **Arduino IDE 1.6.6 or Higher:** Note that the preprocessing of conditional #include statements is broken in earlier versions of the Arduino IDE. To ensure that the ROS Arduino Bridge firmware compiles correctly, be sure to install version 1.6.6 or higher of the Arduino IDE. You can download the IDE from https://www.arduino.cc/en/Main/Software. -**Hardware** - -The stack should work with any Arduino-compatible controller for reading sensors and controlling PWM servos. However, to use the base controller, you will need a supported motor controller and encoder hardware as described above. If you do not have this hardware, you can still try the package for reading sensors and controlling servos. See the NOTES section at the end of this document for instructions on how to do this. +**Hardware:** +The firmware should work with any Arduino-compatible controller for reading sensors and controlling PWM servos. However, to use the base controller, you will need a supported motor controller and encoder hardware as described above. If you do not have this hardware, you can still try the package for reading sensors and controlling servos. See the NOTES section at the end of this document for instructions on how to do this. To use the base controller you must also install the appropriate libraries for your motor controller and encoders. For the Pololu VNH5019 Dual Motor Shield, the library can be found at: