From ca333d8cca3081e9f9fdd6ff44ea548acd9f4660 Mon Sep 17 00:00:00 2001 From: Michael Dryden Date: Tue, 29 Apr 2014 19:49:02 -0400 Subject: [PATCH] Binary data for LSV --- DSTAT-temp/src/experiment.c | 45 ++++++++---------------------------- DSTAT1.atsuo | Bin 47616 -> 47616 bytes 2 files changed, 9 insertions(+), 36 deletions(-) diff --git a/DSTAT-temp/src/experiment.c b/DSTAT-temp/src/experiment.c index c65dd9b..caeef40 100644 --- a/DSTAT-temp/src/experiment.c +++ b/DSTAT-temp/src/experiment.c @@ -393,44 +393,16 @@ static void porte_int0_lsv(void){ /** * ISR for taking LSV measurements. */ - int32_t result; -// -// if (autogain_enable == 0){ -// // while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))); -// result=ads1255_read_fast24(); -// goto noauto; -// } -// -// else{ -// while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5))); -// result=ads1255_read(); -// } -// -// if (autogainswitch()==0){ -// noauto: -// // if (g_gain == POT_GAIN_300) -// // printf("%u %ld\n\r", TCC1.CNT,result); -// // else if (g_gain == POT_GAIN_3k) -// // printf("%u %ld\n\r", TCC1.CNT, result); -// // else if (g_gain == POT_GAIN_30k) -// // printf("%u %ld000\n\r", TCC1.CNT, result); -// // else if (g_gain == POT_GAIN_300k) -// // printf("%u %ld00\n\r", TCC1.CNT, result); -// // else if (g_gain == POT_GAIN_3M) -// // printf("%u %ld0\n\r", TCC1.CNT, result); -// // else if (g_gain == POT_GAIN_30M) -// // printf("%u %ld\n\r", TCC1.CNT, result); -// // else -// printf("%u %ld\n\r", TCC1.CNT, result); -// } -// -// return; + int32_t result = ads1255_read_fast24(); + static uint16_t last_value = 0; uint32_t current = TCC1.CNT; - - result = ads1255_read_fast24(); - printf("%lu %ld\n\r", (current+last_value)>>1, result); //DAC value is average of current and last timer - approximation of center of averaging window + printf("B\n"); + send_data_uint16((current+last_value)>>1); + send_data_int32(result); +// printf("%lu %ld\n\r", (current+last_value)>>1, result); //DAC value is average of current and last timer - approximation of center of averaging window last_value = (uint16_t)current; + printf("\n"); return; } @@ -510,10 +482,11 @@ void ca_experiment(uint16_t steps, uint16_t step_dac[], uint16_t step_seconds[]) } static void portd_int0_ca(void){ + int32_t data = ads1255_read_fast24(); printf("B\n"); send_data_uint16(TCC0.CNT); send_data_uint16(RTC.CNT); - send_data_int32(ads1255_read_fast24()); + send_data_int32(data); printf("\n"); // printf("%u.%.3u %ld\n\r", TCC0.CNT, RTC.CNT, ads1255_read_fast24()); } diff --git a/DSTAT1.atsuo b/DSTAT1.atsuo index 6802fea10785f1825308195d3856bdefc373a8f5..e7185ef389aa30a249f496141a96d58cc3d07d0d 100644 GIT binary patch delta 2378 zcmY+FdrVu`9mmhHufaBiU}GHe0`mxU3jssk;b8+N0Yi9|kihKnh&`Yo&=7})h=J3( zDXLH!{Ed_plmtShv@8oDSL!2Dhok(l{Sif^%i3vLmbB_Lt?IUDMT?S6c)x3##yh$n zo%4H~$L~CT*Rv$^EXi&t<-7(edDf~D##k*;M=Xma@+_`kfAl&2BOVo^Ilm|lDn_`l z90&yP->4+MPE3sckZUrZHT1LXYdcMU`)&1ClS}`I#&|=*c$-rEi*iDtd0MrVKTPaV z%Tl%Dg>9b{$t0^d6PGGiR?sYR0+05m!X!k`ENSFXR#MzsFFx1(T#dAzWcYjZxOX@i zH&e!ON63TQP^UDIk3OO!mJD8*kKtshO=%;2VuUSfiiCf~;d$y=_|kg$8_@K1V#uak zLwYL1tc>kucDA1#V=mUuj$tHy8(tRT@uzeHzDu_&q|yArUWG0_mg`HS8A~ADhc9%c znHt9EWBwPTVPTUOcQzKmlUb(XIx;2^E3rmxA>n~ce4aThm)%l|Ctn%n+$lcGvdKbW z=6GegSUk_Eltj^;`yfWhiRdr73zXrb@D!fqi_jG18vZ~IUlP9~q*MAm)nA3%a?Y68 zR%Dd<+LQ48>ju$p9u`uq+Dl=~EGsC57eGx8Me_VOkmbS`=NR(TXJ*BRo2XNy2Ib96-aS zMm(vGL-A&M2#!%`TR-!4=oHc&31DqUm1#ZQj*Y|yB9}-eQV0W)PNWf%cLvp42%PK4 z=&GZJiO3`J3CUqA)!T^e#13L7v5VME6cB|(5m8K-2@6p|loDlxl_)3n5POMQ0)|5y zilo8oNoXKmB^rtSL=$mpL|+@1aOwSg1PkFIu&G^bJ@T1l|HMTy{-G<>y+ zQkH_^Ud`C|Q4}ZTrfKqfO7#TQf2UMq6c{_af%YSovELXeHp!nJbSBwPQ~gE6xRi~K zhqDoESL1QUm5=+bO-OOZ;=X+jXF5};J&kV1nqd3iu7?R()PJQEP=oSKIG$pxep@B> zb*|@{$F$f`(fNZ;FgeRnue8wpG^1@!zz0=EJa#4G%hGHLPAX?Z`EtM*mM@UJ1C|~S z8m{DHcpxXNm$KnnG?=Slvd3disTNIbiyWiXY3Mj&)CZGEXv8NAjnt6xw>2_HAoF#7 zhIH3L<;g-Nwdtg&3_4xCc5C0E<40V*?qgVNt-;VhVR+(e;RRa5@~yDk5d5_S9EU@X zqck=suj*TolfwS9LI2PLS_yh6G=@zV_Bj`pGceU6#B|UBg~|Zw%Wn?&IlSg|m{RNG z!v?DQU3TlMjc8Zy!Qv4km-cN0mQrb2$!m<{N+}n&^nSwchQ=Ro(i(MG)i;go<2}A1 zE3EM*(LFRqneSu+W_`V)e|S_TNWZR?#4Nf`k@=gx&G28yK=%nRY6i0~-=9kvG?%wx zzH)0Yrr$1z6Za!tVR8>joQWZ zFHwo63kw{#=d;mzaRC?S>o7UJ4(8KN%uQ(Fxt;^NsOMF*hAk9WEN)M2#KNT$c=T~Q z-oJc}yM9_-=r@xq7EHx+>TE%US1;b1IjIxqNA}YO!~I#K5EH3bBE{NBh5Pfd{{gr! B+A#nC delta 2147 zcma)7X>8O*6rb6v|JGf)Jy@0k-R%MPW_!T4mfCGu8rV|WVuM0}-j|V5%R=O^F5zlu zE$#kPZdkT>U`$z=Xeu9M@rsEAtDqPXMg3+XN!7+gMDWeF)yfCM+r0nGJ7(s+H*bFH z8CQA6RRKlKod{Q_8&)yKDv9siClV#%>uN;Y+ zcRK4Y6$V$wh@lw?YW)myQco^KRCw~xc$8XKLW*~0i#xF`5xIFZ-^t3DjpeeX%+40k ztc+!{0{Z5&QkvzlWh7;Xbfx5x16TqEF2k5TZD+WxReGs3O;?Uv_p0V{>_~9IX|(Bl zWQ#W7PQpMqWe}n^T&``ExrJyiNh{D(Y({@a9Ph*nNsEk;TbGRWo*rCvylcN<{v~JFKi9ga^Dg&QIwweD~l(kpYq2Nx|3M@5d3-`k7k0`cj4#HiiaLpWfYn~+o z{2N3SEwsubza*z?#Mg=Cjekw!jmf#FD@svetkZ;J8xuvaxJRR8kx4F_h}0R16ywe+ zeI^+e{>Qj1WEA7euJG_?*33GYfkjaAb|r%84U8!aXDVu89kSqbr2ai;$BBqUf*Eu@hJDS~bHP>A5v67R@We-p6X!fpIYTy}EiTr8R(0)O} zC)mEG63dMl+OJ3&!XIl~2A)k*dDBxx)vD=^e#Q1DU9t)EPm$>@Vo4||cfj#f5WCA` zFmOVPCtFi-bFE=o8MD<2bCT>Ba;#I~hYHKI@}|PmYQm)!J$`9EAC|@1Xv;`c)cpxZ zoe>{&wZT?Dir}Uuady*}+}jYV)ln$-FuS4LCOcyuNpq!!=J7OIh^@p)#EHaGKgD>d zA(`JBtZs$1aqeJE75W<8@U;Z_74U6?h<|+v`kQk^U26=VX_dK!Xl~F>qkJSX2iY1{ zjP@!bvV9JZ`gy{Kz8OJA$7wLya^RnKpwvvVj1x3=shTDdN}R)?rkHFI?C&%gq?e@&PoaW|CRLwD^7Se);0v=pWj3GqGNB{N+ z4fQ+q_z5$7USpC(sSqL&Hs#Zmm$AjnNeH!+5G#kqGL{DsZ?7nN*rWc%xc}KPJ-!fi zmUuXx@u1sc!Vkk~rY^RbJx!-j5!n>5NnGenL(j@Y9NCxOs}VTvLg3JR5$x_!DdtJH376gE66{UoW$>Iyhi5or z;@zKUGndq4x|=t3uHVwtxV~|7hfJ%C*hxX;BCt=7ks%X`kGXK^ya^`*UE=1!NRAg@ zdK{Yb3-D9#EcjkY!O{K}I(kI#p8K5NM?&{}eE()6W%V5Q_o+mi_qO(dWD-=Nc&)>I zG8ExB5u^y;wxF&*3^sp0rCbQZ{z%N;XGX=#j?nR>6Ndf2an!x*Lf^S3=*YYf{GB=; zjhhDx@Y!HAIY(21Sy(Sj==bKq=X0WCxD3*#>Od(@9f~G78n#vfCd%*PQ8U^vEWug- zb)0;=3WcZRpu4aL#sgt80J=r_-`9`&*LT8J8>^j1(g^r#ThZ-Ggm0Y&fvp