eryn/kiibohd-controller
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preparing for mk20dx256vlh7

Browse source 
- Not ready yet
- Will require some more changes to Lib/mk20dx.c
This commit is contained in:
Jacob Alexander 2014-12-31 17:13:44 -08:00
parent 40b5665930
commit f5a1e1bcf5
18 changed files with 295 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scan/MBC-55X/scan_loop.c
View file

@ -61,7 +61,7 @@ void removeKeyValue( uint8_t keyValue );
// UART Receive Buffer Full Interrupt
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
ISR(USART1_RX_vect)
#elif defined(_mk20dx128_) // ARM
#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
void uart0_status_isr(void)
#endif
{
@ -72,7 +72,7 @@ void uart0_status_isr(void)
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
keyValue = UDR1;
#elif defined(_mk20dx128_) // ARM
#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
// UART0_S1 must be read for the interrupt to be cleared
if ( UART0_S1 & UART_S1_RDRF )
{
@ -129,7 +129,7 @@ inline void Scan_setup()
// Reset the keyboard before scanning, we might be in a wierd state
Scan_resetKeyboard();
}
#elif defined(_mk20dx128_) // ARM
#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
{
// Setup the the UART interface for keyboard data input
SIM_SCGC4 |= SIM_SCGC4_UART0; // Disable clock gating
@ -345,7 +345,7 @@ uint8_t Scan_sendData( uint8_t dataPayload )
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
UDR1 = dataPayload;
#elif defined(_mk20dx128_) // ARM
#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
UART0_D = dataPayload;
#endif