Fixing loading script for ARM targets and the teensy loader cli

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68fc2fa0142e5e3e11bcb9260a0293f907c4d9c..7ce02108193f337f1439bed69a722b534fd1e0bc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}" )

diff --git a/arm.cmake b/arm.cmake
index 025cbe2eafa4f269a43ee60f656d4fee11b03d0e..7fe1e05d99bf167c24a73cc37956fb0bd6bcd9ae 100644 (file)
--- a/arm.cmake
+++ b/arm.cmake
@@ -38,6 +38,7 @@ set( CHIP "mk20dx128" )
 
 message( STATUS "Chip Selected:" )
 message( "${CHIP}" )
+set( MCU "${CHIP}" ) # For loading script compatibility
 
 
 #| CPU Type

diff --git a/setup.cmake b/setup.cmake
index 8526a7678ff6559ebefe8da7791db51bff24a0c7..aad36905d030e4f296c5134480528a7937c409ec 100644 (file)
--- a/setup.cmake
+++ b/setup.cmake
@@ -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"  )