Archived
1
0

Fixing uartOut for ARM

- Added fake capability for compilation
This commit is contained in:
Jacob Alexander 2014-09-27 13:20:09 -07:00
parent 94608f93e9
commit 17681c535d
3 changed files with 41 additions and 1 deletions

View File

@ -0,0 +1,12 @@
Name = uartOutCapabilities;
Version = 0.1;
Author = "HaaTa (Jacob Alexander) 2014";
KLL = 0.3;
# Modified Date
Date = 2014-09-27;
# Capabilties available to the uartOut output module
usbKeyOut => Output_usbCodeSend_capability( usbCode : 1 );

View File

@ -49,6 +49,7 @@ void cliFunc_setKeys ( char* args );
void cliFunc_setMod ( char* args );
// ----- Variables -----
// Output Module command dictionary
@ -93,6 +94,24 @@ volatile uint8_t USBKeys_Protocol = 1;
uint8_t USBKeys_Idle_Count = 0;
// ----- Capabilities -----
// Adds a single USB Code to the USB Output buffer
// Argument #1: USB Code
void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args )
{
// Display capability name
if ( stateType == 0xFF && state == 0xFF )
{
print("Output_usbCodeSend(usbCode)");
print("Not used in uartOut...");
return;
}
}
// ----- Functions -----
// USB Module Setup
@ -161,7 +180,10 @@ inline int Output_putstr( char* str )
// Soft Chip Reset
inline void Output_softReset()
{
usb_device_software_reset();
#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) // AVR
#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) // ARM
SOFTWARE_RESET();
#endif
}

View File

@ -57,6 +57,12 @@ extern uint8_t USBKeys_Idle_Count;
// ----- Capabilities -----
void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args );
// ----- Functions -----
void Output_setup();