Fixed programming errors in the AVRISP-MKII project when the programming packet is...

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

diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c
index 5493313..ec39029 100644 (file)
--- a/Projects/TempDataLogger/TempDataLogger.c
+++ b/Projects/TempDataLogger/TempDataLogger.c
@@ -1,21 +1,21 @@
 /*
              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 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -74,7 +74,7 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface =
                                .ReportINEndpointNumber       = GENERIC_IN_EPNUM,
                                .ReportINEndpointSize         = GENERIC_EPSIZE,
                                .ReportINEndpointDoubleBank   = false,
                                .ReportINEndpointNumber       = GENERIC_IN_EPNUM,
                                .ReportINEndpointSize         = GENERIC_EPSIZE,
                                .ReportINEndpointDoubleBank   = false,

-                               
+

                                .PrevReportINBuffer           = PrevHIDReportBuffer,
                                .PrevReportINBufferSize       = sizeof(PrevHIDReportBuffer),
                        },
                                .PrevReportINBuffer           = PrevHIDReportBuffer,
                                .PrevReportINBufferSize       = sizeof(PrevHIDReportBuffer),
                        },


@@ -89,7 +89,7 @@ uint8_t LoggingInterval500MS_SRAM;
 /** Total number of 500ms logging ticks elapsed since the last log value was recorded */
 uint16_t CurrentLoggingTicks;
 
 /** Total number of 500ms logging ticks elapsed since the last log value was recorded */
 uint16_t CurrentLoggingTicks;
 

-/** FAT Fs structure to hold the internal state of the FAT driver for the dataflash contents. */
+/** FAT Fs structure to hold the internal state of the FAT driver for the Dataflash contents. */

 FATFS DiskFATState;
 
 /** FAT Fs structure to hold a FAT file handle for the log data write destination. */
 FATFS DiskFATState;
 
 /** FAT Fs structure to hold a FAT file handle for the log data write destination. */


@@ -104,31 +104,30 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
        /* Check to see if the logging interval has expired */
        if (CurrentLoggingTicks++ < LoggingInterval500MS_SRAM)
          return;
        /* Check to see if the logging interval has expired */
        if (CurrentLoggingTicks++ < LoggingInterval500MS_SRAM)
          return;

-           
-       LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

 
        /* Reset log tick counter to prepare for next logging interval */
        CurrentLoggingTicks = 0;
 
        /* Reset log tick counter to prepare for next logging interval */
        CurrentLoggingTicks = 0;

-       
+
+       LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
+

        /* Only log when not connected to a USB host */
        if (USB_DeviceState == DEVICE_STATE_Unattached)
        {
        /* Only log when not connected to a USB host */
        if (USB_DeviceState == DEVICE_STATE_Unattached)
        {

-               uint8_t Day,  Month,  Year;
-               uint8_t Hour, Minute, Second;
-
-               DS1307_GetDate(&Day,  &Month,  &Year);
-               DS1307_GetTime(&Hour, &Minute, &Second);
+               TimeDate_t CurrentTimeDate;
+               DS1307_GetTimeDate(&CurrentTimeDate);

 
                char     LineBuffer[100];
                uint16_t BytesWritten;
 
 
                char     LineBuffer[100];
                uint16_t BytesWritten;
 

-               BytesWritten = sprintf(LineBuffer, "%02d/%02d/20%04d, %02d:%02d:%02d, %d Degrees\r\n",
-                                                          Day, Month, Year, Hour, Minute, Second, Temperature_GetTemperature());
+               BytesWritten = sprintf(LineBuffer, "%02d/%02d/20%02d, %02d:%02d:%02d, %d Degrees\r\n",
+                                      CurrentTimeDate.Day, CurrentTimeDate.Month, CurrentTimeDate.Year,
+                                      CurrentTimeDate.Hour, CurrentTimeDate.Minute, CurrentTimeDate.Second,
+                                      Temperature_GetTemperature());

 
                f_write(&TempLogFile, LineBuffer, BytesWritten, &BytesWritten);
                f_sync(&TempLogFile);
        }
 
                f_write(&TempLogFile, LineBuffer, BytesWritten, &BytesWritten);
                f_sync(&TempLogFile);
        }

-       
+

        LEDs_SetAllLEDs(LEDMask);
 }
 
        LEDs_SetAllLEDs(LEDMask);
 }
 


@@ -141,12 +140,12 @@ int main(void)
 
        /* Fetch logging interval from EEPROM */
        LoggingInterval500MS_SRAM = eeprom_read_byte(&LoggingInterval500MS_EEPROM);
 
        /* Fetch logging interval from EEPROM */
        LoggingInterval500MS_SRAM = eeprom_read_byte(&LoggingInterval500MS_EEPROM);

