X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/05ac59d0eeb956adc316d89ee06ca13bd3c11aac..9e8bf8c0cfba6613d10a90b0ce76bdbbc9a72c8b:/Projects/RelayBoard/RelayBoard.c diff --git a/Projects/RelayBoard/RelayBoard.c b/Projects/RelayBoard/RelayBoard.c index 7bba1bad4..2c236de97 100644 --- a/Projects/RelayBoard/RelayBoard.c +++ b/Projects/RelayBoard/RelayBoard.c @@ -1,14 +1,14 @@ /* LUFA Library - Copyright (C) Dean Camera, 2010. + Copyright (C) Dean Camera, 2013. dean [at] fourwalledcubicle [dot] com - www.fourwalledcubicle.com + www.lufa-lib.org */ /* Copyright 2010 OBinou (obconseil [at] gmail [dot] com) - Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2013 Dean Camera (dean [at] fourwalledcubicle [dot] com) Permission to use, copy, modify, distribute, and sell this software and its documentation for any purpose is hereby granted @@ -19,7 +19,7 @@ advertising or publicity pertaining to distribution of the software without specific, written prior permission. - The author disclaim all warranties with regard to this + The author disclaims all warranties with regard to this software, including all implied warranties of merchantability and fitness. In no event shall the author be liable for any special, indirect or consequential damages or any damages @@ -44,8 +44,8 @@ int main(void) { SetupHardware(); - - sei(); + + GlobalInterruptEnable(); for (;;) USB_USBTask(); @@ -69,8 +69,8 @@ void SetupHardware(void) PORTC &= ~ALL_RELAYS; } -/** Event handler for the library USB Unhandled Control Packet event. */ -void EVENT_USB_Device_UnhandledControlRequest(void) +/** Event handler for the library USB Control Request reception event. */ +void EVENT_USB_Device_ControlRequest(void) { const uint8_t SerialNumber[5] = { 0, 0, 0, 0, 1 }; uint8_t ControlData[2] = { 0, 0 }; @@ -103,7 +103,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) break; } } - + break; case 0x01: if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)) @@ -130,7 +130,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void) ControlData[1] = (PORTC & RELAY4) ? 2 : 3; break; } - + if (ControlData[1]) Endpoint_Write_Control_Stream_LE(ControlData, sizeof(ControlData)); @@ -140,3 +140,4 @@ void EVENT_USB_Device_UnhandledControlRequest(void) break; } } +