From 155bf2ff9eabc4bb3bf42ad455a2d2cb5a73ad8a Mon Sep 17 00:00:00 2001
From: Demo User <debian@beaglebone.localdomain>
Date: Fri, 28 Feb 2020 14:41:15 -0600
Subject: [PATCH] filtered and unfiltered CO2

---
 daq   | Bin 13920 -> 13952 bytes
 daq.c |  28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/daq b/daq
index 2a71f087bcb9708c125eef00df280b30eff53a95..bc1781d7ae03e17fc6bb17b5618c0349882d612e 100755
GIT binary patch
delta 2681
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
W3zBGl%-IVJzt|8;ix&_j66QY?H*tvo

delta 2500
zcmZ8j3rtg27(TbR^hJ4yRcR6E!vdCxRq$Dyh|Qg%6D7DIGg}pnWhfFKn^I%h;v5o_
zfrlv}h{Qm$IHSbsf^JM=NMJ@CIx>uLTgk{Kh1-FzUgXjJ=l0SyyUBmf|DErDoX3Ce
zy%qc1d#klnYmIJ>;<Or}fYfB~l+*#LQ`cO2t;+l8tA@?-Cs9#p$(_R&o=ix6`Yo>O
zRGCQMqCzMWArylmkPG^oN`zEY0RITMU*%%NIa1Ab1ww@&-@sTF^raxDL4PU7m%>+y
zy5;z<@KWjk-l{z4T)e?yjb;44Zg&3&MQ?L26mSQd23lH9xivy3)}oPp+*<;3jWvO0
z;u#7U8<zq&C5Q{SB*C(gHG*d384*}+;4F4=dYql)d(3h+i(TdvU=Q17yJa7<#|f@)
zvp4OW9gQ$!l-BRt&WfR(>nFO}FM@Wqe}-VWmqmtHCVE*rQ_=2`A(SSEO#-okWPxk~
zF@fZOFoNVmUjULJr-8uz5eDaqsUr8d<0wD3v8i##(wvJ0d7Qya=DM8C5RxUa;|?;C
z;6Jj%QH)Z<9+F)mBN{df{CDX^<May?_|CMh;A3?R(+o<LKO8Tn($x&v4`SUhj0{VH
z_6a!`qrpML94$@|3|cXcOr{#}_mKwkz2V#ue|ju457t=So)AOv2m2J(`Us>N4)z}O
zy&ydxZ897gl^`#HHIPi_@sg;8)N{N$Dv>&jzW}`s--z1g{JB+e)e;|TvoLDgADqg1
z%!&+MT#s2g+Djw7##UcJa3|pI5Zng%hY)-jaBB!|0^A&eYXR4V;7Y)!33l=c#`j1^
zD}uBI&>;ayN0q!LPPgfijx0nuY+>T;Qg8LjHt*k#3v6#mvRA_Q%e;)^OE%NdH<)SY
z8q6|0f<06-q$PeQhPt?6BpsE}1f3lUXimScVMxRn4L_|vYV899zwg(fKtC{qpuj!{
zmL!~M?c$!9`#`!l<sz~t6Xy5(&#_sK8{Q7bs5kme_~SlKsUsG@Xw=MiLR#yP%uTE&
zy<LtuFlmy!jE|fTk^7twtUg=*1l=adHj*KJ#P?9)4h`2Vgqu6$_m#s+1`x5&08L3X
z^6MmbV%B5>ualb*HCfN=<i^M+$w=lTu~{*R^a{Aje&4mJF3#yjVfu1i^@cwS=+RvW
zjiiiGjC8bz4%3sFPI<!gg}PHgR?V}W0_*ii^trmvc(xmS6+GKUOL$*5utr^ZkR9hp
z<jVrv1CjG}2b{ss!#v$2gucVmB|+!kc(ztxuK}B_D+>BP;Mq!nZT5)un|0fRzPC9V
z4sd)=n0}q^y`ax^-p5%cI8}M3xBHO>iVg~;jFw^P=rLLfZ6z&%7Sco8M2n%lOw-V|
z(IRL&X$smN8sR?9ZC(wP<o7-B7<H?JL$i8F8I%32@T}kug|q}`Iz54^RMHw|2~P!z
z?<`D*6l1f;LMlQRC_v>RzwbDBJVkxnQ*9qN0HyZdO_)h;LdgYo#s??8VUBZbX30|T
zJ8&bi93;ksHV|XNY>AJv=f2#r6JAlzi-0iKXRr31zd~N0(pOcVl9$WX7pMZ>C#d2?
z+8WZMk7a9KM^Wgm1fgya(wn3(4#I&x0`d%myo8Q~A#?^L0q}A$LNa_`Wl8NA6!UA2
z<zLX~cAAnx^FS61a%-hb_@+uG{M{PnIPBafIDM8*lBb~1I)$rnRw3o;o_&SFr((}y
ztvX9u9-%<SU2<$w$48Nw9V*_pJLTYf`P$sYVDojv4j3~YRG`{_{7%ZXMdK1<o2CPc
z6SblNl`AQ+kka(S_jCH`)WU~T2Lexv%2luZkXk$-@HC3#$A^QM&&YqR2|=T1p08D7
zlm7P@@(~X_(P%v=!z!#XltNZqWk?e}Q@L&#N-5EZ3Y(0L&f17+;|R17)O#VAIQIrp
zgBIYq5KQ=ufvE)f{18m|h7e5RH-}*04M-N;gg}D)5X=XFX(zp{Z~ou#;}A^Zx>eYd
zln_%JT>A|4E$k+2i6;4qs9%NeCO1+oxHu(|x{pt#>?hmtCgp)>EE3<Hzez;)$do2(
zQQ;g@Y1k{6qz$*57RFEi&Xhs{ZH1JZAr<-EIYO{Yp1Mv%Ww`Pd)JsI2;n<s=AR%W4
zp<^=ia&lZmn((TOL`mS+3h&I&OUNW^)vl_HGnBCc{)Og3&|(mX$)BVgdiW6tKDBtw
Q(&X3{GeS^|!Dm|i7Z1Z)(*OVf

diff --git a/daq.c b/daq.c
index a1a79d8..e04abd1 100644
--- a/daq.c
+++ b/daq.c
@@ -18,6 +18,7 @@
 #define Rep_Dev_ID      "Y\r\n"
 #define Pulling_Mode    "K 2\r\n"
 #define OX_P_Mode       "M 1\r\n"
+#define FILnUNFIL       "M 6\r\n"
 #define unf_gas_con     "z\r\n"
 #define fil_gas_con     "Z\r\n"
 #define Temperature     "T\r\n"
@@ -25,7 +26,6 @@
 #define percent_oxigen  "%\r\n"
 #define ppm_oxigen      "O\r\n"
 #define M_zZTHBD        "M 14406\r\n"
-#define Readings_CM     "Q\r\n"
 #define Readings_OX     "A\r\n"
 
 
@@ -52,6 +52,7 @@ int main(int argc, char *argv[]){
     //configuración de sensores
     printf("Configuring CO2 sensor\n");
     sensConf(GC0017, B9600, Pulling_Mode, " K 00002\r\n");
+    sensConf(GC0017, B9600, FILnUNFIL, " M 00006\r\n");
     printf("Configuring CO sensor\n");
     sensConf(CM31911, B9600, Pulling_Mode, "K 00002\r\n");
     sensConf(CM31911, B9600, M_zZTHBD, "M 14406\r\n");
@@ -141,15 +142,14 @@ int str2int(unsigned char *ptr){
 int DAQ(int t_hrs, int tm_s)
 {
     FILE* dfp; // create a file pointer dfp
-    
-    int co2, co, o2, temp;
-    unsigned char co_uf[10]="", co_f[10]="",
+    //int co2, co, o2, temp;
+    unsigned char co2_uf[10]="", co2_f[10]="",
+                co_uf[10]="", co_f[10]="",
                 o2_ppm[10]="", o2_xcent[10]="",
                 co2_temp[10]="", o2_temp[10]="",
                 co2_press[10]="", o2_press[10]="",
                 co2_relH[10]="", DATA[100]="";
     
-    
     clock_t start_t, end_t;
     time_t new_time, prev_time, t0;
 	double tm_ms = tm_s*1e6 - 0.20e6;
@@ -159,14 +159,12 @@ int DAQ(int t_hrs, int tm_s)
     dfp = fopen(data_file_path, "w"); // open file for writing
     time_t curtime;
     time(&curtime);
-    fprintf(dfp, "%sStarting DAQ\ntime(s)\tCO2(ppm)\tCO unfil(ppm)\tCO fil(ppm)"\
+    fprintf(dfp, "%sStarting DAQ\ntime(s)\tCO2 unfil(ppm)\tCO2 fil(ppm)\tCO unfil(ppm)\tCO fil(ppm)"\
                 "\tO2(ppm)\tO2(%c)\tTemperaure C02(ºC*10)\tTemperaure 02(ºC)"\
                 "\tPressure C02(.mBar)\tPresure 02(mBar)\tRelative Humidity(.)\n",
                 ctime(&curtime), '%'); // send the value to the file
     fclose(dfp); // close the file using the file pointer
     
-    
-    
     //ciclo
     t0 = time(NULL) + tm_s;
     new_time = t0;
@@ -181,15 +179,17 @@ int DAQ(int t_hrs, int tm_s)
         start_t = clock();
             new_time = time(NULL);
             //command transmitions
-            uartTransmit(CM31911, Readings_CM);
+            uartTransmit(CM31911, get_readigns);
             uartTransmit(OX0052, Readings_OX);
-            uartTransmit(GC0017, unf_gas_con);
+            uartTransmit(GC0017, get_readigns);
             
             //uart receptions
             uartReceive(OX0052);
             uartReceive(CM31911);
-            co2 = read_measure(GC0017, 10, 0);
+            uartReceive(GC0017);
             
+            memcpy(co2_uf,   gmeasures(receive[GC0017],  'z', 5), 5);
+            memcpy(co2_f,    gmeasures(receive[GC0017],  'Z', 5), 5);
             memcpy(co_uf,    gmeasures(receive[CM31911], 'z', 5), 5);
             memcpy(co_f,     gmeasures(receive[CM31911], 'Z', 5), 5);
             memcpy(o2_ppm,   gmeasures(receive[OX0052],  'O', 6), 6);
@@ -200,11 +200,11 @@ int DAQ(int t_hrs, int tm_s)
             memcpy(o2_press, gmeasures(receive[OX0052],  'P', 4), 4);
             memcpy(co2_relH, gmeasures(receive[CM31911], 'H', 5), 5);
             
-            sprintf(DATA, "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
-                    (int)(new_time-t0), co2, co_uf, co_f, o2_ppm, o2_xcent,
+            sprintf(DATA, "%d\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s",
+                    (int)(new_time-t0), co2_uf, co2_f, co_uf, co_f, o2_ppm, o2_xcent,
                     co2_temp, o2_temp, co2_press, o2_press, co2_relH);
             
-            printf("time(s)\tCO2(ppm)\tCO unfil(ppm)\tCO fil(ppm)"\
+            printf("time(s)\tCO2 unfil(ppm)\tCO2 fil(ppm)\tCO unfil(ppm)\tCO fil(ppm)"\
                 "\tO2(ppm)\tO2(%c)\tTemperaure C02(ºC*10)\tTemperaure 02(ºC)"\
                 "\tPressure C02(.mBar)\tPresure 02(mBar)\tRelative Humidity(.)\n", '%');
             printf("%s\n", DATA);