From 53a1caac7273394c45545a3e20c6f6a551ea8330 Mon Sep 17 00:00:00 2001 From: Demo User Date: Wed, 29 Jan 2020 11:35:30 -0600 Subject: [PATCH] oxigen --- daq | Bin 13660 -> 13696 bytes daq.c | 36 ++++++++++++++++++++---------------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/daq b/daq index 6812fbc5a4697022a880f7a4722431d4b4ddc441..39786ef175dd39933c1d6e8b78d16208c370db3c 100755 GIT binary patch delta 3660 zcmcgvjZ;+D6+dr3ToxAC1tJK-+Yc24aaq8Mq9P5mGx!msLp#Lg0~FF-pn`y{bhW!0 zCZ$snp~pI!(P|rSwFFuRvW%A#0LlU2`k*b-IGhe3(O~s<{V0La!C&X-hXsK8!OI^n zd)#-i^0!rgy4e%@rLiPzlo3Zna}U04l=2}SK)mMA5i!~g`ZIPu)_Bce?kWkV6F$~XHL_4 zn0Yq9QRcbWIp@8~`2cN%=H>x(Fc$&3nOgx8))wFK0NhImjD4;P6;J3w$0t%k2SN!` z7bXH(0-Qc*Fbb9LANbUArT^3G)8{8Zkv~w$7gh3El^i4)Pb8Es|JnW6^oRE$QvjZ# z0iuIM870RjGOWiZv?T{Z8Y|ug*z#Fk%qd)o#qNgY3eb;6qa(S4TD1|KqnZG&Fy<$( zCA5mDpK6Zc_l%-F5{XTZ#pbLR?7o`pj)bv9(mqStJ=DvW#P80t1>EXzu9>YIP+O=P5ER4UvWr?<;vk{GBOQ=M#c{{RcDps~G z6zwTo_pACXGY)If`p@d;xy@vsi2D+s@joAl_N2%<0Aoo+k z(Y_}6G?~fi069IHA;1)^i4*8evaPR+Xx-WF6`lez+!~o_hwX7veXc9dJkzE>PQBn z&vlrcl4m^jIO^l5|BTfsPW_t}0s3%P%5#QiD2RFPdK^!2ki$nQHlYi}RM9Wk*Vgvb zaG>5;#kMt)6@S^s+{udV=USpIA7=Z!8mw#)@Lexp)VrKoRJ6vXU!3G`$K<;$zNXl8 z-DE}MO0TcwFWH93z{<0c+rHyrM{9m$PV4co?K>|=^u8a5Q+$=4ue3R>`S?j{wGcs@ zIdk(%w|L$+C@bl$e?x#0gFx@nYKd>sRL`e$vx)ME?23GX?ur?r;yW`>8r(@w^|_Na z4!VC-6Pw^OW9ZlBe?>Be$5b8?AjcKCb|cJuP!=@VH6jNPD=yjLOTwo zNKG-p25c6^c{fPPAhHngIo(etEYHVdqG)+YQyz=O+S%h2@e#Z#R{1-~@BfSV0*e>E zyy(KBbDj#{e0-sxQY~*BF7Z|~cy)nO7{NyiME}Lv zg_kOInIJC&vX&>ITwVwg=9KDGxR!9A3bX#83bXzT6=uD(W0}kT{ZMC;kW|424JynI zW>lETO3UiYnKDS7;1eK-C z2geYNY7k#pu!uQi4m!KjUkJpH+6enO>|Tghw#Bz^O4N;+ldyTYUee(f+&oHREx@LEKxw&+lUe zqDC;`g@QcGw`fMzD*aW^VLyc7f+}G(7B8-{#227NlL_ZYcOLgHcDmHB@5fa8bMnxp zc(_85sv}%O`pfvY#iC7JyMWHAJCtX?l2-xY5zH+V_0mfos|$-ZlS8RU|1emuYzB_y zRpp#x11r%mVf7pSluFO-`4VfwHwtrvOQ$av?$b#R`qOKi>oh_K{=_93`QT*QfTsxY zvB~rlj=MxXADR#Gk;|dy<8nSOEOi+9pk%s%n@dF_pBYRhw7Al-ztm)m-xKxt%Th6s zPco)S170c3)AJ;aVwl|Uk;QZu_m!vPk}{KC`ZI^C%N#~tUraj5>7KGtS|zS>(a4A8 z5G9=;)wh+K^gJ@O)64T|1)ZetI9@H!*PCnrA$(Bo&`%Zue2lhb4*l<(bO}<5>Hh<> CAteR? delta 3629 zcmcgvjZ;+D6~AvkU>8_m1?5Y9`(XqTSwU>k1Q!%HArdi;X-Q_1uzo}VD@4px#AKnv zOiad3AjdeEvEy3p47Q}vXfqn2O=gHe(_~0HHm1`LVs$jBte8n}pgxJt~ z@$;qsv97BQy?k@az_G%EFIqGF%>`56SmEmdSwIOOoBNo}QmuBW47#! ziBxDyBWzfsEW~l>d>6)H+^O?!o$uFqkIoP4{J73{gU_@Hv6s1Bh<(g4`T^#-Li918 zEkp|VEUO?&csDW!%gk`D5UtE*OrvtqSI-IYZ%60QP21R_>$b5Y*Hgz{8*@zj{(3YU zbH4D}RrjU+SEKR4>xSHCl6y?@K9k&Ol6UJeMH9!luxP|lnsM;9GC6v?AWIUv(8bl# zLoR2Yb68QncA$43l{o#b1CV+^S7%9LFNK}?uFXIVpfl*{qc@zg@0*x1Iiw`4k$fH1 zxvh?&VraXe-Hn*JkW;hhFHWCx!%Ru6ME3!bk}BlF+f(g1p^7yf)!89sav*lEJ@HP8 zweqgT%{Wd^CwbEbV;2AVvBkR0yY%yPlAf&F7@KNOee{?0>*Icrw&q{;xgp_I zCikK@CzPVwuZRhMb}0LYL!pyH;t#19`3%0KcR+_Ru|Dt%piaoO^muYkem%S$TFk{f zhd$Lm1^zwoAI_A7hkdCx*(=w_tfAb{vTX&hdnOidnA#>5CjQkJIg>t1&YC$f&f}-6 zAaRJ*)3kC<2y&(Sr5pXOSs)JoWrf_P&{;3;f zL~o=%ofyX4b3zUDU8-NIr#Wd}shfgnawN(3NKJb+C(x*rZxnvXw;GsJ2`lk%-M4$% zB;QKCr(QW5u2ka$^_57tRle!Hrm3bs<(_Y}P)DOgQ;mWiY$}IGd9yP4qg(uZ=GOV9 zj?K#C%3I~(<&7Opf6h&e^(;RdyU}qZY24SGA4_OHGVY-d)1H+6L2`Q5kAsst-{u!z zs}~MZ6`kG1RVuHuR6Sx7A_Q6sS`S(YDgzaPevPj)34GC4@l}bToFe(hT&BAq^!u`1bn$|=P2Aa1;^GGTicd>*;L2k8Mh;9iGJ@WqG;s4+9~Fl~|L zoKZ-bAUBBj-CZzY*+##RW%o5ygQ6%c9B~4?k3Nxuk#&gs{~$h-jK=2?pFwE3>S4wQ zn9=w!;&z-)cs`17qTH-%y4YKggod^AnUm5mZUtyIUKKQ}(AJQbK*PLD+A?ZbJJvaM z4Qo?~YGL5di!DmUpgwP_NL3Aor*WE!`SQWdDm29~d412iqgr<8<@X>&KlS?Rs*K?L zCTq}pMIX$-Ml69?tT)CIB2C3n^7`efnL$;pStD+yeCb)ThYrO4L8GUls=mmkork_K#q(|7hak=eo%^1SH6rla5O(y(vAtOgC}1{kHO*&5-dV|#-9S$>tB32 zE};X!{p2nPRDJ2h?LoI1M6c2Knw$)5e3&!vVSe(xC|>{%P*;I0-K3)ha>*BXCk^o9 z5p(#OrZ>XO317)2aeL6f}k{qN)`m&M#;J@S>iqDhN){opu~IyzmMLZAi{P% z!X?bwoYM;EkJ6V5WUsk*9(J~iSeY|=js?K|UEx07cQ*o*FP5?`z3uR#2~^0 z>H{`k+>e^{oL3y9R?`QCdD1(l|6bT-JG~>Y!Xh=$TP3oScU7i`=`s-SsZ6zWuLNfi zq-*3Y_1k$bwNXu}-^sfu(6IlPqg #include"uart.c" -#define data_file_path "/var/lib/cloud9/c9projets/newUART/data.dat" +#define data_file_path "/var/lib/cloud9/daq-serial-bbb/data.dat" #define GC0017 4 //co2 #define CM31911 1 //co @@ -17,7 +17,7 @@ #define Rep_Dev_ID "Y\r\n" #define Pulling_Mode "K 2\r\n" -#define OX_P_Mode "K 1\r\n" +#define OX_P_Mode "M 1\r\n" #define unf_gas_con "z\r\n" #define fil_gas_con "Z\r\n" #define Temperature "T\r\n" @@ -33,24 +33,28 @@ int str2int(unsigned char *ptr); int DAQ(int t_hrs, int tm_s); -int main(int argc, int argT, int argt){ +int main(int argc, char *argv[]){ + + int T,t; if(argc!=3){ - printf("Invalid number of arguments,\n usage: daq \nexiting!\n"); - return -2; + printf("Invalid number of arguments,\n usage: daq \nexiting!\n"); + return -2; } + //configuración de sensores - printf("Configuring CO2 sensor\n"); - sensConf(GC0017, B9600, Pulling_Mode, " K 00002\r\n"); - printf("Configuring CO sensor\n"); - sensConf(CM31911, B9600, Pulling_Mode, "K 00002\r\n"); - //printf("Configuring O2 sensor\n"); - //sensConf(OX0052, B9600, OX_P_Mode, "??"); - + //printf("Configuring CO2 sensor\n"); + //sensConf(GC0017, B9600, Pulling_Mode, " K 00002\r\n"); + //printf("Configuring CO sensor\n"); + //sensConf(CM31911, B9600, Pulling_Mode, "K 00002\r\n"); + printf("Configuring O2 sensor\n"); + sensConf(OX0052, B9600, OX_P_Mode, "M 01\r\n"); //adquisición - printf("Starting data acquisition\n"); - DAQ(argT, argt); + T = atoi(argv[1]); + t = atoi(argv[2]); + printf("Starting data acquisition with duration of %dh and every %ds\n", T, t); + DAQ(T, t); sleep(1); //finalización @@ -138,8 +142,8 @@ int DAQ(int t_hrs, int tm_s) for(int i = 0; i < (t_hrs*3600); i=i+tm_s){ while((prev_time+tm_s) != (new_time = time(NULL))); start_t = clock(); - co2 = measure(GC0017, fil_gas_con, 10, 0); co = measure(CM31911, fil_gas_con, 1, 0); - /*o2 = measure(OX0052, percent_oxigen, 1, 0);*/temp = measure(CM31911, Temperature, 1, 1000); + //co2 = measure(GC0017, fil_gas_con, 10, 0); co = measure(CM31911, fil_gas_con, 1, 0); + o2 = measure(OX0052, percent_oxigen, 1, 0);///*temp = measure(CM31911, Temperature, 1, 1000); dfp = fopen(data_file_path, "a"); // open file for writing fprintf(dfp, "%ld \t\t%d\t\t%d\t\t%d\t\t%d\n", new_time-t0, co2, co, o2, temp); // send the value to the file fclose(dfp); // close the file using the file pointer