diff --git a/core/Makefile b/core/Makefile index f31a15d..752f602 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1,7 +1,7 @@ # # dd2 monitoring # -# buil the core functions, use with care +# build the core functions, use with care # diff --git a/core/config.h b/core/config.h index 1e3d063..ec7d75d 100644 --- a/core/config.h +++ b/core/config.h @@ -9,12 +9,14 @@ typedef struct { int valid; char *input_device; + int input_speed; } Configuration; /* ---------------------------------------------------------------- */ +int set_default_config(Configuration *cfg); int parse_config(char *fname, int flags); int show_config(char *title); diff --git a/core/dd2-monitor.conf b/core/dd2-monitor.conf index 8020bcb..5910bda 100644 --- a/core/dd2-monitor.conf +++ b/core/dd2-monitor.conf @@ -1,10 +1,12 @@ -# +# # experimental config file # +# -------------------------------------------------- +# serial input from the control cpu + input_device s /dev/ttyACM0 -input_speed s 9600 - - - +input_speed i 9600 +# -------------------------------------------------- +# -------------------------------------------------- diff --git a/core/parseconf.c b/core/parseconf.c index 1bf1b99..baf4f4e 100644 --- a/core/parseconf.c +++ b/core/parseconf.c @@ -3,6 +3,7 @@ */ #include +#include #include #include "config.h" @@ -74,6 +75,15 @@ while (fgets(line, SZ_STRINGS, fp)) config.input_device = strdup(strtok(NULL, " \t")); continue; } + + + if (CMP("input_speed")) { + config.input_speed = atoi(strtok(NULL, " \t")); +#if DEBUG_LEVEL + fprintf(stderr, "input speed = %d\n", config.input_speed); +#endif + } + } fclose(fp); @@ -90,6 +100,7 @@ if (verbosity) { printf("valid : %d\n", config.valid); printf("input device : %s\n", config.input_device); +printf("input speed : %d\n", config.input_speed); puts(""); return 0; diff --git a/doc/dd2-monitoring.tex b/doc/dd2-monitoring.tex index 5030824..8a12b81 100644 --- a/doc/dd2-monitoring.tex +++ b/doc/dd2-monitoring.tex @@ -331,8 +331,8 @@ En fait, tout reste à faire. Mais ça peut être un beau projet aux implications et usages multiples. Un couteau suisse de la capture du monde réel, un point pivot -de nos diverses interprétations du -monde\footnote{non, la terre n'est pas plate} et des interactions +de nos diverses interprétations de +l'univers\footnote{non, la terre n'est pas plate} et des interactions étranges entre des paramètres sans relation clairement definie. % -------------------------------------------------------------------