From 0ee6f04641ae53b98161be59f03184353caee9e2 Mon Sep 17 00:00:00 2001 From: Michael Dryden Date: Fri, 31 Oct 2014 17:20:10 -0400 Subject: [PATCH] Fix bug with calculating SWV triggers. --- DSTAT-temp/src/experiment.c | 2 +- DSTAT1.atsuo | Bin 47616 -> 58880 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/DSTAT-temp/src/experiment.c b/DSTAT-temp/src/experiment.c index 9264f2a..4aef87d 100644 --- a/DSTAT-temp/src/experiment.c +++ b/DSTAT-temp/src/experiment.c @@ -521,7 +521,7 @@ void swv_experiment(int16_t start, int16_t stop, uint16_t step, uint16_t pulse_h //calculate time to ADC trigger period = ceil((1/(double)frequency)*F_CPU); - uint8_t temp_div = ceil((double)period/65536); + uint16_t temp_div = ceil((double)period/65536); if (temp_div == 1) tc_write_clock_source(&TCF0,TC_CLKSEL_DIV1_gc); diff --git a/DSTAT1.atsuo b/DSTAT1.atsuo index a0a36812a84921dd7b60d6c36c0d77246e07787b..6a63b74b1f616d08f27ae0f765bf14f5d22ccc15 100644 GIT binary patch delta 7286 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 delta 3241 zcmb_edr(tX9zG|zgoJm(JE8^<6eN%Ygg{Xe#A;V$QPC00D$lB2MZl=2U}FXBw6+3Y zXLfZ}0(I5(QIxwgb!Svi>^`X0y5nqjrjE=0w=>g7pdykjLgg{_LZ zCm)GH>(C(lSs6=HasvLgCKd+47j~^6Hu|)4{s=1H+0mmkS4dEC#-xMBsqbn|0(8*?(&NSwU3$eIOUqUJ^xT;C-3k=f%Joa#zKIh|zkn{z@9e5$Hij ztyQ#W+jF;#MTa!it38XXe6xib26BI>Ti?OVgQ|UIV@9EQ^_# zo?vE1di5;B)sr}BMJCI3ahWt{ptVbwl~ydEUn?`Ce^!DoV=pi|33s%Skj>U?`#;HM z%_MgrS+I|E{9bJ_G2=tr$~1`1m;gTihp2vWwsrY`5&T2kK&qzV#UnGlMU1SOnv%puROKyE?-S7CHx9_$J8@Q;L-F*tJ} z?1_t2JdCzSNr!r}$(dLp%=9Ao2zJgbQn`vr=EaN7xh*o;m=E?Qza)w4od1{~7QdbU zM5ZXBWmg4^rP4&&0yL&I@nZ3-w7UwWhGr6<5t3OfS0)gX?9JM8LS!L2GWI=UPZ54i z5Z}$!@j|K8zMzq-g4n zEWZ`t<4ZF9F)(BlEh`5U7#*^}vTgvzkJfNGVuesRZXQD6O^dWxy6nWf^;~9^PA&M6 z#u%{ie2_;p(gdY3U%$Gx%{QC$R@j%VMeHAwDFJc0FB!f2RXSQ=&QCX+=-tJ(uqsx= zcCa#Px3cZ@`*V~oKOeY>RS@TXns6h2J3>kWpk0}W;rL?ezmM|QlqfHwD3_hY_4s78 zROk3?rVRovZ_X=~g5gJy94Zie2nvFfe#*&K>ibhafDlNa7_wkO2tiHI5JCxIgm6Lx zArcjp@g3y?9~Tc)zQ!@KxdiuzQ}AVJDn<&0zyh|KmC$8dLKkqV*k8@Lx{B4Y1~Tnc zQjR3Bax!N%Ee?ornPO6C6(g(PZb=M+eTokZ^Q7z;{!(u7DG3R!k`kZ98 z>q#Amq*Mr|4F7$g^u2RGa|Yg)lAEtW?9o(T`jAKux-Ukcz26sQ2VtT4j zSB?0$Ucno!MQA>5kjhY8cw{X{-HF9`v_pfj3)|p0xe8sjKlL=paPRa|^zKZ?!*2IE z?Z5OBd-t#O!N)yOBtRnPiQ?&2jynyRoo57mc6Jl(m-rNXVe`c!hp$iN_KJpT+}jh1 zclJz)!Qyl6&>dYX@;4?ppMdWCMmi+{md0Rg7z)KFZ>jO%d@gWd6a4lU0O39uKGha=!*>}Ht{XEcPIt{dtQgO;U%o-O8n7|%ln_4C3e|zxVMX_ z(AD^Ck4o}{INX>dL)trT!$$^Z;@A!~-u%S_95`y9(xEzjGA zs0(fZj;rC6(WXfYHR$g;FexMn{XM~`=#GM;E!!1K_n|JHZp&!g8=i}^yQAXKf-bgt(q5E_YFmX%`i*o^B``-A`q7U)8#9s-3Kw?yWK!)v(=@#ZgCl z1!?~&8U0)E$R!zAqz_V6(F_#_`*>>RX>})^7%AgxYXiF(j2OgJWn;as`i_` znyH-g1jVBURRD!o2_3EZ{zP}QE&q?TDb?O|E=0iat0)S01C`$zTs)Rdr@rbn@6Hve z3MkAx2iyYfw_WV``>+xI+ovFp5Gx;u)hfdo_cm|}LdE`jK=WQ{a gSLn}E9QoXzF!krjcBMoJ@Ftu@NRgRd@w>zS1|=yXLjV8( -- GitLab