More renaming for the USB to Output Module renaming

[kiibohd-controller.git] / main.c

diff --git a/main.c b/main.c
index 58679644e2c5d90e8ca773532b0ad8cbf9263f22..dd8b8e0983ffdc8f705fc4c729082f7dd017fbaf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 by Jacob Alexander
+/* Copyright (C) 2011-2013 by Jacob Alexander
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,20 +21,16 @@
 
 // ----- Includes -----
 
-// AVR Includes
-#include <avr/io.h>
-#include <avr/pgmspace.h>
-#include <avr/interrupt.h>
+// Compiler Includes
+#include <Lib/MainLib.h>
 
 // Project Includes
-//#include "usb_keys.h"
-#include "scan_loop.h"
-//#include "layouts.h"
-//#include "usb_keyboard.h"
+#include <macro.h>
+#include <scan_loop.h>
+#include <output_com.h>
 
-#include "usb_keyboard_debug.h"
-#include "print.h"
-#include "led.h"
+#include <led.h>
+#include <print.h>
 
 
 
@@ -46,7 +42,9 @@
 
 
 // ----- Macros -----
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
 #define CPU_PRESCALE(n)        (CLKPR = 0x80, CLKPR = (n))
+#endif
 
 
 
@@ -65,8 +63,14 @@ volatile uint8_t sendKeypresses = 0;
 // 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;
@@ -75,59 +79,134 @@ inline void pinSetup(void)
 
 
        // 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
 }
 
-int main(void)
+
+inline void usbTimerSetup(void)
 {
+// AVR
+#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_)
+
        // Setup with 16 MHz clock
        CPU_PRESCALE( 0 );
 
-       // Configuring Pins
-       pinSetup();
-
-       // Setup USB Module
-       usb_setup();
-
        // 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 );
+#endif
+}
+
+
+int main(void)
+{
+       // Configuring Pins
+       pinSetup();
+       init_errorLED();
+
+       // Setup Output Module
+       output_setup();
+
+       // Enable CLI
+       init_cli();
+
+       // Setup ISR Timer for flagging a kepress send to USB
+       usbTimerSetup();
+
        // Main Detection Loop
-       while ( 1 ) {
-               //scan_loop();
+       uint8_t ledTimer = F_CPU / 1000000; // Enable LED for a short time
+       while ( 1 )
+       {
+               // Setup the scanning module
+               scan_setup();
 
-               // Loop should never get here (indicate error)
-               errorLED( 1 );
+               while ( 1 )
+               {
+                       // Acquire Key Indices
+                       // Loop continuously until scan_loop returns 0
+                       cli();
+                       while ( scan_loop() );
+                       sei();
 
-               // HID Debug Error message
-               erro_print("Detection loop error, this is very bad...bug report!");
+                       // Run Macros over Key Indices and convert to USB Keys
+                       process_macros();
 
-               // Send keypresses over USB if the ISR has signalled that it's time
-               if ( !sendKeypresses )
-                       continue;
+                       // Send keypresses over USB if the ISR has signalled that it's time
+                       if ( !sendKeypresses )
+                               continue;
 
-               // Send USB Data
-               usb_send();
+                       // Send USB Data
+                       usb_send();
 
-               // Clear sendKeypresses Flag
-               sendKeypresses = 0;
+                       // Clear sendKeypresses Flag
+                       sendKeypresses = 0;
+
+                       // Indicate Error, if valid
+                       errorLED( ledTimer );
+
+                       if ( ledTimer > 0 )
+                               ledTimer--;
+               }
+
+               // Loop should never get here (indicate error)
+               ledTimer = 255;
+
+               // HID Debug Error message
+               erro_print("Detection loop error, this is very bad...bug report!");
        }
 }
 
+
+// ----- 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
 }