# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1390179298 28800
# Node ID 3764d78996a8986de58975d0ce7459e60b39b508
# Parent  e84738d174bca92734fe7472e26ce03abf333cc5
More renaming for the USB to Output Module renaming

diff -r e84738d174bc -r 3764d78996a8 Debug/cli/cli.c
--- a/Debug/cli/cli.c	Sun Jan 19 16:40:36 2014 -0800
+++ b/Debug/cli/cli.c	Sun Jan 19 16:54:58 2014 -0800
@@ -31,7 +31,7 @@
 
 // ----- Functions -----
 
-void initCLI()
+void init_cli()
 {
 }
 
diff -r e84738d174bc -r 3764d78996a8 Debug/cli/cli.h
--- a/Debug/cli/cli.h	Sun Jan 19 16:40:36 2014 -0800
+++ b/Debug/cli/cli.h	Sun Jan 19 16:54:58 2014 -0800
@@ -41,7 +41,7 @@
 
 // ----- Functions and Corresponding Function Aliases -----
 
-void initCLI();
+void init_cli();
 
 
 
diff -r e84738d174bc -r 3764d78996a8 Output/pjrcUSB/arm/usb_desc.h
--- a/Output/pjrcUSB/arm/usb_desc.h	Sun Jan 19 16:40:36 2014 -0800
+++ b/Output/pjrcUSB/arm/usb_desc.h	Sun Jan 19 16:54:58 2014 -0800
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "usb_com.h"
+#include "output_com.h"
 
 #define ENDPOINT_UNUSED			0x00
 #define ENDPOINT_TRANSIMIT_ONLY		0x15
diff -r e84738d174bc -r 3764d78996a8 Output/pjrcUSB/arm/usb_keyboard.h
--- a/Output/pjrcUSB/arm/usb_keyboard.h	Sun Jan 19 16:40:36 2014 -0800
+++ b/Output/pjrcUSB/arm/usb_keyboard.h	Sun Jan 19 16:54:58 2014 -0800
@@ -2,7 +2,7 @@
 #define USBkeyboard_h_
 
 #include <inttypes.h>
-#include "usb_com.h"
+#include "output_com.h"
 
 uint8_t usb_keyboard_send(void);
 
diff -r e84738d174bc -r 3764d78996a8 Output/pjrcUSB/avr/usb_keyboard_debug.h
--- a/Output/pjrcUSB/avr/usb_keyboard_debug.h	Sun Jan 19 16:40:36 2014 -0800
+++ b/Output/pjrcUSB/avr/usb_keyboard_debug.h	Sun Jan 19 16:54:58 2014 -0800
@@ -2,7 +2,7 @@
 #define usb_serial_h__
 
 #include <stdint.h>
-#include "usb_com.h"
+#include "output_com.h"
 
 void usb_init(void);			// initialize everything
 uint8_t usb_configured(void);		// is the USB port configured
diff -r e84738d174bc -r 3764d78996a8 Output/pjrcUSB/output_com.c
--- a/Output/pjrcUSB/output_com.c	Sun Jan 19 16:40:36 2014 -0800
+++ b/Output/pjrcUSB/output_com.c	Sun Jan 19 16:54:58 2014 -0800
@@ -73,7 +73,7 @@
 // ----- Functions -----
 
 // USB Module Setup
-inline void usb_setup(void)
+inline void output_setup(void)
 {
 	// Initialize the USB, and then wait for the host to set configuration.
 	// If the Teensy is powered without a PC connected to the USB port,
diff -r e84738d174bc -r 3764d78996a8 Output/pjrcUSB/output_com.h
--- a/Output/pjrcUSB/output_com.h	Sun Jan 19 16:40:36 2014 -0800
+++ b/Output/pjrcUSB/output_com.h	Sun Jan 19 16:54:58 2014 -0800
@@ -58,8 +58,7 @@
 
 // ----- Functions -----
 
-void usb_setup(void);
-void usb_send(void);
+void output_setup(void);
 
 #endif
 
diff -r e84738d174bc -r 3764d78996a8 main.c
--- a/main.c	Sun Jan 19 16:40:36 2014 -0800
+++ b/main.c	Sun Jan 19 16:54:58 2014 -0800
@@ -27,7 +27,7 @@
 // Project Includes
 #include <macro.h>
 #include <scan_loop.h>
-#include <usb_com.h>
+#include <output_com.h>
 
 #include <led.h>
 #include <print.h>
@@ -136,8 +136,11 @@
 	pinSetup();
 	init_errorLED();
 
-	// Setup USB Module
-	usb_setup();
+	// Setup Output Module
+	output_setup();
+
+	// Enable CLI
+	init_cli();
 
 	// Setup ISR Timer for flagging a kepress send to USB
 	usbTimerSetup();