Mercurial > louis > kiibohd-controller

changeset 342:b29c291ad130

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pre-merge cleanup.
author Jacob Alexander <haata@kiibohd.com>
date Sun, 14 Jun 2015 14:32:42 -0700
parents 66eccdd9ced5
children e464aaa4730f
files Bootloader/CMakeLists.txt main.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Bootloader/CMakeLists.txt	Sun Jun 14 13:56:56 2015 -0700
+++ b/Bootloader/CMakeLists.txt	Sun Jun 14 14:32:42 2015 -0700
@@ -20,8 +20,8 @@
 #| You _MUST_ clean the build directory if you change this value
 #|
 set( CHIP
-	#"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
-	"mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
+	"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
+#	"mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
 	CACHE STRING "Chip"
 )
 
--- a/main.c	Sun Jun 14 13:56:56 2015 -0700
+++ b/main.c	Sun Jun 14 14:32:42 2015 -0700
@@ -33,7 +33,6 @@
 #include <led.h>
 #include <print.h>
 
-extern volatile uint32_t systick_millis_count;
 
 
 // ----- Functions -----