eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add missing TWI_Init() call to the TemperatureDataLogger project. Make DUMMY_RTC compile time option the default, so that it works correctly on the USBKEY and other Atmel boards out of the box.

This commit is contained in:
Dean Camera 2010-02-15 13:40:53 +00:00
parent 67cb070810
commit 96a12cd12c
6 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LUFA/ManPages/GettingStarted.txt
View File

@ -13,6 +13,10 @@
* popular Atmel USB demonstration board to date. To learn how to reconfigure, recompile and program the included * popular Atmel USB demonstration board to date. To learn how to reconfigure, recompile and program the included
* LUFA applications using different settings, see the subsections below. * LUFA applications using different settings, see the subsections below.
* *
* Most of the included demos in the /Demos/ folder come in both ClassDriver and LowLevel varieties. If you are new
* to LUFA, it is highly recommended that you look at the ClassDriver versions first, which use the premade USB
* Class Drivers (\ref Group_USBClassDrivers) to simplify the use of the standard USB classes in user applications.
*
* For an overview of the included library applications, bootloaders and demos, see \ref Page_LibraryApps. * For an overview of the included library applications, bootloaders and demos, see \ref Page_LibraryApps.
* *
* <b>Subsections:</b> * <b>Subsections:</b>

4
LUFA/ManPages/LUFAPoweredProjects.txt
View File

@ -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 * The following are known hobbyist projects using LUFA. Most are open source, and show off interesting ways that the LUFA library
* can be incorporated into many different applications. * can be incorporated into many different applications.
* *
* - Accelerometer Game Joystick: http://www.crictor.co.il/he/episodes/joystick/
* - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia * - Arcade Controller: http://fletchtronics.net/arcade-controller-made-petunia
* - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/ * - AVR USB Modem, a 3G Wireless Modem host: http://code.google.com/p/avrusbmodem/
* - Bicycle POV: http://www.code.google.com/p/bicycleledpov/ * - Bicycle POV: http://www.code.google.com/p/bicycleledpov/
@ -61,10 +62,9 @@
* solutions with no source code given. * solutions with no source code given.
* *
* - ARPS Locator: http://la3t.hamradio.no/lab//?id=tracker_en * - ARPS Locator: http://la3t.hamradio.no/lab//?id=tracker_en
* - BAP, A tiny LUFA based AVR Programmer: http://www.busware.de/tiki-index.php?page=BAP
* - Digital Survey Instruments Magnetometer and Pointer: http://www.digitalsurveyinstruments.com/ * - Digital Survey Instruments Magnetometer and Pointer: http://www.digitalsurveyinstruments.com/
* - Lightweight CC110x USB dongle for 868MHz Protocols: http://busware.de/tiki-index.php?page=CUL
* - Penguino, an Arduino Board With On-Board LUFA Powered Debugger/Programmer: http://wiki.icy.com.au/PenguinoAVR * - Penguino, an Arduino Board With On-Board LUFA Powered Debugger/Programmer: http://wiki.icy.com.au/PenguinoAVR
* - Many of Busware's Products: http://www.busware.de/
* - MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/ * - MIDIFighter, a USB-MIDI controller: http://www.midifighter.com/
* - Mobo 4.3, a USB controlled all band (160-10m) HF SDR transceiver: http://sites.google.com/site/lofturj/mobo4_3 * - Mobo 4.3, a USB controlled all band (160-10m) HF SDR transceiver: http://sites.google.com/site/lofturj/mobo4_3
* - Retrode, a USB Games Console Cartridge Reader: http://www.snega2usb.com * - Retrode, a USB Games Console Cartridge Reader: http://www.snega2usb.com

5
Projects/TemperatureDataLogger/Lib/DS1307.c
View File

@ -7,11 +7,6 @@
#include "DS1307.h" #include "DS1307.h"
void DS1307_Init(void)
{
// Nothing to initialize
}
void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year) void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
{ {
#if defined(DUMMY_RTC) #if defined(DUMMY_RTC)

2
Projects/TemperatureDataLogger/Lib/DS1307.h
View File

@ -100,8 +100,6 @@
#define DS1307_ADDRESS_WRITE 0b11010000 #define DS1307_ADDRESS_WRITE 0b11010000
/* Function Prototypes: */ /* Function Prototypes: */
void DS1307_Init(void);
void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year); void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year);
void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second); void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second);

1
Projects/TemperatureDataLogger/TempDataLogger.c
View File

@ -199,6 +199,7 @@ void SetupHardware(void)
Temperature_Init(); Temperature_Init();
Dataflash_Init(); Dataflash_Init();
USB_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);

8
Projects/TemperatureDataLogger/makefile
View File

@ -193,12 +193,8 @@ CSTANDARD = -std=gnu99
# Place -D or -U options here for C sources # Place -D or -U options here for C sources
CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)
CDEFS += -DAVR_RESET_LINE_PORT="PORTD" CDEFS += -DDUMMY_RTC
CDEFS += -DAVR_RESET_LINE_DDR="DDRD"
CDEFS += -DAVR_RESET_LINE_MASK="(1 << 4)"
CDEFS += -DAVR_RESET_PULSE_MS=10
CDEFS += -DTX_RX_LED_PULSE_MS=30
CDEFS += -DPING_PONG_LED_PULSE_MS=100
# Place -D or -U options here for ASM sources # Place -D or -U options here for ASM sources
ADEFS = -DF_CPU=$(F_CPU) ADEFS = -DF_CPU=$(F_CPU)