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

Preparations for australian daylight saving time

Browse Source
This commit is contained in:
0xFEEDC0DE64
2023-03-01 16:55:50 +01:00
parent 32bdd0911d
commit 2e07459336
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/espchrono.cpp
View File

@@ -11,7 +11,7 @@ namespace espchrono {
namespace { namespace {
static const uint8_t _monthDays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; static const uint8_t _monthDays[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
bool summerTime(local_clock::time_point timeStamp) bool isEuropeanSummerTime(local_clock::time_point timeStamp)
{ {
LocalDateTime _tempDateTime = toDateTime(timeStamp); LocalDateTime _tempDateTime = toDateTime(timeStamp);
@@ -22,7 +22,7 @@ bool summerTime(local_clock::time_point timeStamp)
(_tempDateTime.date.month() == October && (_tempDateTime.hour + 24 * unsigned(_tempDateTime.date.day())) < (2 + 24 * (31 - (5 * int(_tempDateTime.date.year()) / 4 + 1) % 7))); (_tempDateTime.date.month() == October && (_tempDateTime.hour + 24 * unsigned(_tempDateTime.date.day())) < (2 + 24 * (31 - (5 * int(_tempDateTime.date.year()) / 4 + 1) % 7)));
} }
bool daylightSavingTime(local_clock::time_point _timeStamp) bool isUsDaylightTime(local_clock::time_point _timeStamp)
{ {
LocalDateTime _tempDateTime = toDateTime(_timeStamp); LocalDateTime _tempDateTime = toDateTime(_timeStamp);
@@ -71,6 +71,16 @@ bool daylightSavingTime(local_clock::time_point _timeStamp)
return _tempDateTime.date.day() < 8_d && _tempDateTime.dayOfWeek == 1 && _tempDateTime.hour < 2; return _tempDateTime.date.day() < 8_d && _tempDateTime.dayOfWeek == 1 && _tempDateTime.hour < 2;
} // end else } // end else
} }
bool isAustralianDaylightTime(local_clock::time_point timeStamp)
{
LocalDateTime dateTime = toDateTime(timeStamp);
const date::sys_days startOfDst = dateTime.date.year()/October/Sunday[0];
const date::sys_days endOfDst = dateTime.date.year()/April/Sunday[0];
return dateTime.date < endOfDst || dateTime.date > startOfDst;
}
} // namespace } // namespace
#if !defined(ESP32) || defined(CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE) #if !defined(ESP32) || defined(CONFIG_ESPCHRONO_SUPPORT_DEFAULT_TIMEZONE)
@@ -87,8 +97,9 @@ local_clock::time_point utcToLocal(utc_clock::time_point utc, time_zone timezone
switch (timezone.dayLightSavingMode) switch (timezone.dayLightSavingMode)
{ {
case DayLightSavingMode::None: break; case DayLightSavingMode::None: break;
case DayLightSavingMode::EuropeanSummerTime: if (summerTime(local)) local.dst = true; break; case DayLightSavingMode::EuropeanSummerTime: if (isEuropeanSummerTime(local)) local.dst = true; break;
case DayLightSavingMode::UsDaylightTime: if (daylightSavingTime(local)) local.dst = true; break; case DayLightSavingMode::UsDaylightTime: if (isUsDaylightTime(local)) local.dst = true; break;
case DayLightSavingMode::AustralianDaylightTime: if (isAustralianDaylightTime(local)) local.dst = true; break;
} }
if (local.dst) if (local.dst)

3
src/espchrono.h
View File

@@ -54,7 +54,8 @@ struct utc_clock
#define DayLightSavingModeValues(x) \ #define DayLightSavingModeValues(x) \
x(None) \ x(None) \
x(EuropeanSummerTime) \ x(EuropeanSummerTime) \
x(UsDaylightTime) x(UsDaylightTime) \
x(AustralianDaylightTime)
DECLARE_TYPESAFE_ENUM(DayLightSavingMode, : uint8_t, DayLightSavingModeValues) DECLARE_TYPESAFE_ENUM(DayLightSavingMode, : uint8_t, DayLightSavingModeValues)
struct time_zone struct time_zone