Mercurial > louis > kiibohd-controller
diff main.c @ 174:848e1ef8966c
McHCK now working with UART.
- Lots of code cleanup for the intialization of all arm chips
- Added more gcc flags to help with debugging linker and memory map
- Fixed UART initialization for the smaller MCHCK mk20dx128 (different pin mux)
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Mon, 30 Jun 2014 23:52:24 -0700 |
| parents | 7962a42dbda0 |
| children | b250056298df |
line wrap: on
line diff
--- a/main.c Sat Jun 28 14:12:56 2014 -0700 +++ b/main.c Mon Jun 30 23:52:24 2014 -0700 @@ -66,7 +66,7 @@ // ----- Functions ----- // Initial Pin Setup, make sure they are sane -inline void pinSetup(void) +inline void pinSetup() { // AVR @@ -100,7 +100,7 @@ } -inline void usbTimerSetup(void) +inline void usbTimerSetup() { // AVR #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) @@ -134,8 +134,7 @@ #endif } - -int main(void) +int main() { // Configuring Pins pinSetup(); @@ -185,7 +184,7 @@ #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR ISR( TIMER0_OVF_vect ) #elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM -void pit0_isr(void) +void pit0_isr() #endif { sendKeypressCounter++;