X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=main.c;h=2e2fe85fad2269826c39b4d49fd1a0546b4e3c07;hb=5f262ea4b68a07e9b94ce0a49c0f7196e5f32b3b;hp=13fde65a438e5440d352c7a384995d474a8d6d07;hpb=9d423a64a81b267a6a735d1a64a96fcf0564f1ab;p=kiibohd-controller.git diff --git a/main.c b/main.c index 13fde65..2e2fe85 100644 --- a/main.c +++ b/main.c @@ -33,112 +33,18 @@ #include #include - - -// ----- Defines ----- - -// Verified Keypress Defines -#define USB_TRANSFER_DIVIDER 10 // 1024 == 1 Send of keypresses per second, 1 == 1 Send of keypresses per ~1 millisecond - - - -// ----- Macros ----- -#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#endif - - - -// ----- Function Declarations ----- - - - -// ----- Variables ----- - -// Timer Interrupt for flagging a send of the sampled key detection data to the USB host -uint16_t sendKeypressCounter = 0; - -// Flag generated by the timer interrupt -volatile uint8_t sendKeypresses = 0; - +extern volatile uint32_t systick_millis_count; // ----- Functions ----- -// Initial Pin Setup, make sure they are sane -inline void pinSetup(void) -{ - -// AVR -#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) - - // For each pin, 0=input, 1=output -#if defined(__AVR_AT90USB1286__) - DDRA = 0x00; -#endif - DDRB = 0x00; - DDRC = 0x00; - DDRD = 0x00; - DDRE = 0x00; - DDRF = 0x00; - - - // Setting pins to either high or pull-up resistor -#if defined(__AVR_AT90USB1286__) - PORTA = 0x00; -#endif - PORTB = 0x00; - PORTC = 0x00; - PORTD = 0x00; - PORTE = 0x00; - PORTF = 0x00; - -// ARM -#elif defined(_mk20dx128_) - // TODO - Should be cleared, but not that necessary due to the pin layout -#endif -} - - -inline void usbTimerSetup(void) +int main() { -// AVR + // AVR - Teensy Set Clock speed to 16 MHz #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) - - // Setup with 16 MHz clock - CPU_PRESCALE( 0 ); - - // Setup ISR Timer for flagging a kepress send to USB - // Set to 256 * 1024 (8 bit timer with Clock/1024 prescalar) timer - TCCR0A = 0x00; - TCCR0B = 0x03; - TIMSK0 = (1 << TOIE0); - -// ARM -#elif defined(_mk20dx128_) - // 48 MHz clock by default - - // System Clock Gating Register Disable - SIM_SCGC6 |= SIM_SCGC6_PIT; - - // Enable Timers - PIT_MCR = 0x00; - - // Setup ISR Timer for flagging a kepress send to USB - // 1 ms / (1 / 48 MHz) - 1 = 47999 cycles -> 0xBB7F - PIT_LDVAL0 = 0x0000BB7F; - PIT_TCTRL0 = 0x3; // Enable Timer 0 interrupts, and Enable Timer 0 - - // Insert the required vector for Timer 0 - NVIC_ENABLE_IRQ( IRQ_PIT_CH0 ); + CLKPR = 0x80; + CLKPR = 0x00; #endif -} - - -int main(void) -{ - // Configuring Pins - pinSetup(); // Enable CLI CLI_init(); @@ -146,10 +52,7 @@ int main(void) // Setup Modules Output_setup(); Macro_setup(); - //scan_setup(); - - // Setup ISR Timer for flagging a kepress send to USB - usbTimerSetup(); + Scan_setup(); // Main Detection Loop while ( 1 ) @@ -160,47 +63,14 @@ int main(void) // Acquire Key Indices // Loop continuously until scan_loop returns 0 cli(); - //while ( scan_loop() ); + while ( Scan_loop() ); sei(); // Run Macros over Key Indices and convert to USB Keys Macro_process(); - // Send keypresses over USB if the ISR has signalled that it's time - if ( !sendKeypresses ) - continue; - - // Send USB Data + // Sends USB data only if changed Output_send(); - - // Clear sendKeypresses Flag - sendKeypresses = 0; - } -} - - -// ----- Interrupts ----- - -// USB Keyboard Data Send Counter Interrupt -#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR -ISR( TIMER0_OVF_vect ) -#elif defined(_mk20dx128_) // ARM -void pit0_isr(void) -#endif -{ - sendKeypressCounter++; - if ( sendKeypressCounter > USB_TRANSFER_DIVIDER ) { - sendKeypressCounter = 0; - sendKeypresses = 1; } - -#if defined(_mk20dx128_) // ARM - // Clear the interrupt flag - PIT_TFLG0 = 1; -#endif } - -// ----- CLI Command Functions ----- - -