Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to arduino 1.6.12 #1

Merged
merged 3 commits into from
Oct 18, 2016
Merged

Update to arduino 1.6.12 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef5c276
Update arduino-cmake to Arduino SDK version 1.6.12
proan Oct 18, 2016
90125c0
Add license notes
proan Oct 18, 2016
7161872
Fix whitespace issues, add RECURSE for TFT, WiFI, and Robot_Control l…
proan Oct 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#=============================================================================#
set(CMAKE_TOOLCHAIN_FILE cmake/ArduinoToolchain.cmake) # Arduino Toolchain


cmake_minimum_required(VERSION 2.8)
#====================================================================#
# Setup Project #
Expand Down
16 changes: 10 additions & 6 deletions cmake/ArduinoToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#=============================================================================#
# Arduino Toolchain for CMake
# Copyright (c) 2016 Philip Roan
# Forked from Tomasz Bogdal's github.com project (see below for link)
#
#=============================================================================#
# Author: Tomasz Bogdal (QueezyTheGreat)
# Home: https://github.com/queezythegreat/arduino-cmake
#
Expand All @@ -25,7 +30,7 @@ if(UNIX)
list(APPEND CMAKE_SYSTEM_PREFIX_PATH ~/Applications
/Applications
/Developer/Applications
/sw # Fink
/sw # Fink
/opt/local) # MacPorts
endif()
elseif(WIN32)
Expand All @@ -40,9 +45,9 @@ if(NOT ARDUINO_SDK_PATH)
set(ARDUINO_PATHS)

foreach(DETECT_VERSION_MAJOR 1)
foreach(DETECT_VERSION_MINOR RANGE 5 0)
foreach(DETECT_VERSION_MINOR RANGE 9 0)
list(APPEND ARDUINO_PATHS arduino-${DETECT_VERSION_MAJOR}.${DETECT_VERSION_MINOR})
foreach(DETECT_VERSION_PATCH RANGE 3 0)
foreach(DETECT_VERSION_PATCH RANGE 25 0)
list(APPEND ARDUINO_PATHS arduino-${DETECT_VERSION_MAJOR}.${DETECT_VERSION_MINOR}.${DETECT_VERSION_PATCH})
endforeach()
endforeach()
Expand All @@ -58,9 +63,7 @@ if(NOT ARDUINO_SDK_PATH)
/opt/arduino*
/usr/local/share/arduino*)
elseif(WIN32)
set(SDK_PATH_HINTS "C:\\Program Files\\Arduino"
"C:\\Program Files (x86)\\Arduino"
)
set(SDK_PATH_HINTS "C:\\Program Files\\Arduino" "C:\\Program Files (x86)\\Arduino")
endif()
list(SORT SDK_PATH_HINTS)
list(REVERSE SDK_PATH_HINTS)
Expand All @@ -70,6 +73,7 @@ find_path(ARDUINO_SDK_PATH
NAMES lib/version.txt
PATH_SUFFIXES share/arduino
Arduino.app/Contents/Resources/Java/
Arduino.app/Contents/Java/
${ARDUINO_PATHS}
HINTS ${SDK_PATH_HINTS}
DOC "Arduino SDK path.")
Expand Down
131 changes: 100 additions & 31 deletions cmake/Platform/Arduino.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
#=============================================================================#
# Arduino Toolchain for CMake
# Copyright (c) 2016 Philip Roan
# Forked from Tomasz Bogdal's github.com project:
#
# https://github.com/queezythegreat/arduino-cmake
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
# You can obtain one at http://mozilla.org/MPL/2.0/.
#=============================================================================#
#
#=============================================================================#
# generate_arduino_firmware(name
# [BOARD board_id]
# [SKETCH sketch_path |
Expand Down Expand Up @@ -90,7 +102,7 @@
# Alternatively you can specify the option by variables:
#
# set(test_SRCS test.cpp test2.cpp)
# set(test_HDRS test.h test2.h
# set(test_HDRS test.h test2.h)
# set(test_BOARD uno)
#
# generate_avr_firmware(test)
Expand Down Expand Up @@ -130,7 +142,7 @@
# Alternatively you can specify the option by variables:
#
# set(test_SRCS test.cpp test2.cpp)
# set(test_HDRS test.h test2.h
# set(test_HDRS test.h test2.h)
# set(test_BOARD uno)
#
# generate_arduino_library(test)
Expand Down Expand Up @@ -618,6 +630,7 @@ function(GENERATE_ARDUINO_EXAMPLE INPUT_NAME)
endif()

