X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=CMakeLists.txt;h=dcb0c9462790965c1af104ec07a044109ba50f70;hb=a848a6bc79285a2e5b3705f126c36e5c5037d5ef;hp=cede169ed2147b45716fd1b17eceb5bc6b1d6a24;hpb=12295e8362110ef76da76fde4742880cf7a13684;p=kiibohd-controller.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cede169..dcb0c94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 ###| CMAKE Kiibohd Controller |###
 #
-# Jacob Alexander 2011-2014
+# Jacob Alexander 2011-2015
 # Due to this file's usefulness:
 #
 # Released into the Public Domain
@@ -17,14 +17,29 @@
 #| You _MUST_ clean the build directory if you change this value
 #|
 set( CHIP
-#	"at90usb162"       # Teensy   1.0 (avr)
-#	"atmega32u4"       # Teensy   2.0 (avr)
-#	"at90usb646"       # Teensy++ 1.0 (avr)
-	"at90usb1286"      # Teensy++ 2.0 (avr)
-#	"mk20dx128"        # Teensy   3.0 (arm)
-#	"mk20dx128vlf5"    # McHCK    mk20dx128vlf5
-#	"mk20dx256"        # Teensy   3.1 (arm)
-)
+#       "at90usb162"       # Teensy   1.0 (avr)
+#       "atmega32u4"       # Teensy   2.0 (avr)
+#       "at90usb646"       # Teensy++ 1.0 (avr)
+#       "at90usb1286"      # Teensy++ 2.0 (avr)
+#       "mk20dx128"        # Teensy   3.0 (arm)
+	"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
+#       "mk20dx256"        # Teensy   3.1,3.2 (arm)
+#       "mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
+	CACHE STRING "Microcontroller Chip" )
+
+
+
+###
+# Compiler Selection
+#
+
+#| *** EXPERIMENTAL ***
+#| Stick with gcc unless you know what you're doing
+#| Currently only arm is supported with clang
+set( COMPILER
+	"gcc"   # arm-none-eabi-gcc / avr-gcc - Default
+#       "clang" # arm-none-eabi
+	CACHE STRING "Compiler Type" )
 
 
 
@@ -48,17 +63,20 @@ include( initialize )
 #| Please look at the {Scan,Macro,Output,Debug} 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 "DPH" )
-#set(   ScanModule "MD1" )
+set(   ScanModule "MD1"
+	CACHE STRING "Scan Module" )
 
 ##| Provides the mapping functions for DefaultMap and handles any macro processing before sending to the OutputModule
-set(  MacroModule "PartialMap" )
+set(  MacroModule "PartialMap"
+	CACHE STRING "Macro Module" )
 
 ##| Sends the current list of usb key codes through USB HID
-set( OutputModule "pjrcUSB" )
+set( OutputModule "pjrcUSB"
+	CACHE STRING "Output Module" )
 
 ##| Debugging source to use, each module has it's own set of defines that it sets
-set(  DebugModule "full" )
+set(  DebugModule "full"
+	CACHE STRING "Debug Module" )
 
 
 
@@ -88,17 +106,18 @@ set(  DebugModule "full" )
 
 ##| Set the base keyboard .kll map, defaults to "defaultMap" if not found
 ##| Looks in Scan/<Module Name> for the available BaseMaps
-##| TODO Support layering in basemap
-set(     BaseMap "kishsaver" )
-#set(     BaseMap "defaultMap" )
+set(     BaseMap "defaultMap"
+	CACHE STRING "KLL BaseMap/Scancode Keymapping" )
 
 ##| Layer additonal .kll maps on the BaseMap, layers are in order from 1st to nth
 ##| Can be set to ""
-set(  DefaultMap "colemak kishsaver_unix1 stdFuncMap" )
+set(  DefaultMap "md1Overlay stdFuncMap"
+	CACHE STRING "KLL DefaultMap" )
 
 ##| ParitalMaps available on top of the BaseMap. See above for syntax on specifying multiple layers vs. layering
 ##| Can be set to ""
-#set( PartialMaps "hhkbpro2_slim" )
+set( PartialMaps "hhkbpro2"
+	CACHE STRING "KLL PartialMaps/Layer Definitions" )