aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/TempDataLogger/Lib
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2012-05-27 19:12:07 +0000
committerDean Camera <dean@fourwalledcubicle.com>2012-05-27 19:12:07 +0000
commit2ff1370221d3650a6bc0523c93c2f0d37508f408 (patch)
treeb1d7f7a2a7dbebaf76e43e0f977d227d0cabf95a /Projects/TempDataLogger/Lib
parentb017b41e91f7eb7bb83d1466b45c24e01ac2e309 (diff)
parent1e42f7bd46fbef1e67f50741e4fe1a5ea3a70869 (diff)
downloadlufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.gz
lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.tar.bz2
lufa-2ff1370221d3650a6bc0523c93c2f0d37508f408.zip
Merge in AppConfigHeaders branch to trunk, altering all projects and demos to use configuration headers for application and LUFA compile time settings, rather than defines in the project makefiles.
Diffstat (limited to 'Projects/TempDataLogger/Lib')
-rw-r--r--Projects/TempDataLogger/Lib/DS1307.h3
-rw-r--r--Projects/TempDataLogger/Lib/DataflashManager.h1
-rw-r--r--Projects/TempDataLogger/Lib/SCSI.h1
3 files changed, 5 insertions, 0 deletions
diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h
index 0736d8ea5..0ad0a4d92 100644
--- a/Projects/TempDataLogger/Lib/DS1307.h
+++ b/Projects/TempDataLogger/Lib/DS1307.h
@@ -12,6 +12,8 @@
#include <avr/io.h>
#include <LUFA/Drivers/Peripheral/TWI.h>
+
+ #include "Config/AppConfig.h"
/* Type Defines: */
typedef struct
@@ -111,6 +113,7 @@
} DS1307_DateTimeRegs_t;
/* Macros: */
+ /** TWI address of the DS1307 device on the bus. */
#define DS1307_ADDRESS 0xD0
/* Function Prototypes: */
diff --git a/Projects/TempDataLogger/Lib/DataflashManager.h b/Projects/TempDataLogger/Lib/DataflashManager.h
index 5d598cad5..90236260c 100644
--- a/Projects/TempDataLogger/Lib/DataflashManager.h
+++ b/Projects/TempDataLogger/Lib/DataflashManager.h
@@ -41,6 +41,7 @@
#include "../TempDataLogger.h"
#include "../Descriptors.h"
+ #include "Config/AppConfig.h"
#include <LUFA/Common/Common.h>
#include <LUFA/Drivers/USB/USB.h>
diff --git a/Projects/TempDataLogger/Lib/SCSI.h b/Projects/TempDataLogger/Lib/SCSI.h
index bd16460eb..1bb5d7be5 100644
--- a/Projects/TempDataLogger/Lib/SCSI.h
+++ b/Projects/TempDataLogger/Lib/SCSI.h
@@ -45,6 +45,7 @@
#include "../TempDataLogger.h"
#include "../Descriptors.h"
#include "DataflashManager.h"
+ #include "Config/AppConfig.h"
/* Macros: */
/** Macro to set the current SCSI sense data to the given key, additional sense code and additional sense qualifier. This