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
/
Lib
/
DS1307.c
diff --git
a/Projects/TemperatureDataLogger/Lib/DS1307.c
b/Projects/TemperatureDataLogger/Lib/DS1307.c
index
37817e9
..
0c1d98f
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
@@
-26,7
+21,7
@@
void DS1307_SetDate(uint8_t Day, uint8_t Month, uint8_t Year)
CurrentRTCDate.Byte3.TenYear = (Year / 10);
\r
CurrentRTCDate.Byte3.Year = (Year % 10);
\r
\r
CurrentRTCDate.Byte3.TenYear = (Year / 10);
\r
CurrentRTCDate.Byte3.Year = (Year % 10);
\r
\r
- if (TWI_StartTransmission(DS1307_ADDRESS_WRITE))
\r
+ if (TWI_StartTransmission(DS1307_ADDRESS_WRITE
, 10
))
\r
{
\r
TWI_SendByte(DS1307_DATEREG_START);
\r
TWI_SendByte(CurrentRTCDate.Byte1.IntVal);
\r
{
\r
TWI_SendByte(DS1307_DATEREG_START);
\r
TWI_SendByte(CurrentRTCDate.Byte1.IntVal);
\r
@@
-53,7
+48,7
@@
void DS1307_SetTime(uint8_t Hour, uint8_t Minute, uint8_t Second)
CurrentRTCTime.Byte3.Hour = (Hour % 10);
\r
CurrentRTCTime.Byte3.TwelveHourMode = false;
\r
\r
CurrentRTCTime.Byte3.Hour = (Hour % 10);
\r
CurrentRTCTime.Byte3.TwelveHourMode = false;
\r
\r
- if (TWI_StartTransmission(DS1307_ADDRESS_WRITE))
\r
+ if (TWI_StartTransmission(DS1307_ADDRESS_WRITE
, 10
))
\r
{
\r
TWI_SendByte(DS1307_TIMEREG_START);
\r
TWI_SendByte(CurrentRTCTime.Byte1.IntVal);
\r
{
\r
TWI_SendByte(DS1307_TIMEREG_START);
\r
TWI_SendByte(CurrentRTCTime.Byte1.IntVal);
\r
@@
-73,7
+68,7
@@
void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
return;
\r
#endif
\r
\r
return;
\r
#endif
\r
\r
- if (TWI_StartTransmission(DS1307_ADDRESS_WRITE))
\r
+ if (TWI_StartTransmission(DS1307_ADDRESS_WRITE
, 10
))
\r
{
\r
TWI_SendByte(DS1307_DATEREG_START);
\r
\r
{
\r
TWI_SendByte(DS1307_DATEREG_START);
\r
\r
@@
-82,7
+77,7
@@
void DS1307_GetDate(uint8_t* Day, uint8_t* Month, uint8_t* Year)
\r
DS1307_DateRegs_t CurrentRTCDate;
\r
\r
\r
DS1307_DateRegs_t CurrentRTCDate;
\r
\r
- if (TWI_StartTransmission(DS1307_ADDRESS_READ))
\r
+ if (TWI_StartTransmission(DS1307_ADDRESS_READ
, 10
))
\r
{
\r
TWI_ReceiveByte(&CurrentRTCDate.Byte1.IntVal, false);
\r
TWI_ReceiveByte(&CurrentRTCDate.Byte2.IntVal, false);
\r
{
\r
TWI_ReceiveByte(&CurrentRTCDate.Byte1.IntVal, false);
\r
TWI_ReceiveByte(&CurrentRTCDate.Byte2.IntVal, false);
\r
@@
-105,7
+100,7
@@
void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
return;
\r
#endif
\r
\r
return;
\r
#endif
\r
\r
- if (TWI_StartTransmission(DS1307_ADDRESS_WRITE))
\r
+ if (TWI_StartTransmission(DS1307_ADDRESS_WRITE
, 10
))
\r
{
\r
TWI_SendByte(DS1307_TIMEREG_START);
\r
\r
{
\r
TWI_SendByte(DS1307_TIMEREG_START);
\r
\r
@@
-114,7
+109,7
@@
void DS1307_GetTime(uint8_t* Hour, uint8_t* Minute, uint8_t* Second)
\r
DS1307_TimeRegs_t CurrentRTCTime;
\r
\r
\r
DS1307_TimeRegs_t CurrentRTCTime;
\r
\r
- if (TWI_StartTransmission(DS1307_ADDRESS_READ))
\r
+ if (TWI_StartTransmission(DS1307_ADDRESS_READ
, 10
))
\r
{
\r
TWI_ReceiveByte(&CurrentRTCTime.Byte1.IntVal, false);
\r
TWI_ReceiveByte(&CurrentRTCTime.Byte2.IntVal, false);
\r
{
\r
TWI_ReceiveByte(&CurrentRTCTime.Byte1.IntVal, false);
\r
TWI_ReceiveByte(&CurrentRTCTime.Byte2.IntVal, false);
\r