From ee0fbbe95812db37955f6647a2e23ed2496b0ca8 Mon Sep 17 00:00:00 2001
From: Michael Dryden <mdryden@chem.utoronto.ca>
Date: Tue, 1 Apr 2014 14:25:26 -0400
Subject: [PATCH] Implement DAC value averaging for LSV to approximate correct
 position.

---
 DSTAT-temp/src/experiment.c |  66 ++++++++++++++++++++----------------
 DSTAT1.atsuo                | Bin 47616 -> 47616 bytes
 2 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/DSTAT-temp/src/experiment.c b/DSTAT-temp/src/experiment.c
index ed2d5ad..f83f225 100644
--- a/DSTAT-temp/src/experiment.c
+++ b/DSTAT-temp/src/experiment.c
@@ -371,37 +371,45 @@ 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;
-	}
+ 	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;
+	static uint16_t last_value = 0;
+	uint32_t current = TCC1.CNT;
 	
-	else{
-		while (arch_ioport_get_pin_level(IOPORT_CREATE_PIN(PORTD, 5)));
-		result=ads1255_read();
-	}
+	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
+	last_value = (uint16_t)current;
 	
-	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;
 }
 
diff --git a/DSTAT1.atsuo b/DSTAT1.atsuo
index 4d5dce4f8e30d4e80caa77ff3ea7751260016e6d..082d5d758ee5b59ea58f31c58f6a5f3a30c0f42d 100644
GIT binary patch
delta 1201
zcmah|Uu;u#6z=c#-rJ70qn!o2vOnDh8(Al80>(@sU8n)qL0eo5n;q?-qeI%UEuEk<
z*trLJSOoVaTGNz~nUFBZ{`8kPjZQ0=_@KgG&<8Qo7<>}N<UTlz&eMCh7ZbuSxw+?j
zzwey;eJAIp6d|PuvvE<npWgM(_ZSclVXwIfjiQLZM4!y6bUK|L|Lk!i<rHy7YLiyz
z7z+qjD1*ls!{US$ZBNwVN7G3rspO<NfG@>H$wK8>ESr6jNRdG;OIj8MNv5<}qgvaU
zO^p<aEE;ADNc)N5R0|ZFUyxZj<(sryJ2kg9N-cye@MZhg25B9IB^tTRua{XtWT{4W
z1yso!)l6|M!fS4nE)ze%m#f~=li-mp*Jaj9h)b)e_2Y)v1f{l}nKh)&ueB5kDOc)l
z3Aj<dd)&QO9ahq<n&pbSp!0ERv_UJ|rZ$of5>hST!M5iMeR*<wvD46M*6ED8DHL};
ziJO7va;-8G6Wu5JVD;7G&rpud(^YA%Ey{4~eY12de(Kmsv>d6&uRbU8UHfteQw#&?
zN=#21P!Zm`iaW*wdDa3?Xdfa6cIm%kUhWCzWmpdHfaACYp2K+r<8i#&@fCg6@`0yQ
zKvP#U++8-LLmg~Q&;eXXi#Q+MDjId(f|P<v-~XhzA{$X7+R-0=1F7L6lCj@#|8qOJ
z_3}jc1qN%-wA#mpeB`&no=ClPE#iyr`Jzfj6Q}22K63OEhEKb_xD<84AGYAz9<y|j
zh>!8lqI$-E?)jV9l0;oQV-(lnUTl;Hddu`^h_>TGu+vDZsxok-V-ptQHk{ACjLnH*
zdIxZC&dDbdem(l8OVA&yE|`H~&;ifXGq4V=$I}B2{BSjhz(4|(gHbFEzQoN}-V+GW
z3TEd`h-3}9SMm(MoDO4jFof*vPDHM4z|yb*eHjz~eY{>j`MQ9rt7VAH4B^VV+j;)%
zIe|IU)k%(wF*)SzIXV<W(^&^@&%_Yvb|Igx!B11=xI0=Y?IsUNlpjw%#6pe0*|`<Q
zR`~T(4eSwioRecD=Cv)j(_iu^XGOSsy6YjXj3U21)68fvYqJosG*^r}nF_3*dm9bc
z-XtY^@JF}^-wfGks5_C*tfL`s#);elDl%tQ2VI8;nO^?vhfguwjK7HGYyy*)4{__n
aj#8ObllNln=lQ6enbb(3$gW`@kNpR(QqDpE

delta 1355
zcmb7DYfM{Z818p^&MD9`+6G1k9UN8}QxMp|;Dt$-HM>xt#i0%cv`p9yEQOpp5QIX1
zY;hz8o|q6fU_gYeDTqA@+l<k(VGKrR_+^ZV8WZ)Gx0wDI&VgS~fy^I9{gRXOyqD*F
z-{(8;@kbbcgjr}~Ibrs7-zVr`pTm-FFA7-}_gK4v{b?+^xC$;yrBcP=!Lzwigj%pZ
zZ-K{RL(XAS#>X%I_)GER8=2RZ9py#73ay!@u5X<Cx%gV!ie)wrqRz>&G{i@%aETO2
zSk>9NXr@M~EGDin97h9BM@@+O8Z0O0Awu77qd>>fK{PnIZ8Re-Hj2T)@JcUrjFIeQ
z6KHfZojX8{7HKv4Q;pKb7-N|oYDJqUIJt6~v0WiYgcWWFwS=g}%~0f(R<kas35$X3
zJ6PJeAO773d6G;crWj*)4cVz6F~<>22=7^9coG$)izPg!xZ%&WDS{1AuN293FtPsm
z4xXgba!l0ES5Y)Y@JIepEU|kfv0z)8=A4dRyJ`WXt_=QqE&A<`hs$|_u)UZBx4Z=n
zO_-=m3s*D~T=m7{OV=Lq(N?tIE`+Q61mDeN<D1b$bewt=)voLjrwph21STBWlC@gq
z6AKSLS@J~5Q?`AteL-v^$BSS+F5_Oy6yB^IpSIR9xa~ZQOD+R0)z^}TM>@^MscaAT
zqtweRRz}lluQG$4P+=P<m0|&vu0gbS({*Y*s!^$OX^cpfu44qU`zPcz*NmL(B5T9d
zvy$+VnV`4ThO2G?NiIQ>n+c(dz(eomG1si)1}WJhebBN-48E;CzkS$9aS8684oKcJ
ze=-<%njj}^*Q!+NjX}=hKrkJ0>q*@9WW-0ArSuW;phd*~HUsXDy?~o-J<{0AbXlyy
zXVBk~gZF$!$e}#+1$nH^#o=IQ7L64{?@fTv@d!po{~llHG$FIAUaGxTMDXqPrHw*K
zcwaKXGk*wmzCidDnSd;&z!TEr&iMvdUoFE|UL(d9is25W;Iqp{+`W+sVZK<oG;fbF
zilz4MZf2^NK~~p3G`@2l!+oie+;@>7Daw|K149H&^=V)NW&{^&a7#Ra9|D=&Kk1xg
zByw?`kadvGLU_D=|4X*JEoo|qK~vD8+|0izm);uY$bXjlE85kY8m7k<2=YRMsA_ZK
z=XZNiy6C~%;Q^ctmtsD&d1nRmV>F}T${7q@KZcCJDXcAulyeT>-!Q}9xeIcS2A_Aw
zV`4lLzgzO5o78g_x&t#HGd}32>5k2sCF_KG2d~;i{aWRh7H`&&BMOR8lp6Eh8u|-)
CG!26Q

-- 
GitLab