renamed 32bit durations, added ESP32 implementations in separate .cpp file

This commit is contained in:
feedc0de committed 2021-02-24 17:11:42 +01:00
1 parent 5ec358b30e
commit d3547a3323
7 files changed
+121 -65

No files matched your search

+20 -10
View File
@@ -66,6 +66,11 @@ bool daylightSavingTime(local_clock::time_point _timeStamp)
return (_tempDateTime.date.day() < 8_d && _tempDateTime.dayOfWeek == 1 && _tempDateTime.hour < 2);
} // end else
}
} // namespace
auto local_clock::now() noexcept -> time_point
{
return utcToLocal(utc_clock::now());
}
local_clock::time_point utcToLocal(utc_clock::time_point utc, time_zone timezone)
@@ -97,8 +102,13 @@ utc_clock::time_point localToUtc(local_clock::time_point local)
return utc;
}
local_clock::time_point utcToLocal(utc_clock::time_point ts)
{
return utcToLocal(ts, local_clock::timezone());
}
namespace {
DateTime toDateTime(seconds ts)
DateTime toDateTime(seconds32 ts)
{
auto _time = ts.count();
@@ -188,7 +198,7 @@ std::optional<DateTime> parseDateTime(std::string_view str)
};
}
std::optional<seconds> parseDaypoint(std::string_view str)
std::optional<seconds32> parseDaypoint(std::string_view str)
{
int8_t hour, minute, second{};
@@ -199,7 +209,7 @@ std::optional<seconds> parseDaypoint(std::string_view str)
if (hour < 0 || hour > 23 || minute < 0 || minute > 59 || second < 0 || second > 59)
return std::nullopt;
return hours{hour} + minutes{minute} + seconds{second};
return hours32{hour} + minutes32{minute} + seconds32{second};
}
std::string toString(const DateTime &dateTime)
@@ -217,7 +227,7 @@ std::string toString(const LocalDateTime &dateTime)
{
char buf[34];
date::hh_mm_ss helper{dateTime.timezone.offset + hours{dateTime.dst ? 1 : 0}};
date::hh_mm_ss helper{dateTime.timezone.offset + hours32{dateTime.dst ? 1 : 0}};
std::sprintf(buf, "%04i-%02u-%02uT%02hhu:%02hhu:%02hhu %s%02hhu:%02hhu",
int{dateTime.date.year()}, unsigned{dateTime.date.month()}, unsigned{dateTime.date.day()},
@@ -227,7 +237,7 @@ std::string toString(const LocalDateTime &dateTime)
return std::string{buf};
}
std::string toDaypointString(seconds seconds)
std::string toDaypointString(seconds32 seconds)
{
date::hh_mm_ss helper(seconds);
char buf[10];
@@ -235,15 +245,15 @@ std::string toDaypointString(seconds seconds)
return std::string{buf};
}
milliseconds ago(millis_clock::time_point a)
std::chrono::milliseconds ago(millis_clock::time_point a)
{
return millis_clock::now() - a;
}
std::string toString(milliseconds val) { return std::to_string(val.count()) + "ms"; }
std::string toString(seconds val) { return std::to_string(val.count()) + "s"; }
std::string toString(minutes val) { return std::to_string(val.count()) + "min"; }
std::string toString(hours val) { return std::to_string(val.count()) + "h"; }
std::string toString(milliseconds32 val) { return std::to_string(val.count()) + "ms"; }
std::string toString(seconds32 val) { return std::to_string(val.count()) + "s"; }
std::string toString(minutes32 val) { return std::to_string(val.count()) + "min"; }
std::string toString(hours32 val) { return std::to_string(val.count()) + "h"; }
IMPLEMENT_TYPESAFE_ENUM(DayLightSavingMode, : uint8_t, DayLightSavingModeValues)
+18 -14
View File
@@ -17,14 +17,14 @@
namespace espchrono {
using milliseconds = std::chrono::duration<long, std::milli>;
using seconds = std::chrono::duration<long>;
using minutes = std::chrono::duration<long, std::ratio<60>>;
using hours = std::chrono::duration<long, std::ratio<3600>>;
using milliseconds32 = std::chrono::duration<int32_t, std::milli>;
using seconds32 = std::chrono::duration<int32_t>;
using minutes32 = std::chrono::duration<int32_t, std::ratio<60>>;
using hours32 = std::chrono::duration<int32_t, std::ratio<3600>>;
struct utc_clock
{
typedef seconds duration;
typedef seconds32 duration;
typedef duration::rep rep;
typedef duration::period period;
typedef std::chrono::time_point<utc_clock, duration> time_point;
@@ -45,7 +45,7 @@ DECLARE_TYPESAFE_ENUM(DayLightSavingMode, : uint8_t, DayLightSavingModeValues)
struct time_zone
{
minutes offset{};
minutes32 offset{};
DayLightSavingMode dayLightSavingMode{};
bool operator== (const time_zone &other) const
@@ -100,7 +100,7 @@ public:
struct local_clock
{
typedef seconds duration;
typedef seconds32 duration;
typedef duration::rep rep;
typedef duration::period period;
typedef local_time_point<local_clock, duration> time_point;
@@ -111,6 +111,8 @@ struct local_clock
static constexpr bool is_steady = false;
static time_point now() noexcept;
static time_zone timezone() noexcept;
};
struct millis_clock
@@ -162,6 +164,8 @@ struct LocalDateTime : public DateTime
local_clock::time_point utcToLocal(utc_clock::time_point timeStamp, time_zone timezone);
utc_clock::time_point localToUtc(local_clock::time_point local);
local_clock::time_point utcToLocal(utc_clock::time_point ts);
DateTime toDateTime(utc_clock::time_point ts);
LocalDateTime toDateTime(local_clock::time_point ts);
@@ -169,18 +173,18 @@ LocalDateTime toDateTime(local_clock::time_point ts);
std::optional<DateTime> parseDateTime(std::string_view str);
//! Returns null if string cannot be parsed
std::optional<seconds> parseDaypoint(std::string_view str);
std::optional<seconds32> parseDaypoint(std::string_view str);
std::string toString(const DateTime &dateTime);
std::string toString(const LocalDateTime &dateTime);
std::string toDaypointString(seconds seconds);
std::string toDaypointString(seconds32 seconds);
milliseconds ago(millis_clock::time_point a);
std::chrono::milliseconds ago(millis_clock::time_point a);
std::string toString(milliseconds val);
std::string toString(seconds val);
std::string toString(minutes val);
std::string toString(hours val);
std::string toString(milliseconds32 val);
std::string toString(seconds32 val);
std::string toString(minutes32 val);
std::string toString(hours32 val);
} // namespace espchrono
+27
View File
@@ -0,0 +1,27 @@
// local includes
#include "espchrono.h"
// system includes
#include <time.h>
// esp-idf inlcludes
#include <esp_timer.h>
using namespace std::chrono_literals;
// actual implementations used on the ESP32
namespace espchrono {
auto utc_clock::now() noexcept -> time_point
{
timeval tv;
gettimeofday(&tv, NULL);
seconds32 seconds{tv.tv_sec};
return time_point{seconds};
}
auto millis_clock::now() noexcept -> time_point
{
return time_point{std::chrono::floor<duration>(std::chrono::microseconds{esp_timer_get_time()})};
}
} // namespace espchrono