Skip to content

fix: timestamp decrement when hour/day overflow occurs #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siara-cc merged 1 commit into from
Jan 26, 2023
Merged

fix: timestamp decrement when hour/day overflow occurs #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/ESP32_Console/ESP32_Console.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ int update_ts_part(char *ptr, int8_t len, int limit, int ovflw) {
int part = get_ts_part(ptr, len) + ovflw - is_one_based;
ovflw = part / limit;
part %= limit;
set_ts_part(ptr, part - is_one_based, len);
set_ts_part(ptr, part + is_one_based, len);
return ovflw;
}

Expand All @@ -278,11 +278,11 @@ void update_ts(char *ts, int diff) {
if (ovflw) {
int8_t month = get_ts_part(ts + 5, 2);
int year = get_ts_part(ts, 4);
int8_t limit = (month == 2 ? (year % 4 ? 27 : 28) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 29 : 30));
int8_t limit = (month == 2 ? (year % 4 ? 28 : 29) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 30 : 31));
ovflw = update_ts_part(ts + 8, 2, limit, ovflw); // day
if (ovflw) {
ovflw = update_ts_part(ts + 5, 2, 11, ovflw); // month
ovflw = update_ts_part(ts + 5, 2, 12, ovflw); // month
if (ovflw)
set_ts_part(ts, year + ovflw, 4); // year
}
Expand Down
8 changes: 4 additions & 4 deletions examples/ESP8266_Console/ESP8266_Console.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ int update_ts_part(char *ptr, int8_t len, int limit, int ovflw) {
int part = get_ts_part(ptr, len) + ovflw - is_one_based;
ovflw = part / limit;
part %= limit;
set_ts_part(ptr, part - is_one_based, len);
set_ts_part(ptr, part + is_one_based, len);
return ovflw;
}

Expand All @@ -282,11 +282,11 @@ void update_ts(char *ts, int diff) {
if (ovflw) {
int8_t month = get_ts_part(ts + 5, 2);
int year = get_ts_part(ts, 4);
int8_t limit = (month == 2 ? (year % 4 ? 27 : 28) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 29 : 30));
int8_t limit = (month == 2 ? (year % 4 ? 28 : 29) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 30 : 31));
ovflw = update_ts_part(ts + 8, 2, limit, ovflw); // day
if (ovflw) {
ovflw = update_ts_part(ts + 5, 2, 11, ovflw); // month
ovflw = update_ts_part(ts + 5, 2, 12, ovflw); // month
if (ovflw)
set_ts_part(ts, year + ovflw, 4); // year
}
Expand Down
8 changes: 4 additions & 4 deletions examples/Uno_and_above/Uno_and_above.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ int update_ts_part(char *ptr, int8_t len, int limit, int ovflw) {
int part = get_ts_part(ptr, len) + ovflw - is_one_based;
ovflw = part / limit;
part %= limit;
set_ts_part(ptr, part - is_one_based, len);
set_ts_part(ptr, part + is_one_based, len);
return ovflw;
}

Expand All @@ -181,11 +181,11 @@ void update_ts(char *ts, int diff) {
if (ovflw) {
int8_t month = get_ts_part(ts + 5, 2);
int year = get_ts_part(ts, 4);
int8_t limit = (month == 2 ? (year % 4 ? 27 : 28) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 29 : 30));
int8_t limit = (month == 2 ? (year % 4 ? 28 : 29) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 30 : 31));
ovflw = update_ts_part(ts + 8, 2, limit, ovflw); // day
if (ovflw) {
ovflw = update_ts_part(ts + 5, 2, 11, ovflw); // month
ovflw = update_ts_part(ts + 5, 2, 12, ovflw); // month
if (ovflw)
set_ts_part(ts, year + ovflw, 4); // year
}
Expand Down
8 changes: 4 additions & 4 deletions examples/Uno_and_above_SdFat/Uno_and_above_SdFat.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ int update_ts_part(char *ptr, int8_t len, int limit, int ovflw) {
int part = get_ts_part(ptr, len) + ovflw - is_one_based;
ovflw = part / limit;
part %= limit;
set_ts_part(ptr, part - is_one_based, len);
set_ts_part(ptr, part + is_one_based, len);
return ovflw;
}

Expand All @@ -182,11 +182,11 @@ void update_ts(char *ts, int diff) {
if (ovflw) {
int8_t month = get_ts_part(ts + 5, 2);
int year = get_ts_part(ts, 4);
int8_t limit = (month == 2 ? (year % 4 ? 27 : 28) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 29 : 30));
int8_t limit = (month == 2 ? (year % 4 ? 28 : 29) :
(month == 4 || month == 6 || month == 9 || month == 11 ? 30 : 31));
ovflw = update_ts_part(ts + 8, 2, limit, ovflw); // day
if (ovflw) {
ovflw = update_ts_part(ts + 5, 2, 11, ovflw); // month
ovflw = update_ts_part(ts + 5, 2, 12, ovflw); // month
if (ovflw)
set_ts_part(ts, year + ovflw, 4); // year
}
Expand Down