Browse Source

Fixing loading script for ARM targets and the teensy loader cli

simple
Jacob Alexander 10 years ago
parent
commit
e9aa3880a6
3 changed files with 4 additions and 3 deletions
  1. 2
    2
      CMakeLists.txt
  2. 1
    0
      arm.cmake
  3. 1
    1
      setup.cmake

+ 2
- 2
CMakeLists.txt View File

@@ -27,8 +27,8 @@ include( AddFileDependencies )
#| "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}" )

+ 1
- 0
arm.cmake View File

@@ -38,6 +38,7 @@ set( CHIP "mk20dx128" )

message( STATUS "Chip Selected:" )
message( "${CHIP}" )
set( MCU "${CHIP}" ) # For loading script compatibility


#| CPU Type

+ 1
- 1
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 "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" )