-       
+

        /* Check if the logging interval is invalid (0xFF) indicating that the EEPROM is blank */
        if (LoggingInterval500MS_SRAM == 0xFF)
          LoggingInterval500MS_SRAM = DEFAULT_LOG_INTERVAL;
 
        /* Check if the logging interval is invalid (0xFF) indicating that the EEPROM is blank */
        if (LoggingInterval500MS_SRAM == 0xFF)
          LoggingInterval500MS_SRAM = DEFAULT_LOG_INTERVAL;
 

-       /* Mount and open the log file on the dataflash FAT partition */
+       /* Mount and open the log file on the Dataflash FAT partition */

        OpenLogFile();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        OpenLogFile();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);


@@ -155,7 +154,7 @@ int main(void)
        /* Discard the first sample from the temperature sensor, as it is generally incorrect */
        volatile uint8_t Dummy = Temperature_GetTemperature();
        (void)Dummy;
        /* Discard the first sample from the temperature sensor, as it is generally incorrect */
        volatile uint8_t Dummy = Temperature_GetTemperature();
        (void)Dummy;

-       
+

        for (;;)
        {
                MS_Device_USBTask(&Disk_MS_Interface);
        for (;;)
        {
                MS_Device_USBTask(&Disk_MS_Interface);


@@ -170,9 +169,9 @@ void OpenLogFile(void)
        char LogFileName[12];
 
        /* Get the current date for the filename as "DDMMYY.csv" */
        char LogFileName[12];
 
        /* Get the current date for the filename as "DDMMYY.csv" */

-       uint8_t Day, Month, Year;
-       DS1307_GetDate(&Day, &Month, &Year);
-       sprintf(LogFileName, "%02d%02d%02d.csv", Day, Month, Year);
+       TimeDate_t CurrentTimeDate;
+       DS1307_GetTimeDate(&CurrentTimeDate);
+       sprintf(LogFileName, "%02d%02d%02d.csv", CurrentTimeDate.Day, CurrentTimeDate.Month, CurrentTimeDate.Year);

 
        /* Mount the storage device, open the file */
        f_mount(0, &DiskFATState);
 
        /* Mount the storage device, open the file */
        f_mount(0, &DiskFATState);


@@ -201,14 +200,14 @@ void SetupHardware(void)
        /* Hardware Initialization */
        LEDs_Init();
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
        /* Hardware Initialization */
        LEDs_Init();
        SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);

-       ADC_Init(ADC_REFERENCE_AVCC | ADC_FREE_RUNNING | ADC_PRESCALE_128);
+       ADC_Init(ADC_FREE_RUNNING | ADC_PRESCALE_128);

        Temperature_Init();
        Dataflash_Init();
        USB_Init();
        TWI_Init();
        Temperature_Init();
        Dataflash_Init();
        USB_Init();
        TWI_Init();

-       
+

        /* 500ms logging interval timer configuration */
        /* 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);
 


@@ -229,25 +228,24 @@ void EVENT_USB_Device_Connect(void)
 void EVENT_USB_Device_Disconnect(void)
 {
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 void EVENT_USB_Device_Disconnect(void)
 {
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-       
-       /* Mount and open the log file on the dataflash FAT partition */
+
+       /* Mount and open the log file on the Dataflash FAT partition */

        OpenLogFile();
 }
 
 /** Event handler for the library USB Configuration Changed event. */
 void EVENT_USB_Device_ConfigurationChanged(void)
 {
        OpenLogFile();
 }
 
 /** Event handler for the library USB Configuration Changed event. */
 void EVENT_USB_Device_ConfigurationChanged(void)
 {

-       LEDs_SetAllLEDs(LEDMASK_USB_READY);
+       bool ConfigSuccess = true;

 
 

-       if (!(MS_Device_ConfigureEndpoints(&Disk_MS_Interface)))
-         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-         
-       if (!(HID_Device_ConfigureEndpoints(&Generic_HID_Interface)))
-         LEDs_SetAllLEDs(LEDMASK_USB_ERROR);   
+       ConfigSuccess &= HID_Device_ConfigureEndpoints(&Generic_HID_Interface);
+       ConfigSuccess &= MS_Device_ConfigureEndpoints(&Disk_MS_Interface);
+
+       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);


@@ -260,33 +258,35 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
 bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
        bool CommandSuccess;
 bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
        bool CommandSuccess;

