mirror of https://github.com/sqfmi/Watchy.git
Merge pull request #161 from aneeshdurg/formatter
Introduce and use a consistent stylepull/162/head^2
SQFMI
1 year ago
committed by
GitHub
commit
433050a63a
16 changed files with 7814 additions and 6538 deletions
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,133 +1,149 @@ |
||||
#include "WatchyRTC.h" |
||||
|
||||
WatchyRTC::WatchyRTC() |
||||
: rtc_ds(false) {} |
||||
WatchyRTC::WatchyRTC() : rtc_ds(false) {} |
||||
|
||||
void WatchyRTC::init(){ |
||||
byte error; |
||||
Wire.beginTransmission(RTC_DS_ADDR); |
||||
void WatchyRTC::init() { |
||||
byte error; |
||||
Wire.beginTransmission(RTC_DS_ADDR); |
||||
error = Wire.endTransmission(); |
||||
if (error == 0) { |
||||
rtcType = DS3231; |
||||
} else { |
||||
Wire.beginTransmission(RTC_PCF_ADDR); |
||||
error = Wire.endTransmission(); |
||||
if(error == 0){ |
||||
rtcType = DS3231; |
||||
}else{ |
||||
Wire.beginTransmission(RTC_PCF_ADDR); |
||||
error = Wire.endTransmission(); |
||||
if(error == 0){ |
||||
rtcType = PCF8563; |
||||
}else{ |
||||
//RTC Error
|
||||
} |
||||
if (error == 0) { |
||||
rtcType = PCF8563; |
||||
} else { |
||||
// RTC Error
|
||||
} |
||||
} |
||||
} |
||||
|
||||
void WatchyRTC::config(String datetime){ //String datetime format is YYYY:MM:DD:HH:MM:SS
|
||||
if(rtcType == DS3231){ |
||||
_DSConfig(datetime); |
||||
}else{ |
||||
_PCFConfig(datetime); |
||||
} |
||||
void WatchyRTC::config( |
||||
String datetime) { // String datetime format is YYYY:MM:DD:HH:MM:SS
|
||||
if (rtcType == DS3231) { |
||||
_DSConfig(datetime); |
||||
} else { |
||||
_PCFConfig(datetime); |
||||
} |
||||
} |
||||
|
||||
void WatchyRTC::clearAlarm(){ |
||||
if(rtcType == DS3231){ |
||||
rtc_ds.alarm(DS3232RTC::ALARM_2); |
||||
}else{ |
||||
int nextAlarmMinute = 0; |
||||
rtc_pcf.clearAlarm(); //resets the alarm flag in the RTC
|
||||
nextAlarmMinute = rtc_pcf.getMinute(); |
||||
nextAlarmMinute = (nextAlarmMinute == 59) ? 0 : (nextAlarmMinute + 1); //set alarm to trigger 1 minute from now
|
||||
rtc_pcf.setAlarm(nextAlarmMinute, 99, 99, 99); |
||||
} |
||||
void WatchyRTC::clearAlarm() { |
||||
if (rtcType == DS3231) { |
||||
rtc_ds.alarm(DS3232RTC::ALARM_2); |
||||
} else { |
||||
int nextAlarmMinute = 0; |
||||
rtc_pcf.clearAlarm(); // resets the alarm flag in the RTC
|
||||
nextAlarmMinute = rtc_pcf.getMinute(); |
||||
nextAlarmMinute = |
||||
(nextAlarmMinute == 59) |
||||
? 0 |
||||
: (nextAlarmMinute + 1); // set alarm to trigger 1 minute from now
|
||||
rtc_pcf.setAlarm(nextAlarmMinute, 99, 99, 99); |
||||
} |
||||
} |
||||
|
||||
void WatchyRTC::read(tmElements_t &tm){ |
||||
if(rtcType == DS3231){ |
||||
rtc_ds.read(tm); |
||||
}else{ |
||||
tm.Year = y2kYearToTm(rtc_pcf.getYear()); |
||||
tm.Month = rtc_pcf.getMonth(); |
||||
tm.Day = rtc_pcf.getDay(); |
||||
tm.Wday = rtc_pcf.getWeekday() + 1; //TimeLib & DS3231 has Wday range of 1-7, but PCF8563 stores day of week in 0-6 range
|
||||
tm.Hour = rtc_pcf.getHour(); |
||||
tm.Minute = rtc_pcf.getMinute(); |
||||
tm.Second = rtc_pcf.getSecond(); |
||||
} |
||||
void WatchyRTC::read(tmElements_t &tm) { |
||||
if (rtcType == DS3231) { |
||||
rtc_ds.read(tm); |
||||
} else { |
||||
tm.Year = y2kYearToTm(rtc_pcf.getYear()); |
||||
tm.Month = rtc_pcf.getMonth(); |
||||
tm.Day = rtc_pcf.getDay(); |
||||
tm.Wday = |
||||
rtc_pcf.getWeekday() + 1; // TimeLib & DS3231 has Wday range of 1-7, but
|
||||
// PCF8563 stores day of week in 0-6 range
|
||||
tm.Hour = rtc_pcf.getHour(); |
||||
tm.Minute = rtc_pcf.getMinute(); |
||||
tm.Second = rtc_pcf.getSecond(); |
||||
} |
||||
} |
||||
|
||||
void WatchyRTC::set(tmElements_t tm){ |
||||
if(rtcType == DS3231){ |
||||
time_t t = makeTime(tm); |
||||
rtc_ds.set(t); |
||||
}else{ |
||||
time_t t = makeTime(tm); //make and break to calculate tm.Wday
|
||||
breakTime(t, tm); |
||||
//day, weekday, month, century(1=1900, 0=2000), year(0-99)
|
||||
rtc_pcf.setDate(tm.Day, tm.Wday - 1, tm.Month, 0, tmYearToY2k(tm.Year)); //TimeLib & DS3231 has Wday range of 1-7, but PCF8563 stores day of week in 0-6 range
|
||||
//hr, min, sec
|
||||
rtc_pcf.setTime(tm.Hour, tm.Minute, tm.Second); |
||||
clearAlarm(); |
||||
} |
||||
void WatchyRTC::set(tmElements_t tm) { |
||||
if (rtcType == DS3231) { |
||||
time_t t = makeTime(tm); |
||||
rtc_ds.set(t); |
||||
} else { |
||||
time_t t = makeTime(tm); // make and break to calculate tm.Wday
|
||||
breakTime(t, tm); |
||||
// day, weekday, month, century(1=1900, 0=2000), year(0-99)
|
||||
rtc_pcf.setDate( |
||||
tm.Day, tm.Wday - 1, tm.Month, 0, |
||||
tmYearToY2k(tm.Year)); // TimeLib & DS3231 has Wday range of 1-7, but
|
||||
// PCF8563 stores day of week in 0-6 range
|
||||
// hr, min, sec
|
||||
rtc_pcf.setTime(tm.Hour, tm.Minute, tm.Second); |
||||
clearAlarm(); |
||||
} |
||||
} |
||||
|
||||
uint8_t WatchyRTC::temperature(){ |
||||
if(rtcType == DS3231){ |
||||
return rtc_ds.temperature(); |
||||
}else{ |
||||
return 255; //error
|
||||
} |
||||
uint8_t WatchyRTC::temperature() { |
||||
if (rtcType == DS3231) { |
||||
return rtc_ds.temperature(); |
||||
} else { |
||||
return 255; // error
|
||||
} |
||||
} |
||||
|
||||
void WatchyRTC::_DSConfig(String datetime){ //String datetime is YYYY:MM:DD:HH:MM:SS
|
||||
if(datetime != ""){ |
||||
tmElements_t tm; |
||||
tm.Year = CalendarYrToTm(_getValue(datetime, ':', 0).toInt()); //YYYY - 1970
|
||||
tm.Month = _getValue(datetime, ':', 1).toInt(); |
||||
tm.Day = _getValue(datetime, ':', 2).toInt(); |
||||
tm.Hour = _getValue(datetime, ':', 3).toInt(); |
||||
tm.Minute = _getValue(datetime, ':', 4).toInt(); |
||||
tm.Second = _getValue(datetime, ':', 5).toInt(); |
||||
time_t t = makeTime(tm); |
||||
rtc_ds.set(t); |
||||
} |
||||
//https://github.com/JChristensen/DS3232RTC
|
||||
rtc_ds.squareWave(DS3232RTC::SQWAVE_NONE); //disable square wave output
|
||||
rtc_ds.setAlarm(DS3232RTC::ALM2_EVERY_MINUTE, 0, 0, 0, 0); //alarm wakes up Watchy every minute
|
||||
rtc_ds.alarmInterrupt(DS3232RTC::ALARM_2, true); //enable alarm interrupt
|
||||
void WatchyRTC::_DSConfig( |
||||
String datetime) { // String datetime is YYYY:MM:DD:HH:MM:SS
|
||||
if (datetime != "") { |
||||
tmElements_t tm; |
||||
tm.Year = CalendarYrToTm(_getValue(datetime, ':', 0).toInt()); // YYYY -
|
||||
// 1970
|
||||
tm.Month = _getValue(datetime, ':', 1).toInt(); |
||||
tm.Day = _getValue(datetime, ':', 2).toInt(); |
||||
tm.Hour = _getValue(datetime, ':', 3).toInt(); |
||||
tm.Minute = _getValue(datetime, ':', 4).toInt(); |
||||
tm.Second = _getValue(datetime, ':', 5).toInt(); |
||||
time_t t = makeTime(tm); |
||||
rtc_ds.set(t); |
||||
} |
||||
// https://github.com/JChristensen/DS3232RTC
|
||||
rtc_ds.squareWave(DS3232RTC::SQWAVE_NONE); // disable square wave output
|
||||
rtc_ds.setAlarm(DS3232RTC::ALM2_EVERY_MINUTE, 0, 0, 0, |
||||
0); // alarm wakes up Watchy every minute
|
||||
rtc_ds.alarmInterrupt(DS3232RTC::ALARM_2, true); // enable alarm interrupt
|
||||
} |
||||
|
||||
void WatchyRTC::_PCFConfig(String datetime){ //String datetime is YYYY:MM:DD:HH:MM:SS
|
||||
if(datetime != ""){ |
||||
tmElements_t tm; |
||||
tm.Year = CalendarYrToTm(_getValue(datetime, ':', 0).toInt()); //YYYY - 1970
|
||||
tm.Month = _getValue(datetime, ':', 1).toInt(); |
||||
tm.Day = _getValue(datetime, ':', 2).toInt(); |
||||
tm.Hour = _getValue(datetime, ':', 3).toInt(); |
||||
tm.Minute = _getValue(datetime, ':', 4).toInt(); |
||||
tm.Second = _getValue(datetime, ':', 5).toInt(); |
||||
time_t t = makeTime(tm); //make and break to calculate tm.Wday
|
||||
breakTime(t, tm); |
||||
//day, weekday, month, century(1=1900, 0=2000), year(0-99)
|
||||
rtc_pcf.setDate(tm.Day, tm.Wday - 1, tm.Month, 0, tmYearToY2k(tm.Year)); //TimeLib & DS3231 has Wday range of 1-7, but PCF8563 stores day of week in 0-6 range
|
||||
//hr, min, sec
|
||||
rtc_pcf.setTime(tm.Hour, tm.Minute, tm.Second); |
||||
} |
||||
//on POR event, PCF8563 sets month to 0, which will give an error since months are 1-12
|
||||
clearAlarm(); |
||||
void WatchyRTC::_PCFConfig( |
||||
String datetime) { // String datetime is YYYY:MM:DD:HH:MM:SS
|
||||
if (datetime != "") { |
||||
tmElements_t tm; |
||||
tm.Year = CalendarYrToTm(_getValue(datetime, ':', 0).toInt()); // YYYY -
|
||||
// 1970
|
||||
tm.Month = _getValue(datetime, ':', 1).toInt(); |
||||
tm.Day = _getValue(datetime, ':', 2).toInt(); |
||||
tm.Hour = _getValue(datetime, ':', 3).toInt(); |
||||
tm.Minute = _getValue(datetime, ':', 4).toInt(); |
||||
tm.Second = _getValue(datetime, ':', 5).toInt(); |
||||
time_t t = makeTime(tm); // make and break to calculate tm.Wday
|
||||
breakTime(t, tm); |
||||
// day, weekday, month, century(1=1900, 0=2000), year(0-99)
|
||||
rtc_pcf.setDate( |
||||
tm.Day, tm.Wday - 1, tm.Month, 0, |
||||
tmYearToY2k(tm.Year)); // TimeLib & DS3231 has Wday range of 1-7, but
|
||||
// PCF8563 stores day of week in 0-6 range
|
||||
// hr, min, sec
|
||||
rtc_pcf.setTime(tm.Hour, tm.Minute, tm.Second); |
||||
} |
||||
// on POR event, PCF8563 sets month to 0, which will give an error since
|
||||
// months are 1-12
|
||||
clearAlarm(); |
||||
} |
||||
|
||||
String WatchyRTC::_getValue(String data, char separator, int index) |
||||
{ |
||||
int found = 0; |
||||
String WatchyRTC::_getValue(String data, char separator, int index) { |
||||
int found = 0; |
||||
int strIndex[] = {0, -1}; |
||||
int maxIndex = data.length()-1; |
||||
int maxIndex = data.length() - 1; |
||||
|
||||
for(int i=0; i<=maxIndex && found<=index; i++){ |
||||
if(data.charAt(i)==separator || i==maxIndex){ |
||||
found++; |
||||
strIndex[0] = strIndex[1]+1; |
||||
strIndex[1] = (i == maxIndex) ? i+1 : i; |
||||
for (int i = 0; i <= maxIndex && found <= index; i++) { |
||||
if (data.charAt(i) == separator || i == maxIndex) { |
||||
found++; |
||||
strIndex[0] = strIndex[1] + 1; |
||||
strIndex[1] = (i == maxIndex) ? i + 1 : i; |
||||
} |
||||
} |
||||
|
||||
return found>index ? data.substring(strIndex[0], strIndex[1]) : ""; |
||||
return found > index ? data.substring(strIndex[0], strIndex[1]) : ""; |
||||
} |
||||
|
||||
@ -1,36 +1,38 @@ |
||||
#ifndef WATCHY_RTC_H |
||||
#define WATCHY_RTC_H |
||||
|
||||
#include <DS3232RTC.h> |
||||
#include <Rtc_Pcf8563.h> |
||||
#include "config.h" |
||||
#include "time.h" |
||||
#include <DS3232RTC.h> |
||||
#include <Rtc_Pcf8563.h> |
||||
|
||||
#define DS3231 1 |
||||
#define PCF8563 2 |
||||
#define RTC_DS_ADDR 0x68 |
||||
#define RTC_PCF_ADDR 0x51 |
||||
#define YEAR_OFFSET_DS 1970 |
||||
#define DS3231 1 |
||||
#define PCF8563 2 |
||||
#define RTC_DS_ADDR 0x68 |
||||
#define RTC_PCF_ADDR 0x51 |
||||
#define YEAR_OFFSET_DS 1970 |
||||
#define YEAR_OFFSET_PCF 2000 |
||||
|
||||
class WatchyRTC { |
||||
public: |
||||
DS3232RTC rtc_ds; |
||||
Rtc_Pcf8563 rtc_pcf; |
||||
uint8_t rtcType; |
||||
public: |
||||
WatchyRTC(); |
||||
void init(); |
||||
void config(String datetime); //String datetime format is YYYY:MM:DD:HH:MM:SS
|
||||
void clearAlarm(); |
||||
void read(tmElements_t &tm); |
||||
void set(tmElements_t tm); |
||||
uint8_t temperature(); |
||||
private: |
||||
void _DSConfig(String datetime); |
||||
void _PCFConfig(String datetime); |
||||
int _getDayOfWeek(int d, int m, int y); |
||||
String _getValue(String data, char separator, int index); |
||||
public: |
||||
DS3232RTC rtc_ds; |
||||
Rtc_Pcf8563 rtc_pcf; |
||||
uint8_t rtcType; |
||||
|
||||
public: |
||||
WatchyRTC(); |
||||
void init(); |
||||
void config(String datetime); // String datetime format is YYYY:MM:DD:HH:MM:SS
|
||||
void clearAlarm(); |
||||
void read(tmElements_t &tm); |
||||
void set(tmElements_t tm); |
||||
uint8_t temperature(); |
||||
|
||||
private: |
||||
void _DSConfig(String datetime); |
||||
void _PCFConfig(String datetime); |
||||
int _getDayOfWeek(int d, int m, int y); |
||||
String _getValue(String data, char separator, int index); |
||||
}; |
||||
|
||||
#endif |
||||