diff --git a/STM32F1/libraries/RTClock/src/RTClock.cpp b/STM32F1/libraries/RTClock/src/RTClock.cpp index 0bfe7df..5f0467f 100755 --- a/STM32F1/libraries/RTClock/src/RTClock.cpp +++ b/STM32F1/libraries/RTClock/src/RTClock.cpp @@ -80,21 +80,6 @@ } */ - // Usage: 1. localtime = TimeZone(UnixTime, 9, 1) means SAT +09:30 TimeZone; - // 2. localtime = TimeZone(UnixTime, -3, 1) means NST,NFT -03:30 TimeZone; - // 3. TimeZone(UnixTime, 8, 0) same function as TimeZone(UnixTime, 8) -> CCT +08:00 - - time_t RTClock::TimeZone(time_t t, int TZ, bool HFZ) { // HFZ : Half-hour TimeZone flag - if(HFZ) { - if(TZ > 0 ) - return ( t + (TZ * SECS_PER_HOUR) + 1800); - else - return ( t + (TZ * SECS_PER_HOUR) - 1800); - } - else - return ( t + (TZ * SECS_PER_HOUR)); - } -// void RTClock::setTime (tm_t & tmm) { time_t mktm = makeTime(tmm); // time will be make to mktm diff --git a/STM32F1/libraries/RTClock/src/RTClock.h b/STM32F1/libraries/RTClock/src/RTClock.h index c0954ea..60b6fbc 100755 --- a/STM32F1/libraries/RTClock/src/RTClock.h +++ b/STM32F1/libraries/RTClock/src/RTClock.h @@ -75,10 +75,8 @@ class RTClock { // Usage: localtime = TimeZone(UnixTime, 8); time_t TimeZone(time_t t, int TZ) { return ( t + (TZ * SECS_PER_HOUR)); } - // Usage: 1. localtime = TimeZone(UnixTime, 9, 1) means SAT +09:30 TimeZone; - // 2. localtime = TimeZone(UnixTime, -3, 1) means NST,NFT -03:30 TimeZone; - // 3. TimeZone(UnixTime, 8, 0) same function as TimeZone(UnixTime, 8) -> CCT +08:00 - time_t TimeZone(time_t t, int TZ, bool HFZ); // HFZ : Half-hour TimeZone flag + // Usage: 1. localtime = TimeZone(UnixTime, 9, 45) -> UTC +09:45 TimeZone; + time_t TimeZone(time_t t, int HTZ, int MTZ) { return ( t + (HTZ * SECS_PER_HOUR) + (MTZ * 60); } // HTZ = Hour offset, MTZ = Minute offset void createAlarm(voidFuncPtr function, time_t alarm_time_t); void createAlarm(voidFuncPtr function, struct tm_t & alarm_tm);