Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter...

[pub/USBasp.git] / Projects / TempDataLogger / TempDataLogger.c

diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c
index 3d6a9e9..e23d54e 100644 (file)
--- a/Projects/TempDataLogger/TempDataLogger.c
+++ b/Projects/TempDataLogger/TempDataLogger.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -208,7 +208,7 @@ void SetupHardware(void)
        TWI_Init();
 
        /* 500ms logging interval timer configuration */
        TWI_Init();
 
        /* 500ms logging interval timer configuration */

-       OCR1A   = ((F_CPU / 1024) / 2);
+       OCR1A   = (((F_CPU / 1024) / 2) - 1);

        TCCR1B  = (1 << WGM12) | (1 << CS12) | (1 << CS10);
        TIMSK1  = (1 << OCIE1A);
 
        TCCR1B  = (1 << WGM12) | (1 << CS12) | (1 << CS10);
        TIMSK1  = (1 << OCIE1A);
 


@@ -239,14 +239,14 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 {
        bool ConfigSuccess = true;
 
 {
        bool ConfigSuccess = true;
 

-       ConfigSuccess &= MS_Device_ConfigureEndpoints(&Disk_MS_Interface);

        ConfigSuccess &= HID_Device_ConfigureEndpoints(&Generic_HID_Interface);
        ConfigSuccess &= HID_Device_ConfigureEndpoints(&Generic_HID_Interface);

+       ConfigSuccess &= MS_Device_ConfigureEndpoints(&Disk_MS_Interface);

 
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 
 
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 

-/** Event handler for the library USB Unhandled Control Request event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)

 {
        MS_Device_ProcessControlRequest(&Disk_MS_Interface);
        HID_Device_ProcessControlRequest(&Generic_HID_Interface);
 {
        MS_Device_ProcessControlRequest(&Disk_MS_Interface);
        HID_Device_ProcessControlRequest(&Generic_HID_Interface);