mirror/OpenBK7231T_App
3
0
Fork 0
mirror of https://github.com/openshwprojects/OpenBK7231T_App.git synced 2026-08-18 11:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow calling time_setDST for hours or minutes - call now matches documentation (#2127)

Browse Source 
* Update obk_config.h - enable DST for all platforms

* fix time_setDST to allow for hours or minutes

* eleminate one more int variable

* disable DST again as default - only used for testing
This commit is contained in:
MaxineMuster
2026-06-23 08:58:07 +02:00
committed by GitHub
parent 0ffb790284
commit 93b85e42ea
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/driver/drv_deviceclock.c
View File

@ -368,7 +368,7 @@ uint32_t setDST() {
//
// | |-- 1st rule: last_week March sunday 2_o_clock 60_minutes_DST_after_this_time
// | |-- 1st rule: last_week March sunday 2_o_clock 60_minutes_DST_after_this_time
// TIME_setDST 0 3 1 2 60 0 10 1 3 0
// | |-- 2nd_rule: last_week October sunday 3_o_clock 0_minutes_DST_after_this_time
commandResult_t TIME_SetDST(const int *args) {
@ -390,14 +390,21 @@ commandResult_t TIME_SetDST(const int *args) {
dst_config.hour2 = args[8+add];
d2 = args[9+add]; // second DST offset
// no case needed for "DSToffset": one entry must be 0, one != 0, so if valid, the sum is the DST offset
dst_config.DSToffset = 60*(d1+d2)*(d1*d2 == 0);
if ( dst_config.DSToffset == 0 ) return CMD_RES_BAD_ARGUMENT; // neither two times 0 nor two times != 0 is valid !
if (!((!d1) ^ (!d2))) return CMD_RES_BAD_ARGUMENT; // neither two times 0 nor two times != 0 is valid --> XOR them!
dst_config.isDST1 = (d1 != 0);
dst_config.isDST2 = (d2 != 0);
// we know for sure now, one of d1 and d2 is 0. So store the "sum" in d1, resulting d1 being the actual dst offset
d1 += d2;
// if dstoffset != 1, assume minutes, if dstoffest == 1, assume "1 hour" (3600 seconds)
if ( d1 == 1 ) {
dst_config.DSToffset = 3600;
} else {
dst_config.DSToffset = 60*(d1);
}
if (TIME_IsTimeSynced()) setDST();
dst_config.DSTinitialized = 1;
@ -450,13 +457,12 @@ commandResult_t CMD_TIME_CalcDST(const void *context, const char *cmd, const cha
int clkargs[10];
clkargs[4]=0; // starts with "DST-End", so after this DST offset is 0
for (int i=0; i<4; i++){
clkargs[i]=Tokenizer_GetArgInteger(i);
clkargs[9]=Tokenizer_GetArgIntegerDefault(8, 1);
for (int i=0; i<4; i++) {
clkargs[i] = Tokenizer_GetArgInteger(i);
clkargs[i+5] = Tokenizer_GetArgInteger(i+4);
}
for (int i=4; i<8; i++){
clkargs[i+1]=Tokenizer_GetArgInteger(i);
}
clkargs[9]=Tokenizer_GetArgIntegerDefault(8, 1)*60; // we'll use minutes with TIME_SetDST
return TIME_SetDST(clkargs);
}