Removing sudo from Linux load script.

[kiibohd-controller.git] / main.c

diff --git a/main.c b/main.c
index 90ca20ebae1ddfc81bdbb2484cefa5e55a0da2af..fec612cd1f4a70187d0ecf79454cdd75a8fdde08 100644 (file)
--- 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,8 +27,9 @@
 // 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>
 
@@ -48,6 +49,10 @@
 
 
 
+// ----- Function Declarations -----
+
+
+
 // ----- Variables -----
 
 // Timer Interrupt for flagging a send of the sampled key detection data to the USB host
@@ -134,54 +139,42 @@ int main(void)
 {
        // Configuring Pins
        pinSetup();
-       init_errorLED();
 
-       // Setup USB Module
-       usb_setup();
+       // Enable CLI
+       CLI_init();
+
+       // Setup Modules
+       Output_setup();
+       Macro_setup();
+       Scan_setup();
 
        // Setup ISR Timer for flagging a kepress send to USB
        usbTimerSetup();
 
        // 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;
+               // Send keypresses over USB if the ISR has signalled that it's time
+               if ( !sendKeypresses )
+                       continue;
 
-                       // Indicate Error, if valid
-                       errorLED( ledTimer );
+               // Send USB Data
+               Output_send();
 
-                       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!");
+               // Clear sendKeypresses Flag
+               sendKeypresses = 0;
        }
 }
 
@@ -191,7 +184,7 @@ int main(void)
 // USB Keyboard Data Send Counter Interrupt
 #if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
 ISR( TIMER0_OVF_vect )
-#elif defined(_mk20dx128_) // ARM
+#elif defined(_mk20dx128_) || defined(_mk20dx256_) // ARM
 void pit0_isr(void)
 #endif
 {
@@ -207,3 +200,7 @@ void pit0_isr(void)
 #endif
 }
 
+
+// ----- CLI Command Functions -----
+
+