Obbart/ETcontroller_PRO
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed RTC and Ethernet drivers, with NTP

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-07-10 21:48:30 +02:00
parent 7fd4a284af
commit 208f5f7534
5 changed files with 160 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/RTC/PCF85063_Driver.cpp
View File

@@ -157,12 +157,27 @@ namespace drivers
return false;
}
const std::string PCF85063::getTimeStr() {
const std::string PCF85063::getTimeStr()
{
datetime_t dt;
readDatetime(dt);
return datetime2str(dt);
}
PCF85063::datetime_t PCF85063::fromEpoch(time_t currentTime)
{
PCF85063::datetime_t tm;
struct tm *localTime = std::localtime(&currentTime);
tm.year = localTime->tm_year + 1900;
tm.month = localTime->tm_mon + 1;
tm.day = localTime->tm_mday;
tm.dotw = localTime->tm_wday;
tm.hour = localTime->tm_hour;
tm.minute = localTime->tm_min;
tm.second = localTime->tm_sec;
return tm;
}
const std::string PCF85063::datetime2str(datetime_t &datetime)
{
tm dtime;
@@ -171,7 +186,7 @@ namespace drivers
dtime.tm_hour = datetime.hour;
dtime.tm_wday = datetime.dotw;
dtime.tm_mday = datetime.day;
dtime.tm_mon = datetime.month;
dtime.tm_mon = datetime.month - 1;
dtime.tm_year = datetime.year - 1900; // time offset in structure according cpp reference
return std::string(std::asctime(&dtime));
}

4
lib/RTC/PCF85063_Driver.h
View File

@@ -130,10 +130,12 @@ namespace drivers
const bool readAlarm(datetime_t &time);
const bool getAlarmFlag(uint8_t &flags);
const std::string datetime2str(datetime_t &datetime);
const std::string getTimeStr();
static PCF85063::datetime_t fromEpoch(time_t currentTime);
private:
const std::string datetime2str(datetime_t &datetime);
const uint8_t decToBcd(const int val);
const int bcdToDec(const uint8_t val);
};