From 35b19283237e9189b4387f453197dc76e452b0ef Mon Sep 17 00:00:00 2001 From: mikee47 Date: Thu, 20 Jun 2024 15:40:45 +0100 Subject: [PATCH] Fix Timezone build errors --- Sming/Libraries/Timezone | 2 +- samples/SystemClock_NTP/app/NtpClientDemo.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Sming/Libraries/Timezone b/Sming/Libraries/Timezone index 92ceeaff61..1e3305df08 160000 --- a/Sming/Libraries/Timezone +++ b/Sming/Libraries/Timezone @@ -1 +1 @@ -Subproject commit 92ceeaff611f5df80143b5d3092e0a50f4859108 +Subproject commit 1e3305df084c414dacc0d959e32e354d1c38b166 diff --git a/samples/SystemClock_NTP/app/NtpClientDemo.cpp b/samples/SystemClock_NTP/app/NtpClientDemo.cpp index aefa2bf30f..1ed73460b8 100644 --- a/samples/SystemClock_NTP/app/NtpClientDemo.cpp +++ b/samples/SystemClock_NTP/app/NtpClientDemo.cpp @@ -12,8 +12,8 @@ using namespace TZ; * For handling local/UTC time conversions * This is for the UK, amend as required */ -const Rule dstStart{"BST", Last, Sun, Mar, 1, 60}; -const Rule stdStart{"GMT", Last, Sun, Oct, 2, 0}; +const Rule dstStart{{"BST"}, Last, Sun, Mar, 1, 60}; +const Rule stdStart{{"GMT"}, Last, Sun, Oct, 2, 0}; // Posix rule string DEFINE_FSTR_LOCAL(tzstr, "GMT0BST,M3.5.0/1,M10.5.0") @@ -80,7 +80,7 @@ void NtpClientDemo::ntpResult(NtpClient& client, time_t ntpTime) SystemClock.setTime(ntpTime, eTZ_UTC); // Now we've set the clock, we can determine the initial active timezone and maintain the offset - SystemClock.onCheckTimeZoneOffset([this](time_t systemTime) { checkTimeZoneOffset(systemTime); }); + SystemClock.onCheckTimeZoneOffset([](time_t systemTime) { checkTimeZoneOffset(systemTime); }); /* * Display the new time