Adapt cmake files to new arduino-cmake

Author: thomasjfox

Arduino_Pedelec_Controller/CMakeLists.txt

@@ -10,9 +10,6 @@ include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}
 
 set(FIRMWARE_NAME pcontroller)
 
-set(${FIRMWARE_NAME}_BOARD ${FC_PROCESSOR})
-set(${FIRMWARE_NAME}_PORT /dev/ttyUSB0)            # Serial upload port
-
 # special compile flags for the Travis CI environment
 # (avr-gcc is rather outdated and outputs crazy warnings)
 if("$ENV{TRAVIS}" STREQUAL "true")
@@ -26,7 +23,7 @@ endif("$ENV{TRAVIS}" STREQUAL "true")
 # and move everything to main.cpp
 configure_file(Arduino_Pedelec_Controller.ino main.cpp COPYONLY)
 
-set(${FIRMWARE_NAME}_SRCS                          # Source code
+add_executable(${FIRMWARE_NAME}
     ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
     BMP085.cpp
     BMP085.h
@@ -71,9 +68,8 @@ set(${FIRMWARE_NAME}_SRCS                          # Source code
     switches.h
     switches_action.h
     )
-generate_arduino_firmware(${FIRMWARE_NAME})
+target_link_arduino_libraries(${FIRMWARE_NAME} PRIVATE AUTO_PUBLIC)
 
-# Dirty hack to solve compile error on Fedora 15
-#target_link_libraries(${FIRMWARE_NAME} m)
-#target_link_libraries(${FIRMWARE_NAME} c)
-#target_link_libraries(${FIRMWARE_NAME} m)
+# Upload support: Usage:
+#     make upload-pcontroller SERIAL_PORT=/dev/ttyUSB0
+target_enable_arduino_upload(${FIRMWARE_NAME})

CMakeLists.txt

@@ -5,21 +5,23 @@
 # Description: Pedelec controller cmake project                               #
 #                                                                             #
 #=============================================================================#
-set(CMAKE_TOOLCHAIN_FILE cmake/ArduinoToolchain.cmake) # Arduino Toolchain
-
-cmake_minimum_required(VERSION 2.8)
-project(Pedelec_Controller C CXX)
-
+set(CMAKE_TOOLCHAIN_FILE cmake/Arduino-toolchain.cmake) # Arduino Toolchain
 
 # "grep" for FC 2.0 hardware in config.h
+# Do this before project() since it invokes toolchain detection
 file(STRINGS Arduino_Pedelec_Controller/config.h config_h_lines REGEX "^#define HARDWARE_REV 2[0-9]")
 if (config_h_lines)
     message("Building firmware for FC 2.0 or higher")
-    set(FC_PROCESSOR mega2560)
+    set(ARDUINO_BOARD "Arduino Mega or Mega 2560 [avr.mega]")
+    set(ARDUINO_AVR_MEGA_MENU_CPU_ATMEGA2560 TRUE)
 else(config_h_lines)
-    set(FC_PROCESSOR atmega328)
+    set(ARDUINO_BOARD "Arduino Nano [avr.nano]")
+    set(ARDUINO_AVR_NANO_MENU_CPU_ATMEGA328 TRUE)
 endif(config_h_lines)
 
+cmake_minimum_required(VERSION 3.7.0)
+project(Pedelec_Controller C CXX)
+
 # Documentation
 option(DOCUMENTATION "Generate API documentation with Doxygen" OFF)
 

Hardware_Test/CMakeLists.txt

@@ -12,17 +12,14 @@ configure_file(Hardware_Test.ino testprogram.cpp COPYONLY)
 
 # Hardware test program
 set(TESTPROGRAM_NAME testprogram)
-set(${TESTPROGRAM_NAME}_BOARD ${FC_PROCESSOR})
-set(${TESTPROGRAM_NAME}_PORT /dev/ttyUSB0)
 
-set(${TESTPROGRAM_NAME}_SRCS
+add_executable(${TESTPROGRAM_NAME}
     ${CMAKE_CURRENT_BINARY_DIR}/testprogram.cpp
     PCD8544_charset.cpp
     PCD8544_nano.cpp
     )
-generate_arduino_firmware(${TESTPROGRAM_NAME})
+target_link_arduino_libraries(${TESTPROGRAM_NAME} PRIVATE EEPROM core)
 
-# Dirty hack to solve compile error on Fedora 15
-#target_link_libraries(${TESTPROGRAM_NAME} m)
-#target_link_libraries(${TESTPROGRAM_NAME} c)
-#target_link_libraries(${TESTPROGRAM_NAME} m)
+# Upload support: Usage:
+#     make upload-testprogram SERIAL_PORT=/dev/ttyUSB0
+target_enable_arduino_upload(${TESTPROGRAM_NAME})