More renaming for the USB to Output Module renaming

diff --git a/Debug/cli/cli.c b/Debug/cli/cli.c
index 0e81893a2e1e02413d131f2043704e0185882c6e..da657ccc60940ab4b1fc0c601aed377bf3111eeb 100644 (file)
--- a/Debug/cli/cli.c
+++ b/Debug/cli/cli.c
@@ -31,7 +31,7 @@
 
 // ----- Functions -----
 
-void initCLI()
+void init_cli()
 {
 }
 

diff --git a/Debug/cli/cli.h b/Debug/cli/cli.h
index 50f7a3b0537316e3aaecf9feb37c0de79b68afb9..d5f4e5bb7ccded0afe5411ff305e4ee8c1f30842 100644 (file)
--- a/Debug/cli/cli.h
+++ b/Debug/cli/cli.h
@@ -41,7 +41,7 @@
 
 // ----- Functions and Corresponding Function Aliases -----
 
-void initCLI();
+void init_cli();
 
 
 

diff --git a/Output/pjrcUSB/arm/usb_desc.h b/Output/pjrcUSB/arm/usb_desc.h
index f4e8dfcfd72d8b66c407058c712cce1ac8d846bb..9f4511eade4f39502b87a643c5ca7c93fb3ccc44 100644 (file)
--- a/Output/pjrcUSB/arm/usb_desc.h
+++ b/Output/pjrcUSB/arm/usb_desc.h
@@ -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 --git a/Output/pjrcUSB/arm/usb_keyboard.h b/Output/pjrcUSB/arm/usb_keyboard.h
index 49aa84d1ce14b3c93605a05c6c07f504812ff533..792076ac18c726999ad693e7a6f63f3c8ba9a30e 100644 (file)
--- a/Output/pjrcUSB/arm/usb_keyboard.h
+++ b/Output/pjrcUSB/arm/usb_keyboard.h
@@ -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 --git a/Output/pjrcUSB/avr/usb_keyboard_debug.h b/Output/pjrcUSB/avr/usb_keyboard_debug.h
index 987e4fd9d7b91a4dfd455455e6825fc8aa71773b..121215d82113c0d614c0182361a3bb8b8d1e006c 100644 (file)
--- a/Output/pjrcUSB/avr/usb_keyboard_debug.h
+++ b/Output/pjrcUSB/avr/usb_keyboard_debug.h
@@ -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 --git a/Output/pjrcUSB/output_com.c b/Output/pjrcUSB/output_com.c
index 96fb0f70174916448bb570b0e3d4ec52b632f02b..06ca58cc21aa8b19840efb8a1b2981cd113cb50c 100644 (file)
--- a/Output/pjrcUSB/output_com.c
+++ b/Output/pjrcUSB/output_com.c
@@ -73,7 +73,7 @@ volatile uint8_t USBKeys_LEDs = 0;
 // ----- 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 --git a/Output/pjrcUSB/output_com.h b/Output/pjrcUSB/output_com.h
index 07f81f59b15815b3cb033fa5c92d6d390bad9691..bc31b2d6b333580a08017a0700d65c86181e5e24 100644 (file)
--- a/Output/pjrcUSB/output_com.h
+++ b/Output/pjrcUSB/output_com.h
@@ -58,8 +58,7 @@ extern                       uint8_t USBKeys_Idle_Count;
 
 // ----- Functions -----
 
-void usb_setup(void);
-void usb_send(void);
+void output_setup(void);
 
 #endif
 

diff --git a/main.c b/main.c
index 90ca20ebae1ddfc81bdbb2484cefa5e55a0da2af..dd8b8e0983ffdc8f705fc4c729082f7dd017fbaf 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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 @@ int main(void)
        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();