]> git.donarmstrong.com Git - kiibohd-controller.git/commitdiff
Pre-merge cleanup.
authorJacob Alexander <haata@kiibohd.com>
Sun, 14 Jun 2015 21:32:42 +0000 (14:32 -0700)
committerJacob Alexander <haata@kiibohd.com>
Sun, 14 Jun 2015 21:33:40 +0000 (14:33 -0700)
Bootloader/CMakeLists.txt
main.c

index ad5a3952e5b59c99bcced59ad0ad0a73eeec8b71..2e12cf82edd000438aeadb1f1c9fa1a6c759736a 100644 (file)
@@ -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"
 )
 
diff --git a/main.c b/main.c
index 2e2fe85fad2269826c39b4d49fd1a0546b4e3c07..3b48941dfca0ed1e647378b51b8998fa1138362c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -33,7 +33,6 @@
 #include <led.h>
 #include <print.h>
 
-extern volatile uint32_t systick_millis_count;
 
 
 // ----- Functions -----