di0ib
/
controller
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Fixing uartOut for ARM 

- Added fake capability for compilation
simple
Jacob Alexander 9 years ago
parent
94608f93e9
commit
17681c535d
3 changed files with 41 additions and 1 deletions
Split View Show Diff Stats
  1. 12
    0
      Output/uartOut/capabilities.kll
  2. 23
    1
      Output/uartOut/output_com.c
  3. 6
    0
      Output/uartOut/output_com.h

+ 12
- 0
Output/uartOut/capabilities.kll 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 );


+ 23
- 1
Output/uartOut/output_com.c 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
}



+ 6
- 0
Output/uartOut/output_com.h 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();