From 7332f876540b11b92115fdb399cd6753a02d6f3a Mon Sep 17 00:00:00 2001
From: tth <sigfood@dinorama.fr>
Date: Sat, 12 Jan 2019 16:26:15 +0100
Subject: [PATCH] premiere mesure de temperature avec le LM35

---
 serial/essai.sh             |  4 ++--
 serial/t.c                  |  2 +-
 simulator/rdtemp/rdtemp.ino | 47 +++++++++++++++++++++++++++++++++++++
 viz/curses/7segments.c      | 35 +++++++++++++++++++++++++++
 viz/curses/ecran.c          |  2 +-
 viz/curses/t.c              |  8 +++----
 6 files changed, 90 insertions(+), 8 deletions(-)
 create mode 100644 simulator/rdtemp/rdtemp.ino

diff --git a/serial/essai.sh b/serial/essai.sh
index cedaa1e..854ac44 100755
--- a/serial/essai.sh
+++ b/serial/essai.sh
@@ -5,9 +5,9 @@ DATAFILE="foo.dat"
 TMPFILE="/tmp/dd2data"
 
 IMAGE="graphe.png"
-NB_READ=12000
+NB_READ=50
 
-./t -n ${NB_READ} -d ${DEVICE} | tee -a ${DATAFILE}
+./t -v -n ${NB_READ} -d ${DEVICE} | tee -a ${DATAFILE}
 
 gnuplot << __EOC__
 set term png 	size 1600,512
diff --git a/serial/t.c b/serial/t.c
index ed45298..fe72b05 100644
--- a/serial/t.c
+++ b/serial/t.c
@@ -33,7 +33,7 @@ for (count=0; count<iters; count++) {
 		fprintf(stderr, "getline #%d -> %d\n", count, foo);
 		fprintf(stderr, "%s\n", ligne);
 		}
-	foo = parse4values(ligne, 'X', datas);
+	foo = parse4values(ligne, 'T', datas);
 	// 
 	if (foo >= 0) {
 		temps = time(NULL);
diff --git a/simulator/rdtemp/rdtemp.ino b/simulator/rdtemp/rdtemp.ino
new file mode 100644
index 0000000..cf28832
--- /dev/null
+++ b/simulator/rdtemp/rdtemp.ino
@@ -0,0 +1,47 @@
+/*
+ * lecture des capteurs de temperature LM35
+ */
+/* -------------------------------------------------- */
+
+#define NBVAL   4
+#define DELAI   5000
+
+int   values[NBVAL];
+
+/* -------------------------------------------------- */
+void setup() {
+  Serial.begin(9600);
+  pinMode(LED_BUILTIN, OUTPUT);
+  delay(2000);
+}
+/* -------------------------------------------------- */
+void updatevalues(void)
+{
+  int foo;
+  for (foo=0; foo<NBVAL; foo++) {
+    values[foo] = analogRead(A0);
+    delay(50);
+   }
+}
+/* -------------------------------------------------- */
+void sendvalues(void)
+{
+  int foo;
+
+  Serial.print("T");
+  for (foo=0; foo<NBVAL; foo++) {
+    Serial.print(" ");
+    Serial.print(values[foo]);
+    }
+  Serial.print("\n");
+}
+/* -------------------------------------------------- */
+
+void loop() {
+  updatevalues();
+  sendvalues();
+  delay(DELAI);
+}
+
+/* -------------------------------------------------- */
+
diff --git a/viz/curses/7segments.c b/viz/curses/7segments.c
index b49b5ab..4f44bca 100644
--- a/viz/curses/7segments.c
+++ b/viz/curses/7segments.c
@@ -15,6 +15,41 @@
 int	verbosity;
 
 /* ---------------------------------------------------------------- */
+int afficheur_7segs(WINDOW * win, int lig, int col, int bits, int k)
+{
+int	numbit, mask;
 
+for (numbit=0; numbit<8; numbit++) {
+	mask = 1 << numbit;
+
+	switch(mask) {
+
+		case 0x01:
+
+		case 0x02:
+
+		case 0x04:
+
+		case 0x08:
+
+		case 0x10:
+
+		case 0x20:
+
+		case 0x40:
+
+		case 0x80:
+			/* decimal point */
+			break;
+
+		default:
+			fprintf(stderr, "%s mask is wrong\n", __func__);
+			break;
+		}
+
+	}
+
+return -1;
+}
 /* ---------------------------------------------------------------- */
 
diff --git a/viz/curses/ecran.c b/viz/curses/ecran.c
index 37dd65b..71f7f71 100644
--- a/viz/curses/ecran.c
+++ b/viz/curses/ecran.c
@@ -33,7 +33,7 @@ char    buffer[200];
 tp = " DD2 MONITORING by tTh 2019 ";
 if (NULL != title)	tp = title;
 
-barre_inverse('+', 0);
+barre_inverse(' ', 0);
 standout();
 mvaddstr(0, 2, tp);
 #if TRACE
diff --git a/viz/curses/t.c b/viz/curses/t.c
index 7b35db7..742668c 100644
--- a/viz/curses/t.c
+++ b/viz/curses/t.c
@@ -22,16 +22,16 @@ water = open_waterfall("premier essai", 0);
 
 for (loop=0; loop<nbl; loop++) {
 
-	sprintf(line, "%04X  %04X", loop, rand()&0xffff);
+	sprintf(line, "%06X  %04X", loop, rand()&0xffff);
 	mvwaddstr(stdscr, LINES-1, 1, line);
 	wrefresh(stdscr);
 
 	for (foo=0; foo<4; foo++) {
 		if (rand()%100<42) {
-			rvals[foo] += 3.8*(foo + 1);
+			rvals[foo] += 3.9 * (foo + 1);
 			}
 		if (rvals[foo] > 1023.0) {
-			rvals[foo] = (float)(rand() % 15);
+			rvals[foo] = (float)(rand() % 25);
 		}
 	}
 
@@ -77,7 +77,7 @@ keypad(stdscr, TRUE);           /* acces aux touches 'curseur' */
 
 fond_ecran(" Demonstrator ");
 
-demo(90000, 0);
+demo(190000, 0);
 
 /*
  *      plop, on a fini, restaurer la console