From f708ce720cf4bf04ec41488f81536d0f578e30d3 Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Sun, 14 Jun 2015 14:32:42 -0700 Subject: [PATCH] Pre-merge cleanup. --- Bootloader/CMakeLists.txt | 4 ++-- main.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Bootloader/CMakeLists.txt b/Bootloader/CMakeLists.txt index ad5a395..2e12cf8 100644 --- a/Bootloader/CMakeLists.txt +++ b/Bootloader/CMakeLists.txt @@ -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 2e2fe85..3b48941 100644 --- a/main.c +++ b/main.c @@ -33,7 +33,6 @@ #include #include -extern volatile uint32_t systick_millis_count; // ----- Functions ----- -- 2.39.2