-       
+

        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
        CommandSuccess = SCSI_DecodeSCSICommand(MSInterfaceInfo);
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
        LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
        CommandSuccess = SCSI_DecodeSCSICommand(MSInterfaceInfo);
        LEDs_SetAllLEDs(LEDMASK_USB_READY);

-       
+

        return CommandSuccess;
 }
 
 /** HID class driver callback function for the creation of HID reports to the host.
  *
  *  \param[in]     HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
        return CommandSuccess;
 }
 
 /** HID class driver callback function for the creation of HID reports to the host.
  *
  *  \param[in]     HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced

- *  \param[in,out] ReportID    Report ID requested by the host if non-zero, otherwise callback should set to the 
+ *  \param[in,out] ReportID    Report ID requested by the host if non-zero, otherwise callback should set to the

  *                             generated report ID
  *                             generated report ID

- *  \param[in]     ReportType  Type of the report to create, either REPORT_ITEM_TYPE_In or REPORT_ITEM_TYPE_Feature
+ *  \param[in]     ReportType  Type of the report to create, either HID_REPORT_ITEM_In or HID_REPORT_ITEM_Feature

  *  \param[out]    ReportData  Pointer to a buffer where the created report should be stored
  *  \param[out]    ReportSize  Number of bytes written in the report (or zero if no report is to be sent
  *
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent
  */
  *  \param[out]    ReportData  Pointer to a buffer where the created report should be stored
  *  \param[out]    ReportSize  Number of bytes written in the report (or zero if no report is to be sent
  *
  *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent
  */

-bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,
-                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)
+bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
+                                         uint8_t* const ReportID,
+                                         const uint8_t ReportType,
+                                         void* ReportData,
+                                         uint16_t* const ReportSize)

 {
        Device_Report_t* ReportParams = (Device_Report_t*)ReportData;
 
 {
        Device_Report_t* ReportParams = (Device_Report_t*)ReportData;
 

-       DS1307_GetDate(&ReportParams->Day,  &ReportParams->Month,  &ReportParams->Year);
-       DS1307_GetTime(&ReportParams->Hour, &ReportParams->Minute, &ReportParams->Second);
-       
+       DS1307_GetTimeDate(&ReportParams->TimeDate);
+

        ReportParams->LogInterval500MS = LoggingInterval500MS_SRAM;
 
        *ReportSize = sizeof(Device_Report_t);
        ReportParams->LogInterval500MS = LoggingInterval500MS_SRAM;
 
        *ReportSize = sizeof(Device_Report_t);


@@ -297,18 +297,20 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
  *
  *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
  *  \param[in] ReportID    Report ID of the received report from the host
  *
  *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
  *  \param[in] ReportID    Report ID of the received report from the host

- *  \param[in] ReportType  The type of report that the host has sent, either REPORT_ITEM_TYPE_Out or REPORT_ITEM_TYPE_Feature
+ *  \param[in] ReportType  The type of report that the host has sent, either HID_REPORT_ITEM_Out or HID_REPORT_ITEM_Feature

  *  \param[in] ReportData  Pointer to a buffer where the created report has been stored
  *  \param[in] ReportSize  Size in bytes of the received HID report
  */
  *  \param[in] ReportData  Pointer to a buffer where the created report has been stored
  *  \param[in] ReportSize  Size in bytes of the received HID report
  */

-void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,
-                                          const uint8_t ReportType, const void* ReportData, const uint16_t ReportSize)
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo,
+                                          const uint8_t ReportID,
+                                          const uint8_t ReportType,
+                                          const void* ReportData,
+                                          const uint16_t ReportSize)

 {
        Device_Report_t* ReportParams = (Device_Report_t*)ReportData;
        
 {
        Device_Report_t* ReportParams = (Device_Report_t*)ReportData;
        

-       DS1307_SetDate(ReportParams->Day,  ReportParams->Month,  ReportParams->Year);
-       DS1307_SetTime(ReportParams->Hour, ReportParams->Minute, ReportParams->Second);
-       
+       DS1307_SetTimeDate(&ReportParams->TimeDate);
+

        /* If the logging interval has changed from its current value, write it to EEPROM */
        if (LoggingInterval500MS_SRAM != ReportParams->LogInterval500MS)
        {
        /* If the logging interval has changed from its current value, write it to EEPROM */
        if (LoggingInterval500MS_SRAM != ReportParams->LogInterval500MS)
        {


@@ -316,3 +318,4 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
                eeprom_update_byte(&LoggingInterval500MS_EEPROM, LoggingInterval500MS_SRAM);
        }
 }
                eeprom_update_byte(&LoggingInterval500MS_EEPROM, LoggingInterval500MS_SRAM);
        }
 }

+