From cda7b7f45e40dd8348f24bf5062366f8a3418b66 Mon Sep 17 00:00:00 2001
From: tth <sigfood@dinorama.fr>
Date: Wed, 12 Dec 2018 20:07:49 +0100
Subject: [PATCH] serial : a small test main()

---
 doc/dd2-monitoring.tex |  3 +++
 influxdb/README.md     |  6 +++++-
 influxdb/injecteur.pl  |  3 +++
 serial/Makefile        |  6 +++---
 serial/serial.c        | 26 ++++++++++++++++++++++++--
 serial/serial.h        |  7 +++++++
 serial/t.c             | 12 +++++++++---
 7 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/doc/dd2-monitoring.tex b/doc/dd2-monitoring.tex
index 737987c..9efd5c1 100644
--- a/doc/dd2-monitoring.tex
+++ b/doc/dd2-monitoring.tex
@@ -92,6 +92,9 @@ ne demande qu'à grandir.
 
 \subsection{Analyses}
 
+% -------------------------------------------------------------------
+
+\section{influxdb} \label{influxdb}
 
 
 
diff --git a/influxdb/README.md b/influxdb/README.md
index ce37442..6d2fdfc 100644
--- a/influxdb/README.md
+++ b/influxdb/README.md
@@ -14,7 +14,11 @@ purpose-built platform that InfluxData provides._
 
 # On essaye ?
 
-Ok, c'est parti. On va écrire un injecteur en Perl.
+Ok, c'est parti. On va écrire un injecteur en Perl. Puis enchainer sur
+une visualisation dynamique des données en lancer de rayon.
+Projet ambitieux ? Non, la suite sera bien pire.
+
+
 
 
 
diff --git a/influxdb/injecteur.pl b/influxdb/injecteur.pl
index 7fd0401..0c54195 100755
--- a/influxdb/injecteur.pl
+++ b/influxdb/injecteur.pl
@@ -3,3 +3,6 @@
 use strict;
 
 print "injecteur v 0\n";
+
+0;
+
diff --git a/serial/Makefile b/serial/Makefile
index 3af2ad8..984dabe 100644
--- a/serial/Makefile
+++ b/serial/Makefile
@@ -1,9 +1,9 @@
 
-
+OPT = -Wall -DDEBUG_LEVEL=1
 
 serial.o:	serial.c serial.h Makefile
-	gcc -Wall -c $<
+	gcc ${OPT} -c $<
 
 t:	t.c serial.o Makefile
-	gcc -Wall  $< serial.o -o $@
+	gcc ${OPT}  $< serial.o -o $@
 
diff --git a/serial/serial.c b/serial/serial.c
index 1de14ce..471907c 100644
--- a/serial/serial.c
+++ b/serial/serial.c
@@ -1,6 +1,7 @@
 
 #include <stdio.h>
 #include  <stdlib.h>
+#include  <sys/select.h>
 #include <unistd.h>			//Used for UART
 #include <fcntl.h>			//Used for UART
 #include <termios.h>		//Used for UART
@@ -84,7 +85,7 @@ if (uart0== -1)
 
 baudbits = baudrate2const(baudrate);
 #if DEBUG_LEVEL
-fprintf(stderr, "%d -> %x\n", baudrate, baudbits);
+fprintf(stderr, "%d -> 0x%04x\n", baudrate, baudbits);
 #endif
 tcgetattr(uart0, &options);
 options.c_cflag = baudbits | CS8 | CLOCAL | CREAD;	//<Set baud rate
@@ -98,7 +99,7 @@ return uart0;
 }
 /* -------------------------------------------------------------------- */
 /*
- *	maybe we have to check for timeout ?
+ *	this function have NO timeout !
  */
 int getbyte(int fd)
 {
@@ -115,3 +116,24 @@ return (int)byte;
 }
 
 /* -------------------------------------------------------------------- */
+/* timeout is in milliseconds */
+int getbyte_to (int fd, int to_ms)
+{
+unsigned char   byte;
+struct timeval	timeout;
+
+timeout.tv_sec  = to_ms / 1000;
+timeout.tv_usec = (to_ms % 1000) * 1000;
+
+#if DEBUG_LEVEL
+fprintf(stderr, "timeout %6d is %4ld %6ld\n", to_ms,
+				timeout.tv_sec, timeout.tv_usec);
+#endif
+
+
+
+
+
+return -3;
+}
+/* -------------------------------------------------------------------- */
diff --git a/serial/serial.h b/serial/serial.h
index 3bafcb5..2bd7cb5 100644
--- a/serial/serial.h
+++ b/serial/serial.h
@@ -1,8 +1,15 @@
 /*
  *		serial.h
+ *		--------
+ *
  */
 
 int prepare_UART(char *port, int bauds);
 
 int getbyte(int fd);
 
+
+/* timeout is exprimed in milliseconds. */
+int getbyte_to (int fd, int to_ms);
+
+
diff --git a/serial/t.c b/serial/t.c
index b912596..cbc43aa 100644
--- a/serial/t.c
+++ b/serial/t.c
@@ -7,14 +7,20 @@
 int main (int argc, char *argv[])
 {
 int	serial_in;
-int	byte, foo;
+int	byte, foo, to;
 
 serial_in = prepare_UART("/dev/ttyS0", 9600);
 fprintf(stderr, "prepare uart -> %d\n", serial_in);
 
 for (foo=0; foo<20; foo++) {
-	byte = getbyte(serial_in);
-	printf("%6d    %02x\n", foo, byte);
+	to = (foo+1) * 666;
+	byte = getbyte_to(serial_in, to);
+	if (byte < 0) {
+		fprintf(stderr, "get byte : err is %d\n", byte);
+		}
+	else	{
+		printf("%6d   %6d    %02x\n", foo, to, byte);
+		}
 	}
 
 return 0;