Fix Timezone build errors

SmingHub · Jun 24, 2024 · 35b1928 · 35b1928
1 parent 1b6e395
commit 35b1928
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sming/Libraries/Timezone b/Sming/Libraries/Timezone
diff --git 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
+1 −1		src/include/tzdb.h
+4 −0		test/app/transitions.cpp
+7 −3		test/app/zoneinfo.cpp
+1 −1		tools/compile.py
+3 −0		tools/tzstr.py