X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=main.c;h=2e2fe85fad2269826c39b4d49fd1a0546b4e3c07;hb=5f262ea4b68a07e9b94ce0a49c0f7196e5f32b3b;hp=90ca20ebae1ddfc81bdbb2484cefa5e55a0da2af;hpb=4c7a4d98d4a5a87b4cac72ea4eafaccb58421193;p=kiibohd-controller.git

diff --git a/main.c b/main.c
index 90ca20e..2e2fe85 100644
--- a/main.c
+++ b/main.c
@@ -1,15 +1,15 @@
-/* Copyright (C) 2011-2013 by Jacob Alexander
- * 
+/* Copyright (C) 2011-2014 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
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -27,183 +27,50 @@
 // Project Includes
 #include <macro.h>
 #include <scan_loop.h>
-#include <usb_com.h>
+#include <output_com.h>
 
+#include <cli.h>
 #include <led.h>
 #include <print.h>
 
-
-
-// ----- 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
-
-
-
-// ----- 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)
+int main()
 {
-
-// AVR
+	// AVR - Teensy Set Clock speed to 16 MHz
 #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
+	CLKPR = 0x80;
+	CLKPR = 0x00;
 #endif
-}
-
-
-inline void usbTimerSetup(void)
-{
-// AVR
-#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);
+	// Enable CLI
+	CLI_init();
 
-// 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 USB Module
-	usb_setup();
-
-	// Setup ISR Timer for flagging a kepress send to USB
-	usbTimerSetup();
+	// Setup Modules
+	Output_setup();
+	Macro_setup();
+	Scan_setup();
 
 	// Main Detection Loop
-	uint8_t ledTimer = F_CPU / 1000000; // Enable LED for a short time
 	while ( 1 )
 	{
-		// Setup the scanning module
-		scan_setup();
-
-		while ( 1 )
-		{
-			// Acquire Key Indices
-			// Loop continuously until scan_loop returns 0
-			cli();
-			while ( scan_loop() );
-			sei();
-
-			// Run Macros over Key Indices and convert to USB Keys
-			process_macros();
+		// Process CLI
+		CLI_process();
 
-			// Send keypresses over USB if the ISR has signalled that it's time
-			if ( !sendKeypresses )
-				continue;
+		// Acquire Key Indices
+		// Loop continuously until scan_loop returns 0
+		cli();
+		while ( Scan_loop() );
+		sei();
 
-			// Send USB Data
-			usb_send();
+		// Run Macros over Key Indices and convert to USB Keys
+		Macro_process();
 
-			// 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!");
+		// Sends USB data only if changed
+		Output_send();
 	}
 }
 
-
-// ----- 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
-}
-