feedc0de/espchrono
1
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Fix so it will be compatible

Browse Source
This commit is contained in:
Commander Red
2023-06-03 13:47:35 +02:00
committed by GitHub
parent d39d84e169
commit 9395718ce2
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/espchrono.cpp
View File

@@ -262,7 +262,7 @@ std::expected<std::chrono::seconds, std::string> parseDaypoint(std::string_view
std::string toString(const DateTime &dateTime) std::string toString(const DateTime &dateTime)
{ {
return fmt::format("{:04}-{:02}-{:02}T{:02}:{:02}:{:02}.{:03}Z", return fmt::format("{:04}-{:02}-{:02}T{:02}:{:02}:{:02}.{:03}",
int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()}, int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()},
dateTime.hour, dateTime.minute, dateTime.second, dateTime.millisecond); dateTime.hour, dateTime.minute, dateTime.second, dateTime.millisecond);
} }
@@ -271,12 +271,30 @@ std::string toString(const LocalDateTime &dateTime)
{ {
date::hh_mm_ss helper{dateTime.timezone.offset + hours32{dateTime.dst ? 1 : 0}}; date::hh_mm_ss helper{dateTime.timezone.offset + hours32{dateTime.dst ? 1 : 0}};
return fmt::format("{:04}-{:02}-{:02}T{:02}:{:02}:{:02}.{:03} {}{:02}:{:02}",
int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()},
dateTime.hour, dateTime.minute, dateTime.second, dateTime.millisecond,
helper.is_negative() ? "-" : "+", uint8_t(helper.hours().count()), uint8_t(helper.minutes().count()));
}
std::string toISOString(const DateTime &dateTime)
{
return fmt::format("{:04}-{:02}-{:02}T{:02}:{:02}:{:02}.{:03}Z",
int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()},
dateTime.hour, dateTime.minute, dateTime.second, dateTime.millisecond);
}
std::string toISOString(const LocalDateTime &dateTime)
{
date::hh_mm_ss helper{dateTime.timezone.offset + hours32{dateTime.dst ? 1 : 0}};
return fmt::format("{:04}-{:02}-{:02}T{:02}:{:02}:{:02}.{:03}{}{:02}:{:02}", return fmt::format("{:04}-{:02}-{:02}T{:02}:{:02}:{:02}.{:03}{}{:02}:{:02}",
int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()}, int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()},
dateTime.hour, dateTime.minute, dateTime.second, dateTime.millisecond, dateTime.hour, dateTime.minute, dateTime.second, dateTime.millisecond,
helper.is_negative() ? "-" : "+", uint8_t(helper.hours().count()), uint8_t(helper.minutes().count())); helper.is_negative() ? "-" : "+", uint8_t(helper.hours().count()), uint8_t(helper.minutes().count()));
} }
std::string toDaypointString(std::chrono::seconds seconds) std::string toDaypointString(std::chrono::seconds seconds)
{ {
date::hh_mm_ss helper(seconds); date::hh_mm_ss helper(seconds);

4
src/espchrono.h
View File

@@ -204,6 +204,10 @@ std::string toString(const DateTime &dateTime);
std::string toString(const LocalDateTime &dateTime); std::string toString(const LocalDateTime &dateTime);
std::string toISOString(const DateTime &dateTime);
std::string toISOString(const LocalDateTime &dateTime);
std::string toDaypointString(std::chrono::seconds seconds); std::string toDaypointString(std::chrono::seconds seconds);
std::chrono::microseconds ago(millis_clock::time_point a); std::chrono::microseconds ago(millis_clock::time_point a);