Mercurial > louis > kiibohd-controller
changeset 226:718e74285b36
Fixing uartOut for ARM
- Added fake capability for compilation
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Sat, 27 Sep 2014 13:20:09 -0700 |
| parents | b4e7a712cc15 |
| children | ed05fa3555d4 |
| files | Output/uartOut/capabilities.kll Output/uartOut/output_com.c Output/uartOut/output_com.h |
| diffstat | 3 files changed, 41 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Output/uartOut/capabilities.kll Sat Sep 27 13:20:09 2014 -0700 @@ -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 ); +
--- a/Output/uartOut/output_com.c Tue Sep 23 11:42:40 2014 -0700 +++ b/Output/uartOut/output_com.c Sat Sep 27 13:20:09 2014 -0700 @@ -49,6 +49,7 @@ void cliFunc_setMod ( char* args ); + // ----- Variables ----- // Output Module command dictionary @@ -93,6 +94,24 @@ 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 @@ // 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 }
--- a/Output/uartOut/output_com.h Tue Sep 23 11:42:40 2014 -0700 +++ b/Output/uartOut/output_com.h Sat Sep 27 13:20:09 2014 -0700 @@ -57,6 +57,12 @@ +// ----- Capabilities ----- + +void Output_usbCodeSend_capability( uint8_t state, uint8_t stateType, uint8_t *args ); + + + // ----- Functions ----- void Output_setup();