Use puts_P() and printf_P() instead of the normal variants where possible in the...

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

diff --git a/Projects/TemperatureDataLogger/TempDataLogger.c b/Projects/TemperatureDataLogger/TempDataLogger.c
index 538a6a5..5910528 100644 (file)
--- a/Projects/TemperatureDataLogger/TempDataLogger.c
+++ b/Projects/TemperatureDataLogger/TempDataLogger.c
@@ -96,6 +96,7 @@ FATFS DiskFATState;
 FIL TempLogFile;\r
 \r
 \r
+/** ISR to handle the 500ms ticks for sampling and data logging */\r
 ISR(TIMER1_COMPA_vect, ISR_BLOCK)\r
 {\r
        uint8_t LEDMask = LEDs_GetLEDs();\r
@@ -109,6 +110,7 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
        /* Reset log tick counter to prepare for next logging interval */\r
        CurrentLoggingTicks = 0;\r
        \r
+       /* Only log when not connected to a USB host */\r
        if (USB_DeviceState == DEVICE_STATE_Unattached)\r
        {\r
                uint8_t Day,  Month,  Year;\r
@@ -135,18 +137,19 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
  */\r
 int main(void)\r
 {\r
+       SetupHardware();\r
+\r
        /* Fetch logging interval from EEPROM */\r
        LoggingInterval500MS_SRAM = eeprom_read_byte(&LoggingInterval500MS_EEPROM);\r
 \r
-       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
-\r
-       SetupHardware();\r
-\r
        /* Mount and open the log file on the dataflash FAT partition */\r
        OpenLogFile();\r
 \r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       sei();\r
+\r
        /* Discard the first sample from the temperature sensor, as it is generally incorrect */\r
-       uint8_t Dummy = Temperature_GetTemperature();\r
+       volatile uint8_t Dummy = Temperature_GetTemperature();\r
        (void)Dummy;\r
        \r
        for (;;)\r
@@ -157,6 +160,7 @@ int main(void)
        }\r
 }\r
 \r
+/** Opens the log file on the Dataflash's FAT formatted partition according to the current date */\r
 void OpenLogFile(void)\r
 {\r
        char LogFileName[12];\r
@@ -172,6 +176,7 @@ void OpenLogFile(void)
        f_lseek(&TempLogFile, TempLogFile.fsize);\r
 }\r
 \r
+/** Closes the open data log file on the Dataflash's FAT formatted partition */\r
 void CloseLogFile(void)\r
 {\r
        /* Sync any data waiting to be written, unmount the storage device */\r
@@ -196,6 +201,7 @@ void SetupHardware(void)
        Temperature_Init();\r
        Dataflash_Init();\r
        USB_Init();\r
+       TWI_Init();\r
        \r
        /* 500ms logging interval timer configuration */\r
        OCR1A   = ((F_CPU / 1024) / 2);\r
@@ -247,7 +253,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
  *\r
  *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface configuration structure being referenced\r
  */\r
-bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* MSInterfaceInfo)\r
+bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)\r
 {\r
        bool CommandSuccess;\r
        \r
@@ -294,13 +300,10 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
 {\r
        Device_Report_t* ReportParams = (Device_Report_t*)ReportData;\r
        \r
-       GPIOR0 = ReportParams->Day;\r
-       GPIOR1 = ReportParams->Month;\r
-       GPIOR2 = ReportParams->Year;\r
-       \r
        DS1307_SetDate(ReportParams->Day,  ReportParams->Month,  ReportParams->Year);\r
        DS1307_SetTime(ReportParams->Hour, ReportParams->Minute, ReportParams->Second);\r
        \r
+       /* If the logging interval has changed from its current value, write it to EEPROM */\r
        if (LoggingInterval500MS_SRAM != ReportParams->LogInterval500MS)\r
        {\r
                LoggingInterval500MS_SRAM = ReportParams->LogInterval500MS;\r