find_arduino_libraries(TARGET_LIBS "${ALL_SRCS}" "")

set(LIB_DEP_INCLUDES)
foreach(LIB_DEP ${TARGET_LIBS})
set(LIB_DEP_INCLUDES "${LIB_DEP_INCLUDES} -I\"${LIB_DEP}\"")
Expand Down Expand Up @@ -656,31 +669,37 @@ function(REGISTER_HARDWARE_PLATFORM PLATFORM_PATH)

find_file(${PLATFORM}_CORES_PATH
NAMES cores
PATHS ${PLATFORM_PATH}
PATHS ${PLATFORM_PATH} ${PLATFORM_PATH}/avr
DOC "Path to directory containing the Arduino core sources.")

find_file(${PLATFORM}_VARIANTS_PATH
NAMES variants
PATHS ${PLATFORM_PATH}
PATHS ${PLATFORM_PATH} ${PLATFORM_PATH}/avr
DOC "Path to directory containing the Arduino variant sources.")

find_file(${PLATFORM}_ARCHITECTURE_LIBRARIES_PATH
NAMES libraries
PATHS ${PLATFORM_PATH} ${PLATFORM_PATH}/avr
DOC "Path to diretory containing the Arduino libraries that are specific to this architecture.")

find_file(${PLATFORM}_BOOTLOADERS_PATH
NAMES bootloaders
PATHS ${PLATFORM_PATH}
PATHS ${PLATFORM_PATH} ${PLATFORM_PATH}/avr
DOC "Path to directory containing the Arduino bootloader images and sources.")

find_file(${PLATFORM}_PROGRAMMERS_PATH
NAMES programmers.txt
PATHS ${PLATFORM_PATH}
PATHS ${PLATFORM_PATH} ${PLATFORM_PATH}/avr
DOC "Path to Arduino programmers definition file.")

find_file(${PLATFORM}_BOARDS_PATH
NAMES boards.txt
PATHS ${PLATFORM_PATH}
PATHS ${PLATFORM_PATH} ${PLATFORM_PATH}/avr
DOC "Path to Arduino boards definition file.")

if(${PLATFORM}_BOARDS_PATH)
load_arduino_style_settings(${PLATFORM}_BOARDS "${PLATFORM_PATH}/boards.txt")
#load_arduino_style_settings(${PLATFORM}_BOARDS "${PLATFORM_PATH}/boards.txt")
load_arduino_style_settings(${PLATFORM}_BOARDS ${${PLATFORM}_BOARDS_PATH})
endif()

if(${PLATFORM}_PROGRAMMERS_PATH)
Expand Down Expand Up @@ -787,8 +806,8 @@ function(get_arduino_flags COMPILE_FLAGS_VAR LINK_FLAGS_VAR BOARD_ID MANUAL)
set(BOARD_CORE ${${BOARD_ID}.build.core})
if(BOARD_CORE)
if(ARDUINO_SDK_VERSION MATCHES "([0-9]+)[.]([0-9]+)")
string(REPLACE "." "" ARDUINO_VERSION_DEFINE "${ARDUINO_SDK_VERSION}") # Normalize version (remove all periods)
set(ARDUINO_VERSION_DEFINE "")
#string(REPLACE "." "" ARDUINO_VERSION_DEFINE "${ARDUINO_SDK_VERSION}") # Normalize version (remove all periods)
set(ARDUINO_VERSION_DEFINE "") # This overwrites the line above, so just comment that line out
if(CMAKE_MATCH_1 GREATER 0)
set(ARDUINO_VERSION_DEFINE "${CMAKE_MATCH_1}")
endif()
Expand All @@ -800,9 +819,22 @@ function(get_arduino_flags COMPILE_FLAGS_VAR LINK_FLAGS_VAR BOARD_ID MANUAL)
else()
message("Invalid Arduino SDK Version (${ARDUINO_SDK_VERSION})")
endif()
# Handle patch version
if(ARDUINO_SDK_VERSION MATCHES "([0-9]+)[.]([0-9]+)[.]([0-9]+)")
if(CMAKE_MATCH_3 GREATER 10)
set(ARDUINO_VERSION_DEFINE "${ARDUINO_VERSION_DEFINE}${CMAKE_MATCH_3}")
else()
set(ARDUINO_VERSION_DEFINE "${ARDUINO_VERSION_DEFINE}0${CMAKE_MATCH_3}")
endif()
endif()

