Skip to content

Commit c741afa

Browse files
committed
Update TimeZone function
Add TimeZone(UnixTime, HourOffset, MinuteOffset)
1 parent 9f5cdd2 commit c741afa

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

STM32F1/libraries/RTClock/src/RTClock.cpp

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,21 +80,6 @@
8080
}
8181
*/
8282

83-
// Usage: 1. localtime = TimeZone(UnixTime, 9, 1) means SAT +09:30 TimeZone;
84-
// 2. localtime = TimeZone(UnixTime, -3, 1) means NST,NFT -03:30 TimeZone;
85-
// 3. TimeZone(UnixTime, 8, 0) same function as TimeZone(UnixTime, 8) -> CCT +08:00
86-
87-
time_t RTClock::TimeZone(time_t t, int TZ, bool HFZ) { // HFZ : Half-hour TimeZone flag
88-
if(HFZ) {
89-
if(TZ > 0 )
90-
return ( t + (TZ * SECS_PER_HOUR) + 1800);
91-
else
92-
return ( t + (TZ * SECS_PER_HOUR) - 1800);
93-
}
94-
else
95-
return ( t + (TZ * SECS_PER_HOUR));
96-
}
97-
//
9883

9984
void RTClock::setTime (tm_t & tmm) {
10085
time_t mktm = makeTime(tmm); // time will be make to mktm

STM32F1/libraries/RTClock/src/RTClock.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,8 @@ class RTClock {
7575
// Usage: localtime = TimeZone(UnixTime, 8);
7676
time_t TimeZone(time_t t, int TZ) { return ( t + (TZ * SECS_PER_HOUR)); }
7777

78-
// Usage: 1. localtime = TimeZone(UnixTime, 9, 1) means SAT +09:30 TimeZone;
79-
// 2. localtime = TimeZone(UnixTime, -3, 1) means NST,NFT -03:30 TimeZone;
80-
// 3. TimeZone(UnixTime, 8, 0) same function as TimeZone(UnixTime, 8) -> CCT +08:00
81-
time_t TimeZone(time_t t, int TZ, bool HFZ); // HFZ : Half-hour TimeZone flag
78+
// Usage: 1. localtime = TimeZone(UnixTime, 9, 45) -> UTC +09:45 TimeZone;
79+
time_t TimeZone(time_t t, int HTZ, int MTZ) { return ( t + (HTZ * SECS_PER_HOUR) + (MTZ * 60); } // HTZ = Hour offset, MTZ = Minute offset
8280

8381
void createAlarm(voidFuncPtr function, time_t alarm_time_t);
8482
void createAlarm(voidFuncPtr function, struct tm_t & alarm_tm);

0 commit comments

Comments
 (0)