Skip to content

Add feature to Timestamp activity in stdout using -T in command line. #109

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

Closed
wants to merge 1 commit into from
Closed

Add feature to Timestamp activity in stdout using -T in command line. #109

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
31 changes: 28 additions & 3 deletions direwolf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include <string.h>
#include <signal.h>
#include <ctype.h>
#include <time.h>

#if __ARM__
//#include <asm/hwcap.h>
Expand Down Expand Up @@ -175,7 +176,7 @@ static int d_p_opt = 0; /* "-d p" option for dumping packets over radio. */

static int q_h_opt = 0; /* "-q h" Quiet, suppress the "heard" line with audio level. */
static int q_d_opt = 0; /* "-q d" Quiet, suppress the printing of decoded of APRS packets. */

static char timestamp_format[100]; /* "-T format" for timestamping activity ouput. */


static struct misc_config_s misc_config;
Expand Down Expand Up @@ -219,6 +220,7 @@ int main (int argc, char *argv[])
strlcpy(l_opt_logdir, "", sizeof(l_opt_logdir));
strlcpy(L_opt_logfile, "", sizeof(L_opt_logfile));
strlcpy(P_opt, "", sizeof(P_opt));
strlcpy(timestamp_format, "", sizeof(timestamp_format));

#if __WIN32__

Expand Down Expand Up @@ -357,8 +359,8 @@ int main (int argc, char *argv[])
};

/* ':' following option character means arg is required. */

c = getopt_long(argc, argv, "P:B:D:c:pxr:b:n:d:q:t:Ul:L:Sa:E:",
/* Add the -T option for timestamping activity display. */
c = getopt_long(argc, argv, "P:B:D:c:pxr:b:n:d:q:t:T:Ul:L:Sa:E:",
long_options, &option_index);
if (c == -1)
break;
Expand Down Expand Up @@ -523,6 +525,15 @@ int main (int argc, char *argv[])
case 't': /* Was handled earlier. */
break;

/* Proposed addition for 1.5 to enable timestamping activity display. */

case 'T': /* -T for timestamp activity display */

if (strlen(optarg) == 0)
strlcpy (timestamp_format, (char *)"%Y-%m-%d %H:%M:%S %Z", sizeof(timestamp_format));
else
strlcpy (timestamp_format, optarg, sizeof(timestamp_format));
break;

case 'U': /* Print UTF-8 test and exit. */

Expand Down Expand Up @@ -897,6 +908,20 @@ void app_process_rec_packet (int chan, int subchan, int slice, packet_t pp, alev
ax25_get_addr_with_ssid(pp, h, heard);
}

/* If timestamp is enabled then output it here. */

if (strlen(timestamp_format) != 0) {
char time_str[200];
time_t now;
struct tm tm;

now = time(NULL);
(void)localtime_r(&now, &tm);
strftime (time_str, sizeof(time_str), (char *)timestamp_format, &tm);
text_color_set(DW_COLOR_INFO);
dw_printf ("\n%s", time_str);
}

text_color_set(DW_COLOR_DEBUG);
dw_printf ("\n");

Expand Down