# Define flags for Arduino architecture and cpu
if(${${BOARD_ID}.build.board} MATCHES "AVR")
set(ARDUINO_ARCH_FLAGS "-DARDUINO_ARCH_AVR -DARDUINO_${${BOARD_ID}.build.board}")
endif()

# output
set(COMPILE_FLAGS "-DF_CPU=${${BOARD_ID}.build.f_cpu} -DARDUINO=${ARDUINO_VERSION_DEFINE} -mmcu=${${BOARD_ID}.build.mcu}")
set(COMPILE_FLAGS "-DF_CPU=${${BOARD_ID}.build.f_cpu} -DARDUINO=${ARDUINO_VERSION_DEFINE} -mmcu=${${BOARD_ID}.build.mcu} ${ARDUINO_ARCH_FLAGS}")
if(DEFINED ${BOARD_ID}.build.vid)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -DUSB_VID=${${BOARD_ID}.build.vid}")
endif()
Expand Down Expand Up @@ -921,9 +953,12 @@ function(find_arduino_libraries VAR_NAME SRCS ARDLIBS)
DIRECTORY # Property Scope
PROPERTY LINK_DIRECTORIES)
foreach(LIB_SEARCH_PATH ${LIBRARY_SEARCH_PATH} ${ARDUINO_LIBRARIES_PATH} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libraries ${ARDUINO_EXTRA_LIBRARIES_PATH})
if(EXISTS ${LIB_SEARCH_PATH}/${INCLUDE_NAME}/${CMAKE_MATCH_1})
if(EXISTS "${LIB_SEARCH_PATH}/${INCLUDE_NAME}/${CMAKE_MATCH_1}")
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME})
break()
elseif(EXISTS "${LIB_SEARCH_PATH}/${INCLUDE_NAME}/src/${CMAKE_MATCH_1}")
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH}/${INCLUDE_NAME}/src)
break()
endif()
if(EXISTS ${LIB_SEARCH_PATH}/${CMAKE_MATCH_1})
list(APPEND ARDUINO_LIBS ${LIB_SEARCH_PATH})
Expand Down Expand Up @@ -962,6 +997,9 @@ endfunction()
set(Wire_RECURSE True)
set(Ethernet_RECURSE True)
set(SD_RECURSE True)
set(TFT_RECURSE True)
set(WiFi_RECURSE True)
set(Robot_Control_RECURSE True)
function(setup_arduino_library VAR_NAME BOARD_ID LIB_PATH COMPILE_FLAGS LINK_FLAGS)
set(LIB_TARGETS)
set(LIB_INCLUDES)
Expand All @@ -976,7 +1014,7 @@ function(setup_arduino_library VAR_NAME BOARD_ID LIB_PATH COMPILE_FLAGS LINK_FLA
set(${LIB_SHORT_NAME}_RECURSE False)
endif()

find_sources(LIB_SRCS ${LIB_PATH} ${${LIB_SHORT_NAME}_RECURSE})
find_sources(LIB_SRCS ${LIB_PATH} ${LIB_PATH}/src ${${LIB_SHORT_NAME}_RECURSE})
if(LIB_SRCS)

arduino_debug_msg("Generating Arduino ${LIB_NAME} library")
Expand Down Expand Up @@ -1174,7 +1212,7 @@ function(setup_arduino_bootloader_upload TARGET_NAME BOARD_ID PORT AVRDUDE_FLAGS
endif()
set(TARGET_PATH ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME})

list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex")
list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex:i")
list(APPEND AVRDUDE_ARGS "-Ueeprom:w:${TARGET_PATH}.eep:i")
add_custom_target(${UPLOAD_TARGET}
${ARDUINO_AVRDUDE_PROGRAM}
Expand Down Expand Up @@ -1222,7 +1260,7 @@ function(setup_arduino_programmer_burn TARGET_NAME BOARD_ID PROGRAMMER PORT AVRD
endif()
set(TARGET_PATH ${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME})

list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex")
list(APPEND AVRDUDE_ARGS "-Uflash:w:${TARGET_PATH}.hex:i")

add_custom_target(${PROGRAMMER_TARGET}
${ARDUINO_AVRDUDE_PROGRAM}
Expand Down Expand Up @@ -1258,15 +1296,20 @@ function(setup_arduino_bootloader_burn TARGET_NAME BOARD_ID PROGRAMMER PORT AVRD
return()
endif()

foreach( ITEM unlock_bits high_fuses low_fuses path file)
foreach( ITEM unlock_bits high_fuses low_fuses file )
if(NOT ${BOARD_ID}.bootloader.${ITEM})
message("Missing ${BOARD_ID}.bootloader.${ITEM}, not creating bootloader burn target ${BOOTLOADER_TARGET}.")
return()
endif()
endforeach()

if(NOT EXISTS "${ARDUINO_BOOTLOADERS_PATH}/${${BOARD_ID}.bootloader.path}/${${BOARD_ID}.bootloader.file}")
message("${ARDUINO_BOOTLOADERS_PATH}/${${BOARD_ID}.bootloader.path}/${${BOARD_ID}.bootloader.file}")
# If there is a .path entry, combine with file (as done in newer Arduino distributions)
if(${BOARD_ID}.bootloader.path)
set(${BOARD_ID}.bootloader.file "${${BOARD_ID}.bootloader.path}/${$(BOARD_ID}.bootloader.file}")
endif()
#
if(NOT EXISTS "${ARDUINO_BOOTLOADERS_PATH}/${${BOARD_ID}.bootloader.file}")
message("${ARDUINO_BOOTLOADERS_PATH}/${${BOARD_ID}.bootloader.file}")
message("Missing bootloader image, not creating bootloader burn target ${BOOTLOADER_TARGET}.")
return()
endif()
Expand All @@ -1291,10 +1334,10 @@ function(setup_arduino_bootloader_burn TARGET_NAME BOARD_ID PROGRAMMER PORT AVRD

# Create burn bootloader target
add_custom_target(${BOOTLOADER_TARGET}
${ARDUINO_AVRDUDE_PROGRAM}
${AVRDUDE_ARGS}
WORKING_DIRECTORY ${ARDUINO_BOOTLOADERS_PATH}/${${BOARD_ID}.bootloader.path}
DEPENDS ${TARGET_NAME})
${ARDUINO_AVRDUDE_PROGRAM}
${AVRDUDE_ARGS}
WORKING_DIRECTORY ${ARDUINO_BOOTLOADERS_PATH}
DEPENDS ${TARGET_NAME})
endfunction()

#=============================================================================#
Expand Down Expand Up @@ -1546,6 +1589,29 @@ function(LOAD_ARDUINO_STYLE_SETTINGS SETTINGS_LIST SETTINGS_PATH)

foreach(FILE_ENTRY ${FILE_ENTRIES})
if("${FILE_ENTRY}" MATCHES "^[^#]+=.*")
#
# menu handling code
# Newer versions of the Arduino IDE have allowed for multiple cpu types on
# the same board. A menu has been introduced into the boards.txt file.
# This code uses the variable MENU_SELECTION (set in the top-level CMakeLists.txt
# to remove the menu text from the selected target board. This is not the
# ideal solution to this problem.
#
if(MENU_SELECTION)
list(LENGTH MENU_SELECTION NUM_MENUS)
if(NOT NUM_MENUS EQUAL "1")
message(FATAL_ERROR "Only 1 menu selection is currently supported. You have ${NUM_MENUS}.")
endif()
#if("${FILE_ENTRY}" MATCHES ${MENU_OPTION})
if("${FILE_ENTRY}" MATCHES ${MENU_SELECTION})
string(REGEX REPLACE ${MENU_SELECTION} "" FILE_ENTRY ${FILE_ENTRY})
#else()
#continue() #continue() isn't supported in CMake 2.8
endif()
#endif()
#
# end menu handling code
#
string(REGEX MATCH "^[^=]+" SETTING_NAME ${FILE_ENTRY})
string(REGEX MATCH "[^=]+$" SETTING_VALUE ${FILE_ENTRY})
string(REPLACE "." ";" ENTRY_NAME_TOKENS ${SETTING_NAME})
Expand Down Expand Up @@ -1590,7 +1656,6 @@ function(LOAD_ARDUINO_STYLE_SETTINGS SETTINGS_LIST SETTINGS_PATH)
# Save setting value
set(${FULL_SETTING_NAME} ${SETTING_VALUE}
CACHE INTERNAL "Arduino ${ENTRY_NAME} Board setting")


endif()
endforeach()
Expand Down Expand Up @@ -2077,18 +2142,19 @@ endfunction()
#=============================================================================#
if (NOT DEFINED ARDUINO_C_FLAGS)
set(ARDUINO_C_FLAGS "-mcall-prologues -ffunction-sections -fdata-sections")
set(ARDUINO_C_FLAGS "${ARDUINO_C_FLAGS} -MMD -flto -Wall -Wextra -Wshadow -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums")
endif (NOT DEFINED ARDUINO_C_FLAGS)
set(CMAKE_C_FLAGS "-g -Os ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_DEBUG "-g ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELEASE "-Os -DNDEBUG -w ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -g -w ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS "-g -Os -Wstrict-prototypes ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_DEBUG "-g -Wstrict-prototypes ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG -Wstrict-prototypes ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELEASE "-Os -DNDEBUG -Wstrict-prototypes ${ARDUINO_C_FLAGS}" CACHE STRING "")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Os -g -Wstrict-prototypes ${ARDUINO_C_FLAGS}" CACHE STRING "")

#=============================================================================#
# C++ Flags
#=============================================================================#
if (NOT DEFINED ARDUINO_CXX_FLAGS)
set(ARDUINO_CXX_FLAGS "${ARDUINO_C_FLAGS} -fno-exceptions")
set(ARDUINO_CXX_FLAGS "${ARDUINO_C_FLAGS} -std=gnu++11 -fno-exceptions")
endif (NOT DEFINED ARDUINO_CXX_FLAGS)
set(CMAKE_CXX_FLAGS "-g -Os ${ARDUINO_CXX_FLAGS}" CACHE STRING "")
set(CMAKE_CXX_FLAGS_DEBUG "-g ${ARDUINO_CXX_FLAGS}" CACHE STRING "")
Expand All @@ -2108,7 +2174,7 @@ set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "${ARDUINO_LINKER_FLAGS}" CACHE STRING

#=============================================================================#
#=============================================================================#
# Shared Lbrary Linker Flags #
# Shared Library Linker Flags #
#=============================================================================#
set(CMAKE_SHARED_LINKER_FLAGS "${ARDUINO_LINKER_FLAGS}" CACHE STRING "")
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${ARDUINO_LINKER_FLAGS}" CACHE STRING "")
Expand All @@ -2129,7 +2195,8 @@ set(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${ARDUINO_LINKER_FLAGS}" CACHE STR
set(ARDUINO_OBJCOPY_EEP_FLAGS -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load
--no-change-warnings --change-section-lma .eeprom=0 CACHE STRING "")
set(ARDUINO_OBJCOPY_HEX_FLAGS -O ihex -R .eeprom CACHE STRING "")
set(ARDUINO_AVRDUDE_FLAGS -V CACHE STRING "")
#set(ARDUINO_AVRDUDE_FLAGS -V CACHE STRING "")
set(ARDUINO_AVRDUDE_FLAGS " " CACHE STRING "") #turn on verification of upload

#=============================================================================#
# Initialization
Expand All @@ -2141,6 +2208,8 @@ if(NOT ARDUINO_FOUND AND ARDUINO_SDK_PATH)
NAMES libraries
PATHS ${ARDUINO_SDK_PATH}
DOC "Path to directory containing the Arduino libraries.")
# Add architecture-specific libraries path to generic libraries path
list(APPEND ARDUINO_LIBRARIES_PATH ${ARDUINO_ARCHITECTURE_LIBRARIES_PATH})

find_file(ARDUINO_VERSION_PATH
NAMES lib/version.txt
Expand Down