Reading P&T in new data structure

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
+#endif
\ No newline at end of file

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));

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 "#