Skip to content

Commit 65ab651

Browse files
authored
Merge pull request #45 from Zondax/feat-decodetime-icp
2 parents 9a82671 + d3cb852 commit 65ab651

3 files changed

Lines changed: 19 additions & 1 deletion

File tree

include/timeutils.h

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,19 @@ __Z_INLINE const char *getMonth(uint8_t tm_mon) {
5555
}
5656
}
5757

58+
typedef struct {
59+
uint8_t tm_sec;
60+
uint8_t tm_min;
61+
uint8_t tm_hour;
62+
uint16_t tm_day;
63+
uint8_t tm_mon;
64+
uint16_t tm_year;
65+
char *monthName;
66+
} timedata_t;
67+
5868
zxerr_t printTime(char *out, uint16_t outLen, uint64_t t);
5969
zxerr_t printTimeSpecialFormat(char *out, uint16_t outLen, uint64_t t);
70+
zxerr_t decodeTime(timedata_t *timedata, uint64_t t);
6071

6172
#ifdef __cplusplus
6273
}

include/zxversion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@
1717

1818
#define ZXLIB_MAJOR 14
1919
#define ZXLIB_MINOR 1
20-
#define ZXLIB_PATCH 7
20+
#define ZXLIB_PATCH 8

src/timeutils.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -502,6 +502,13 @@ static zxerr_t extractTime(uint64_t t, uint8_t *sec, uint8_t *min, uint8_t *hour
502502
return zxerr_ok;
503503
}
504504

505+
zxerr_t decodeTime(timedata_t* td, uint64_t t) {
506+
CHECK_ZXERR(extractTime(t, &td->tm_sec, &td->tm_min, &td->tm_hour,
507+
&td->tm_day, &td->tm_mon, &td->tm_year))
508+
td->monthName = (char*) getMonth(td->tm_mon);
509+
return zxerr_ok;
510+
}
511+
505512
zxerr_t printTime(char *out, uint16_t outLen, uint64_t t) {
506513
uint8_t tm_sec;
507514
uint8_t tm_min;

0 commit comments

Comments
 (0)