Archived
1
0

More renaming for the USB to Output Module renaming

This commit is contained in:
Jacob Alexander 2014-01-19 16:54:58 -08:00
parent 59f13f8f4f
commit 85dd7f5c52
8 changed files with 13 additions and 11 deletions

View File

@ -31,7 +31,7 @@
// ----- Functions -----
void initCLI()
void init_cli()
{
}

View File

@ -41,7 +41,7 @@
// ----- Functions and Corresponding Function Aliases -----
void initCLI();
void init_cli();

View File

@ -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

View File

@ -2,7 +2,7 @@
#define USBkeyboard_h_
#include <inttypes.h>
#include "usb_com.h"
#include "output_com.h"
uint8_t usb_keyboard_send(void);

View File

@ -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

View File

@ -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,

View File

@ -58,8 +58,7 @@ extern uint8_t USBKeys_Idle_Count;
// ----- Functions -----
void usb_setup(void);
void usb_send(void);
void output_setup(void);
#endif

9
main.c
View File

@ -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();