From 5433ec17c2ff80165a47d2b0aad98aa94c7434ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hern=C3=A1n=20Asorey?= <asoreyh@gmail.com>
Date: Tue, 19 Nov 2024 14:59:38 +0100
Subject: [PATCH] Reading P&T in new data structure
---
include/lago_defs.h | 5 +++--
include/lago_file.h | 8 +++++++-
lago-anna.sh | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/include/lago_defs.h b/include/lago_defs.h
index fb69d7c..77b8e0f 100644
--- a/include/lago_defs.h
+++ b/include/lago_defs.h
@@ -20,12 +20,13 @@
#define CODEVERSION "v5"
#define DATAVERSION 5
-#define CHANNELS 3
+#define CHANNELS 2
#define TRACELEN 12
#define BASELINE 50
#define BIN 25.
#define ADCMAX 1024
#define CHRGMAX 4096
+#define CHRGMIN 0
#define TRIGGERBIN 3
-#endif
\ No newline at end of file
+#endif
diff --git a/include/lago_file.h b/include/lago_file.h
index bf5764f..e3c78ef 100644
--- a/include/lago_file.h
+++ b/include/lago_file.h
@@ -103,8 +103,14 @@ class LagoFile {
break;
case 'x': // extra data
switch (line[4]) {
- case 's': // sensors
+ case 's': // sensors in Nexys
sscanf(line, "# x s %lf C %lf hPa", &(Data->temperature), &(Data->pressure)); // not reading altitude
+ break;
+ case 'p': // pressure in RP
+ sscanf(line, "# x p %lf", &(Data->pressure));
+ break;
+ case 't': // temperature in RP
+ sscanf(line, "# x t %lf", &(Data->temperature));
break;
case 'f': // clock frequency
sscanf(line, "# x f %d\n", &(Data->clockfrequency));
diff --git a/lago-anna.sh b/lago-anna.sh
index 2917269..f49e4a0 100755
--- a/lago-anna.sh
+++ b/lago-anna.sh
@@ -10,7 +10,7 @@
# License: BSD-3-Clause
# See the LICENSE file in the project root for full license information.
################################################################################
-VERSION="1.5.0"
+VERSION="2.0.0"
export LAGO_ANNA=${PWD}
date=$(date -u)
echo "#
--
GitLab