From f71ace74eadcc50da885869e2454db943b56ba35 Mon Sep 17 00:00:00 2001 From: Demo User Date: Thu, 27 Feb 2020 17:43:45 -0600 Subject: [PATCH] monitoring --- daq | Bin 13884 -> 13920 bytes daq.c | 33 ++++++++++++--------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/daq b/daq index 4bfcfbb92ed149b08ff8b5e76f363662f1b8ce9c..2a71f087bcb9708c125eef00df280b30eff53a95 100755 GIT binary patch delta 4907 zcmcgwjdN7h6+ds^zU&7Zk|hbrCXko6O9&D2MG}=Jnn1UUmizZ2879dDPzC^<2c&d!lMO(j0}IwBv?6M?9r#P8(8&SRA9#PT zeA#2qw=JE%7uIdw^zP3OUAS!s+aKi7+JU4)NAKp23B zNiw&H=u^h2a7ZpG*%V~W8f?e%M;e@iWiNYBCt4rW)RNURY!@#|D<;%#nt&f>@90F< z$0u_O*{DwBUSn2X(nKC_fC+Qa5#rk z0V=V63M4`o@;5C2saQ|=ZNwK*PP0TffV@A4ll85T0XGnX#KB5bAiNOmRysH=DH!TE zu3cBS^~u6JVQa&djm)brNqAzz6I(Yt-E~x-$q730%+3l~EFdJah)~8YWd#Z8k2Yc( z>FA?L<;^N@Re77rkEpy;<-3um=>hf;7XVs_WB=QUPXp*6F0xk>PS#{$a3GpG9iV}D zHo()wa{#sxmjIq6j!S8*F1WTCV940mdsXi*xT5zTx-!}Syx%zT_Lb@k4!X`8B(CD` z&tI~B&~&LWeBuhIlN3dVj$TuT3Vfh=jYmzN*FCCr@#^R&Ll}(9O7M>u6gcRsJAKK0aD zDdFB=k6CPKoxw48hAUO}- zWR5C1#y+;>bFZ**OP2T3V5F|XZ7j_~uhH7kMqIbJoM?D; zP>=bvD3xtd9p+P`R#me;-tWfVfDxb&M_q~JM5;zwjC2Rm{YWmAmYeXvT8W@c7O+mShI2{bQc>cHJ2N^&L3RDb9IvPy2>>7tA)D9oxv2+FZG+P2Vs$ z%H#UkvVNv(`^Icl-pPJEIge{&p2?1)4~LhGL`ySVGvv9&Xqvv_B zXVx8TB;1eqlm_=8KB2)r#GM-4j<`dETM)Nu@IJ&%guQYDV~-m~8{^^%L{F=THVAb? zUs`7ei5A&1T;a-c8$!)L=m~x0ITSp^rEwa3rrW_BsEq`RdP-Etl6)1*P*(bHWUr-z>!=A(l5i3g?mLFCxvy|c$-|N z;7%GpD3>YdP2*HkIZitB#=&mJEfozP`+gwe^@CvFAvNQ9!jG;87@2j8a~Vd@@PeIs z`h7sKuabTfm)c}$zbXv{66{N)U9$8P+L~o)51%00`caxI?TAaqBIMbpO3$F@<ok_qT!DMxl-(;cLpeoX+9eR^W;ULoN%Q#phTsG&vcc`A|?1-bSP;3$=;CQc`;bI>CVtX+!56t@^L#y z@o~GjVtST)$v11(;-PfIi-O{V3#!5||BX&=!_DV@L1+KbujLC88h01Y$D;(`XU6&8 zCUNiqKI2Xy5x;}pZAcL;k04z|qH|{(z6pMZl#TdqJ>Kld8;|epgrkwVNv<7rV_U}D zo;5nZ2hTna`yxe5>$|3x=Y#I8M!a_lEgZ~X*3>la8J3qS3CqkJ+}HI$>X*EbyWW($ zo>gU}vBen)=p0`*HR`P^Hq-v7)rW6IrJCNY0Nw2O_9gRU-f3AEVJ%(BN>Xsl8K5(g#~K4jlCh8FI>ZOu z8mpI3D~5Hd*WDWV3n-6$wE#W>2*-v5IHcEDi6h18Q)eNjag`l+6nXcne#mbv+BIqX zE<)_nV3MEEU;_@nSH-b@`8D!Is86qSC8f*$M>O(G4(#zg5pyt&!d^~^P>itKxj@N}fndKC6m5 z%ziXWluqM3&Ox{I)%q3cHK?adGIskt#28AminulGIO@js#}wQj|CykB193mQIZM=m z#HQwFbC0m{e9`(k#z8fXi`>({1RvXwUm^Sw53gJ7aDJ6F7V1`AI{X9W!|Y~$kyrbv zorJnU^ir>SnWi3m2+=FRS?s*F(<{&m{q~?ltrkwuuR^TVUx@f7u5}%9(y!5DGMeHp1vIhWBXfb5Q3c4W<;pu{Y<60^KWf*cWph0^KOJOel4j=q@3;%1TN_ z6Lo~h!bVF{SbeF*6uVLz*e;aQSx?l@{#+^w6jPVk=~9Q8&UB)7J^QXSJ3;wV#j?xn zCfWi-dfDUZvTlrHYq@BmyTpexVwCG^%Pj&;TQ~b@c^=029?UPY*UR&SR0+q!J}Y-5 Ww9LkBBrx5bcHwX_z7}wRDgOoLyU-B; delta 4764 zcmcgwi+5DT8K1j%AK8${CM@QG&D}>r5<<-8h0>@AG~F7YO^BdDQ%}I4tHeT2IaXZi zt~FNh#1cAGkwZ&VJO^x!#uE}iiJ%Qesdz#k2Cdi?ik5_3vuK-zHQoNcd+)B-`~jVF zzWdE@zQ=qs^WB-bH_&mkqdVJtC5f>r##q-5dscEwHe(9yShCjG4%D8#54PQ4J`H4wOCYkeJG6*<#+dw zL~b)zT;KggY-;q2(Q5>@1x-6alwwxb-V0XS-V35@dq8L7pEK5cJ}*`#ycvs)_d&Ot zZ!$3z_2YM1Mo&1QoFx3iV0kxu~hX>7){j*SPYA9x0COEwHxf_#)K7nKb$d6u5 zg1^B_lbzZ>Z+*5qHq{fF-fRk|h;{$bWe~p12a@e2 zgCU)>Ip9)t`a+G9vC5@^=;rxLpKoc7IBg}%&bQ>aEznQm!mQQ4+d|RJX^M=cLze4i z_Sn>eXw7k_s9q{U%$e=ZzJAEvH^hz&BA&0zj9mupL$qhWjmbz6)Vomc9(b&ey&}4! zKTTe~r9N5p(F~7CN-tIuz{W@}EHplRWkf&4)hdAIn zOh%_hxw-|Il>^1rW7|kA1pv? z!P1B8Q|&q%n_L#D@#rh(!hdY)14K~cNm9}K!NYB@d9HZos$P}^k9Z;;HtD`1*kV&{ z{DIWDOExA(;~)AZcG$N;e+7LEIs^I)^cLtG=o6JLflq?o1D#9aCsS`OxG`9zb}~O0 z^-?H#v4_@p?_(u~)7PnzJYJfXl{I`xbh8rk>F9kzWsaMMLfXUp&NN9l$h~QWLJxl- z%~>{jiE=92oi9(CJ5!moP3ZD|5KUe?cn8P>YU2M+yWNnRA+RpKB7K?RxP@xZrLXcG z>PwaOip z*VmfD3lb>0#uTm1Js=^wNDb)Sl!=cZ;dxInE3qwYkUmtRNp9toA$1dhOM=lmQ zPhd)N+{5a`{C;92(#7Znq-lD2B3>Ju(76koM;kWRk3k-rnw(I0WP)LBcSBm^nO#2; z@ojaDMYg&|BE2r=9Et34-Tdh@!6NTK=(sl=vRs{YW-QWcBaOf0=C}{2o!&K(6dk=KmFH7rG&mYUuyArm?Na_n$sp9t_UShv3VcaJh7pc-W#`TUS zdt<`*xrpeV>xr&0IBu~wBy66RZ7izIzVUi_w!Vj_yhP)aEAb`xbFL|D5q(MA6uwq8 z;aMaa@kBUy)`@yNmy05vEus$3c2U4{BM!;2h~MQ(B-Y#GN@Bea-fL5ms@H{79FN?4 zb;DSs6Pfc(T4z#PuiqQA-1)1J!TU@w-?x5Y=m*H}BJWsak7~Zh<@GdvwPvj@Dqcn_ zlBss;(95)|9+Y2pcI=fenICUB^LJjim^j|~#rgC~rThW?(MD#30>%ey!_sNe=5Qwlg;7gNDk@&c(WVNEf7LePqXAP9*J-Stg;pHvRIjZX`O}cczc?7a zI0&!g+niEHmpbxzYYRW(EX!G^+LEv3&~1C)xCZ_wCMZ0$-Cpr(wrQ-euYlZ#%VxdIKTvRLkf;SXN_7^dC3*eT%BtM5< zhq{qi5b6owKEAD}OjyK^KsWwYXX35?Y=-V-;N$#Ck)-?D#&e7FgmS*9Sju=DYhQ=4 zkoy(*z}nC6E3PrD$NqGhA1JQPi065RE{pvM@>YJOxU5?H`I`>i6Y$cZdO3|?wL#tv zEBXt;_)YV(e5KIVN~?iSVf7-=q8Jtd)4M^1hWLHpc%i=lw*zZGwp)QuV0D`yBl~-R zOW`k$f2OgwQSLsWX&{HYXW*BB;{nj12Q_jyV57jAuXXmJMo#|B!11jq6I+w}TXKwY zy#Mi%UO}kruPA*)*Z)@8H9G!5`JmwEPgO`}Iv9v< z$w;!CO=MoMZV^8HmOk&@Nbl7V*q{d{$`(?FBc#~-aOM4BGJ^DIAIU1+e_5jdZ& cb{hR9IGFW(-a<#V&xP|`Sxd}}a{3ehAC;hv761SM diff --git a/daq.c b/daq.c index dfc49aa..a1a79d8 100644 --- a/daq.c +++ b/daq.c @@ -147,7 +147,7 @@ int DAQ(int t_hrs, int tm_s) o2_ppm[10]="", o2_xcent[10]="", co2_temp[10]="", o2_temp[10]="", co2_press[10]="", o2_press[10]="", - co2_relH[10]=""; + co2_relH[10]="", DATA[100]=""; clock_t start_t, end_t; @@ -165,6 +165,8 @@ int DAQ(int t_hrs, int tm_s) 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; @@ -188,14 +190,6 @@ int DAQ(int t_hrs, int tm_s) uartReceive(CM31911); co2 = read_measure(GC0017, 10, 0); - //co = read_measure(CM31911, 1, 0); - //uartTransmit(CM31911, Temperature); - //o2 = read_measure(OX0052, 1, 0); - //temp = read_measure(CM31911, 1, 1000); - - //printf("unfil co: %s\n",gmeasures(receive[CM31911], 'H', 5)); - //printf("unfil co: %s\n",gmeasures(receive[CM31911], 'Z', 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); @@ -206,20 +200,17 @@ 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); - - //printf("pressure: %s\n",gmeasures(receive[OX0052], 'P', 4)); - //printf("oxigen xcent: %s\n",gmeasures(receive[OX0052], '%', 6)); - //printf("Temperature: %s\n",gmeasures(receive[OX0052], 'T', 5)); - - dfp = fopen(data_file_path, "a"); // open file for writing - fprintf(dfp, "%d\t%d\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\n", + 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, co2_temp, o2_temp, co2_press, o2_press, co2_relH); - /* gmeasures(receive[CM31911], 'Z', 5), gmeasures(receive[OX0052], 'O', 6), - gmeasures(receive[OX0052], '%', 6), gmeasures(receive[CM31911], 'T', 5), - gmeasures(receive[OX0052], 'T', 5), gmeasures(receive[CM31911], 'P', 5), - gmeasures(receive[OX0052], 'P', 4), gmeasures(receive[CM31911], 'H', 5)); // send the value to the file - */ + + printf("time(s)\tCO2(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); + + dfp = fopen(data_file_path, "a"); // open file for writing + fprintf(dfp, "%s\n", DATA); fclose(dfp); // close the file using the file pointer new_time += tm_s; end_t = clock();