di0ib/controller
Archived
1
0
Fork 0
Code Releases Activity

Fixing loading script for ARM targets and the teensy loader cli

Browse Source
This commit is contained in:
Jacob Alexander 2014-01-19 15:00:48 -08:00
parent 1accaf36cc
commit e9aa3880a6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -27,8 +27,8 @@ include( AddFileDependencies )
#| "avr" # Teensy++ 1.0 #| "avr" # Teensy++ 1.0
#| "avr" # Teensy++ 2.0 #| "avr" # Teensy++ 2.0
#| "arm" # Teensy 3.0 #| "arm" # Teensy 3.0
#set( COMPILER_FAMILY "arm" ) set( COMPILER_FAMILY "arm" )
set( COMPILER_FAMILY "avr" ) #set( COMPILER_FAMILY "avr" )
message( STATUS "Compiler Family:" ) message( STATUS "Compiler Family:" )
message( "${COMPILER_FAMILY}" ) message( "${COMPILER_FAMILY}" )

1
arm.cmake
View File

@ -38,6 +38,7 @@ set( CHIP "mk20dx128" )
message( STATUS "Chip Selected:" ) message( STATUS "Chip Selected:" )
message( "${CHIP}" ) message( "${CHIP}" )
set( MCU "${CHIP}" ) # For loading script compatibility
#| CPU Type #| CPU Type

2
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 #| 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 ##| Deals with acquiring the keypress information and turning it into a key index
set( ScanModule "avr-capsense" ) set( ScanModule "MBC-55X" )
##| Uses the key index and potentially applies special conditions to it, mapping it to a usb key code ##| Uses the key index and potentially applies special conditions to it, mapping it to a usb key code
set( MacroModule "buffer" ) set( MacroModule "buffer" )