Browse Source
Adding teensy-loader-cli so it's not required.
- This is a patched version to work with Teensy 3.1 (current version on the website doesn't work) - "Should" work with OS's other than Linux, but hasn't been testedsimple
Jacob Alexander
10 years ago
8 changed files with 1249 additions and 30 deletions
+ 6
- 13
CMakeLists.txt
View File
| @@ -25,8 +25,8 @@ set( CMAKE_USE_RELATIVE_PATHS 1 ) | |||
| #| "avr" # Teensy++ 2.0 | |||
| #| "arm" # Teensy 3.0 | |||
| #| "arm" # Teensy 3.1 | |||
| #set( COMPILER_FAMILY "arm" ) | |||
| set( COMPILER_FAMILY "avr" ) | |||
| set( COMPILER_FAMILY "arm" ) | |||
| #set( COMPILER_FAMILY "avr" ) | |||
| message( STATUS "Compiler Family:" ) | |||
| message( "${COMPILER_FAMILY}" ) | |||
| @@ -142,7 +142,8 @@ add_custom_command( TARGET ${TARGET_ELF} POST_BUILD | |||
| #| After Changes Size Information | |||
| #| TODO Do lookup on Flash and RAM sizes and do % used | |||
| add_custom_target( SizeAfter ALL ${SIZE} --target=${FORMAT} ${TARGET_HEX} ${TARGET_ELF} | |||
| add_custom_target( SizeAfter ALL | |||
| COMMAND ${SIZE} --target=${FORMAT} ${TARGET_HEX} ${TARGET_ELF} | |||
| DEPENDS ${TARGET_ELF} | |||
| COMMENT "Size after generation\n\tFlash Usage: data (hex)\n\t RAM Usage: data (elf)" | |||
| ) | |||
| @@ -150,17 +151,9 @@ add_custom_target( SizeAfter ALL ${SIZE} --target=${FORMAT} ${TARGET_HEX} ${TARG | |||
| ### | |||
| # Setup Loader Script | |||
| # Setup Loader Script and Program | |||
| # | |||
| #| Provides the user with the correct teensy-loader-cli command for the built .HEX file | |||
| #| teensy-loader-cli must be in the user's path | |||
| if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) | |||
| configure_file( LoadFile/bash load ) | |||
| endif() | |||
| #| TODO Windows | |||
| if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" ) | |||
| configure_file( LoadFile/bash load ) | |||
| endif() | |||
| configure_file( LoadFile/load load ) | |||
+ 118
- 0
LoadFile/CMakeLists.txt
View File
| @@ -0,0 +1,118 @@ | |||
| ###| CMAKE teensy-loader-cli |### | |||
| # | |||
| # Jacob Alexander 2014 | |||
| # Written to replace the pjrc's kludey Makefiles | |||
| # (that require hand edits for different platforms) | |||
| # | |||
| # Released into the Public Domain | |||
| # | |||
| ### | |||
| #| Windows / Cygwin Compatibility options | |||
| set( CMAKE_LEGACY_CYGWIN_WIN32 0 ) | |||
| set( CMAKE_USE_RELATIVE_PATHS 1 ) | |||
| ### | |||
| # Project Description | |||
| # | |||
| #| Project | |||
| project( teensy-loader-cli ) | |||
| #| Target Name (output name) | |||
| set( TARGET teensy-loader-cli ) | |||
| #| General Settings | |||
| cmake_minimum_required( VERSION 2.8 ) | |||
| ### | |||
| # Source Defines | |||
| # | |||
| #| Sources | |||
| set( SRCS | |||
| teensy_loader_cli.c | |||
| ) | |||
| ### | |||
| # Platform Setup | |||
| # | |||
| list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR} ) # Use local find scripts | |||
| #| Linux - libusb | |||
| if( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" ) | |||
| # Find libusb (not 1.0) | |||
| find_package( LibUSB REQUIRED ) | |||
| # Defines | |||
| set( DEFINES -s -DUSE_LIBUSB ) | |||
| # Include directories | |||
| set( INCLUDE_DIRS ${LIBUSB_INCLUDE_DIRS} ) | |||
| # Libraries | |||
| set( LIBS ${LIBUSB_LIBRARIES} ) | |||
| #| Windows | |||
| elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" ) | |||
| message( AUTHOR_WARNING "Not Tested...") | |||
| # Defines | |||
| set( DEFINES -s -DUSE_WIN32 ) | |||
| # Libraries | |||
| set( LIBS hid setupapi ) | |||
| #| Mac OS X | |||
| elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" ) | |||
| message( AUTHOR_WARNING "Not Tested...") | |||
| # Defines - XXX What is SDK? | |||
| set( DEFINES -DUSE_APPLE_IOKIT -isysroot ${SDK} -Wl,-syslibroot,${SDK} -framework IOKit -framework CoreFoundation ) | |||
| #| BSD - NetBSD and OpenBSD | |||
| elseif( ${CMAKE_SYSTEM_NAME} MATCHES "BSD" ) | |||
| message( AUTHOR_WARNING "Not Tested...") | |||
| # Defines | |||
| set( DEFINES -s -DUSE_UHID ) | |||
| endif() | |||
| ### | |||
| # Defines | |||
| # | |||
| #| Default CFLAGS | |||
| set( CFLAGS -O2 -Wall ) | |||
| add_definitions( ${CFLAGS} ${DEFINES} ) | |||
| ### | |||
| # Includes | |||
| # | |||
| #| Linux | |||
| include_directories( ${INCLUDE_DIRS} ) | |||
| ### | |||
| # Build Targets | |||
| # | |||
| #| Create the executable | |||
| add_executable( ${TARGET} ${SRCS} ) | |||
| #| Link executable | |||
| target_link_libraries( ${TARGET} ${LIBS} ) | |||
+ 94
- 0
LoadFile/FindLibUSB.cmake
View File
| @@ -0,0 +1,94 @@ | |||
| # Attempts to find libusb (not libusb-1.0) | |||
| # | |||
| # LIBUSB_FOUND - system has libusb | |||
| # LIBUSB_INCLUDE_DIRS - the libusb include directory | |||
| # LIBUSB_LIBRARIES - Link these to use libusb | |||
| # LIBUSB_DEFINITIONS - Compiler switches required for using libusb | |||
| # | |||
| # Adapted from cmake-modules Google Code project | |||
| # | |||
| # Copyright (c) 2006 Andreas Schneider <[email protected]> | |||
| # | |||
| # (Changes for libusb) Copyright (c) 2014 Jacob Alexander <[email protected]> | |||
| # | |||
| # Redistribution and use is allowed according to the terms of the New BSD license. | |||
| # | |||
| # CMake-Modules Project New BSD License | |||
| # | |||
| # Redistribution and use in source and binary forms, with or without | |||
| # modification, are permitted provided that the following conditions are met: | |||
| # | |||
| # * Redistributions of source code must retain the above copyright notice, this | |||
| # list of conditions and the following disclaimer. | |||
| # | |||
| # * Redistributions in binary form must reproduce the above copyright notice, | |||
| # this list of conditions and the following disclaimer in the | |||
| # documentation and/or other materials provided with the distribution. | |||
| # | |||
| # * Neither the name of the CMake-Modules Project nor the names of its | |||
| # contributors may be used to endorse or promote products derived from this | |||
| # software without specific prior written permission. | |||
| # | |||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | |||
| # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | |||
| # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | |||
| # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR | |||
| # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | |||
| # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | |||
| # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | |||
| # ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |||
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | |||
| # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |||
| # | |||
| if ( LIBUSB_LIBRARIES AND LIBUSB_INCLUDE_DIRS ) | |||
| # in cache already | |||
| set( LIBUSB_FOUND TRUE ) | |||
| else () | |||
| find_path( LIBUSB_INCLUDE_DIR | |||
| NAMES | |||
| usb.h | |||
| PATHS | |||
| /usr/include | |||
| /usr/local/include | |||
| /opt/local/include | |||
| /sw/include | |||
| /include | |||
| ) | |||
| find_library( LIBUSB_LIBRARY | |||
| NAMES | |||
| usb | |||
| PATHS | |||
| /usr/lib | |||
| /usr/local/lib | |||
| /opt/local/lib | |||
| /sw/lib | |||
| /lib | |||
| ) | |||
| set( LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR} ) | |||
| set( LIBUSB_LIBRARIES ${LIBUSB_LIBRARY} ) | |||
| if ( LIBUSB_INCLUDE_DIRS AND LIBUSB_LIBRARIES ) | |||
| set( LIBUSB_FOUND TRUE ) | |||
| endif () | |||
| if ( LIBUSB_FOUND ) | |||
| if ( NOT LIBUSB_FIND_QUIETLY ) | |||
| message( STATUS "Found libusb:" ) | |||
| message( STATUS " - Includes: ${LIBUSB_INCLUDE_DIRS}" ) | |||
| message( STATUS " - Libraries: ${LIBUSB_LIBRARIES}" ) | |||
| endif () | |||
| else () | |||
| if ( LIBUSB_FIND_REQUIRED ) | |||
| message( FATAL_ERROR "Could not find libusb" ) | |||
| endif () | |||
| endif () | |||
| # show the LIBUSB_INCLUDE_DIRS and LIBUSB_LIBRARIES variables only in the advanced view | |||
| mark_as_advanced( LIBUSB_INCLUDE_DIRS LIBUSB_LIBRARIES ) | |||
| endif () | |||
+ 0
- 8
LoadFile/bash
View File
| @@ -1,8 +0,0 @@ | |||
| #!/bin/bash | |||
| #| Loads the hex file onto the teensy | |||
| sudo teensy-loader-cli -mmcu=@MCU@ -w @TARGET_HEX@ | |||
| exit 0 | |||
+ 16
- 0
LoadFile/load
View File
| @@ -0,0 +1,16 @@ | |||
| #!/bin/bash | |||
| #| First check to see teensy-loader-cli has been compiled | |||
| if [ ! -e teensy-loader-cli/teensy-loader-cli ]; then | |||
| # Compile teensy-loader-cli | |||
| mkdir -p teensy-loader-cli | |||
| cd teensy-loader-cli | |||
| cmake @CMAKE_SOURCE_DIR@/LoadFile | |||
| make | |||
| fi | |||
| #| Loads the hex file onto the teensy | |||
| sudo teensy-loader-cli/teensy-loader-cli -mmcu=@MCU@ -w @TARGET_HEX@ | |||
| exit 0 | |||
+ 1009
- 0
LoadFile/teensy_loader_cli.c
File diff suppressed because it is too large
View File
+ 2
- 2
arm.cmake
View File
| @@ -35,8 +35,8 @@ set( SIZE "arm-none-eabi-size" ) | |||
| #| | |||
| #| "mk20dx128" # Teensy 3.0 | |||
| #| "mk20dx256" # Teensy 3.1 | |||
| set( CHIP "mk20dx128" ) | |||
| #set( CHIP "mk20dx256" ) | |||
| #set( CHIP "mk20dx128" ) | |||
| set( CHIP "mk20dx256" ) | |||
| message( STATUS "Chip Selected:" ) | |||
| message( "${CHIP}" ) | |||
+ 4
- 7
setup.cmake
View File
| @@ -20,7 +20,7 @@ | |||
| #| Please look at the {Scan,Macro,USB,Debug}/module.txt for information on the modules and how to create new ones | |||
| ##| Deals with acquiring the keypress information and turning it into a key index | |||
| set( ScanModule "SKM67001" ) | |||
| set( ScanModule "ADCTest" ) | |||
| ##| Provides the mapping functions for DefaultMap and handles any macro processing before sending to the OutputModule | |||
| set( MacroModule "PartialMap" ) | |||
| @@ -203,7 +203,6 @@ execute_process( COMMAND git rev-parse --abbrev-ref HEAD | |||
| execute_process( COMMAND git show -s --format=%ci | |||
| WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} | |||
| OUTPUT_VARIABLE Git_Date_INFO | |||
| RESULT_VARIABLE Git_RETURN | |||
| ERROR_QUIET | |||
| OUTPUT_STRIP_TRAILING_WHITESPACE | |||
| ) | |||
| @@ -212,7 +211,6 @@ execute_process( COMMAND git show -s --format=%ci | |||
| execute_process( COMMAND git show -s --format="%cn <%ce>" | |||
| WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} | |||
| OUTPUT_VARIABLE Git_Commit_Author | |||
| RESULT_VARIABLE Git_RETURN | |||
| ERROR_QUIET | |||
| OUTPUT_STRIP_TRAILING_WHITESPACE | |||
| ) | |||
| @@ -221,7 +219,6 @@ execute_process( COMMAND git show -s --format="%cn <%ce>" | |||
| execute_process( COMMAND git show -s --format=%H | |||
| WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} | |||
| OUTPUT_VARIABLE Git_Commit_Revision | |||
| RESULT_VARIABLE Git_RETURN | |||
| ERROR_QUIET | |||
| OUTPUT_STRIP_TRAILING_WHITESPACE | |||
| ) | |||
| @@ -230,19 +227,19 @@ execute_process( COMMAND git show -s --format=%H | |||
| execute_process( COMMAND git config --get remote.origin.url | |||
| WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} | |||
| OUTPUT_VARIABLE Git_Origin_URL | |||
| RESULT_VARIABLE Git_RETURN | |||
| ERROR_QUIET | |||
| OUTPUT_STRIP_TRAILING_WHITESPACE | |||
| ) | |||
| #| Build Date | |||
| execute_process( COMMAND "date" "+%Y-%m-%d %T %z" | |||
| OUTPUT_VARIABLE ${RESULT} | |||
| OUTPUT_VARIABLE Build_Date | |||
| ERROR_QUIET | |||
| OUTPUT_STRIP_TRAILING_WHITESPACE | |||
| ) | |||
| #| Last Commit Date | |||
| set( GitLastCommitDate "${Git_Modified_Flag_INFO}${Git_Branch_INFO} - ${Git_Date_INFO}" ) | |||
| set( GitLastCommitDate "${Git_Modified_Status} ${Git_Branch_INFO} - ${Git_Date_INFO}" ) | |||
| #| Uses CMake variables to include as defines | |||
| #| Primarily for USB configuration | |||