data.c: Reset time stamp when starting new log

[log-plotter] / options.c

diff --git a/options.c b/options.c
index 48cd259a3fa754dcf79723229fbd9e1b56eb07b5..582b4e73627c86f5547b56e7896b6bba97a00f71 100644 (file)
--- a/options.c
+++ b/options.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "options.h"
+#include "config.h"
 #include "trace.h"
 
 void print_help_and_die(const char *exec_name)
@@ -15,20 +15,21 @@ void print_help_and_die(const char *exec_name)
        pr_info("  -o, --output            logfile path, stdout only if omited\n");
        pr_info("  -v, --verbose           increase verbosity\n");
        pr_info("  -q, --quiet             decrease verbosity\n");
+       pr_info("  -c, --config=PATH       config file path\n");
        pr_info("  -h, --help              show this help\n");
 
        exit(0);
 }
 
-static void set_default_options(struct plotter_options *opts)
+static void set_default_options(struct plotter_config *opts)
 {
        bzero(opts, sizeof(*opts));
 
-       opts->baud_rate = 128000;
+       opts->baudrate = 128000;
        opts->device_path = "/dev/ttyUSB0";
 }
 
-int read_args(int argc, char *argv[], struct plotter_options *opts)
+int read_args(int argc, char *argv[], struct plotter_config *opts)
 {
        int option_index = 0, c;
        static struct option long_options[] = {
@@ -37,9 +38,10 @@ int read_args(int argc, char *argv[], struct plotter_options *opts)
                { .val = 'b', .name = "baud", .has_arg = 1 },
                { .val = 'v', .name = "verbose", .has_arg = 2 },
                { .val = 'q', .name = "quiet", },
+               { .val = 'c', .name = "config", .has_arg = 1 },
                { .val = 'h', .name = "help", },
        };
-       char short_options[] = "d:o:b:vqh";
+       char short_options[] = "d:o:b:vqc:h";
 
        set_default_options(opts);
 
@@ -55,10 +57,10 @@ int read_args(int argc, char *argv[], struct plotter_options *opts)
                        opts->device_path = optarg;
                        break;
                case 'o':
-                       opts->output_path = optarg;
+                       opts->log_path = optarg;
                        break;
                case 'b':
-                       opts->baud_rate = atoi(optarg);
+                       opts->baudrate = atoi(optarg);
                        break;
                case 'v':
                        trace_level++;
@@ -68,6 +70,9 @@ int read_args(int argc, char *argv[], struct plotter_options *opts)
                        trace_level--;
                        pr_debug("Degreased trace level to %d\n", trace_level);
                        break;
+               case 'c':
+                       opts->config_file_path = optarg;
+                       break;
                case 'h':
                        print_help_and_die(argv[0]);
                        break;