From 9a091ff11a15f253b51d6f724a2ab2fc0ef0fa08 Mon Sep 17 00:00:00 2001 From: Eric Yanush Date: Mon, 11 Nov 2019 18:22:58 -0600 Subject: [PATCH 1/2] Add support for Saskatchewan Time (CST no DST) GMT-6 --- wled00/html_settings.h | 19 ++++++++++--------- wled00/wled10_ntp.ino | 4 +++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/wled00/html_settings.h b/wled00/html_settings.h index cb3b29fc..17c1ba84 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -308,15 +308,16 @@ Time zone: - - - - - - - - - + + + + + + + + + +
UTC offset: seconds (max. 18 hours)
Current local time is unknown. diff --git a/wled00/wled10_ntp.ino b/wled00/wled10_ntp.ino index 6eb5d907..16b06950 100644 --- a/wled00/wled10_ntp.ino +++ b/wled00/wled10_ntp.ino @@ -25,6 +25,8 @@ TimeChangeRule CDT = {Second, Sun, Mar, 2, -300 }; //Daylight time = UTC - 5 TimeChangeRule CST = {First, Sun, Nov, 2, -360 }; //Standard time = UTC - 6 hours Timezone tzUSCentral(CDT, CST); +Timezone tzCASaskatchewan(CST, CST); //Central without DST + TimeChangeRule MDT = {Second, Sun, Mar, 2, -360 }; //Daylight time = UTC - 6 hours TimeChangeRule MST = {First, Sun, Nov, 2, -420 }; //Standard time = UTC - 7 hours Timezone tzUSMountain(MDT, MST); @@ -55,7 +57,7 @@ Timezone tzNK(NKST, NKST); TimeChangeRule IST = {Last, Sun, Mar, 1, 330}; // India Standard Time = UTC + 5.5 hours Timezone tzIndia(IST, IST); -Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia}; +Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzCASaskatchewan, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia}; void handleNetworkTime() { From a90a07f46d64fc82c444da086629231471d7214c Mon Sep 17 00:00:00 2001 From: cschwinne Date: Mon, 23 Dec 2019 20:54:00 +0100 Subject: [PATCH 2/2] Put new timezone to end of list --- wled00/html_settings.h | 20 ++++++++++---------- wled00/wled10_ntp.ino | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 17c1ba84..53da653f 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -308,16 +308,16 @@ Time zone: - - - - - - - - - - + + + + + + + + + +
UTC offset: seconds (max. 18 hours)
Current local time is unknown. diff --git a/wled00/wled10_ntp.ino b/wled00/wled10_ntp.ino index 16b06950..3bb76674 100644 --- a/wled00/wled10_ntp.ino +++ b/wled00/wled10_ntp.ino @@ -57,7 +57,7 @@ Timezone tzNK(NKST, NKST); TimeChangeRule IST = {Last, Sun, Mar, 1, 330}; // India Standard Time = UTC + 5.5 hours Timezone tzIndia(IST, IST); -Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzCASaskatchewan, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia}; +Timezone* timezones[] = {&tzUTC, &tzUK, &tzEUCentral, &tzEUEastern, &tzUSEastern, &tzUSCentral, &tzUSMountain, &tzUSArizona, &tzUSPacific, &tzChina, &tzJapan, &tzAUEastern, &tzNZ, &tzNK, &tzIndia, &tzCASaskatchewan}; void handleNetworkTime() {