Mercurial > louis > kiibohd-controller

diff main.c @ 132:e08d7b586ea3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adding analog.c lib from teensyduino. - Mostly for reference, you shouldn't include it verbatim in your module.
author Jacob Alexander <haata@kiibohd.com>
date Sat, 12 Apr 2014 21:13:37 -0700
parents 8dab4014c398
children 98e4f0bc2a5b
line wrap: on
line diff
--- a/main.c	Sat Apr 12 21:09:35 2014 -0700
+++ b/main.c	Sat Apr 12 21:13:37 2014 -0700
@@ -146,7 +146,7 @@
 	// Setup Modules
 	Output_setup();
 	Macro_setup();
-	//scan_setup();
+	Scan_setup();
 
 	// Setup ISR Timer for flagging a kepress send to USB
 	usbTimerSetup();
@@ -184,7 +184,7 @@
 // USB Keyboard Data Send Counter Interrupt
 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
 ISR( TIMER0_OVF_vect )
-#elif defined(_mk20dx128_) // ARM
+#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
 void pit0_isr(void)
 #endif
 {