Add missing TWI_Init() call to the TemperatureDataLogger project. Make DUMMY_RTC...

diff --git a/LUFA/ManPages/GettingStarted.txt b/LUFA/ManPages/GettingStarted.txt
index 66be59b..a1e5e1f 100644 (file)
--- a/LUFA/ManPages/GettingStarted.txt
+++ b/LUFA/ManPages/GettingStarted.txt
@@ -13,6 +13,10 @@
  *  popular Atmel USB demonstration board to date. To learn how to reconfigure, recompile and program the included\r
  *  LUFA applications using different settings, see the subsections below.\r
  *\r
  *  popular Atmel USB demonstration board to date. To learn how to reconfigure, recompile and program the included\r
  *  LUFA applications using different settings, see the subsections below.\r
  *\r

+ *  Most of the included demos in the /Demos/ folder come in both ClassDriver and LowLevel varieties. If you are new\r
+ *  to LUFA, it is highly recommended that you look at the ClassDriver versions first, which use the premade USB\r
+ *  Class Drivers (\ref Group_USBClassDrivers) to simplify the use of the standard USB classes in user applications.\r
+ *\r

  *  For an overview of the included library applications, bootloaders and demos, see \ref Page_LibraryApps.\r
  *\r
  *  <b>Subsections:</b>\r
  *  For an overview of the included library applications, bootloaders and demos, see \ref Page_LibraryApps.\r
  *\r
  *  <b>Subsections:</b>\r

diff --git a/LUFA/ManPages/LUFAPoweredProjects.txt b/LUFA/ManPages/LUFAPoweredProjects.txt
index b03b908..0dbab21 100644 (file)
--- a/LUFA/ManPages/LUFAPoweredProjects.txt
+++ b/LUFA/ManPages/LUFAPoweredProjects.txt
@@ -32,6 +32,7 @@
  *  The following are known hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library\r
  *  can be incorporated into many different applications.\r
  *\r
  *  The following are known hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library\r
  *  can be incorporated into many different applications.\r
  *\r

+ *  - Accelerometer Game Joystick: http://www.crictor.co.il/he/episodes/joystick/\r

  *  - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia\r
  *  - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/\r
  *  - Bicycle POV: http://www.code.google.com/p/bicycleledpov/\r
  *  - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia\r
  *  - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/\r
  *  - Bicycle POV: http://www.code.google.com/p/bicycleledpov/\r


@@ -61,10 +62,9 @@
  *  solutions with no source code given.\r
  *\r
  *  - ARPS Locator: http://la3t.hamradio.no/lab//?id=tracker_en\r
  *  solutions with no source code given.\r
  *\r
  *  - ARPS Locator: http://la3t.hamradio.no/lab//?id=tracker_en\r

- *  - BAP, A tiny LUFA based AVR Programmer: http://www.busware.de/tiki-index.php?page=BAP\r

  *  - Digital Survey Instruments Magnetometer and Pointer: http://www.digitalsurveyinstruments.com/\r
  *  - Digital Survey Instruments Magnetometer and Pointer: http://www.digitalsurveyinstruments.com/\r

- *  - Lightweight CC110x USB dongle for 868MHz Protocols: http://busware.de/tiki-index.php?page=CUL\r

  *  - Penguino, an Arduino Board With On-Board LUFA Powered Debugger/Programmer: http://wiki.icy.com.au/PenguinoAVR\r
  *  - Penguino, an Arduino Board With On-Board LUFA Powered Debugger/Programmer: http://wiki.icy.com.au/PenguinoAVR\r

+ *  - Many of Busware's Products: http://www.busware.de/\r

  *  - MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/\r
  *  - Mobo 4.3, a USB controlled all band (160-10m) HF SDR transceiver: http://sites.google.com/site/lofturj/mobo4_3\r
  *  - Retrode, a USB Games Console Cartridge Reader: http://www.snega2usb.com\r
  *  - MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/\r
  *  - Mobo 4.3, a USB controlled all band (160-10m) HF SDR transceiver: http://sites.google.com/site/lofturj/mobo4_3\r
  *  - Retrode, a USB Games Console Cartridge Reader: http://www.snega2usb.com\r

diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.c b/Projects/TemperatureDataLogger/Lib/DS1307.c
index 37817e9..64e03df 100644 (file)
--- a/Projects/TemperatureDataLogger/Lib/DS1307.c
+++ b/Projects/TemperatureDataLogger/Lib/DS1307.c
@@ -7,11 +7,6 @@
 \r
 #include "DS1307.h"\r
 \r
 \r
 #include "DS1307.h"\r
 \r

-void DS1307_Init(void)\r
-{\r
-       // Nothing to initialize\r
-}\r
-\r

 void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)\r
 {\r
 #if defined(DUMMY_RTC)\r
 void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)\r
 {\r
 #if defined(DUMMY_RTC)\r

diff --git a/Projects/TemperatureDataLogger/Lib/DS1307.h b/Projects/TemperatureDataLogger/Lib/DS1307.h
index 4918360..90b91e3 100644 (file)
--- a/Projects/TemperatureDataLogger/Lib/DS1307.h
+++ b/Projects/TemperatureDataLogger/Lib/DS1307.h
@@ -100,8 +100,6 @@
                #define DS1307_ADDRESS_WRITE  0b11010000\r
 \r
        /* Function Prototypes: */\r
                #define DS1307_ADDRESS_WRITE  0b11010000\r
 \r
        /* Function Prototypes: */\r

-               void DS1307_Init(void);\r
-               \r

                void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year);\r
                void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second);\r
                \r
                void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year);\r
                void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second);\r
                \r

diff --git a/Projects/TemperatureDataLogger/TempDataLogger.c b/Projects/TemperatureDataLogger/TempDataLogger.c
index 2f2e8da..7d26ee2 100644 (file)
--- a/Projects/TemperatureDataLogger/TempDataLogger.c
+++ b/Projects/TemperatureDataLogger/TempDataLogger.c
@@ -199,6 +199,7 @@ void SetupHardware(void)
        Temperature_Init();\r
        Dataflash_Init();\r
        USB_Init();\r
        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
        \r
        /* 500ms logging interval timer configuration */\r
        OCR1A   = ((F_CPU / 1024) / 2);\r

diff --git a/Projects/TemperatureDataLogger/makefile b/Projects/TemperatureDataLogger/makefile
index 622bb1c..8fd2c29 100644 (file)
--- a/Projects/TemperatureDataLogger/makefile
+++ b/Projects/TemperatureDataLogger/makefile
@@ -193,12 +193,8 @@ CSTANDARD = -std=gnu99
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 \r
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r

-CDEFS += -DAVR_RESET_LINE_PORT="PORTD"\r
-CDEFS += -DAVR_RESET_LINE_DDR="DDRD"\r
-CDEFS += -DAVR_RESET_LINE_MASK="(1 << 4)"\r
-CDEFS += -DAVR_RESET_PULSE_MS=10\r
-CDEFS += -DTX_RX_LED_PULSE_MS=30\r
-CDEFS += -DPING_PONG_LED_PULSE_MS=100\r
+CDEFS += -DDUMMY_RTC\r
+\r

 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r
 \r
 # Place -D or -U options here for ASM sources\r
 ADEFS = -DF_CPU=$(F_CPU)\r