Mercurial > louis > kiibohd-controller
changeset 103:6704aba435f0
Fixing loading script for ARM targets and the teensy loader cli
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Sun, 19 Jan 2014 15:00:48 -0800 |
| parents | a9b3520c7892 |
| children | e84738d174bc |
| files | CMakeLists.txt arm.cmake setup.cmake |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Sun Jan 12 11:39:25 2014 -0800 +++ b/CMakeLists.txt Sun Jan 19 15:00:48 2014 -0800 @@ -27,8 +27,8 @@ #| "avr" # Teensy++ 1.0 #| "avr" # Teensy++ 2.0 #| "arm" # Teensy 3.0 -#set( COMPILER_FAMILY "arm" ) -set( COMPILER_FAMILY "avr" ) +set( COMPILER_FAMILY "arm" ) +#set( COMPILER_FAMILY "avr" ) message( STATUS "Compiler Family:" ) message( "${COMPILER_FAMILY}" )
--- a/arm.cmake Sun Jan 12 11:39:25 2014 -0800 +++ b/arm.cmake Sun Jan 19 15:00:48 2014 -0800 @@ -38,6 +38,7 @@ message( STATUS "Chip Selected:" ) message( "${CHIP}" ) +set( MCU "${CHIP}" ) # For loading script compatibility #| CPU Type
--- a/setup.cmake Sun Jan 12 11:39:25 2014 -0800 +++ b/setup.cmake Sun Jan 19 15:00:48 2014 -0800 @@ -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 "avr-capsense" ) +set( ScanModule "MBC-55X" ) ##| Uses the key index and potentially applies special conditions to it, mapping it to a usb key code set( MacroModule "buffer" )