sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-02-08 00:31:58 +00:00
Code Issues Releases Wiki Activity

fix, macos and linux disagree on ambig time

Browse Source
This commit is contained in:
J. Nick Koston
2026-01-30 01:18:16 -06:00
parent cfea3472bd
commit d31a860bf2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
esphome/core/time.cpp
View File

@@ -275,7 +275,7 @@ void ESPTime::recalc_timestamp_local() {
}
// Try both interpretations to match libc mktime() with tm_isdst=-1
// For ambiguous times (fall-back repeated hour), libc prefers DST
// For ambiguous times (fall-back repeated hour), prefer standard time
// For invalid times (spring-forward skipped hour), libc normalizes forward
time_t utc_if_dst = this->timestamp + tz.dst_offset_seconds;
time_t utc_if_std = this->timestamp + tz.std_offset_seconds;
@@ -284,8 +284,8 @@ void ESPTime::recalc_timestamp_local() {
bool std_valid = !time::is_in_dst(utc_if_std, tz);
if (dst_valid && std_valid) {
// Ambiguous time (repeated hour during fall-back) - prefer DST to match libc
this->timestamp = utc_if_dst;
// Ambiguous time (repeated hour during fall-back) - prefer standard time
this->timestamp = utc_if_std;
} else if (dst_valid) {
// Only DST interpretation is valid
this->timestamp = utc_if_dst;

7
tests/components/time/posix_tz_parser.cpp
View File

@@ -1098,10 +1098,11 @@ TEST(RecalcTimestampLocal, FallBackRepeatedHour) {
EXPECT_EQ(esp_result, libc_result);
// Test the repeated hour (1:30 AM occurs twice)
// Both implementations should resolve this the same way (typically standard time)
libc_result = libc_mktime(2026, 11, 1, 1, 30, 0);
// libc behavior varies by platform for this edge case, so we verify our
// consistent behavior: prefer standard time (later UTC timestamp)
esp_result = esptime_recalc_local(2026, 11, 1, 1, 30, 0);
EXPECT_EQ(esp_result, libc_result);
time_t std_interpretation = esptime_recalc_local(2026, 11, 1, 2, 30, 0) - 3600; // 2:30 CST - 1 hour
EXPECT_EQ(esp_result, std_interpretation);
}
TEST(RecalcTimestampLocal, SouthernHemisphereDST) {