From 69dd1d167b5bbb9b76acee80e1813987b7e7d668 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 25 Feb 2025 11:11:28 -0500 Subject: [PATCH] DMR: Fix LRRP Report to File Format; #281 --- include/dsd.h | 1 + src/dmr_pdu.c | 4 ++-- src/dsd_time.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/dsd.h b/include/dsd.h index bf3688e..01486ee 100644 --- a/include/dsd.h +++ b/include/dsd.h @@ -1302,6 +1302,7 @@ char * getTimeC(); char * getTimeN(time_t t); char * getDate(); char * getDateH(); +char * getDateS(); char * getDateN(time_t t); //dmr alg stuff diff --git a/src/dmr_pdu.c b/src/dmr_pdu.c index 79320cb..5a364ea 100644 --- a/src/dmr_pdu.c +++ b/src/dmr_pdu.c @@ -433,8 +433,8 @@ void dmr_lrrp (dsd_opts * opts, dsd_state * state, uint16_t len, uint32_t source FILE * pFile; //file pointer if (opts->lrrp_file_output == 1) { - char * timestr = getTime(); - char * datestr = getDate(); + char * timestr = getTimeC(); + char * datestr = getDateS(); //open file by name that is supplied in the ncurses terminal, or cli pFile = fopen (opts->lrrp_out_file, "a"); diff --git a/src/dsd_time.c b/src/dsd_time.c index 87ac97d..0c42cad 100644 --- a/src/dsd_time.c +++ b/src/dsd_time.c @@ -60,6 +60,16 @@ char * getDateH() return curr; } +//get YYYY-MM-DD with forward slash (LRRP files) +char * getDateS() +{ + char * curr = calloc(27, sizeof(char)); + time_t t = time(NULL); + struct tm * ptm = localtime(& t); + sprintf(curr, "%04d/%02d/%02d", ptm->tm_year+1900, ptm->tm_mon+1, ptm->tm_mday); + return curr; +} + //get YYYY-MM-DD with hyphen (Ncurses Call History) char * getDateN(time_t t) {