Mercurial > louis > kiibohd-controller
diff Output/pjrcUSB/output_com.c @ 177:3420e018ffbc
Adding McHCK flash reload function and some cleanup.
- Requires special string to be compared with the bootloader and VBAT register file
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Sat, 19 Jul 2014 09:21:35 -0700 |
| parents | c70f641581b5 |
| children | 50702debf278 |
line wrap: on
line diff
--- a/Output/pjrcUSB/output_com.c Sun Jun 22 20:45:56 2014 -0700 +++ b/Output/pjrcUSB/output_com.c Sat Jul 19 09:21:35 2014 -0700 @@ -139,11 +139,7 @@ // Sets the device into firmware reload mode inline void Output_firmwareReload() { -#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) - usb_debug_reload(); -#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) usb_device_reload(); -#endif } @@ -157,12 +153,8 @@ // USB Get Character from input buffer inline int Output_getchar() { -#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) - // XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes) + // XXX Make sure to check output_availablechar() first! Information is lost with the cast (error codes) (AVR) return (int)usb_serial_getchar(); -#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) - return usb_serial_getchar(); -#endif } @@ -192,11 +184,7 @@ // Soft Chip Reset inline void Output_softReset() { -#if defined(_at90usb162_) || defined(_atmega32u4_) || defined(_at90usb646_) || defined(_at90usb1286_) - usb_debug_software_reset(); -#elif defined(_mk20dx128_) || defined(_mk20dx128vlf5_) || defined(_mk20dx256_) - SOFTWARE_RESET(); -#endif + usb_device_software_reset(); }