projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added incomplete MIDIToneGenerator project.
[pub/USBasp.git]
/
Projects
/
TemperatureDataLogger
/
TempDataLogger.c
diff --git
a/Projects/TemperatureDataLogger/TempDataLogger.c
b/Projects/TemperatureDataLogger/TempDataLogger.c
index
7d26ee2
..
955359d
100644
(file)
--- a/
Projects/TemperatureDataLogger/TempDataLogger.c
+++ b/
Projects/TemperatureDataLogger/TempDataLogger.c
@@
-110,6
+110,7
@@
ISR(TIMER1_COMPA_vect, ISR_BLOCK)
/* Reset log tick counter to prepare for next logging interval */
\r
CurrentLoggingTicks = 0;
\r
\r
/* 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
if (USB_DeviceState == DEVICE_STATE_Unattached)
\r
{
\r
uint8_t Day, Month, Year;
\r
@@
-139,15
+140,15
@@
int main(void)
/* Fetch logging interval from EEPROM */
\r
LoggingInterval500MS_SRAM = eeprom_read_byte(&LoggingInterval500MS_EEPROM);
\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
SetupHardware();
\r
\r
+ LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
\r
+
\r
/* Mount and open the log file on the dataflash FAT partition */
\r
OpenLogFile();
\r
\r
/* Discard the first sample from the temperature sensor, as it is generally incorrect */
\r
/* Mount and open the log file on the dataflash FAT partition */
\r
OpenLogFile();
\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
(void)Dummy;
\r
\r
for (;;)
\r