refactoring CMake arduino #5

Author: rbonghi

panther_led_controller/CMakeLists.txt

@@ -5,8 +5,10 @@ project(panther_led_controller)
 # http://wiki.ros.org/rosserial_arduino/Tutorials/CMake
 
 find_package(catkin REQUIRED COMPONENTS 
-#    rosserial_arduino 
+    rosserial_arduino 
     rosserial_client
+    geometry_msgs
+    std_msgs
 )
 
 catkin_package()
@@ -15,30 +17,16 @@ catkin_package()
 ## Build ##
 ###########
 
-#rosserial_generate_ros_lib(
-#  PACKAGE rosserial_arduino
-#  SCRIPT make_libraries.py
-#)
-
-#rosserial_configure_client(
-#  DIRECTORY firmware
-#  TOOLCHAIN_FILE ${ROSSERIAL_ARDUINO_TOOLCHAIN}
-#)
-
-#rosserial_add_client_target(firmware hello ALL)
-#rosserial_add_client_target(firmware hello-upload)
-
-#################################
-## ARDUINO - Compile and build ##
-#################################
+rosserial_generate_ros_lib(
+  PACKAGE rosserial_arduino
+  SCRIPT make_libraries.py
+)
 
-#include_directories(${ROS_LIB_DIR})
+rosserial_configure_client(
+  DIRECTORY firmware
+  TOOLCHAIN_FILE ${ROSSERIAL_ARDUINO_TOOLCHAIN}
+)
 
-# Remove this if using an Arduino without native USB (eg, other than Leonardo)
-#add_definitions(-DUSB_CON)
+rosserial_add_client_target(firmware led_controller ALL)
+rosserial_add_client_target(firmware led_controller-upload)
 
-#generate_arduino_firmware(hello
-#  SRCS chatter.cpp ${ROS_LIB_DIR}/time.cpp
-#  BOARD leonardo
-#  PORT /dev/ttyACM0
-#)

panther_led_controller/firmware/CMakeLists.txt

@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 2.8.3)
+
+include_directories(${ROS_LIB_DIR})
+
+# Remove this if using an Arduino without native USB (eg, other than Leonardo)
+add_definitions(-DUSB_CON)
+
+# ARDUINO_SDK in /usr/share/arduino
+#${ARDUINO_SDK}/libraries
+# link_directories(${ARDUINO_SDK}/libraries)
+
+# https://github.com/adafruit/Adafruit_NeoPixel
+link_directories(/home/nvidia/Adafruit_NeoPixel)
+
+generate_arduino_firmware(led_controller
+  SKETCH led_controller
+#  SRCS led_controller/led_controller.ino led_controller/led_effect.ino led_controller/system.ino ${ROS_LIB_DIR}/time.cpp
+  BOARD nano
+  PORT /dev/nano
+)

panther_led_controller/led_controller/led_controller.ino renamed to panther_led_controller/firmware/led_controller/led_controller.ino

@@ -13,8 +13,10 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <!--<depend>rosserial_arduino</depend>-->
+  <depend>rosserial_arduino</depend>
   <depend>rosserial_client</depend>
+  <depend>std_msgs</depend>
+  <depend>geometry_msgs</depend>
   <depend>rosserial_python</depend>
 
 </package>