From 72ac2745eada3dbe2d7ad6ac88ecb9ad2b3a43ad Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 12 Nov 2019 12:11:52 +0100 Subject: [PATCH] gotthard2: server fix enum for onchip dac --- .../bin/gotthard2DetectorServer_developer | Bin 143640 -> 143640 bytes .../slsDetectorFunctionList.c | 3 +-- .../slsDetectorServer_defs.h | 9 +++++---- .../slsDetectorServer/src/ASIC_Driver.c | 11 ++++++++--- slsSupportLib/include/versionAPI.h | 2 +- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer b/slsDetectorServers/gotthard2DetectorServer/bin/gotthard2DetectorServer_developer index 5cfff1d29fddac36178c1e02de3e67ef2a288508..358b9776428e698d4ab09b15ee161a0970442d0e 100755 GIT binary patch delta 39911 zcmd6Q33wF6)^^uqvH^h!rZbZSCL4q#EFr8(fFwX<6Io;x*%So?MO3Z=VrB$XL`0y# zMnpsf1w=%NY!_ivyaFQfc~KDp1VjXkY$BVG{BL!ip6PBvK=1wj|IhQB%&E7kPHm@7 zovyC#o_{24{*ka*Q$uR)WKyl2v!}b+)eo1Sw%HQq@C8AeS<#xi?JqOi(AoTC@Md;= z&GL}j!fg3TYc^LO5#o8TPGWwYAStA!Bst4Hhl?bM**_$#i2++rSVIH$31O)Q>@&iW z4cM22xeeG(4I2^?V*vk$5=I%Y?+L46!1fbX#ekI%7Hq(NuA^+}#}-vNd4F2Yv~bDS zB}h5lnZ@!iqO(|QUKZUiv9&GH+aO5t{Twazm%I+QOL7!RKFQwtGgp!1mF!pe6VCW5 zt=pxk9TQrYzu_F^4u3!kBC`}7Bo#^d%pORxrk=~jSRzl4Y094DgJar<>%u1U6*2KB zct^~W@+_+i^m}XGH};X}wH3wKxTi%TzZx6CzT;KmhTFU!^2g%pvtqs|t`|GW&&8z( zD7IEIJH>NrwPct06Sex;LR0uRwR*Plt&EnOm$#JEiSaserX@O@f94(bei$vKM0&j% zE=B2B&a?=msp?hRTQ!Bh5tqm()vn`IWn9`);;te&oL5OvqEdKXMs2>Qb^|t*Gj~h% zf2tBOh*jk!ZaJ7q47IxA?#{n+CyNSRao;C?2FIssKTiH;d_j2a;aY#X`KkB}md@P? z_3*y~{@3SY5~ld$8}cg&87!BlC)Q_qyl-MM_=$j4 zJ=VOE^aNwOc|@HN9&fr!QZ?aDmsEf>KK!b~H(+?$)TyZLi%!XI_c9e5GCa*L*_dye z6KNpt{**-DM_PXG#$d@i(yq!tZ%NYG0H0rGm(B+v{VYeKi1Strmd+om&g|YMVJhHj z5X|GFWBJn)YKE4ml1K4Ib(^wd+a+;du&P6v6D;vr$ufVnZZq~M-&Hq{UEtMI z8ri)4d2UKN+Vfz_(7sohR(-t(C#EFkhX+aW!7U|DkULs*g_qeUzLTjo>1pa|(%b^5 zxIAF-Zi@!<_chsf%;#+oQO z&+_z^?QHoQ`IwgRwNK}j$e@twlBNfXpFy?COP1KA80TreqGepf=`AHF$RXp`d3w#a zE&DO{8Bfo?qweZ=9U(T#_91#l^6qt(m7|ss2~a((s1mam@dep~ZN7v2O7@HFTmD?m z7`yjJr^E;5)Z$UCWcDLZZ`Hw`|1BV2_Xd1%t3=z8dOQ!BQPRq8ljibct+uce{GHar zu+&v)Q;wysN^X5yXew`+d!MaF>YCSbqnRxxm9NQ5XQ}*PUW&~ZwfW_1&=AUlj zo%*qV@^+mcVcYpfojbB0_?6D0LGCV1M4@+eNmtA6($97{m6vx<;+MM&w3TY?ggcx; zQVSO!5??n+Y9@Z8`TyL}0OMJ9M^n!xF;<}tXZeNc-SRqTU?!NCMj>mcgyE*ID%O*X>`*wRAR(wad7g=N8 zxBDF|lfTvd9(XEc-RrX=p57xR2-10ZVqIl*CbRQNJ)UNF@+&=_3XKbu+*k7)JRv$p z`E4K^sl`3(h9-ncIkWAKIY|k;v}bsDJp{3~`jUBB&ksE777F{~5;i4gq~xgfxFjWj znt?ij27<J)q+t(K>Zz_DZ|{Qs8dFjF$pK38PB^kDB=b0*%)KqX;uz z3p_%Y@mgRUVa7{=34}!%Dp*LE@ls$)TB=rSphaa#mjof)n59bwumlEOZ2u2mE`X+^52t{Oye#3^h#T;=G8n5SZlT6Ybf8(VhY^36?0XuYiTIs-SKpTM*A!oZ z_!577Y`=K<2Z}j_m_vTa-TL*Ciz((u#Qf-wS=+BY`|f1!2Z%*orXYG|VT=I1O)4 zuV5N>p@hb1*gajFhP_8=({L$G!=HOZ$@imgH)FV9^F?o{&dpL@IItf(z`q~3%O*|X z?+of*_fbj)U&(n*PX-OTrfG(1+Dm!t;HGUIVX%{i>)G*?6N{Pi3TgCGLp5ch!+S;8XG6I!QV!u2{^`$AwltcL z9r8floD~kgv&F&Va#AgQ9(Y`rsQjzo(Tytq8hG8ydVPgMaSda2c-Bza6TjG`f%CnR zv;?#ov2)Sy$@cm&c~@Edi|tZ31lr z?E#g5N&Q$e#p3!jrb(lRhbARlNaXfNm}=nUv8DC~Lk z04M>}0F(tP0QCS31dRlZ19?F+K=VOMK&wHUK-)ljKqa73&?S(48hQX!Ynn%rQo%F> z<%7C{`h)HVjRj2tO#{sZEe5Rwtp{xd?FJQtj)TsFq!-WwAQz|(s4=KDs1v9+Xej6* z(0I^P&@9kG5B@C!6@h%9ouIv-qo6aOtDvyy=mAgyr~xPoQ~>G$8VDK*8VB-%W`O2{ zmVj1+Hi5Q*_JB%2rJze7`-|uSkf#>@rGlD)@y7K2m`{t)VX zUhICr0(=bqEb$w`pCbNK@V^rOFYw2S-wFO_;=f(tafBS9zz>KxM0_#$V&Y4{|495X z@ZS?(3jW{3p9a61_;cXDCjKJ$9mM|${!8M^!DF>9l00ZZ(0h)MPbnf4{AS`K!2gr@ zn&8(H?*#ub@p0fkB0d592gIj};_$}b?A^uD7 z{fYk?d>`WXfWM3Qec-zje+Yb6;(rF;nfR07I}rby2Z8n!I0HVP`19b~5Pu1L4)JB+ zTN2M!IzpNe9}GT|_$uHV5nls*ed43RrxITqd|mJ!F@=&4NTP^z@bScFg0DqldVyhpOXg}_e~u>yPv@gIRdK>S+p z`-tBNUf+b+41N#cpMw7%;=csHi};=3zaoA&_-(}R0sjT;zuHAVBJdgUhrn+k{wMI8 zh(8W~1Mw%puOCcXvu8N{~%kM%@ta69l=U2$m&1?-3boDG$~1HA73 z^aTGj;r+nFQCHIp0{g)?}6_^{D3SQX%bqEwt#3$g} z68|~)T;jKZZ$cbe*vFH{BPhrDHJ$|Kr-NnTot49ZWT1;__lYEjr`M68=yZ(d?1jh8s0m7yLvstipz=AB;Nnmyh zR_laI4mM*RdpCd~X3#zvSf~YC1}w~i?E)5V!L9+TV!@J6y5y=BZ1}G(xth;I7dzCt z82}?J3C{tmZo!(Dy5t%btS2ys1=|KJ(t@1^R#V43RIvP;OTJA9340h=lm*)eOtxUf zz@jZ!^;0g{X~CWZ=CWX(Hvq<1z;A%XTCl{^E;-JE^#oSSg1rr_wguY)%x%F=0gLxJ zG%KYmVU;s3Il+=J8(5+R>jNywf=vaMY{80v)v;i)XI*k#KjzW2zYD+=Kd51=fz`8M zyMU!yFm}!*r&+LgVCfd@E@1U7*jNw11{UybU=1zUr@$Inu=Bt&ELff2U2`Zoy6hYhl5{&b#E67Ayr=Rsi#;#-{*ab^uhd z*Ma3&uKV0|puOkjO2SP`&(7VHSH{wfA9Rqy_=KV9RoloLoL_^V*X2FgCyWfJz*Icsa0Snj( z;BX7}6tEE%taF)59%;cw1AEYdEdn;mg6#!1TEjg4?*F#jB|l_Icna9V7Oa-fC6BRS z?SMUE!Nvj`Yr$Rt_NWQN_-_aJm- z0oZtt1-u4uf(5JpnM+g&oZVEMr2TCg#|=2@`0z+SOnp8-=WnCCda`4%vGhf99dg0%*=z=Dke_L>Eo z1#F=O`yANo7OeGGE_spF{~NW_CBI=wcpBJZ3pVg;m;9y$>%Yq-zh%L`0QR;8y98{B zAB)p`z53s{ zlIV+DwCh{-E|zvzG~YOUv;S(5gX5k2VQ&Kzxxm{YU78|G)oqd^|I1J*@RmDk9Nrn`)%I9t_0fVP$!O-S)`P0*c7Ib?y zny;Q#$EXPhr?v9jwZe3db1JqSANnuQw&l3x1u6y|2b~8=kXsGp0@VRE21T^SzfPdu zprL%}3q`?~8zuT)<%6f!^ISD-FkM@Pde(3_&u=*_j@qdmA!TTG1?Q5Sf9SV?(UpH_ zT8y+MB{(wS#spI*)&d*|#5t$MVO~c{H2Cv*hsD8T(Xpl>3f1H`5r>?d7Yu?gkYIH@ zYY5B0?A1QV6k{ud`QGF$Ud&62eB{O^olGE^p+zq`*?PYA#rOx-qZ;Bw+xhats3Mw| z&+Lhn$icBP=Ox{op~;uDnu(1%=kMsE^Dwh#VHj~p)%m-|!{p}7@OYY5A{7VJoR|6wncGCf( zQ6z(`c7ZrRB#v8XR+~TmvTCtmv?48LBY!quu_#t_d-d7vGbvI&gM+DOLDxWKc_qHO z;*^DUwpLUnKM3by&ujtCC(lj}Kk&Ks1jnO%)$DkWkRgtiU^@BF&5EkfxmmF<>_lF% zj$%BuHFS`6vdA4P;iMh%VlGGt_{A&}Wot(zVUovFGof)pcl`tVJ9QNXoOhiQE>EI# znC3#?$#jpJqb}{!=Oo$kH}F++JkXv-Jf$)??O z3ADa?JMfuvGqPt_qKm3cGE7C`Gl}C|*xk>s&dcW4_YcTxJbhlgtPcp)m2`OUJhd~h zh&MM@@9mpa4_-(*yb^~f$f1w?@(*Bw!yR^>InQ;Y@?MFLSxv&J1^%{|@iB8$9fX25 zGS+7OjWTFWHmrzf#~{jCfICtC74ehG+at-)E~}CMl=7Gc7w%ImpEawR$%X1^tn60G zX0ix@dHny^=)V%pC%sy$hVTc~83|X}_j*nHXr1UW}|BceZ8*6LC|DDoqyXDd} zZ7rM{Z4=MJVC-vCR@2pxuB`zd1RCowt?{@g%vVp96O$=FIc0u}M@|{6eYdxx+llAa z#1VY;eks;Mack6@48ITRE?+5EJul}K;rn3?)T?ANGrVkR`?U12H})>60c89~y`vj{ zOgBtUhR1r)+U)mDK;E3wR;;#rD_`e}^*#Cym(YGqpFk!l@Dm1R5oce^(Q#)C2HSwg% z5?9c(|IZ=Q;*Y6=%@4D0pJVaur&0?|>KpJ0#Cm1A4o%e7FoC7GG+sDXzEk$=-INzp z**zrLWSjy@8dwbJdUWP$aXpHQ1_*pJTnY)bRF*f!<#jl3^-^70xkJen;Eg9o8LzS4 z`3TP@`}e2#u8-o9l!}HjP#44cfkCW7at&y=_0fFc8i(CihzAG8z8Mt+h98=f#6Nje zPJ-22Nb<>bwCfi*j$-V@ZoJEe$KyB{#27n&E156E%$#kD6v%pAzO9hUY?1E$*FF zODIvd^|95(vmnkPi+2mXlhXJT>ql!NRaK0X*rWCF2p&JTId8q8SrGbxzqcXAE%ZQr zv=hSo+n_i&wY5Bt`A+c_8)9QCOoB%=e3$vb4JmOIM&lYu3JvCmHq@?7eO7J!#(W-^^zWPJxmmG$Z!Y4xVh`Os4~n%8NA<0y z3#fKmlaqeFxgb;FH`UowHy7yNY7QvjsxM5Nbtk__PP#yXFwvd|}S^7{(4&F%27 zSl3_ML12a3T`6V>egkEYKvVb@tJKIW@NZNp%PiqPuTopHz`s$YJIoUP^D6Z=3;Y{Z z8f=zugDPp0%hx@Xw>~7?s9n3_V~w{wX@gAM@)R1Yxn&JZJ9Q(dpzF5wD%z>Ll|^mOx|C;r~LLU2~^ekm0Vl}9QaP$=ggfM%^lyHu4Ed0A1ALQVYn&bJmbGvF!=jc zZS?K!O&_Y;+f!q`*tk$1Hcfyt>+<2nJF2TME@#9o4|>@LdD7p1-(9^$T-}n&bYp~f z_#s37fofp7t-+`Nz|($y^u}8{v|v(c9rg}MV~^c9wfPR#uDz;$SvB3=L~F=@Z5Ah! zz{+Q_)ql}$NJsJ2`y9sW%pLpcC8d+V3hp0@n;?b-RqW2S-7oGCj@duJ?45oij#Kb` z`|HUqNL=Km5@+Nj?GgE;poYBuoAZd@k4hC29CPTH&EWuwTgM`1PJv+?;|3;Pem?iw@ zRoZVB_&2I_#4MqbDpfx*%zwxDIG=bTaL4#p*s)*rJI#F6iS%e+7~a!U3b@ze-OgXs zD2G(WPo0R%xJU(xxA+{#OFi^WjN_UIXh$xw1LO@0RbTMNXUvZA7hA>$oD39u5)w}O zi=BCLh%NMSe)?pz9MM!;p73HI=Lvcv$Wk8rYd>4`hEp;J$c;p4wW3z9*5+{-A=KwD&K_;fcccs5&3f+;$W8U zMc1)OGH>!*t8BaWP7HMeF7@#nFU_Wxa9|lJ=lkZg;Kjc^Bj-@XC`Ey~)5IS;^|n8T zEI7rapAN+66HLo<!{A)cw z-dupSiiV!w_{XjE{4*ra-1DO@+@R;5Hy8h3>-kw`xz=XgLeIZymQYF0Ypbqh-ClJm zF6~WoU-&Cwv`>+$R-e0+C$u_m5m}?a&Kou{<>e&DwAIEpUv4RXU@n2W&ve+RZY`+qs!IGdgB|CWA2UUYc1s;%q84n zZx=O9_V1PQTbYG_R#d@x9aud% zq?u`RbgEiXg{IEDH()*VT+=Ma-)jcLbQ6Ct&Md*-i3SOO%^yrM3#_C{H(EC8lLV9T zQrtl-UT$UGR(UQ=?Ea5-zw>!-O|3;O1n zUZoLcfq$b)kC-L==T&;bEbwns>1nfsN~)xpb;}(pae`n9i7?F>cqoRI0fs=`D$09+ zr6|{`Fl_26V`5mk`QH8j*hJiP_usIeL4r-s0w_CTSkvIS&2ZvDSyh$AbzX@#l;W1Y zdIamWqQDzj7lFrSlZw9y9;=1QF9DCLs{Fg)VR2P{g)%&rB`8g*v3l9>7X|LhuREwa3HkN7IH_GBPNGqPL8;zjfE zs%wAq@ls-c^RaoVHNQxCK8fWhPgiFRJjSYhRphXrD=#tjfqG%IYn*sHp-a3HQ@mzV zyqwbeFujo$FW7WP_>d1(KePo;XwfRShnhr}ntpwyOU;m(&;Y!)Q%SACveWjCyYZEm z@!g+GmFYDY-l(gr!jI>v5OKu9UuEZ^augqdbME=fe!LQi^tMs|bru6~iM6grr*A-YY*yFgVr zM-AO2HP@DEym8d|v#tTkXAZ35;uugIs)pqLsx45;9ISpr`#)~nZ^t0%m|i$^>6kdc ztzG~6A1hMUMzSV%nY@+zQPPF-5-~f)YvWagG3rR<$3k^MG&iEC;5XjZSM{*vkaIL_0=t359w> zbvs68$Zy9ElhJ4dP1z5F0a?-(Ww47Sx2en|7~fPZZby`m7#U*J>L{CC%qi>U0M=E^ zd74!xT`WEZ<^YMsA|>8$&kA7e#0~*8V#l-bN}mUq7vL!eybSC|t%OCm+l!ah529Ycr?k!IxpO18+s&gZCYt2f1=J zDh4kRuVdo38t6FUgedXUu=?E2LG3FdQzbmZBlzk#@~89IOT?4U8jhzKrxNcGuN@P< zgSsL4iqNfaDMx=tB|Ta;RPs99Z_}Fd+Q)(E{RVh_dcO_cKfS^0)B8Q}y0h~Ec-`44 z0)KXk@?sKe(G!)`ACa>kEEl}X9^u6cj-^QFLC;~~`#8~m#^pq{QtMQkq4__E-z}a> z#oFjRtekSQdUqZv5BMEhDlup#cL3vvcj&7Rh24d&!EnL5!uMd5`{G%>yNn`tS0eJd zMV>@9S4AEcFHLtIgtyjTY#Jvi*Wy{2N0Y5R4^&c#Y;r~XZqm;rTWo}q-2AC{Bmgdw z>dyRRu$sS+>SF0|9@Xs^ntU|xaGYqf$RI43a3#ch;+?_=d(;2yw3u&)Fy9g|-{LXf z;{Vcov)y36;TdIpzM1A(DOHx-^MtC3t;a30|L9g4gF2cx_&xhbx;`?xFuH zbE-r>m#4g(#G3R$Mf~&X2+gZ-npb$OzdEl(zZtHruA5hg_s=WvvusLE4Hm03PG%9F zKPu7E8%-*7q;RB#VyRlH-mofHHPtlux~9@h@(=zoZSd_U%S(94OD-%c%C0+EhVn^I z=JLeMHjVmRcm>Nqn?SokM?sfB)oy1}0;n0N6KEi4EXY|-17>e={mbpE5Y_|@(9=Z{ zW_r1OG=ZsxgmHw4doX(D1j5_~tS({3m)oZk1~c!^n?YC&1Jjmew z&|Yre{t5Nv_WA9i)Nf2EpY&o?6-Nro?%Zo_;NrW_T1VA#p*)5o@%^5t@cKr&2PfF+ zF+*XV^4lqMQdrBIiW^ahIC@lo#MP|FJU12hXeHw4i2@S058rNM7Ztn_xF3E7r?NZn zvm%w{MNBmGz$E2DDod6NTO_ItG`Rg}V52l#VBD;~DytDaXRY^F8XFP*!&c47zo^*K z89rB|bV+BeB6_u$s=XLgvfKM8bJB4M`T|wS;Jubebya68|$<7 z77I`VW>Uo-Q)2x#4a_3n+%rvc=79NUU7sc%*%$imYr$Wwn zP>%}a>1o8T#~Ap(&FA;P>#-{cgimi?vz@=QIyU{ z>98P+@9Fr{={sCQDc$Fk4o1Y)VX-Da{Q#x^#jdPs-3Z6l^%7n(OUx@D?c;M)Oaw?rUVIxm9R!wD2CVLy9gPAZf z7nMd$*gXv`rqI9d_%)S)69~>S?feN$)!HW5Hq-^IOK-~7+Jk)0%Xp+IMG4PhaW-j% zl9I*N+)(VdB$lofwTdet*{oisr6$e`ThK1r1uda$bQF@Z4bEm6H!SHCWx*!4c-Dfl zY|Lh@np;b{RE~F}7)mRnth6*1-~dN{yLIU~Y&f&|3Y9snSg!c}mVRrt*1~tu?;QI5 zmVRrtq4+keo5=T88*EBBT578k-M!q3dy44ab8T2JIfkNWzBw_$5j7x}HNm%Pl$p7# zqwJ<6bc&XeoXllOB1!c;BuS$rv|dq?QF&UDnIcJ3Nyy^=1=O_?bUH3t%A zRLy${GpgqBta@6ls~9d9M^i$hYK~Pl_hWBV`Nw!wGkvw4{wv5%^0Qfq-WE>vMO5Ow zlwu|F)mCDAvmr94D8n_PulBl`z1eF_euLu3rc<`uzU&^)`qxe7!to@`0w@dA6*Lqy z4m1t45VRV!6|@&r3i6N1yVR1FhSt4Lm~l*s2s4ez1_F&^vY9aBn0!u{aZI)mW*n2R z2{Vq#w}ctTe~$AlwM!O)b#jHEWMjeUHz(0&{jXEviWZ2%yr(b1#3`N!}5#v_)lCGNces* z9+TFNuhK$VdxCP?05-t$zWD=(M<-&>2UP7T?D>G2fjWT(g2sZTg64x(f_xx<``y{s zPvAO)8I`3zVJ2m1OrTL&niFPJmK?&2%92NzQCSKIGb&4G!i>t&ExUrXr57bMDog)t zZ4YSB1Z@xKU7Ept2C@e7!`X?F4_ZS0i_nt%ca>KLLQ5h;G%bM(Uj*158KQhSkUe7; z8o(FVt*68fVlm2$LCk?q>MDx{!OeP_q+Quu;=EF*+5csB|xd5)}S7s`$6MDGeC<$MWAhmy&gqalaYXXgm_$^^ZMf`ymz(gc%j_7-2?5{Iw!QJVObM ziuea9;uTF1rEr(Jl&pL7KGuNARdN!2i7xdnrxS0S6brQ!u6#6%4f8lCip+~@j&K%6 zH!t$lJd77K)J^HgmiW_MgOh@BJs*TLvmA+1C_QS}fYQ^2sz1GOYLMQkI`1t@l)3k_ zhH_(bC8&Pi-_JV6G&jo;{tOxio5jnXN>_$Hz#7K1rX=L@Xt|N(55+x_xp9a|yJ4a> zqYI@q>^`dEE{L?rO2lwBu5NF0ZTwXyi!0o9Z!6`U;Y^W-QBv}ow4};iBiI^w97WOf z7quyNBzrt_5=9x80MRD>+CVJ;!zIQ9yzfqB^GMd+)8{SI`aSgpm|W0GkPoy6bR2XQ zpT$g!Um%Q4Rs%dWP?vXd3t zYb$d`v*hrq&ug}EpR##0&NdWN=|^Ggj*@K@r5{x;Ae#NGL_fra1s_A~F{SV!78e1w zz~+;J@iMlp(aJjyu@14%;(fvLPq`)H3tRH(yb|%E)QGcr_#CxT{bB4f|DrbAp&kH1 zcKhjaxD)ioCCp9nrd)BV%=uGUN%c^#%XuvKDCU$`!h^)P$>r6HyIsQF+MiH7Zd%Lu z73oFZ=zUv|XES8t@fYNge?c5bm3geJBv;&ZE^umfb^;KQ0>cnFw2ZWObdoybI0PKm zJ40FVFw2vFrKnOwmC~XxTPb^(J(+TaqJBlxuX+@^@KvLng*H+S^`=P+63AL+5;*ET}7Vb>pm%D54Q}{MJoTA$dc9-tYyBa@W$ioHf}O< zR`AjS0!%=x5sw|~P%h1iC^tbF(#bF*p6?(bMCg6pn)#|rHNpSX`@0$;h0 z-D_(wTdA?1)w2zqtz_+IDeRImWIvJvenA9hD699g4sm;CF{uh(j2p)KvP?+|zQ+!$ z-xA-ClS-7xV%DK$GfIH(nj%pj`|qqzyhz+wsydXSuBcJH5!IWbLcPk&Viv=uty@;i zK3A*u@L~2Cs#bECc{7K;jD;LUR0Eac4~xj8_-b)#I04u+#P`Rq=x7lxQDz@uBT(hb zM{q;ulG64kRv!&nH|8g{A}ndr9F&j0ASpuqUFi?wRx|!wrR#D^Ss6=mm1+r@R73h0 z5p^h`4F%(ihtkM7%79a>TjavW@D*Al75D|C-*8F&au46#{IGUQnF5f$135!v-l)O0&b)e{0!h!AHHr(;rR%M?NPe?&Kh~L zPNG!8e+51jiI7z7|Embk*c=#-+Ay%IlbN)h;xiC#7R{s*3g;ob>M0lLC;XLM7|L?_76HQb%z>Ad=fLWFj{s+srcbP$H zK0)kxd`DJq=q`k}J%l36{usi`-bNaV{}bV%*|_Q;{fIz^%urta1Euv> zHvGZ5M;5pOO?VBlSxU?WRI%$|ED&h5=#3u%!!lf8d2Fom!UdL*xa=OhB7%y@4Fi87 zFc$q0?ydX?A&Cjkx^!iq{Ljr#LrSXUqtFC%s9Q?Veq7fVgRxz zbv=Z8C@&y&(L6ZKxeW0mcI+qO0g?+U<02LgKgPlTs+fT>0uM1yu9yn8Rc*Fe(u zBAl;eUqZVb!_av&%GI$&wqAJP4< zV{j?`DujD0CoZ9`1Mv(-9qN}8fakv-m`i67UY3dLNKzw)<43(e4YVZ&;X2CQmrR$*;7(G4zA%tfvgW)6f`vu`WFbz8?|3!qi?hAxNBd`eeSF-;^mvmC@ z7C&c{3HV8zg!|h*%Jl@+-QMQ|xuzkEHB%&uIv#*G0j>ips~7ey!h4j8nrYml5{;E3ihqi}0+w za6XO3=OcvIE88K)Q!OOWqa}c=;d9qVDcO01mtbHvQIFbdU|9de_d_TggD_qIDxsaK z{x?8))44!xvk{JJ6=-w^giG;NYdhudTSIChoe2vViV;E}Y(T2sxd;pEy@$dtAiP_7 z^%{o4r)KkNaxY@nD<=TU>&L^)P^KCV=uK-ZN=ofA78iL5j$1Pk1-)#E zs69&OGRWJeJcys3i{A-M84qIX;A7sUBxp9mBQd|`Q}}I!&on@<)8MT^cr4U=62v5d^~?*_zP0KBPbz;-%tu5EA6z~Chyd|t^e$D$d=0&rizOE6ga7(a|~wYQXs z`t*EW$^9V*YA_7G4u;7M21%J^|qpjOb#D&qR1y zAIO+j+ZK0M{;q&lJ%X5g#B`#RlM&wfA`B{YTbRSy2#3`RNPZjPk!J(T?K*@V-RDiW zxf35MK>;M@G~i;aWV(gFgz&(5+imfQzU=|sYKD(9?Hm^qx%~}gEt0?tHh?VLpU4m@x#8Rw^ zOUT-v1zu}Rz-cH)_>%HMknNGkfq;in6CR3&@1lg;ZSnV(c7yVh)K>r>9|t#sEGKTq zNsU*bo2X7J5Z-+pcpnuSuTDOlB7Tk?+kv-5~k0U%@i3!G#Ej$y@izR?NDV+rz_8Qzls^X7;mnaj0Z5gaU zS&rDAlePsiWx7z#KnxQ#Fc;w&uoDl73d2rxM7Z^jXcS57g>ccw0qOT6JW`1XK}!mh z><|<(OL-8Xnqz+p^hzlbxkf7sLTqkN7`%v;)El>9YsiO*KA*x#2zP>U*C%K*g!}&z zm>+ov?+vv{E>uRCy}k&KLjX#nYRrQO+aC?|_C$m?JsR+kX2wWL%TQZn=Fp!4vwRa0 z?TiZu`5NI_I|Ekb5W-O6P;~2FtRk=vYFWv#FoDW)!0;Nj&R4brZoBZ+ zfHj#8c$p{Q$j?JKOAcIAEk$@Iobawx+ItA^Rnn?p;xxv!n_h{dfb$LhzW7+o*d76k zDI;7w71swOrXj+6O9S?&Gs0&afl=v)@IYlbieW32?fA(o-VhkW*AP2vf1vwUBHaJq zxI`l9MF{UyVyYr{iIR<<%pNI$x`wzh$=3#~a}>g*{TQAP(Z;1V!uiSz$Yu+BM_Ex7 z)^F^afgT!%X#0qD`>NVDCPMq?HMGSCi_M8i%7%uv6?Ee5w(7Sg4 delta 39826 zcmd6Q33wF6)^^uq5)#%4q%)HQCM#rt5CX^&APEpwkxgU~1XM&e5s{04$P5}aqJ&7H z%_g8AB61NSvUm}qA_6M%->ZlaAuMWGgowy4`QPe3J=5KUpkBZ4|MNU2bLy??Q`@Oi zr>d*F=N}86e=N8lHz@aWCgpzq@+>!7^WNL%Y_?S|^MwK1*t`vc>~ol{w1A%q+{Sio zcsr<0u&pR^!?v0a2YF^E#AYW1NI@+n$yx3>S|~}(&IxO3z!nmgYQUBfmSn(I5EgI1 z-X_d#z}9Nmu%HM7xPcOe8L-WS)iPio5?0lKeN0%O0sAaL@pNNLs(vvdIU_GbD(W7f zEFH)q`KRHnSQ5VxJ|H&97VB*kAY~s5mj+5+hubAN3Z){+p7gP+Q1VLlVm{d!T{Wpg zvf3~w6Zlf+829NBS`ZgY;Q>;il+En^BpVW4HpT*YN<=d@h!2hE7@`Xs!B~{Jln@J z>$bEVtk17Cjpg&}-eEggpMO=iPe%6J;ga*p_L77MuOlNb*5SOCbyQj#E;R`CdNo`M z)3J=a8c0*ktJe2t$_^A@6e11yhGgGtm%eV<0dm!z-uHt z?2!^(lF)$c?k*_@X~eJEZEZ&;=jNikc}~f0_c9f0KQh@a*;w|cPNadn&JAL--_@@7 zZVr^ZqwJ~-w31YG&d*D~+ocNuNMGQH6>-^B1EmW;)?{{X(_j_wHVov^;gS5cskN(= zsFHi|#`T-AVxHN_SuL*yN?6Sy6$DDWAYSGR>NjV1^S$-6*co24L1SC?0G`<(1@#%- zV0iyaOe?`zB|xJU%x$tKF=TVm!LMfdNv97hsx)x0nMujP|d;+wBmWjeg|0wi~U$0NDXx$Y^vw9#6t`&Rnhl*HU;4nt4b#{WKD1%9`>2j-!#-%WLGp!>d{INU?b1m8 zuZD59t0Val{QN$W2Q-Rf5^vBb9#*wG{#W7S@xL0Mi~lwGM*I)u2k}3Q-@tz-k4ueb z5xg`0*X3hU6GNgOrjFwaQ=@7?H-u(6i?favE$1JnriG;W;;*K*30;!ua30P&>P;3# z3Dzr#cWxYSv|e}S)Z+z>Ls)yhu<<6=jW=i#UHh#fW?$)L&Kp@r#SGy6FkI=C!;<-$ zwBP_~eK=p*v@ulH$*-p+vp%?@aeyz0w~3zQUUo0P+BBYrq&wLCym7OpyeK`C-=@QyZMBsFR)R#q8WP>sb{IFyg5ja*x~F-oa4 zv-2De{hoDHzTr74mv6_Mg{r=>(ji|IDgu5b_)EmE1`oTX;%mXf466Kk@K=f71pXRE z&hO!G&nLp(C$MYfKw%ouN%_B$m$J)oR z+I~RgGas=1oVej%nc>WKDUtstD}@E|8(9r(*{%%@vIjF;M39p9C`;c^*j{F~nn^+? zFYPeM7M3I$u5-}0RC4z!f7ix>*Sj_Wyxz5m;PtLe0k3y$Dqr0(t$veL{&q-5EVTo= z3vEH|(2U>c7!P|Emy^ia@$NYTY@L&YLFAw2v>oU%Gg|Z>zOeIHmdk^>41n07T{3M&ZTONdcd~qbs!PL=^+A$+ zetU`3g1fuE+fLL`ua~H!UN2EcyK(@;?i^yDbP;0Q@BMFQ9;k;r?|CCMkZm+-|sTk$4$ zrP_`q@nLthU}O2Kca61OO5zP$xOr^PyKUa_d~(mn;gFr``66uYDQ$R0)mVpXE zyFj8&>Li(-e6u&+k}#t;o=F&a;~w?mjszOr@vej!-SN8!a~m@5OPJ9cA3#``A>9zd zjNbVD$w^wNjqdnJN@#S)$0lp;_=M4#JDylYb;p(O(wWTn^t+pRx%-}|de4m3=Dg>U zW4+l`BzZqNeZS{ujxfB5y#GCSC+DjIw7DK;SFQcal=?VQANQsH_dRWr6+`NplzIWB zhS%Xd=1bk8e-k}v4GgShS>O+bnK zxq*r4-%!i}#2nBiR*{?sw5dtj10KH57v#bT>M!zH6eh{vB0Z>PpjUE! zi{ZK-J^62eVeJtqOMJzkq!e#`S#kn&E#B^Mhf>#^rVQb{IltEn#xD+vk3E|lD>32P zpjc&;O7(d4V)2Z7@AfQRVj7EUrb$u}=xb0Z=sL*pq$DMPT7i0ihJz-7@<6_^_$z6! zab&Ul`H~?6*lvDt$X=V*!*|}-t9~y^ z2G_^=yPgbs^t+}Xs%<~TGln*6Uo#jc)3CbiPgi12b6zFAUXClTYFDZ=$|FLniZH_A z*2VF)LkHKlN*P8{#O!=sm%a_$R=lG1XE{1+V*9Pp)<-y&q%=eBf}|<6LIa!zo@#$^{jG7K2uS z3PDBUS5)sQ2txO&yazlME-F70yzcuw170uC^WgOYy$D_}&}{H1P_TNjuSBlHrf38*coE2tl6IA|Pb3J8m5sQ|PXvy9%vb84QMlH2WTIt7*q3%QJ_g6FX$!Ee9#KeI?z_oF3{JY63`jYWsv;^v;e3sC<)XYlnv?u8VDKzngE*a z!M{AvJkT=G8qj9Y4$wYOF{l)D0VK^r3xHgp1W*%DTToX}KhSW{IM5VOE~o&s7_`7pVaPYqn zKOg*A;+KLyP5cV*rNplW{{!*sR(l*l$0+bVB90LM0r+C#w}DqTK#f_)_qViT@dVL*g%hPa^&r`1;^IVhBlV96{KUQioG8_-Nv5fv-!v3_gPRDDdIL z$AGUxe0}f^;v0g;7M&_H9eh>d?*Lzg_>46UPmrAgnTTM-=YYRKW4$Z*YsB9L{xb1> z!T(15An@mj9}fN;@uR?>A$|h*lf+K}|D(!#B)b=Z;}nqxzJ&M!@ZS?Z5Bx#m=Y!X` zAr^!Gn((FI{}1tRg5OL0YVe;EzZU#1;@5-!6!u?jqD=^VO#Fx7w-f&n_^rh61iyv& zUEnto|0Vbh#Qz)oI^w?t|4-t-2fv#5Htbh>rq~c|@&n40z0{SfxS%>mvXsL*pG16T@Q)FHC;0Ki_W?ha_yOQY5kKUgu>TKH;C@6rK>SGX!-yXX zehBdszz-t+AK?2FKMnld#CyQ^CO#MZUBtftzB}=Az;_Y6u>Y?hkV6rRz_%yfqe+X6aNkP7~&6s zuSfh*@R7v-2wq(dq5`ME>t5=4@Vb|J3B2y5UI$-|u9epMywtjOI|6|e5dt1=s#=4Z zYgNCwF5fpc&=dEJW0F)P*`rEbvd{G=tRFC@F9!&F5}3_`y$dYBf*k{9w_sr>U2>oq z^VmBB3^IfEX~3#juw}r4E!a+AAr|a6U{x(x)G3!-&4LX*?UJh(d1$diwaW!q!;
`lkwddmx)R#T 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 IY> 4) & 0x3F; // MSB (6 bits) diff --git a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h index 2672a7c85..5431a3d2b 100644 --- a/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h @@ -9,7 +9,7 @@ #define NCHAN (128) #define NCHIP (10) #define NDAC (16) -#define ONCHIP_NDAC (6) +#define ONCHIP_NDAC (7) #define DYNAMIC_RANGE (16) #define HV_SOFT_MAX_VOLTAGE (200) #define HV_HARD_MAX_VOLTAGE (530) @@ -66,10 +66,11 @@ enum ONCHIP_DACINDEX {G2_VCHIP_COMP_FE, /* 0 */ \ G2_VCHIP_OPA_1ST, /* 1 */ \ G2_VCHIP_OPA_FD, /* 2 */ \ G2_VCHIP_COMP_ADC, /* 3 */ \ - G2_VCHIP_REF_COMP_FE, /* 4 */ \ - G2_VCHIP_CS /* 5 */ \ + G2_VCHIP_UNUSED, /* 4 */ \ + G2_VCHIP_REF_COMP_FE, /* 5 */ \ + G2_VCHIP_CS /* 6 */ \ }; -#define ONCHIP_DAC_NAMES "vchip_comp_fe", "vchip_opa_1st", "vchip_opa_fd", "vchip_comp_adc", "vchip_ref_comp_fe", "vchip_cs" +#define ONCHIP_DAC_NAMES "vchip_comp_fe", "vchip_opa_1st", "vchip_opa_fd", "vchip_comp_adc", "vchip_unused", "vchip_ref_comp_fe", "vchip_cs" enum CLKINDEX {READOUT_C0, READOUT_C1, SYSTEM_C0, SYSTEM_C1, SYSTEM_C2, SYSTEM_C3, NUM_CLOCKS}; diff --git a/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c b/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c index b6d4816e2..39af05e55 100755 --- a/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c +++ b/slsDetectorServers/slsDetectorServer/src/ASIC_Driver.c @@ -32,14 +32,19 @@ int ASIC_Driver_Set (int index, int length, char* buffer) { { char printbuffer[2 * length + 15]; memset(printbuffer, 0, 2 * length); - strcpy(printbuffer, "\t values: ["); + strcpy(printbuffer, "\t[values: "); int i; for (i = 0; i < length; ++i) { char bytes[10]=""; - sprintf(bytes, "\t0x%02hhx", buffer[i]); + sprintf(bytes, "0x%02hhx", buffer[i]); strcat(printbuffer, bytes); + if (i < length - 1) { + strcat(printbuffer, "\t"); + } } - strcat(printbuffer, "]"); + int len = strlen(printbuffer); + printbuffer[len - 1] = ']'; + printbuffer[len] = '\0'; FILE_LOG(logDEBUG1, ("%s\n", printbuffer)); } diff --git a/slsSupportLib/include/versionAPI.h b/slsSupportLib/include/versionAPI.h index 4f70df8d9..d87273b7c 100644 --- a/slsSupportLib/include/versionAPI.h +++ b/slsSupportLib/include/versionAPI.h @@ -8,5 +8,5 @@ #define APIGOTTHARD 0x191111 #define APIJUNGFRAU 0x191111 #define APIEIGER 0x191111 -#define APIGOTTHARD2 0x191111 #define APIMYTHEN3 0x191111 +#define APIGOTTHARD2 0x191112