avr/ds3231
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ran clang-format

Browse Source
This commit is contained in:
BlackMark 2020-05-15 09:29:26 +02:00
parent 7310eb2c9a
commit 85e37de950
2 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ds3231/clock.h
View File

@ -1,8 +1,8 @@
/*
* Copyright (c) by BlackMark 2015
* Date 24/11/2015
* Version 1.1
*/
* Copyright (c) by BlackMark 2015
* Date 24/11/2015
* Version 1.1
*/
#ifndef CLOCK_H
#define CLOCK_H
@ -11,4 +11,4 @@
#include <util/delay.h>
#endif
#endif

136
ds3231/main.cpp
View File

@ -1,16 +1,16 @@
/*
* Copyright (c) by BlackMark 2017-2018
* Date 02/01/2018
* Version 1.3
*/
* Copyright (c) by BlackMark 2017-2018
* Date 02/01/2018
* Version 1.3
*/
#include <avr/interrupt.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#include <avr/interrupt.h>
#include "usart/usart.h"
#include "ds3231/systime.h"
#include "usart/usart.h"
#include "clock.h"
@ -18,13 +18,12 @@ void setup()
{
USART0 &cSerial = USART0::inst();
if( SysTime::init() )
{
cSerial << "DS3231 detected!" << "\r\n";
}
else
{
cSerial << "ERROR - No RTC detected!" << "\r\n";
if (SysTime::init()) {
cSerial << "DS3231 detected!"
<< "\r\n";
} else {
cSerial << "ERROR - No RTC detected!"
<< "\r\n";
}
}
@ -37,73 +36,83 @@ void setTime()
constexpr auto BUFFER_SIZE = 32;
char szBuffer[BUFFER_SIZE];
cSerial << "Set time:" << "\r\n" << "Year: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial << "Set time:"
<< "\r\n"
<< "Year: ";
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
sTime.tm_year = atoi( szBuffer ) - 1900;
sTime.tm_year = atoi(szBuffer) - 1900;
cSerial << "Set time:" << "\r\n" << "Month: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial << "Set time:"
<< "\r\n"
<< "Month: ";
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
sTime.tm_mon = atoi( szBuffer ) - 1;
sTime.tm_mon = atoi(szBuffer) - 1;
cSerial << "Set time:" << "\r\n" << "Day: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial << "Set time:"
<< "\r\n"
<< "Day: ";
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
sTime.tm_mday = atoi( szBuffer );
sTime.tm_mday = atoi(szBuffer);
cSerial << "Set time:" << "\r\n" << "Hour: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial << "Set time:"
<< "\r\n"
<< "Hour: ";
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
sTime.tm_hour = atoi( szBuffer );
sTime.tm_hour = atoi(szBuffer);
cSerial << "Minute: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
sTime.tm_min = atoi( szBuffer );
sTime.tm_min = atoi(szBuffer);
cSerial << "Second: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
sTime.tm_sec = atoi( szBuffer );
sTime.tm_sec = atoi(szBuffer);
mktime( &sTime );
mktime(&sTime);
SysTime::setTime( sTime );
SysTime::setTime(sTime);
}
void setAlarm()
{
USART0 &cSerial = USART0::inst();
rtc_tm* tmAlarm = rtc_get_alarm();
rtc_tm *tmAlarm = rtc_get_alarm();
constexpr auto BUFFER_SIZE = 32;
char szBuffer[BUFFER_SIZE];
cSerial << "Set alarm:" << "\r\n" << "Hour: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial << "Set alarm:"
<< "\r\n"
<< "Hour: ";
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
tmAlarm->hour = atoi( szBuffer );
tmAlarm->hour = atoi(szBuffer);
cSerial << "Minute: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
tmAlarm->min = atoi( szBuffer );
tmAlarm->min = atoi(szBuffer);
cSerial << "Second: ";
cSerial.receiveLine( szBuffer, BUFFER_SIZE, "\r" );
cSerial.receiveLine(szBuffer, BUFFER_SIZE, "\r");
cSerial << szBuffer << "\r\n";
tmAlarm->sec = atoi( szBuffer );
tmAlarm->sec = atoi(szBuffer);
rtc_set_alarm( tmAlarm );
rtc_set_alarm(tmAlarm);
}
int main()
{
USART0 &cSerial = USART0::inst();
cSerial.init( 9600 );
cSerial.init(9600);
sei();
setup();
@ -111,52 +120,43 @@ int main()
constexpr auto BUFFER_SIZE = 32;
char szBuffer[BUFFER_SIZE];
while( true )
{
if( !SysTime::checkSync() )
{
while (true) {
if (!SysTime::checkSync()) {
SysTime::syncSysTime();
time_t timeNow = time( nullptr );
tm *psLocalTime = localtime( &timeNow );
time_t timeNow = time(nullptr);
tm *psLocalTime = localtime(&timeNow);
strftime( szBuffer, BUFFER_SIZE, "%F %T %z", psLocalTime );
strftime(szBuffer, BUFFER_SIZE, "%F %T %z", psLocalTime);
cSerial << "Time: " << szBuffer << "\r\n";
if( rtc_check_alarm() )
{
cSerial << "ALARM!" << "\r\n";
if (rtc_check_alarm()) {
cSerial << "ALARM!"
<< "\r\n";
}
}
uint8_t ui8Cmd;
if( cSerial.receiveByte( ui8Cmd ) )
{
if( ui8Cmd == 's' )
{
if (cSerial.receiveByte(ui8Cmd)) {
if (ui8Cmd == 's') {
setTime();
}
else if( ui8Cmd == 'a' )
{
} else if (ui8Cmd == 'a') {
setAlarm();
}
else if( ui8Cmd == 'p' )
{
} else if (ui8Cmd == 'p') {
uint8_t ui8Hour;
uint8_t ui8Minute;
uint8_t ui8Second;
rtc_get_alarm_s( &ui8Hour, &ui8Minute, &ui8Second );
sprintf( szBuffer, "Alarm set to: %02d:%02d:%02d", ui8Hour, ui8Minute, ui8Second );
rtc_get_alarm_s(&ui8Hour, &ui8Minute, &ui8Second);
sprintf(szBuffer, "Alarm set to: %02d:%02d:%02d", ui8Hour, ui8Minute, ui8Second);
cSerial << szBuffer << "\r\n";
}
else
{
} else {
cSerial << "Invalid char: '";
cSerial.transmitByte( ui8Cmd );
cSerial << "'" << "\r\n";
cSerial.transmitByte(ui8Cmd);
cSerial << "'"
<< "\r\n";
}
}
}