# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1390172448 28800
# Node ID 6704aba435f0b4dffdb85eeacda482751f510c3c
# Parent  a9b3520c789223d706e2ab21aa5b24c33d4d4beb
Fixing loading script for ARM targets and the teensy loader cli

diff -r a9b3520c7892 -r 6704aba435f0 CMakeLists.txt
--- 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}" )
diff -r a9b3520c7892 -r 6704aba435f0 arm.cmake
--- 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
diff -r a9b3520c7892 -r 6704aba435f0 setup.cmake
--- 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"  )