diff --git a/include/lago_defs.h b/include/lago_defs.h index fb69d7cf7a82425969c086cef53d159f655cdac5..77b8e0f87b20c5d32e3bf6e2a264321a94587792 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 bf5764f8089880cba50ca231264f74a3b5bebe52..e3c78ef9f0c816c3e61453848dfce198a9f856b7 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 2917269e43b01d3c1b1525aa7207e26598cf01a4..f49e4a051b7476771968f522e02735392c67c3b2 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 "#