Mirrors/TTGO_TWatch_Library
2
0
Fork 0
mirror of https://github.com/Xinyuan-LilyGO/TTGO_TWatch_Library.git synced 2026-03-09 09:37:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #119 from vanvuongngo/patch-1

Browse Source 
Fix typos and default style is HMS as declared in header
This commit is contained in:
lewis he
2021-03-27 11:17:29 +08:00
committed by GitHub
parent b65057efde e785a13bc5
commit d95ed442c5
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/drive/rtc/pcf8563.cpp
View File

@@ -102,7 +102,7 @@ bool PCF8563_Class::isValid()
RTC_Date PCF8563_Class::getDateTime()
{
uint16_t year;
uint8_t cetury = 0;
uint8_t century = 0;
_readByte(PCF8563_SEC_REG, 7, _data);
_voltageLow = (_data[0] & PCF8563_VOL_LOW_MASK);
_data[0] = _bcd_to_dec(_data[0] & (~PCF8563_VOL_LOW_MASK));
@@ -110,10 +110,10 @@ RTC_Date PCF8563_Class::getDateTime()
_data[2] = _bcd_to_dec(_data[2] & PCF8563_HOUR_MASK);
_data[3] = _bcd_to_dec(_data[3] & PCF8563_DAY_MASK);
_data[4] = _bcd_to_dec(_data[4] & PCF8563_WEEKDAY_MASK);
cetury = _data[5] & PCF8563_CENTURY_MASK;
century = _data[5] & PCF8563_CENTURY_MASK;
_data[5] = _bcd_to_dec(_data[5] & PCF8563_MONTH_MASK);
year = _bcd_to_dec(_data[6]);
year = cetury ? 1900 + year : 2000 + year;
year = century ? 1900 + year : 2000 + year;
return RTC_Date(
year,
_data[5],
@@ -252,11 +252,11 @@ void PCF8563_Class::disableTimer()
_writeByte(PCF8563_STAT2_REG, 1, _data);
}
void PCF8563_Class::setTimer(uint8_t val, uint8_t freq, bool enIntrrupt)
void PCF8563_Class::setTimer(uint8_t val, uint8_t freq, bool enInterrupt)
{
_readByte(PCF8563_STAT2_REG, 1, &_data[0]);
_readByte(PCF8563_TIMER1_REG, 1, &_data[1]);
if (enIntrrupt) {
if (enInterrupt) {
_data[0] |= 1 << 4;
} else {
_data[0] &= ~(1 << 4);
@@ -278,8 +278,6 @@ void PCF8563_Class::clearTimer()
_writeByte(PCF8563_TIMER1_REG, 1, &_data[1]);
}
bool PCF8563_Class::enableCLK(uint8_t freq)
{
if (freq >= PCF8563_CLK_MAX) return false;
@@ -294,16 +292,13 @@ void PCF8563_Class::disableCLK()
_writeByte(PCF8563_SQW_REG, 1, _data);
}
const char *PCF8563_Class::formatDateTime(uint8_t sytle)
const char *PCF8563_Class::formatDateTime(uint8_t style)
{
RTC_Date t = getDateTime();
switch (sytle) {
switch (style) {
case PCF_TIMEFORMAT_HM:
snprintf(format, sizeof(format), "%02d:%02d", t.hour, t.minute);
break;
case PCF_TIMEFORMAT_HMS:
snprintf(format, sizeof(format), "%02d:%02d:%02d", t.hour, t.minute, t.second);
break;
case PCF_TIMEFORMAT_YYYY_MM_DD:
snprintf(format, sizeof(format), "%02d-%02d-%02d", t.year, t.month, t.day);
break;
@@ -316,8 +311,9 @@ const char *PCF8563_Class::formatDateTime(uint8_t sytle)
case PCF_TIMEFORMAT_YYYY_MM_DD_H_M_S:
snprintf(format, sizeof(format), "%02d-%02d-%02d/%02d:%02d:%02d", t.year, t.month, t.day, t.hour, t.minute, t.second);
break;
case PCF_TIMEFORMAT_HMS:
default:
snprintf(format, sizeof(format), "%02d:%02d", t.hour, t.minute);
snprintf(format, sizeof(format), "%02d:%02d:%02d", t.hour, t.minute, t.second);
break;
}
return format;
@@ -371,8 +367,6 @@ RTC_Date::RTC_Date(uint16_t y,
}
uint8_t RTC_Date::StringToUint8(const char *pString)
{
uint8_t value = 0;

4
src/drive/rtc/pcf8563.h
View File

@@ -162,7 +162,7 @@ public:
bool isTimerActive();
void enableTimer();
void disableTimer();
void setTimer(uint8_t val, uint8_t freq, bool enIntrrupt);
void setTimer(uint8_t val, uint8_t freq, bool enInterrupt);
void clearTimer();
bool enableCLK(uint8_t freq);
@@ -171,7 +171,7 @@ public:
void syncToSystem();
void syncToRtc();
const char *formatDateTime(uint8_t sytle = PCF_TIMEFORMAT_HMS);
const char *formatDateTime(uint8_t style = PCF_TIMEFORMAT_HMS);
uint32_t getDayOfWeek(uint32_t day, uint32_t month, uint32_t year);
uint8_t status2();