From 83e6ba4269e2bde6af85c4b46b7bf945a82f8ee8 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 5 Feb 2019 21:56:40 +0100
Subject: [PATCH 001/123] Find Pugixml library installed with Homebrew

---
 cmake/Modules/FindPUGIXML.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake
index 3232285c3..3d8ce2bdc 100644
--- a/cmake/Modules/FindPUGIXML.cmake
+++ b/cmake/Modules/FindPUGIXML.cmake
@@ -32,9 +32,12 @@ find_path(PUGIXML_INCLUDE_DIR
     PATHS ${PUGIXML_HOME}/include
           /usr/include
           /usr/local/include
+          /usr/local/include/pugixml-1.9
           /opt/local/include
           ${PUGIXML_ROOT}/include
           $ENV{PUGIXML_ROOT}/include
+          ${PUGIXML_ROOT}/include/pugixml-1.9
+          $ENV{PUGIXML_ROOT}/include/pugixml-1.9
 )
 
 find_library(PUGIXML_LIBRARY
@@ -51,6 +54,7 @@ find_library(PUGIXML_LIBRARY
           /usr/lib/powerpc64le-linux-gnu
           /usr/lib/s390x-linux-gnu
           /usr/local/lib
+          /usr/local/lib/pugixml-1.9
           /opt/local/lib
           /usr/lib
           /usr/lib64
@@ -59,6 +63,10 @@ find_library(PUGIXML_LIBRARY
           $ENV{PUGIXML_ROOT}/lib
           ${PUGIXML_ROOT}/lib64
           $ENV{PUGIXML_ROOT}/lib64
+          ${PUGIXML_ROOT}/lib/pugixml-1.9
+          $ENV{PUGIXML_ROOT}/lib/pugixml-1.9
+          ${PUGIXML_ROOT}/lib64/pugixml-1.9
+          $ENV{PUGIXML_ROOT}/lib64/pugixml-1.9
 )
 
 # Support the REQUIRED and QUIET arguments, and set PUGIXML_FOUND if found.

From 1de95886113d66ed15b8b14561d655c04b28b5c8 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Wed, 6 Feb 2019 01:32:46 +0100
Subject: [PATCH 002/123] Update block diagram

---
 docs/doxygen/images/GeneralBlockDiagram.png | Bin 89995 -> 94046 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/doxygen/images/GeneralBlockDiagram.png b/docs/doxygen/images/GeneralBlockDiagram.png
index b208624ef4c67acfb5f345803bf67d01d878d639..51e433ec011fca9fe89bb1a9954307f1f2c23fcc 100644
GIT binary patch
literal 94046
zcmaHTbySwy)~|wubV+x2mvlGM-5t{14U*E`CEeZ9Ev<lrAl;3Cz+LQf&iCCv?zs%d
z*zmqjt@X?`=P%~k5sDuq5#ey*UcGvSC@m$X{OT1X@vB#_H(?>bC%ILEW#B(JF5;Rl
zD)#0s?nX{#uY^tQjm?OqZH+9<l+BDxJsn5Q_`q4@R;rpVn(}fyCib?BMlZ)Ode}OE
zvtPa96ZCK}GWlrcLTqeiVP(fpdfL%LN^E7yPpZKo&n)jCYG!FA<>h3i;`Kq*#OtHU
zds9+D0b)K69&iC$GZ!Ob4_g~MXC4oJ(tobY1Ac$`n2D75pF><e@{|7Sp)}<ciAC+5
z%!oM{*%(ZiSy+fUIT=~lIXF34=!sdGSy-8v!9Pw07Iq#EP99b+;(z~;g1b4Hn)4`&
zN&Nd>;4gksOBWXh9wsJtcXvj2Hb#3V3nrHL@87>%gO!y59Kqo1Y3E|(!C>c1_Ma<=
znK_#{Svj~^+1nAnT+ztb-qnSl6g=s_hG6UPKbN(0{`WM231jjwa$sU%WPTaae-4zF
z|NkFqYx_S(JG&^G{qOVsKQHX8>giy{q-^GF@9Ja%UYt4E%dH%EM4ilxT<o1x?d@&;
zGmDCr_Ad6$mi7+BqAHxk)bd6qR(3BR(EM|TygZMzowJLPor#&W7(Xev2BVdgDG#Tx
z2$&mTW>ywaVHOtg_rlz)oFXj35@K8utis$ZT>m*&%-+P+*38c3Kj)hM@3}1h_1u?W
zuyp`;7Bh3Qax*iPaI&{0{%6oUR{!-`-i!a&>;3y&)BpM`?<M~0xlG_;m|kA(|MjZ>
z^AU)jmtX%UaKRt{6Z&R$Al{uoU~hF**S&iEaavkTSk+_sC>zF5jiW#8l(1{n`&3U|
z$8E`*b|i&@n$&v?Ev~B4KnMjz49b*71*e{-1A`iax)DRW{kFU7;mO|q=&qW<Fc5;k
zQ{X5yG1E06YfJvahraLDP4sY~BKeBc7&6<v`C39Rzkv^+F#q)-+&j&eKf$M}hD!f@
zldo9%wcuX|mC>GAVyf~C4h~{5=}$~el^9qmgJX)9Nl;*Mx$JB#EF>E?<qcI(75Bx&
z#qS;-GSkw|?tC)vUM^XtZ)$E{t<_*YTO`d+xAul7SnZBFS>|s{Z0x6@f;M4r%cKMG
z@e~GUXXlUo*|Zpujg9P7R3$B_+<M^9+9jL63zqEcbT1F3d^~O4g#TeO6=v^?sHiA1
zAs;pokph%DM@1ex`ae%yRv$iSoG$0KJ@)QzF+|iq1BTna21C-Q(PyBixA|U~UQzMU
z*x1;`#ie*y<j229>q(HORNv5We0=QLnL7G5M#A~&@7?tDG_t@SVrpvGpq*3$Kc$KV
zBLBa2si{A<$5WAs1o$kc^S*u+3UT}U=e)JGRXULp2NzdDT>N;gONSoQ|9-!umCxhM
z(8lKI&-w4k$w?DqW50)Et^r=3KMr7kqMwjfTOIr7=Fn4_{CnQIhL+~?d#fudPM4`r
ziAC<^@Oh%4pnTnSqGNI1L-^NgO7h>&kA$a(&3k;fl@t>b!s{Brc@q;FDsE?Ir>u;|
z_@l;PJx@58QLo+ScGcafZDnFYjy753yw=4a;_mJ)G&HoAa8$Fw9FaY}r{{Sn2G4PS
za}#1zO;;Bo_3(RDFrW2e?S_Kj<JF&Y6RAcTl`q6NagI#V%*tp)M98;Q+D#(H7nhd=
z`1o<njg5^31qEZ15<J1;FR?WC5d;ey9NgH?#F}jVK3ROe+Y$}eXD=m4q)#T6matqX
z{M%UQsps%qx{O>PDX_52jEsz|tr1>~eEaqdOyfFE?o^FIk3dnh5V262LasnIr)`EN
zeb`ozSg@ayn;Rv`&pl>NPKjDiPfu`uoFa-43=)381EqY%(MlUSBT4h@+}z=O8Dyx-
z)=2!wh?ItghODgYUUP^0X|vVbj(BKteEe%sb#=@}T;=49jDzFjm_6dtyq|`75Ea@%
zUIEsDw59emiKB-0wziKKy>9{xRJlv-FMMGFie-v}eD4rjm=gkir=Fsp7Z~OqV)u|T
zV*g5O4MhBl7CT{b=X4rv@DlAfE8u=xqlwdq+o4i849ciDMW<mb&n0W+Qep%3q>M9)
z?t9a(-5cFc^&iVBFG#*dhY=8<>`M|i6Y_bystP8oQYw^C6g0#2p=8JYmE%G>pe#r_
z`-54KCBC48M6gaqkSv(LAOJ@&zQvo5@RVZCK28Nic@M|Y{VXVnY?6L;sJuw9YNcHm
z>U+np(L|~S^GO+L=|IBM#k$|K#j@h0sL=cs8Z`oLM`>cDG_<rqZD!*sN=iz;_g72J
zwmNfP<To5aD4Z=6%cg<=$ooTblV78h`$Zv_5Ea#NbKotkTlmSu#6+9(E)q8LD}BYb
zp1&8eZMsOqF?d`Owb)S;IsAB{pU!^|AC?>(Ej7Sn(oZ8}iozA4K*rx)?xJ($`rc^u
z_&q8T7=4|7(}Y8od~^JhNxu{O90`Z@&587Qfhw&=mG(k`IDDG_)7@^<#~)AEKMX#9
z{@l7!Yt#>7mgSAGngnsHFP}%FI>;Tkue9ym-EU7;J5q_%1X@a{`nAn<Wf06LBgYI<
z9G`Vl@4sF7dsUm=EvDxZ^G^SsuQBld^)+z2r)n-1stejHcY0be9B&1SJSsgMC&O1k
zL4lXI<D%b+6?XVoG;nZeXp@O?RP2?Ap%|^!w@}kxRQZbGA7CEy%F1Z)zv6WEqd}9A
z6-GxRTp2j*93H}_!yCjB@{62CJcW~^l?9ndU@R{$_X+Uw;vu0x@W}j?F>j7bkXgse
zf~#!#psubC4kpedmdRrdLn1iX++;QC3jr@gc++O79xD0wY0q=m=Uxig7SzA<Wh!7%
z*cuwX>N!6@e|mb#<g}GhQ1}$0U1to{Df;E_{b3EP+hVN|3eWDh>`Znmv;o8egCEs;
zMkha8?EU<nGz@$>ysq}v{T>kgq&a3wjQYdmYUwnpUEJIxYS;ar`O}3dh~1>9=cPiT
za}~+X=@Q`fp_j0*us&URczY+lr3DL$m8!*L7>N(f;#(GufDgA#-eO*9_tX8yMlmV5
zsT}?qy$*8|6VXFxun<n-++ne)eiUVjjK@mgIc*8*ZLW=Gazt<V`uJpJW#xs8@dgKJ
zb^F|bK(kwIPfkhUv|Hgu7%_Uj+sze)^aTlQ@4{}aGvb7jnAq^)=6G7V!D5Q=y%Rb9
z*8n8Tp=cb19KM%G%I0;)q}OCN9)P{F!>%Sn2??9`^7QNtSj6M7Zgk%L015?lt;JN1
zFeNL~6ABWKqKmQ==cdRQ$;C92XmM|yCjA$Pii|*7D92zpVM^wFX5u@g0}#~X5$IIR
zG658{G9Dh>?C7+Jv@rOUIxTkJE451B#4UKZD0ve%Gjo?})DR}2$Z}~#F3YhauH>DF
zBoOg?VWb%N-BCo`e<Jb=kdz{w&%DU>NINhLqR?4NpfR8(F)w_-8PCVZ>~TO%Pd}g%
zh>MSpuWOFH5*`j)WP5$EkjZ6F$Z87f$q?>xe|Lwf=DyJvIu7c@)r@4L-AmL9P5!(-
z+s=J+06B_=hPHWnYHwzCo#39gH$L>4AgWi82k8n{kq<kouqH4p7%^-!*YBRj(<J-^
zO&bo<X@vO7mo$E)zaP>c)TR8{?)w8e?ttE}Utgu{`A!cKTZ^&y-n;CHczb)3TYU|9
zz4eX(;!^`_grl>w=sXNEVdM1q*+&1-k&S`DI_u$3>DO{--8QFU*Te4<!?|Kg!oi}U
zAY|CSK|n%IW%GWbHM6q1o8($YAmnQWF-&d0Gc%~bTxc9G8;-}#>vn|A?ja)sw<0>A
z+vC?|`?Fatt<(*Loy%^;V{}d=D0zH)3+)~50wW_MQi{~&LWM?&Tzb%b<i_B1zG(i2
zA}XpY2)%f}5qc@=J+?HG=XgQ{B)6l*nGSb*?y#Z0t`?i61hxAQ*#RXitgH!e00$|X
zP}W%=cNM03&O~0YYQ3Q;v=7etjGfm)oO9(*da9EqEo@0CF_HXM%>Of@QXCG<nNwMa
z14>y_6Gyw@l{_jc>fX`H>MEUkEHrKH8dTf?2t^~teDOSU;@xqkNb+KRRn_?d@hA{M
zAF_Fx05V|mqKkGo_+ABncX2r-h=qYcuiF||$|w;S9|@lwVy%7t8gmx<b;#>C>Ae}u
zMi3BUxJO4v%S|7#-o0ybKV7S>W!5#W3>bdJ^VSvjv(b=fLTak}#n$N6l}j`pD9N`+
zOQLU51VCLxLPBaZet~V<U0;8n^SJE2>IZ3eCKY@I3a6SE{Z(Rh3)1{-oyl;0ef`Kb
zNT`z0*hT;lfrX2?jry5LkPshVPGB#1ES=L9H|aZgh;apbG*ebBkV^y~jv54?|DrQ$
zRO`MS2V)bSi<=_VY~R)eZ_9GNG+w!kzGgQEUQ1@7QmbKSGLy@886!f>D=+2m<752M
zJ34h@BSpP%f_E5w75>jpM1FsaYV^C}ut5q1X_%a_1%U|?8iCvO0Am2tE-*eq(Qxa7
z)nMKWzIX_l;I(ejzEa#f)t_JJj*l*E``c^<KqaVFBw`Y=gxPU%%pfmaAO7Iw=AOtE
z^dC#20Y3m;Jlvj6O->RB_;}dZ&?6|m9~v5xO`(7L_N`G8&VjIm1oWkrjIgk<pPvB2
z&d!eD-!suvM!n@mtGQ;|pI^Uz4TOaGjQ<{Oqf)!cx;F?48X6iPVHD5i=4M6hIN{ZH
zS2lKbAG=zIvYryz4<9}&OPZTg-XXcIb$Y&j{aQAa@o_VXX?Av&({_1lXGa3F4F(Eo
z<2#slE~{DcP2bbCu1`n=BEL!$a&Im#MJ)lS5eoa&ZTas}FK9AoH=f<z){Hnk{RoIc
zO51VTPRPmWcKkh*&SsIIfabxc50WEEn24z8@87>ICNr)_sdB%r{rG{E@q2SHipze@
z#nJI@C)3`>#wO36*f>w{4MbpKVq$uFdPxaY2z-SLJW46`g*o7~HQ<GAC9|y%SNHYx
zeUZ-;;S)~G7W5ZjVQ~a?B~F-r_0zzg>!k(@MGwXIaoiJh2duq)>Dk!?TGSH8fjGEG
z8(bg1BP^h@3UYJ*0R<ThF$@w`Of1Ck9IGre1((J6&E>ndb|jz}w!EDQTg=}=;TX``
zw%d^a2=WxZ(MGu}$!9>tWU<*6uRZyDmCldazR2ikv0U*jRq*sKF6>?{U`6S+I&1*Y
zu;)L6)!>r*g@E7dYAl%!U>FGr3Dbzh{kf8v?D*RVFe|*?H#VA@n!37Kg@wPP%zG9&
zPA@-|D~5ms8$3qS;1K)54>%B9hOl{V!1GeBszzZl@VKAw*{^lts%uuLR{@^myfb06
zuU{)95`)We@H<v8hsU*CjuNCT&7aM-AQeH##z@T7nMjuIs+4@NU2R_&8+!?p?(S|B
zHBh62a$agy(E{KM8;+0n*Ha6cSMNyvp;}29v5M5D&4SyPcgA&^Rq8O%&<Q_e_`PqA
zrt|yvW(s3sVvP2do9O8MpC50Nl9E<dbU``B!^4B6sZu}O*|}M=$OW&F!)6hMu~?br
zKNQZI#<YULnDSwt4W_$Ss5$>r3aO54&U@z_FvPXBH4y1w2|Ei3y>bpyu(mz`aZZjl
zTBXxMDVKJ((xq1RZ`!9!$IQwqBPU00UP@6fO73i3BvCjzJ`RFCWDO1h!3K;T<Xr$X
zAS~+Y>HvOxi;PU=H(Fro?fno>CfT<gRZ#eE1|~B(JUnaxPAHU&#f%UG!*K@_&5i$A
zl{T~*OmT<XagccsY~uJf0k50sx76s^SSChBz%fGj(@zql$U&aSZ)&<8FZ|yNQc+Wv
z>UFsFe?sO050r8MFpiAO7(fUTF}TI5w1@}@>NWb4<_+n#(Xap<lFg|?1P0*C%YQq*
zo7&sc2uVhMjEn=X-}>zpU7s~rvR@<$NiG$(invQD_Grn-$To$Fl^tE;#)E<&1ag_s
zBG`F6_z35*pPqJ6rCp%^#VloP1K&f(7wZI2%$_qDU7gN(<7^C;R$~zuX+V3aBK@0h
zQ;7cmSa#q)^y!6r|A(#?j|sI{z2rPls16m&R9o!V0euIH>C3;4NTLmSy6Xj`8Gt&F
z?MNCbtE%+$^yv6~?*ADQp!f_B1?9E1(<>{Tp!UcVv(nQeaQ=tbm(g0XXFR(UE?7_H
z3if!MZ-S|7aQU?GQf_7n#0O5n0^gm=?eV-cZ_>`r%<S;KJpsWh`f8&@GM11*v-VZ$
z{{Fs$&(1_T4x9PF@bK@F#YN4KT7X!$woLzqob66#Vi6GN#j{gUQUX$gqVxtDnunX4
zoPq*`cJxdAeOY#Dq2Rg%f_{9Aj3*S5conL&=;(>j(a|9xZ=9^`?TH8pk(@zvf-Eo`
zjRTo|wVUfNVggE-Ubl}HW2z`;l~%(SfW|;TgGJV-kdl(3r~wN@_yc5(YQ2v8>%-qv
zZ!AqrF6D;(DY2zF*x1k`#9HiDH_ts_btw~3XVlxKIW*O<RC&u(t*x!c@Nu(KQ&W?Z
zDKOyjTO(pb@&nK;8kTBNVc!g(8RM&=znfWHOj|UyurSdy1V0}?%GyLmMX4w&gD5U6
zBzy1vRt-luzGY@YYqNA13JR)~eAhS#Fk~QRcmzs1(W2Ax=iqp>G&G<`4G!R}d@c6d
zyu7?*u@>Gu*Nvxum*Pu^v_KPPi5O-JYezCTleKYjAvO(Bu=(}s8w&49M%LR<AruUV
z#`=2WZ!sb+;i`h?BMMuzspI0&e`HT^BZe7>E#d?RaKdD;mxyoE$SUIAj=&8-#gd=P
z6r-{9@!EZQKMbc88NJZ+(Uh0<c@+zX^|jV{0ckLnM`a}`S%m*j@tv(LF|=nH@h~yc
zp=WwlHiCCdte_%au8<~5kz4LPH;nv(W;9SWZN*xd@yFD<qYR>9eH_pz8j;!r-^D?j
z{;t5pfrBTcyQT5|DIPY!CNFjeu51yBfU0&z<K0i%P+J=ySLP8<;^y&piqu;)?iZWI
zx0O~$$ic1C)6>Jlr~;Y>M#TNM2nc+>_w1u;%II;(QVdRSDS|qH($WiXzSs4ExE(s9
zbn1^*$KRk}67smf5|WfiT?;)CvmGu}eDVgdi`;j6d1=D>Oi^?wWKLQNpp&YsDb@uM
zYW~PrmdKwkmNdzes~zs~b<|Z{2qpIG-LMvek?*1>K}9wK^cQbvr#Bd;2p_05;fUq3
ziInn&4Yofyhn4`IGo0)3_aB1(4Y~MhU;Lwp&2)QPTU+nNNIY3|1HgKH=3q3@lLr2e
zP<V|3rS}8SlW<lKK#dvT#$&fcu>myY>*5PftF@XhMWtn_6V6C~jq)3T3~jN}peLtJ
ztILbS22ix#MZ-m5T#o4X;fOgY0RgWxH>FLoCbQn7bCO9!8`@06eTA0CQ{iEbqeN2>
z_<b~|AQ(Cc^r_Lsqn|CvoE`x)A*guKiBj-E!q~qn0rRQVYICA6x$H+4Orog=V5p~b
z#P8|OVrZ!^6yAu<@N2+@c$j(UVxAcZJR8fANmdMzV7FZShQ=Z{FK<78oiJ?C2nywI
z8^D^)B9Fk00ui-aQn9o^J~wJG>W3aOUnp0r6}DsM1Ym<)Jj{oTb3|I%bVO%pDH?~(
zkj-gpgjGE3gHq3kRBCiCw#69)o`;1ED7f%=VoKd3ao9sR2k&g+42Ph(An;Z&OoB5R
zR7^)uE|yU1!yUsagAwcN<l;#xuA>m3l)j88YSs$(vT%Ap8wK|bs*Gab?0*E`EI@LW
z(nceequ3~BE0&F6;LsBOMtFzDS(+7%NNbx;O4a~x7Ksr1>ZO#r58)7^FaC-*vN@yf
zg^o@3i$~?pH!$^JHVXcfRM*=NpULBT@XL{s)8ngj{6@S*mh0&n0jDJ<HXb`xt?(Rp
zWI{o|2@D)uqQyKC<1F9D>mRkkCWDK4sKJQ$e(WCypb-f&cr^?5!AuhHVscs%8X+Mf
z@&iz7g*_7jrs7L-X%-;f%!D(r{m_W4Cc$Cta`7xoZPT5pG^{SKqY>Mo7k$opVZal^
zL6V^uLw3QoL5>SP{RwvD1iWm~2NZs$eP0m~kt_5v1wb`ol>1zMX=T=!e9L+dN}ztH
z$2q9==X7(D%svmtEpnU%>Ieip7-5G$YRCkQxPAVdb$VVJ29V+din&GBXb4!eA!H!H
z5zH6#fXd*+GS|bWN5H_rIi3CLCBHSF%qTV(9(%<#!{Y!Cbksq%CX?aMd;}htiY$4)
zbQ%b?2COBLp8TX_WF!^ooZC(Nv&HZSL>YYMouMq~<q(aWY&)Xj<cY=DQOvV=oY=~S
z4qu~N6yeVoO)C4z-^ybjFowZe!lVb{+Mp1xF#l#yb&Q@sL1LR7M30I`-wcv8mv{{c
z!Ri^+$WlnxI*=A2&DSSvxksL6#FN42LB2}GrYMRV$BAH&MuSs?zc0xYYJ|vU*vC)m
z_D1{!cLAGIicjLh1PYF4DE?f}N4{KYtQDsEC}}=EQVQ5C9MZ%Avey%asL1*sJ|Jbt
z4oGSHtT1Vzzrv$Dhs9UgTfhFv$eQp6ED<@wq1&R7IFF*hbS2^l|6|f%MCTlzmmKGB
z7r#+0y=hQ3lB2V}rWH?e-a6c(VJbzX{BTi%5b<f4%X6&U1biHR-X<QVWB$dIR?}1p
z63w8Olx|(Dvvh<}zcbu>f4*!kD(7E0HH~tU;T_1a1$+Sh@2#}4ZGE`Q1<FHkcpO^2
z58Mn1J9*dyZ7<sXz;SCw2N?>GtscwhqfMvZlh#N%#^SI+*Hf~vpo$g(j0B(^lDj0d
zY@7<Hlp>`0jlbZPA6nM^f+7F1+b*-0I>S1Scom_v1Un7_2yi~P(&jv4PpV%OS5&ga
zPY^39^ClH#MT*er-CYDm4k+OukBDuMx+PH#;3vu^L%h>e(=g2cU}zdZTB0TMQrXdA
z=^JmlyspdLXg*=zZ+s$ZcRhqIJC}i|@VwmV?d?57LJjsi0QvS4GErCx@n$Q~fAsbB
zC-4*`{#NO>U4XO{7d%4Ox>RpA4%8v=P`59f1_c#0Fb|VaH!URvdcpNzzAS}7M?^|^
zTttw>bdMGfFB3o{urgPMhf4srobCX)hRXRX00^zAAY1_f_62Jy?ib)~raRo^<OBWv
z!P0LrEC46m3>p$If`$3!cDi=Fx3>s{0|~e}4owdHdGc_V4CH@o3>RVn0FZy}?5OJ-
zcD)Iw9U-Vj8k(J+MkyFxUnf%DX~PX2{tYMsoD6I|!lnc{+9VJ{{YRa61O)}d3HPW%
zObiW~&Bl@d4v#A{E2Rc+EX2yzwo1JMbp-eW$ubl+d2uKN39lJK4N2w!pRH0ZGYrNc
z#bg~Gn)ri8{F;r84OLcC6WbIgi-L-ZOekb%0!uki?NV4TKmEndNosjrGz--Kv?)t{
z>GXXAkuO4f%%>K)@Scuk_M-ZjY&A0J(v<N?kGc2+1QCIq?F+~u=~Q$?PqG0yQBhIB
zL**JZIU@NUf6hp*a<jAbitVvw{|#K5kiru{Aa#WevqBtFd~7SH2dsMQ=i0{~)y2id
z>1k<k_MJckDlRH1DJd#q?wAy5`+XiaYPwZO4!w5{Do#Jel?NcoN`c|3R0n`hDlw)e
z)<N89rph7pPtKJnY%C5Be`*zj4UeaP2WC4bC+FS(7Yh@!FHCo6czAbbhc;QJXn191
zWnn?BaE8zG;teEOJt2A>G4&AtKWOq)LpKO0CIArT_rt-$8VWQ6RbRapym#OayvUd1
z@|m0rTJ=RhT*c-Wx&<mVukx^c&*P9sp!xmPoPvpo2}u=5pKKmyzfQX!?0~8;IywqU
zTyTwWFto6gxVShD4vsI#rhxq8aoT7C5(;uGBqU@*eSKb|ROj=p|8ontI^fW~i0lHJ
zpeh)QTJV|-MZb61L)j!XsFBNH-v>k$5tlvSATlE2MZ1LI`NdC8{ssw<cWG;@bU=k<
zn!@gQYM>46>^^^h>(U2+WL@Hqs-c=*7$ROXP%|YA%T&t&`4_&em5Igb0xCRPg_vf$
z3(Wxc7E+QT&~X6B&5QK9Ig(CsHZwKFc=t}YS<vgM6v(|OqKbw<+0bsWBY3*MzwbLe
z0AgB|w)jok-QUZpQFS^XiIn;S>@TT^VgaD`@p4meCR6vHpn(p{8B*>r_tGw~fL%{k
zmH-yk(xyg>NJB2Cd7&xqgveqYYoemYf2MVoW!!oLZt&}uA&6Kf7lmMGL^*kRpiKaD
zU}I=FU8+Rp@BbVW6!d#IHgS~)1S43ev5fQ#3=Eu{>ZI{`Q=#L4Nx#Fwf`1bP5MMmQ
zc@8{3ZOH+v;n!D>OnUjHBhYNbTwJM(dmWOVKx=gYQVj~%AMm=YZjP1!t7xjN72=mt
zQ0Q^|Edl%wfxl<{KvzXWVgxc7o9BfoSdkvWz8M0(_ZQpa(t2VprWNljIYLDOcTsMr
z6mmi^@Bl4&gNYwkx)DFoDq<oGOG@3O?F$5jv$Hdx%qC=O{4;7-A!o#<7f!E{OtYY2
z$e`cJO+gWw1}bDsHDU{J8D0bJc~K#a`86Cp71i!xO^*aqn4dGa&brSfqHIfyo17d%
zdk;JoV;<FNy&3$ymP-_X#C$-!j501_1MH-}h6S?m5;$@$=bPfNGztn+WRjng?r<^D
z@WwKhTs{}`su_Yr2vQozpQY$$ct8q1I{FJTbX=?zNgr|Z$lAKJwDh{~Ex}zH1ZOEf
zpxtnYh%u3o^^J|Xz&I#sS1wxt9!mm+tahViVBG0S+gy<}I`uu!a*fzu4Z5AIw1N83
z2fYlRvh{$Wx_QtFm+(THIW5x-t{u{z`J%qi2K&WG3yQs4vMNxkPzSbVXg&xNAf5yj
zh*)r$Phh8<ND*DRgJJqy?I{7hi=^j|kHCNyn1@dYIDNC(;=Xqm+n@$01*&z$%M|yA
zA(9Pa{fb9{3yqt)M*{4Yq#Yg(4jYde2p_7201!(NQC|U!CKM<fDIA;F^6lj01V|9{
zt2p$)CjyEH$SBVsqPLyy05k`Z7*sD({0DR4{8FH6ja*a$w+7bVsSh&fV5Sfzq0#Tr
zD_pSt{2o*rDGY!QxjY-BU-Bs}#MU4fyS}UFk#*OrsLE;@XC|5A1YH37^EHx3O<z1p
zK2O$(jg5`pLovZ5931bm_kr;>ssR|lH5N}dfZpPglJ?7u`{FZTY_`*u?AW%8KYt$n
z+(V`uq1yuTsOZ(NQDKI=o1gYT1ChbtnddsnZycFH1nK7iXiaA-Kpq8xK3E|JL_|cY
zWgxoa=a7}We@%!=0^k?$8uDbVs{`a=z*+in_&@=B9B1kwmy`?*3Gw-}@yU#~4j5Hh
zUTU)XXDT4OTn8-~mv5@Bi=UWAsqTajjZjKatiaF3U}9mRbD>4NS*2*72P?inzsn0O
zSFv3>6xeVKQP`1|7roMcjgOhRb|U8*<RfH|X~3JgMn0I$%_jW|X4|O^zt|2qy;TjS
zqY3$<pG5B8KtbuXIYB`weE3*x(BlVW(f34z9w4s(ug>QCD<cdXoTXw}tZ?RV+CRAb
zUX7ac-=?N4%2xqv0Qw#mfT>{I{=f)A#N!Mp297l_F#Umpo-CtAX;cc-2Kq1G%`GhE
zAc|iEVs8x1J>{va_rFh0KA&*Be~*)@C=0Uop8n;<#dJqLky!3W8yn!+6A%3cs>w_-
zniW*u1Ox;GtrIsIz%Z#mpRLsEXa<CE>jF?JGjrCrK#L~Eo2hq!L5+jbR1^UVTV6`a
z5)=g~DcJYzXkL8m>`6G4FK}E@)y>U~ewF_Ghk-w$yxa4WuWI&NbV{MNe!{VAR83&?
zy=ZvBFvxMxmTtxoaUc^xo=)qSQKp~I)$}|a?Cwf3=3jx-Ed!qfmRC8(o<Led+(*bn
zkdIhQpxa0O{`E;CDH<?72Wq}#3~q8_BIE`KSX+NhEiHk-DJL+iQL*6Y=m^A6Vm&<i
zP##+H{XL_p<PT;9H=r<f0t_E3a35|?1IneUeEGG}6v*y6%{Dk}Hs&6qMpJ+q3=?+(
z?|DH(C86r)s1o0_!nCrOB^urZ1K%Yg4kKvKn4Fkcv}sl@Gd&EbiNuGOx2P>=j9Xw5
zT#a}UbWX8c8f)%J^xp|rEa<m7kN`coIXN{k5#4!o+i5g{3;`cW(ts}>T_!yJJ)-t=
z-bdQna*7(4zV|N$oVJ>wufN}HP#I}ge(Dy?GBs_2emBPbPMLD~d``~V=g&x|l<33+
zH>c|cU`c3PsO?jc{xJMki;B##NL7MC_nqeEe9)wqO50bq+Z`Q;f(s0LY$O+1J9AoD
zyvJ{EFpFjn8HDrcq5x94v1G@+XiqhVD&9oQmHSdqMO2*NWtbv0Qk71Z*Q6~<rox6N
z+5DxPkHLmf=e9|iy~-WPXKOql*W>ZJ*?`PtrLIUj^7x?Se)8AM++3<5=wb&06LV>i
z-FmfM9+4o%vhjeH9jo8SN=uug%Jt=BC}5l&&6OZe!pIE9%e<S+ywuej1br>`AN+C-
zBwB-ZMCHW`XXtgB5y(7=h;na}U$yC0t5+BW%v0zDY%<x5*ewL~Z~S7)iYE{rRsXzI
z0kNaugvJQECajr!z?j;BfEQ)6FP*RIf-+%Lp-RDkJhZ#*XL|T#b;a0JV@G-X!<pfk
zi{otb4Ih`O%tA<&>I?-O2aZ$<$krT|)4#Ic(wC`b0PK~V4AontNPX5)S{lBzu4JIZ
z@-Ud##eZ#qo1V-j7Kcg$Z2(M=FJHch<fF*QlA~#9X?1OUkXAKZFoj0KmtqT4mOgW3
zh!2{?tk<N?o-igydRRCAe4_Cv+mu5Kp_`3ZSh2W0kM;m{A5qvazXv7Gff;)7gu$N4
z4@C7xet6owLp6g+b93{d!9fa2%7o*>5s7SOY+T&sr6pnH_%a&OD*b9$9PABo%CD+C
z#LK_{+vXYhzNDxP`d~l>INcuLq^+e+%BZQXHi%lgeOOpoDfkLqof~bbN1y!I{&*4c
zmLOC_$xHj@TXyPj%qOk1OdV$T6C!jfx2qdBr83iXfB(LpKbyU8hZMzojyv~`P3RaB
zR$*f^1-kH}D1i8+bX7QyL;%_Scq3JZF&k5?{1N8LesjwP755(4V9j1=kyu2j?T&Nl
zWh(8OKQ%`piv^!N?DpbP%rPar4uHJasX}bYX|s5yUKsEy5}*@gWOql$z-iQ|!F$?B
zSdN_<8Lmft;dn`X_<ENI?fsu@uM;$4044)Pr_1-j4d6n4e*Se=q&XRh{COK!*ZtYx
zCAM33+XH?xnU+$RQJv;2I_kK`b4hNAX!;Z>^~#lJ$uyC`FEQ@-^N&RSovkJhYU-oV
z!x^A%d_ufqc~1iwv$*7pY+^D;Bwq3@?fjw61eHDoblm)2x%*UB=BdFbj*PeFG+*kL
z>%Z3Q2ia1hFc(YIq4Ons^c#(K-R5a1e5_@YO|tgoFcB9Vycs>F@1t10Dx1C)v}~EG
z$O@pT4-XG`I5@&+@uO5tNamQ4XEN<o6RMbjZ&NzCwl41giU|x148I4R4yOV&dkE?a
z+YhHb_8{G6^SD~7E9!T!3<%l%s2=aSe*-dj#-MVgjvzY?i$QhV?k?8plIwzyaa>&7
zYYm9k3T1KGJf5egJtcNaP67-J{h;nIE%o)U?i@nFG~3+uO)HM<I%;Wu&l5)cQT2YI
zG(I&xe)_A>*X>%wm_b}b*(zb#;UL7=;Y6vBZCo+84!7=D6J=z=&gBk`+Wh>q$^3&z
z<*FU;#Y&CU*}$rwX0j?#>ml%OAdrz`LH`d3U2Pqm%=Gm5nA1^sVPC83a$H%1v-k))
zH<}4N(R8_#?Ck9Lc#_m{Iu9@6cbZM1Ks`KJtP6&tAIr>JD2IpN{)~i)Ew@ROO6TC_
z=yT7`$j0_OmTU<rDy*#?C|501c*{(?e{fBeSmKs4t}6LiEE;#=1EYp~?wapRfhf$4
zL5h^j&c-&JS?agzBJnZ%?)Sh{dzHZ<kc)?v+UEG1rZL@;&|>O@=9l0u%3F3%PEN|X
zFK&dqc9H=-U4gG{J*m~stc)C6>AM4}l0GirV#W^doNK~`ri_c`P9|Vt%0$a>3eA)^
z`H<+8nU<+(3-p+hF<gwnU+0c9uv9G2S4oU-)Nkaqwk}RD1}qYrHk~AMr}it;u0JE8
zO7#NT0lGlw>FL+3Ul7|gS6NvZs9lO0r19aEy~YT&Asg2p@Rezk;X;G{Qk1~;(a+_p
zSB#Fi{{_8_zy-Mw1pN3In5mb67nCu0nG9E#bzQD>CxrqGEID!?WPY|Vb-Lo6<`K6b
z3i|ZzU{g>~`tUfxYd`lqMJv)It@}CiQMK$%^>aPk+Cw}`g!P%pKKS16E0ER^7kQ4t
zL8t59?OPB)1DVsPKmDtaMR@I3p;UsO!w#(ws}OFz4HiFKhhyWK#rrGk$EH%DpuDg5
z(fMqb31ieJ^Vu|$$~jj_P1kz}+)QuX4JKAB&8={8{H_O{<jKBNejAs0_;{*~*<pIE
zI2Bt0D-PYkIeB<FimzZ$llbW-Lu*+I{vxtCR4ctq`dq2LKtu)p=MaN;IEBQp-#Rgh
z^dCO`+;{^co6Fx9EasTa)-hw>db^z09Tl-~Cm%Wu5WImZ_#umX2J~lXWUzRt*^X>D
zM7t&-%(}!a>;biU0vgd28a^;l4?E5N?WhwS={)wZ>1Ua$#EN?&!UTEzKR(^@@$tpQ
z6k0iIPrPCvjaCBYJR_Ia=}EU-B{^N2FUV<ou)k@{>waRVgO^ynda$)4Q#>dWA*MyI
zCS?{muyq6pV}HEN)+`LklwMitIVYZ<uVk4V8HsUy@NjjwZh0`@l}PETN<DA+-NWZR
zYiTtYkHN{gNvJR-DGA;0vP^MAqk^5YdB<|hIJaoM{SI3`BfTuJ<5RMoTx{MJeTsG8
zpAS8!@KIiAat5f%<+%8Sbb?Hm%jsRV?TEHNx^xx?$u_WJukg98rc&<o9u#1ato*mH
za(R1lS056!etdiC-F^Foekm&jKPpF%iVVlsyN1N1k1?y=;ctr(IwrY*@5SLV4tQ5i
z*X7Q}&#@g`-ws(U>m>>ad7gBN3p{3us&k&?aoKH2QoDAw=m9Cy@O8iOk_lbffjfX{
z|D+Z3O^WEEWn!8BF$Vj}04jki8q96|wPA9%13BCg|4Y-Ya)Z+Mn$vD4wP(E^y+ll`
zjy5d@?RiP<O3Q^Yot6<jvJ_b0ZFrz%F4d_BJ$ikkPZ1$UQ^=jUo+(U{K;%b=5mOX5
zh_<`^<Cu}2PSWWti*%*<2HLw?hfA?+K0`;!u+8t0hW(=@0<X&%XbN3g9<n@cN4NZi
zJMW&&U4|Yz%*w%GxikxZTr6c%>vkM>+@n9=C0+EBU9lXE;`C4Jnro)u=XNcsT5)x4
zk<~EUoS~JvS~olFS)A)`txSC`#;4>z?B%w%8#2YD^jDqv@i?i&+vj)q0_y_<U*}iG
z7U%oMzF$dLMrXS7uX`b4IN3fBlAY)aCMPCq(=)W9yM3u89-kiQ>l@ney?vtK@;+YX
z08Jno*`K`<m+~$?R$+&VB^24;ImK&GX8q6^q(~jl74SXS-X0W_e-WiT*Dj+|a)udK
z9V3NT%T$=3gt6;1v8&2s<QwVK5$3AKl;3k}e#;enB~u}v>BW<Yc1z^Hl5q|%8?OoY
z-flZ$qf`Zq#nJh1?*n6{(`62ECLZiYn42m3)l(T+k+XA0&}0z6_{OYZ=V>zI#|%_K
zF%fHzJv%%6Q!;^d%qIg;E5DuVs9~F<)yU#I+$srm-6Exro<7aG>bkl~8U-b9HtirO
zpU&sd(49ZB$v*i1wU)uu-WRZ;V;PBx3Rk2~k=|y-iKU9e#4Mr`WS}2OdG`)31X^t)
zDW|3V{@{8`1E>EdgI&xH5GVk>1g<y&0zwf)1tw@c+SuE(w6c<J2og~&O9E}k>J<iy
zR|5kB(&QH_oqu;fAUSf|#C(Y}Ckss{KfA$<5>x$sAZQGyBFmfq)o^{MMliek=BCNy
zTeY7BvaP4buC?LiPD@R$az&EcXTsY)g%04~&wp%o-EQUSJ(gKB-QOw9t5UW88@qj^
zzdK#6_EsVHeLJ_oy?1JIS5!n>Ojm>ZsS)~_rQhY2pLL%Jo;O}odDs@7XOzZq!sLbn
zXlw(%04Tt^y1KN!yY2w>GlCwk)lN_6=ch*iqhXhpLfub~;1SsUW(Gtb@A;~}YZiX*
z_K2cszlgX{kZ*PG85s#b+@bt(YAve<Axq85%+Be2YwbXFRMep`9UKmy()^7mR_Eq{
zX+4W~M>j2(!==xO@e_Pgk#fDZJAv2bMMQ$AcC_4kT|(6qA!^Q+S|w`D6F*lkgtW%<
z%$e_Qc1~KowdZuIw8?d4ZMy0g8~KHq21-Ub&2SThJG;A4gT?~6&tV%Yot|t!Mds#S
zTwcCU7BTr=+u(93z4cYtw`z!fcGIbCqMUwHT;)DSD1AKg)o^}(KETof0s=sQLD2*~
z2p<>9-+@{WrK9unw%!${c&uQiHajcY_mTekO^W(02HSDGvU?Ju&MoWbV(-_(3+YWf
zkneB9vJ(5}9tL7-*y7ATdu*jZSNAXmMySe%YF~dMOD=E1rLB5`nOArmB5>&vIIMW)
zh3NmqGH%%H=yG*opOu(wZFWeCcBv+F{EJ0ajkYQ<(DdY)z_?yfyXg81en_xb1m1u^
z5PP}QY^tx*=A$=PPC%8qwWOTB-bFxJBcud_&^J1a<=fR9OJbVt=cfmtxpyZFUyLUc
z&x7UVfB2oj!eSRlGO($UojxIPpk@QkZQX=RIyyg(u}M!y2cODE7;A%XZDWJ*7IqjE
zdgiqB^xi1Y`GLq7LEKOARM1iRD@xqSg&m^D=gtX;qCn6>2U;r;5mVx*7%3{4vLNT(
zZ}F$vG)c2JrCZ#%+0#aiNP=W!xA#q!WvVlL13zbGcxY%Cs5(kN=viFlrKfv3I^rPW
zwfANvW)tDuRXUm=$7_b%Y~MGP<`H9wl0m+4eQ=BJ=(wIM*{7t0wzF%7y&6s2N^oq`
zboeb%*{CT!pqlt4N5*WFCgkMA?J7JI_m!7dd7=S(a;SxTMJDW!L9z%PXB@T^pUi}e
z9#%E4P2$q)!*vC#Q3VIkPY@F=7ac8csD5}y8diSxjzMe)nAdss`lDFv(}2;B_@KRg
zV=M0DR4+yvXxOI^OC%Vk>g4Enetqrg?(Q$Gs3?WSsJqx=pWD^NztnlqFeMPYCk$(4
zWwrMN@_-?*rZ0dvgbDO<#QC3bB%*G|%dUWvg7&(vh(|zmS_NJ;P+-tDu5;^I)g&Dp
z&VW3Wn2-S0qK&PsQGi^fZlL&jx5hpWy(&`%a#AWn+==**FW=rL+0??qLKWz%pI{y)
zlIdc9)Cd-5CZUOoQ%q%C!&tpT#_yc@avXX1Bezzw?{DYk4S_nNzK<r?z$T-%3o{Ro
z?PNwzhpU#BrY1rx3{nV@fXn6VcAC}P?U29+ac<;-gh;q;UN>C<pFcZ2B~5^$mDRaC
z-}a0ra2(yQJMHm4q$+fE|Ap!<AEDENEd)9qXqM|LuL%hW(J2<%`^9vHlKvgEaKvdX
zEiHlVAFck+0_i$lqX<A?!E{*!`Vbbq=C8dy*gB|3cIO?rD_<gDr2f6Ttg5U`q1W0x
zK7L%#FnF;7`1uJg;6(?(K7mFr2TXMIV0PkyNO}mMk%6WrI!4AY_2Ahcl#p2wxR~f@
zRoZur+7w*VSHcB~<@-J<GR0ZEr?(0cAqa#kNVaYdH?B!C9I5?E)C>Do?`@E{*cyb4
zi311|-eKvr;Wt>T^{o3Ne_Z{-sQot#QSUQ;_iCGLm)kJ}$SYxU-@j9O-i<YV{NTfJ
zYmy%~yzRhYZF{KR-C%yJRIyDVYFDjT(KWQI;wqj$AC4I^X}8|}SaBc3ZuLcUot2&a
zY9IoAT2mx{dUcf`V|0CeePRMZ5G=tia`r%>xTGYPn<Fi$T(CU_G|~X7{)QAYio|OI
zH2oI*$^%ku?We2^pkW%n_q-@dP1W%5@Bq@*R(5Qx0@OM(=m;UFq}0~dPVrgQ(v8-1
z;H{j6(ogQT#{_yAR=V7fr2SCwBhL2SWMQS|`IfZ$93^2pS6HO^<f9h-M!x87EMZq-
zM#lKIQ$pfpRu=uV*Gh~JWn#rABr6u<ft1!(Q!+9DHP2J$IvDjmsF|nLsJA}K9%MQV
zM*4Z*>h<6dT3J%lr<4<SekO?h^XE4QT&OlFDuV%wkkG<A&>KaPS#|i+fg69M4D25P
zqQ0c$aHP8q3P=SspdED)^lAXi033wS&#_DNs>RB^2zrBA+j6QHD?+#ez(YD<AR~i3
zS69RXeumJfu*vrJHc9-SkD#{)g1n;DI_hh}_%<lG@)_)9;U=a$GNr(G;V44`{kXoM
z{k+B{{B^N93C4wuP4vZO<Y>Y5#Kci!W8bE++Eh*;aK$$-J$JvYKc5dP{`LAL^k;i~
z=5psm(Ens6o~%XkvyGan>Pnf)>WFtl6efXC#h_7x8f{Er;^2=<!N1lgM7_P$-#(-`
zwb2%}-6jk|Cdoi;Wh56zC>PJj|8bUSSvC%f&YCqdTAAI}!fzi&3sokg5!6rx3L<EL
zlO|8lK!igp2fMC-pJ21vehqvlu)AnybF-i(B|179MNdQoLaXH3AGlV)IZzY<ZNqVr
zVB?PppxR=jN<hqnGI4QoLW6w+i&9XYm-osEC4r8L3WoLDz(A1`TlqnCZ;+55=neq7
zu+pn%EfF9=ho)5-C3Ca0V-$ZNG9Qc5e%~!LpP&8QeyZ?JHp-0kI_rJU^Zg-Id^lA+
z?8JmTLX4c8JcW+{6&b_j&15UsT4g%X`i<A`;qTc-rnK~XA3}|M>i6S!JClEcVeH|=
zDNL#gM6~)PEUEc{>=GhII&awslJ^Orn?Sc4A>ns?BxHtc5q&4QE|Kc_(&rfk?U?4;
zyjIhwLA2n;fxM^TFibE@W;2%TAg%O(mzW7-W@L1Zdk|TygF%rjlkbWP1R2m6Vc&fR
zovO=-H4Af$ploSlvjPIi<s9VK;P!T>Z8!`y&?vlI0QzHd1pT}H9`Cm-cO&fw%uGzs
zF))AzXbu9%%Id8eP!wJln*nuJ=M84P$3Qr$ah(Tfj9}983fl}k;^5*U;&w1Ztaz0C
zj4vEoSoLaK90HzUYmbSCI;lJm^2g17!$EIX5sL{=nHp|#!qH&fOlgyG-LI{EZ%Xro
z581d2HK)rR?xKHqy>|pYjjNT-qeYAcL3J_XhmtGzdyY!5E(7hUl{=GGjW$30Vb`EV
z;K@V2$8X(#-U1-zma3{4E?WU!o5gl;v(r`Ym_al{>ZBYcX1~6gwl?u}txz(_rz8Vn
z+3^uPuBRVI_%wP*3i+zr5v72=4-XD@)x61ju$#^k2Kr30OtE$qAuvV3B#ov9>`iB9
zWf>x;F92f+D9XSh7VZb;*y6%M6G%CPgoFSTfi{(!tE);Nse^<g;tjRmzwuQAxKqD?
z^Pz)c0b4bTwN=}+TrM#7VuuYzVF4i=VL@w$3YKXe8Fmr)6KdISBqbyYwm=&@t*?%z
z3<DJd!)<S{t?jbrUYGChvF(f25}aA%w$zgB{P?2UTB$O{^mJJnOsml(ad9WYSjghy
z2AaDQKB^L_D#oRbsTEz36gTst-OP->LIi6$-FoVr>})k+6bDZ}J1?(p5hd2p=-&Lc
z(0HM*;}av2CgHLs=#X?33ASR>(0%DuwxhdyG&G(_H(yY!YwPM*gkfFK$IIcUj=XY;
z-%YKq{(>?a_%=q{>O9=y`|z3LbVn_6Gxs)|<MKe;wVdix|JbP1Im>6;nfir}2&KZA
z34j>(rt|&${LK7<E<gv!C5X(ihvjxxx)srBRpyk--KpK}?R+l!9#m>vqCg?AcT6HW
zoUjg<0lElvP>@CM-e9Jul6Fwl%Br)L5=S^lr<nG>y4{)+e{)eFO)m!eiP?eIeIY2U
zr`zp=<3101b7inJ7YyUQK@uUZ0zeNMQK#es!4TNI<P8iulpeiym;4xt;^qQOI4FVc
z5A9}}mOZLrVaC~Qrv0?>;Y?_6BdTfjaEn2+<!l4Z`(J&_&}6Th+Tv_b4C?F0R{GMg
zv-GYcIVg?`#f<aZwT%0BFY)o|rT={RKmm=ES_d>Wk+O2M%zokF`>_VrBbm%p61<oL
zc!7EvtRpj49NE(m3#ZXPq(KOA`;2HKAF~#M@mM%H-5eY&fgF0wfAj*)=jUC3f7s=H
zOX>X$DAd*3O$Wiq0;N}7$23W_E5r$G)Qit+QhF6F$5b6I$M1Cv-aV$qXiw!-S(x+N
ziz@lzJu)vbF)NlssP3oa_RLt*m4(&I4s+Qj5pwGEZ+6alGM$!CT2(me0k3|<$UM^{
zUP={UR#0VtVSRYWSN~Vme@=;20U8xrEi#vQKMwi1jn1lR=}T{azX>o?ffcLg=Eix2
zIllma8^}1C!MV>AvMDZy-;dSY0}JN^+@2Tf$h420IrmhklR`ryO(fYY{iVwce=sqq
z!@%IRwc$+1@;q~>Z@dku3|iSM#CO}K7gM)Z_4$T(U1Gy2tFCE?vZb|9fsv_4z=4^e
zGV-OS`<|A90*bb8U_gu*rBb&IEyD`5Jk}2QUZ1Q!fawWn2a<Le(0z0nPiKqAfAt2F
z40779t$@~WkSl@YOn?M9Tz)ligTVb>VYlytx_2NH01=?m7bs+5x&BX{AV9#X=ID6)
zb+Wy+RWVTQ=T{WjvgpG#c|~*R@JXXX9!R{V_N^keM&}6&uRnol2BuSKvPgT=Pjh?;
zZ?6+ngs+e^9*4X1iOpt(dJrr1A?SD{GUBVJ-_l3=xsN}ZE(*nHU+>IS!v0#B%VaI?
ztZ;We#)BE$Ia}AF%p>7;+!Ql3Bwm6)V0i5cQ7jS`rCoJH5XI({#;)~k@b|g-M4FPO
zCO7DC!v>b$AD^dEr9#k^#0fTx0Bi)j%@-|xqyH1wSbGXO?rjVMs?nkbBO)TEO#%OI
z1&i_IE7lRf#$cP{CxolBv(g)gsN$d3u3!TS=$I=zKY+`Fo)7z3lq5-wat38anG4l!
zlE%U8&^or;H1Yhgz!jQRuXl#6LH3zdM-3IPY7NKgPyFTPP;L!;WFfC|##rS6No|OT
zn<I;_#>3x<4F@{O$)j#};fY=MbKAi(^_oErT*SsfU@xy9@a%y0W&mw?NJs*+7+{n8
zM=D!Ln$vnoUEcLEeJ4pA#bvjAB}+#~r=p?)w!p%`z@(9pk}4}JOGIM}&$hW8YkTZE
zwJ9nAI{}#GiY8%UVMazqy}iA_h$Bbqef`u2_QLpSYvUH-sV+yMsXV$lQ4!(hnRjl5
z6lU}SNx}+UiX>w{cD*L+y|YG{a*Or0psB-UYio4R=QTp!X0li+u(x-$bAMusMh^io
z=5)=o(`qiALiRpgCyjcme&67PkoQY)O>TvpI#6Rqrv&XUe}1bNqJ$2HX$c!zZn%xi
zj0%maSSSdE!H_BCYLv`a>%v`LPG9TE<@WK&oaH#Bh}El8y*aG0C@@JlSa2p_FHKh*
zDZz~rc|CP8E22V(S(@w&*I<jtP_8oGXU=6kzo*9K@3o*2qR2+%d!+<6e|vfHD3OPw
zvcmIoFQF1bHzOHOW9e^`8DF7GhY6S-V=NV6gcTH!whA8sg}S=B8WZyw191r{hdUSx
z^tDKQh|6Bt__#fm3<3shF4AkVPR`C=1-1m}Y5P_={3#f?y0~bF7azesa?mWrA!%4w
zen-j+xBYIzZq4Q3G%;SK#0?A1lP-m*jy-j8G2`j+wkrai<piTV>0s5nZz$$4fXZZQ
z?IW+7zWwTu{nr3aYYwr6wzRbQ{!iWW){UQ#*Kv8+w+@=pvU&R<Aocz}^4A#nPRv@9
zqn&TlDYV!>NAqbR-K0pyuD83ec>OtZyU!H<>&m|Q6kIeV>6-R@eF_Ct{}#QyK@(1!
z6Jsp-5AV#~{+=t-;QBG%bhFo_dKQ2;vs0gFVugr_d0$BtD~BgkR#t+&o1L9}PC|(B
zytD+&qTOdMC^VwP#^GxB3Gt3{<hWXXA6CBFSX;v_ncCSQQBYw<8L(oReEb-dBy<;_
zS`>xFWcRa~p;L&nml!P~?gDHgB>y=%30i+rl!)onD`DZ_NRjlNeqYgxz!gU#Q>p&+
zgVXD<lbSPkWnun#GrlVxI<`gLs1(}s<b@hzVr|_lH6YoLke&QUFYvHfN0Z5w`%vmm
z7L&5jB>U>gZpq91D9vqX$T-B@-hR2kdzC^K>ABe%2$pHFZV|&Q%qT)^`w}7ab!oA+
z2nb`1xaI0qKHe_K7<g$?<RX}v-A)CHE^{QflWQ<on!2xLE1uZyopJ-37Y>)0nLV}#
zJ&(9N{vx_)>gcd>g2phXHr;&1xSp*`{tFG2i|mpV&)g9?$M_bHH;vv91eR~lv6f3o
z(b=cn#HxiguJ>k4K>7f6w;K?6z|g@)yw{_l4$(0&5f8vc5~(I}AV((L=mPM2HpWp1
zO1)_d?C1jc>E`B!oz9xYCPsn*<I*)!GQwXXOhO{8bE{|~E35BkORfmAnJET!vUPl#
z`<Y^^Oc`rZ_=y-_RJ6~I!Ej)|8I#_;d*49z>(`&rBBXv~(F{l1`frUK$7FthgVJSB
zwyaM`Z1B6^=Zml(iYD~&yL+Ac{flW0{mH>IZ(O<-x3LG^Y7jGAaWi^6t}_qAQ203A
zbiJrbA(0v1Ws}pFC1u9}o;9=RX;ZK}hsquyf3X|vrUfOL5XhMAwqSb(SW$7hU`^cz
zC1k<cn3-{a|4o8GuHZ{2`p+DdK()y|P=&zeJH?cjVQM4H%Eb)6eX9lhgI|G&T_~so
ziG&z?^Lc@X865pAlyVBP`*ZHTMuA6H`y<hn1*biN{Tohhr)|wPT7v0v`x{35AI)2|
z*lyp7>+Uf`zird~)_DgWNBg5GdFA@ox0{uAdSG`6p)4+XX(=98j)QDUd!p?vd;7a{
zii%%74<`<LZKYk_!#KD&v$w$*aNLBx#fnO%v~g+mo{muIslV+sm;#e?a_oRCgS3XG
zPLLNTaJPlN1K6WqWpLg8dQVUH13<Ot!ChUCpy(T7vs)@c{ob6WDjHKR`H(Fm=$)X9
zxPgT8-Djq+Kb28JpWA;oYDTa^jW)Xc;<6a74NXK+n_i=gU88zPOi+f`&t|zfSCVK^
zaARxTos4vI!CF3Eb*)PhUC_TH3X8~Ok1}}-Scq<JH;I()e9ku{=~VtV^t|-+_d_vh
zhd&61hKmaZJ^wJ@4aG=mRP*^<G5;Ty&N(2@H}2wTi_5i^YuUBjGL~&DEZerRtYs|Q
zT()g***4zm_rCA`++R=k^V}D{=bX=p_2dT!)4r51cRt)DGSbqIwI;=N2ifv0dCfk2
z&0T*J+U52T?gq3~O%vwGU(D-Uz_A`2-Mx17iFDrUF#oSs3!n#QuBQo#Y-wGuFKH6_
z!}MC?m=Z?6#TuWUubiitsmnDVZJWqfzTt(w%iw-zXpHU6UJ@ywen~OaGgF~<CU#)<
zpu;_fg&@gyr`43*s93yx#rYv%?c_vSgYLoiRi;AM2mDqHj490IH^5DN#?pD{S+%vn
z`{uCqSIQ^LWk>Ynn<Jj1@hyFF@*N}`oaY7IMqm}Xvlbj5Z*WA9P#l4m^F&R;vZ0BI
zk^0PVX6SyrmN4*v;JIXko{Wr)X<!^6PfA38{rWX2ogMSVgzq75jWVllzO9@#R-TXV
zws!A&P69u%K60o#=tat<h&1<Go9!0F^U3<}YU`b(?xjBWz40NYpPyDl_Y{Y=?B~lK
z5{}F3y#@k(z7?+3TZFG04cV8b)Vd#ZQ+`%sQ&GblK0_I=U3@zdZnkXDWZ=j3s&9d#
zLk@8OHj|H5aS!O=xr#dcGKLIN+?hIr`M|X%m(x1CFM)qqdbpAMO@Sr=M}ll2C2_QP
zf*a4N*kw1XWcIUzg#6(ut)y^)ygA$5OxANEYS=)b{ME$2>@TKrUq8sv4i{rL3fy+F
zaBvjnOT1Gp{|u~@vg?Yk^tJn)u|mb@tJ2}<_RWG64X31^>s2HCLJJo;J7;gJS@#sg
z@W+S{BHBsIh8>R=?ZD0k+~9c{{~=sd!ZX|HSKQcl9b7*e^uVUyNA+P@KiJ0oE-n|!
zXW}RtD&<*p#QRE9Wex$xb}^FqtVHH`LL_R9?iphSQ^7wK?e<~zc>1I*EepP=OO2{)
zeuyY{`cm(}R9`ICm_20*^j=<o2e6kV3PLE;>;+&8-5(Dm`I=zDg^6Z&)I2~}G`AcW
z=s#1K54<)sp+Xh6=crHjl12UQC@Gcm<w}MQ37Rr&@!Ogw;7tS(-ySt|b;tLm!H9G<
zZgP>7WMqM=lc|yh2C4N<fgvGoDTJ}C-$_UcO7<)ZdgdLT6~91DB|WKhXyg$=&QUF<
zXoUazWk94W4C3Dr()yWo=BhS}|HYf{@9+QI(kq!~ce1dvdk<YiVoJ`1jO?VQNRE#F
zB2*}~0OvxKYw<PJeWdj1vwKc%*u&|8r1IK@!{cUdkIP6B<||1TJ(I*#jeMS34CVal
zqPI217{l{xs66F>DD-z9iN5iNy2(L%uk~Ujj}<#dBXUvgvdv;;^tz)!(eeTd?J0cp
z(|mq(YvEDk`H{_23NtGc0$h=BDcnx^9COlo%crkwsXZZ;-<#2`3@j&WO>EcP2^($r
zC1uA?)_LLhHzI!e;HNE@s$pCg?2U`^0h_G7As%)F5kZFQ?Pwd?XD!5_+&_Pw{|%fu
zpDMfDWm@R8&N?_WhRAYPy_v^TWV*RcZ@j^QtIK)Rt=;J2t(_c;o2PZHG2h#|Lym~%
z$(lp8TWDi^yiqaBZ)K<1y6p9T0cC{_7SJ(9j_;3n;mW=-M_Us})-lyg{n>F&VYCf%
zPk(dH`jptP_$(;k`{uDa1oa~V+(FpQrUO-HaQUHg6wNvwcF$i1^J25=J#XneE)zDK
zEs3tq^@krEP=J{q0agJe9)$qmY_7Cfvt0e{rMPq<v(Dn<=HVg!$7DX|RU6z77RODe
zZf<>Ajp-IR$9yiQuiy_P_{y0w@b6^NZfSk}D-F%T<IMnY2muU`X5{>6?|#TXlhHAx
zG`6b+4E5E#ywSPR=$E>k=VnA*E-novkn2=7WR2=DU=JC;S6t8S{CnxD+JB23e4F}a
zC3`>bx?-YKvUu=!^-hZ&cx8e4o)9P<Tg*SBqWI6hEe1_C_fr(mC9#wBjtG!$UT_Xk
zbA4o7|53Z-az=rRlRbR}QjTYb=1X9N$lF>mk@~NH%QlVUZn6H!d?bnQ7P%l89qkW?
z#cpCU<%`)-%9O4n2P?W=Gd@G~ze9tav$LY9B0DovGBku{A%&EItc;}8m4ZkcNkwEw
z9C|E-{J&5US|4=N%ve)_@44P|s(WhcBJr#0JQ6m#Z+1BF57*WrA|e{Gq)6sZ@9P~z
zNg9%pzNd%|^HV~|nn)HW0|qe)3JNhXv13K^gwAOdHn!Qs0t(CPQSY-6(f>1{>nwZE
zK`p*}=o6zr2cwjlyOyjhSU2|1pR-=BXQ=Bi6%?rbKBVhk-G#NXvlqNVBI{0U@H=U$
zv3~u4%jt584;)*sXY)wtaBfBQP>?n|;jc3VXVz=WY6kL`Il1D4{C0n>Rh@G*%VWhw
z@a9qWu9|kfVF`8-3U;kO-EB;o?$bgb<omZ}s!~>|&so1mEHMJpED&+^Qt`W4rb-+J
z(arz!!^Ose6%L0PCZqS?1##keaw)X2m{e?sh%3nwlYlpHH`XI3B8$arG5!%YTUuGc
z!^IVHYO7p3JYfHzk__@5lhQ@xGIizU@VJqytEAvkrcK1-Jhn81Yb9Fw{lh}pr?B0f
z&Q~duiS_uQ%UhzRoozi_LPD3F!<qAQb<^T*A-9Q485E)@^_FcoO$zo1diuDh2QKOK
z#fy<o9&TTeqerM2RFQBNf$!E&Gct8d->%u9S;$H?x4J36baQA$K*r1mEYjcgxkGw(
zl?N)}KzRM$y7wEH{DOf$NIfOQ`1wIPqRfIgI-oVkEB_31Z);}0H~K1MJY>is&N0{o
z1Q-y6?hV}s5)!cPuV3uh{g)>`BdD*fO{}bZS-3(O{q>-)sJNRAnKqu0)wNT#!*W@i
zt(rrVg7tbdu_EX<j>i#Y=y3n^)^z{Uq9hy=GH4{pdWQJ%_VzAo=gcI!K#W2SO9JcV
zsgcwEe!gOjBZ=-bB34IMRl(dmQ?;~zb7DC>vI8D|2_D{zCULcURi4A`Rt}LoxwP)T
zJa+Nsxi|;slnk8Om#}yBc7VyHHi!RcUf|!`*9S7gO8~>OvI4kV4$b7v`TPVb%^c)Y
z;MVJxCuBpNC^=ZRxVQ*JbnsFM%_)F)cQ%)qDXmARp>E?(^An})YEo)kho{?Hw!p^r
z_EA)nv0*EW(vNDejBU5&ML)8#va$pkg&;ePXGZuNUtTsCRVN@Lv-4Zxcwf%)@@4HE
z{TQKj`_Yy1=5#h%21OWcVPo>RsSgMq9ohO|jt%aDH|JGLuSfZd>Tq;7F(f2JUb6{Y
z3rlNjlG-)v5$1FV`A~9a{9n{p51aZkOfwo~fSdZYrKRQa!Bd9Xrjk=Uj2Pka5-kon
zH+<k<2Cqj$RaFcEog_T?J(nvLMnyy*j)iObE)Op|&O~QnVPjpm;pbEtGOI>s`tiEI
zM_Zf8w|HUD!Am$*QmOeD+ZOP^*x{KIuZzEy?0eWHtcgrG4aJ`3gI`>m?BTJJ#mS7v
z|8T$TbfBoK^vK4aHfBE6?a~`M-z&z!Avdcc(Q`e<0qyj@WjsUZ!REDbu+8}x`3AQU
zD41>lWCJ3(VIl@4J)NDt8X@DyPucv;x1<g!iz9R%l(iPprZkB(jEsyxZSVo9sJuBI
zhR^?*2HM<jmfO8}z#{qW#}@yZiLdX{fKI8&WP7LBZ=&uFE7r%Y{U}bugSTrNJXJ1T
zKtSn$!CsoGz%8K_kGa2h1!MWajK-C^;yIvhfEyGlHxQ$N*f(R!3g`>UVA%pgk*@@k
zT1;Pb;n0^vkRJbrNe7S^UVhX>Kt}*bBa#`CL`i+>Nqrz?t9-=3xQdGQ%YiCAoCY_Q
zyPFf}9bR^KRzyIvBdc=M;j47Fo<YUIxgQ|%sk7O5CFp&ZBkayf8lCO8ZSMxgD?qSZ
z`Y7h(5wth194oV((or^j=WEys`xi;`0~&mgP$&(~^__+5UC1$r4mdpkYRu5yf7vLZ
z;#?L{4ywPZ6FOq~iU$^hQ48y^5n+hA-$-MDMV4haOd~CyUX)+|jptn9EQ2^@Y5J{{
ze<~m4NT;0rH&p5JIm5!={}6vWP9g!;AFvB?fs}(E78+`6YwODYpenn_jBvoFN2ZxL
zyk$;YwMf@S&1Y5oN?$zjHljiARsEmUJHdq!a}a94oHHOOYHnhp@-VM(m%vV)*SIP)
z(0>~JLR7L|vRvUs%W`hih6Bu<q@|_TZ!d+xhj;7P9z^KIAne_xSZKU3|GPb*-|=c4
zBk}NQ&!8uVK(m?Mmc72bX<)EU9T6JC<MW6bwmR-5wYAk-xI9fFHWn7}8c#iHTfrp7
zQ2q>U_P%@+B+a86wQOZOv#`{wxtmS8PRC?V18{>wH@4HoresZ}nRXiBAw2<s$CXkw
zMok%NOi7s?JJr8swP|f&YAi#b`h8`FZ2fKon+PK^NHt^R!Q|klP&uaULvPu<8LoBn
zf`nZ&HHK`NmD$Ja>5^}RI?WCLnjkFh-l$2+-*+W>dX|3K*Xpjixt$uX=we?tmj3y6
zmHSWBrg9JoJGxJQ;j}073kwSf7Mv=Di<6Z!>Dp%!KOn`Vr$B$PB;M5{E?rLHts6w+
zHrx&J<QM<*4?U{5)BRl&{&!DvX>0x6`}Qjp+?)0pt-Fk6?y{%A$(4a`KCA=%tAr`E
z*it3SX$!+8l`7>eVC|ONskzzB8Y6%zU?+le*l<6I9?(`YRW4;Xk)$0Cn~*!(S^MK7
z5OUVz-I0c7LJ>!2%Jx^^_&I6Cr<ipa^0nOKp?)5PhMAGKwkg|0fR;!qd3*?E%7~8d
zO$wM=1#kJZdQcpiRtveP52jbQyN@M4c(|NfdeS{!%DKq?iuhT;c4A|p*YYqvMSwEy
z`fG9A>Sd_Kq9cStq`|&qrMr1OwQ6Gr_eSsS_T{jSzA{&`L$}nME84pjq(gupWDO`Y
zeO|FAQz>4HpQL_aA@rTBGy)U{;5K@CdA+>6oE#tH@Lr=kfl-?mh**&IOios1XK#WW
z9vEKUYk@#aotaW@V}*9Jft6Kc3<wGULW0C&fWQBrKYviqK$cWIPo-q0><~(7WLoG)
z3QlTDn!5g?zPTY}+pw`iFX`vCYn3p(FTxQew(Ji14j@kE;{2Wx1Qh;wgsX%H`d>#w
zNjgraP;SXNC|Q0Oi%_}L8j9v_;=os|objL3U6mp5j&820z6#W$W)6G!r1d$9t>&V_
z=In)vCr8?JEd2=i#)e~ilEvl6k#(kw7|abPw%3ilc3^VQRdHdX7{@b&y}8Cwtj6@8
zlRMcK4NmJn4|~r^J%8<$-l9IxDh_)}pKKZJ9>_E*5w1ywSs&m`_SGIdU-5q^p6Oa&
zH2-_>;e+MZw(|6m5zKjh6ExM1o=g;cP9~7RSHt-5^}C3O2r!+z{&^3RBu(+zLxV&e
zuHcFr#41x+%}8U#zXKC~yP}d($KzosFeD=b#3i^%g9Qw5xn2M;3iwK^0k;s)_VV(`
z;JUyJ;2jLifAGbYnC5q`6GKB9AojufUuyUJKeDW4+A4@F#wK*Pg6tyVMye-;=M0+x
z>wor5xb^ODOS(vb@8$JA^Z(klJSmW;HCLZe>hShjepLi)Go-8@EZe5HiFLQmZwhrj
zo+BqWnXCDCgwrJO@Q^}h1PTIZm<p)XPbFs?ui;eAeZdIW%BUg<>#ctBLWpFjLcTHU
zl^aQKwXH*+NQ8uB^nA7*j!(wN$G{xc(`0waq=f!Ml~s*KxVhx+UfF}}9`r9ZPSQ20
zor)wX|LgA<-7WmB7bAuf=lc2wDC9_P9(NO3<3w&$`jev7iD{(+eYb6l`jZXa0cS>x
zeF~n6tDPo|o?Bitw90z~**8e?cpmS`Gs@{TytrG7S{AcsDWAl8h|-^CTjXHhyF{_T
zh&4Z`Y2mHzq;AEo%_#<@)I>)fe1PP}^S>$`Z-7vb6gwr5>m>DM@ujosV`=+Ngp2F0
zpj=;H59|rgbp+xxiSJ=x1eiL14-XHI2&3RfhK2&w+Cfn<uC<j1;?r@UE(j3-r!P3%
z0I(EPjQ@-0AV64M68CjjbbvrCkPx8r|8o>B%Lwp7R%z14IZ}MP`NjA6E>*Do^<@p(
zO(WLt0w-z$=P5Ti4Mjo$Vyux!2OgbFeA0>$E!gEETsx+gW{AgA#4+0NZ9k*0nM}A=
z37z$XI0FaaUgfOvP7~+q*<uCT(?w6k-)1|_t1zSD>)mD4+04toI>kiVh71$ra^8%W
zgH6g1F=rm_@3sZE{?X1c2+8g7ZPzcOX6UiMP>d-vP&>5gO6z8qsRmLG5swgWFHaZI
z#_gzrvtyWGMZ@goPxlOO+<ptG$*b)avVV7nmyz0W{BsA#jO4MO6SC}%Z72@@0pA_t
zvaX^cR5o<)4<;NSWBILo<>hrdQ^LZ+N{*g6aD);Cacb!Eu~fE*ER{e9Fx&^>EFgPj
zfi(lf-G!J0Du61~@%ni590vXy)|Us!roWhfBuMUnQ3CK{El&`udce|Q3TEU%4~P)D
z>n_TMO7pmSHujj+a?u5f(~%hBh_N8iH<_W5iN|C|6~V@bBx{zOy*WfBD|?jWSeoj^
zW%c*SDn!x>GbgBvl<}q1pRHcFhp>HSI(4)<m<Zu8B_HPVzQ7HuaZ~0Eh*SM|Oi;T`
zF4tT!yv|g3$GW)0K}B79teh(+Qe2!GLK52CWfpM(C&2_GqyC5+uCHVOo1kU>@Y~mg
zwObzU!;5o(HV+Nm%hudkt5iZ*@FrDsHny1V{rsLRiyfszP2UR;dc&fk-YY{PnOme|
zN92P{9PnEKb^dQPP^JL#hltDG5Iitcl9>28^LPD{;^MBCLzEA-5WD}sMu^7^8FB-V
z6>uj3-RcbYJ46|6H;d7v2Tz7`$P99HYNdxj&S4<X1@Y%HI^p9;&2}4f;+#Q}7XVj=
z2M1A0^aTB3)+*xu{$22pqphGXt(nD5aJON5%6waSAygPi;0*U-IkyWCx*N)-yrc>L
zn!wFpZsHOwaTQq|9|b4un^>nbM&}3KGR9y&C3O|c&jf<j>%O`-&R6doZhlp<a*^E3
z;P4aN!@wX;d-$+yGUuz``lQ6msivz)VnS+8SVLZ*qw&~Y+DAW;2jX}Okr;0Tq{VU@
z3y9N5#Ont`pw0Vp*oND=*>@<dvet3(Z3CT<CDOd~K1?*!4IJ!2gxRT$e}8uu8yEL+
z>Kjqp<uEO9LR2hp0V%sf2w7keI7t3WRoZWh-~R_m=w4_&YuAD(Qyn_2bB-ME<-W0#
zKh}a)@Vlrc(ZSDqnVNcYia|cS&8M9NhBlAueG-TyVnKiFD|S3V&w9f1z2$!elkCU}
zRF3Dxaf7Y*>@B^$@~qRS5O}hw&oocbalw-KKXhGlaojDHjX!1$ivP%_%}jh~ozLRB
z?;}nsg_GVM7e&PLtTXtzzm3)%GCPD@i0fp}<_Q(U_JWV?9JV$mYTF5gJ%6#P2N~;m
zGp7dPkwC6#xm~PShUe)XdoP)<7)J&T1!X**{s7KfH7+4|?~lMFpRwZ^9Rov2K>>2}
zU6;LsgRa+&3f~JjeV^Z?m}CN)sUKcUN=h?`p#cR}IPj#aQJ^)8R74@piB^*R28$}(
zFlShH+4@Ox59BhzbQ+UJ7yLNj&2w&qE@08$D~)cP6eTpdx>Zjpr2NQb(V17{fKkH5
zn7k0Hg7^Sl<aYa=;Ug$@HTuGtAvroI^pvsP*Ow;~Lql=0I9NhgUmyAlu*oG18A1cg
zB2153Cu1_>d*3Rc$Ur-Fg~9E8WdUwMGY;7;8+5%KxaCzY#su*Muj0hk0XSg}4<TDj
z_s^W7O3$lA!GF{7?)vZa^btkhn3rTY2&@h$<<$<p;ptxL-7_JzcC<x%^8y83h=4{s
zhFI`z{zX-?qG~eeS}ZrQ^uu4xiYSi2ckqN9*6AT31N3t6D2falnjiz?gA$vCkub9J
z$49~2S+QJ|!$c%+sU{dF_`>gut`jP?xN(+Kg3<=9D8Yg%wQh-i@*yT{hdZ$~-Vwrn
z3+KC{Q$s=f@XDH8B|A5D$dV={_6VFdQo5m&I^;0EZ0ndlxro7_V4VGMJ`I<}9^49Y
ze7&ERC~VM%{0N&i_HR`FK6&Kn_qy=uMYYPpbp}EuN;OiXF?E|mN|PrW=xbsNq<_Xq
zi!u@i#lHO}IHQKf*ZAXV$1^1S5&hy;eXM%u-FMGlBa3Qm(R;FxbZ8VbbX*Uw(QkWO
zrvX23BAI%=P?W8|M2s0L4JN9#&aG_voOOP}3HR#QjgL2Rm_v|}(GfjM(C=aC?|Awb
z;oBhh(?^F6opJ5CT;XU=ub9_+*H&VOD@^^cfZaLbZ03s{)Am8;j}`37x8a$Lo6(`k
z(WX}=hs&DVom1C?9JxA#mxcff>D`vR!RtnBKD^COP@ae{k?=1>$md872n>WUYwfwz
zd1a%cljBjy8uAu@Nvo%Xku%h{8W7C+|L#%QdE4*E?pNd#+0Lw>=?PYU(K<3>d5FjO
zt|p#<DYKG3f3*`dA)StavHGCBbdYkkmYBlI*?8Vr?eE3NdtaTl{P}LwZwWCI=@J>%
zam{nHaaK0vMKM@yL8ZhfRUzdLg*=1k_1QkurZ+V6E;gY@cA1RSOh(wK$mhDuuCj{n
z`I9C^>=|bhUm>x@O-0`wN{Ug<>_UopIXi9gPY#Gd?~T`gdn3jjx05EMXj7h1H81;x
zS>6Bw-8`6;Ml5LMelPuDK1ga7cS3wVMPi^Gvscy4a97wlOqp&~P4J`$r6*cXAIkOF
z<1AE5`h4CP_3enm&GU#t1`WNbsi4BXCv&5Zv{<M>I$RpMjLUmBW=)@#j%#OU_o#rG
zaA<>r*s83xzsG=M;Ju4P)M;XTR=(<f|4l}N`NG7-){tT`QjhJt@cSNA7?SQj7zT8G
z(#0_SU+QGkEw<)26}n41T+DxT4{f0+#cqBjWVE(fNEb-wGNl}mg!COJe5HvWe4ih=
z=4Fa#`@P7<@#$KL8$hW=Be3Cp$@iB_*bC=3&+yiQjyL1Cir}buG>0Y&(L^BV1Wyjo
zEUvesoI8j8hQ`KjuC6Ss=NvziB}&Rr#4lMor>Lyq&u`^~o3uVYy2p{ZO`J92>2;AW
zQ+qghz4JpO>ti4gXTFZ=If}~SaxEkNRyaSBSC*fU5W^<h4kc7Ag-haGSngrq1JCek
z)Z>Y^Zu)OmQyYU__4JW^Z+5+1Cm17e@w93orF2UhjUm^pUyv)nle8P!phN4$%u?J0
z>1`zl{uv<(O|ckXzD!4EiG5+Q`UePj20cnmvhjH!$w28$8Nw2E8OS@gW1xw_!_+gf
zeQI|3^GPVR00RR9&{&r`eBK)3G}5{Ov)2W<@+m1pT=d@=gotyJ$OJ1bi0f3Kv3Lit
zO;Jd|Qu0t%tFHp8AYNo#<NGS{;ZK{N9M3ur?8Cy1O(Vtve=jC<$%(;|W2<Gl?FL8~
zO9iCO|8m)t-`L*b3|`POkIG!;cU#2Rla%Xe{_P?6dbS6oxT9a+;~9rlTry0GY!X!S
zE6s|cqQ%{8duLc>?4aXtM7gYxkFx7por#v}PAfOuT|NcdR+5K{8l))4dKpkkEO|yk
zrsIX)76B_1T);S3-O*>;AtS6U7kG$YELd^z2Pz-0!FN-v><$9Cohr=C%)qV$P$i5s
zG%R*Cn&r<1{<hqCT|po+eResf>wpQZ=*XR67!Of+FY2^y&qX$&#{>fd)45mgdT74j
zD>|jzmOn1REfE{vM-*sQHG8$ANUdZsXKf-Wi#*h{H}~+R58bUucebF-$NkfD9O<;r
zO3mbM-QirYomXM|;|-E83Exb)GomlGWxm*r^wBKdfGFhz;RJV$Mxk?|hQb>9;|!)z
zqgG#_p-{)Sf(e49xnYJy@8eOwjm8%}hvkN2Ew1*r9`x$fQ_DhzdYBe)zK+RuW~j(F
zk%u|5y<vkG02+ty*NVe94M?o|%n680D6X!C6pR>D6s->*K43?@V~2>IG;VQJA7PW;
z!M*msC1ijR06*vAIdkC0RHk{bV+j(ni{FE>fz(q#Iyu;NP^*L$<rJJcZt>%!XmQ#6
zeTo~<WA@p0s)-LpvhPwpYd^Wbvx(m1r2PjEMz@lO%ct<1#Z7CMCyzk&vV!d*Lb<3n
z-6k8#!WqFY(plSExIyC*TpA{)nEvsug_|Os)Qdeke7jXzt>o7j5oD@q)V-9KZv~!t
zD*J0rneni^TVw?2LYMoCZxQeZ-4&gm|JwrnVRRBxwdtMzpwV?E`1<-<gh3MT9?B})
znqQzYVe{j^%UZRCKbj4H>*W-z*}||LW7~JS3Mp7d)0;vvnsjxid|1h75KGR%S?6#g
z>-=zzx~(#iC&((J0WOsrMYeCUveOc%=z5H;Gt0c~L=v&-jWmv?kFIg{oa)gUrsj@v
zRP(aVFZc;RI9VpYu#Q&7AAQ?$TyGy1TvkXJmc~cgA}Imi_az+iifs{Z@++8u?`y4Y
zbN%@5{DD3jyoGN%i!=USiV5`(gZ#8%niJkWg&k3!JbPi{!-@p)4+nLKKlfXFoW1P>
zA-U&fF3Wy_O}|->tGTSwBQZJX_n907`mI+a@b)@}Rk9T*PwEzBD)>1O@8P?jUogme
zrP<ywH9E9F-5f7D09Rx86~%wg>_ioF&2)Pm&5HY8A(uUabg`n2r_)@@##bN4WbD7s
zMOO4V)TUw*xe1#jdk)}>|GUrZN*M>Tx2T}QYfM_#1Gq~m6F;V7VYtBJ!`)F;H-(MV
z^eQ8Da83Cj7Ol#-gQSHIlptzO61F2=(bN>x^2N_pzj)vX)CSq5{zpNaF7t9G62#?l
zz%63Kjf_F@*Hlm-C5M&O9JW}*;#vG2Uvv}AKAS`e)o1&<h98LfTeY^iy*+6yjI;@^
zk14OAAe@Yv69&@u&s5UK+gcyff0Ti&X}I#%(0n99&UC5z_rJKH=lWw%YnyYBz2A{;
z%Y8&!<vCr|=w8E|t)6XCmWAy_c0I&q{Eq+eBjsu@9+^IjR801*`i))D>@p4B;cYsR
zOALDm-{=e_^CEAzl)m!sCQSE*<TGoiRdxC#x$i#24wJpsFTp$~*Cph-1QQR4eatA8
zzIG^lYWBCQaSt}A2GkPE?nvo41RGu#3zd;6m$_*QtseglTT<-<3f~^SP(DVw>McDt
zT9nWn&p(pfePxKHMn2a5J>Q(gd8wvhm$SZ!g`3gclCNMo?Sb-gG4rOPnl#ON@{fqc
z`LdSQ`#!It!eDvECWDc?(XMa7h4&ntp*yIHUXY-`BY>6uc6ACBv8M|79N=B#!3O4k
zO4gFQAJ-Gqz%BKeusJEEBhTDsH8M9Zpk_{;;h0w^-AS@6uI1YU4yo54gBR1FdzMgg
z?BCzO_(#olTVS3WqAb9Jop7=3c8CLe^VfDEqwWZgr{2qDCHnN^4KB-;w%~fQ&4m28
zJtHkcwgh@#%;R$SVYorFvWAvQi_JpI^xtlib?skm9!mP_e%YaU4u#RuJ{KbuZQt77
zHsFQNQm}9dT94CQBnrLOE`yAfPJX<-%x>9w-|k)$9Qk}<n=R9Lmbml2Gj$C9TkGcU
z7LpxBzAlb0JjG*pI=Yi783UnCpzZ?fu>f8KIy7uZXiu58M13*_UmbY^e!o=(wpeBa
zOTcSOp06atGpsAwzE&y?7?Q?@yqEZCRc-TO%&%t%f4SCrc!tPYx3;L}Ps#pvY+wQ(
zZpOU65uvB~_>zCTb6Wnlw=hzCl*m&|?0Dyf%}{k36O#|0V0z&3KkBcN8HgLMwisRQ
zwlncDd#Sr;DfI0j*u|>Tk%$-wRmhKQn};Rb%ps8=UfHw2%Are<D+c8~b;6$?N!D+j
zhJ4q#Iw}-Ca}%Obfos&2ABeM{7gDyJAr^-yi^>Jt+D{y2p}`QIs{RVbiUO+e7zsc9
zidFjEvO+37@~BQz%6BWI)Fduy9+dBg{Z|>&%|4A2|9xC;dErq@mA;{jHX@o>qD~UW
zJ+x5QqJp9y<x$o6Zt1c}m*g&#OKz1gX0Ax(M5+xFyT!Q@OWv!Pv?pFTzGl%Mv5|ne
zXY>4WG((B(Oyr8<Z_lot9xZSiy{i;H&1zQ9noXBOQa@*8Q2mqaB%}31@VQ0O7={BH
z0{X0<h#d;yJY?jmS*rJ5h6}J@5D*fsKh_4K(Lq*O!@k`Aiyj&p65?C+BgI57>LN4O
zNG@(O<i_fm{OA{pSjGuEeH>-w@M=m`+$FEPlmDgv!L9e5YyW+iAxrI&$j1h4yl^;H
zkEb*Jj27hPqnyq2z%u%d8-k0;zm?yqTbZy#tBLr0?7D?*Lg7g*jxG~Ud)lA2o0o^D
z^E7OBjx}6d&nP0D?_*!Irrjg$)JK~_)f+9_*UU4Yx33JsJo``_PS|OO%8McFxsNR$
z6_R><YlV37t+if$SnfGSfU=XZ=zoNsW^Wbsc{9wWqje@{XC?E^{{rQy;Sc3sa*$iG
zNo=PP8ULVSV9Zc-qC1X2Abu0&6v}Sw83|jYcQI!Hmg5}X^_0IGtvyW2M|%uY=2}~x
zezC2kj)K9yKjFMWlcg*FA}|d_F>np~90ZeM1}Up07$aw5qGKIxVK|*$Goze!o<g5K
z*pL6CigFpk!A8U5(0@#m>d5e7^%x0qpmaJF%g!hHXH56{=mYCqsbX<+F_iM{_H44n
zE$^<~Vk=~#{pPrbRR+2JiMf7$^MGLVM~0kUo;qCsyST|U8rt8V-oGWs!2`MZG)d=l
z^o4>i-$Q?$M2K{%rI><`+hZbWr+e+=Y%ET`8BFN~?_!k7MD{)~eLp`x2R<!ALLd$=
zxINj$7hS)1Ll9+7&|1DQMv_&O#Z_Al%twJ)D+!M-Z#4@pa9vQH#q!8Ct9>t7|5a^j
z4BsH<%^RWfqr(F9n;%haDo!k%&-uZfY4|6{1>pm)vtSdAe3hkRX+6`~cpFb$C5;lh
zt1>#?2!p?ygNuc)ckzA7g-$awWbwb2VFkBPyp9uXEJ`HVxPPnr3y(r7>E==0Dr8(Q
zrlFRPbzkGM#M;CXdLEt}hST`R6xB&i4<Ti7B38^A7*D%L`|@+D{qjbg^+Sy?yWU>E
z2*zSUdb%884ANR;hA4GV+zTx_#|t5ojq6pfMe)~SdhA#2K8J>3K!cE)EGMOFcUYCw
zf`woyR$aoyY!zR9l0))mzr=n@;KIpQe5d8h2iJN|^Hj{?Dg+^y1>t&43=#FiJTeMp
zaxvl?j(AO47Y3n>H@}?P@%tgxCwl9iF4H>q;3xXqQ7NJSeZd?Ed~%9W9e+Sd(P1C;
zS#vOy18Ls(mV$vnws39@{%#k@erHp^zX6wEpn>}Uyv3#C`upwd%7tiMZn4qY*oYKO
z>5nr>-%;qZ6S7x?kT|AC`D);tLzt5Ew!JMNj{0xWO;d?O!S`8H!=e`j@O3N3T_-*>
zfUxC#zXc0fbt(cF1nXeZrXJTZir`+f>7MP>79@sOhP(%h2mlJ1ypz8UZyvQ0-$(Q*
zs;R+dJ=e@&ie7m4ZN`&H+y`p+aWbcG(nkF|pR3Q>@Xhdr0a7YJ(I-kmRxPWe>8VRf
zh6C;k_zUg;xCuDQ@$fu680R>g4rf7RFXy%8D)2HxzhWJmSZXpd2-=!6?!n~2!rZs{
z;D=yx5a#_rhiGUvfo=8P_4PFy=oY|X+T4B4?b$LlHKn4Z<?(s_GiM$&J>Y;9Eh!)l
zBY6J2?N6Cm>WXjK9$EF{5EI3aI25))pFbV>S6>!G{Lr7awn(wxBBagavvaZU{fIlj
z`GuqwlshQO%gbwM451ix(Kpj)tpdgt;@m>UcMrsQ0)OjYy`;yj0iwH5c#_SXg#Qrn
z`^$AKYq@AjM;dLYNvY#}z9Ac}@#bKMd|n;9J8klotS)0axwlGo7&}=?q2O09Cpdw|
z{V&bCX5D8!ADSGWCnVhC<>ke|3*+VL8{M!VWp#QF31MVnqT6KaM<%gJ2tMS@fnLA>
z^}S`_lPU@fJ0<-BAz_1W-LZ4)nDLjiF;M0OlIRd1_C`oTLINiJP<lGD=Jnk4^kXwK
zSD-pTUYeGM#<$B)J?Kzz^5nC#{rl#@mqcR0h34CV$r}^eJ5E~MFh8>#rHIgRQgV-1
z!3UhP?%*(6ltH+k9nW%>OD$|~()r4yZB}9iIX8{0vr&Ze3q3Qn)jE4{=r;8Zq;Yj;
ztGd~@6HQ!Rl;WU}k-B?Z7eU>Z4a|J~C~m|Gb1EvVLCpd}5Y+v9zAYEX09QhL!9AxI
zb!R9vm{~ZafeAt=8;$b$!^1;hn(r|&H!p!uPd?$(!^tk1GX3g#Uo~Xte~fV`DcFdm
zn-j^_$RtR$-ydf1i|qHZRCo^NGV6PYs?MeYBm&uK%h-}O)^u9`{%&=H3Z7~C1BzH`
z%`NAS_I06qq?lsN#z+-b1|bW%<N76B)ZSWZyfpmChF+;iS}X&fe;<dLBok%N4kF|^
zJ}b%N$C0ClU21)G$1-MDGch-ATmj;tZ-w@}GRLgqIu_S9|2dG(0%(I0pufQR&d~rE
zC+J||d$JxmL<#qgj*d=C!z0~~f-a-zMkm`39y-k<lKX&&6!+See$NlBteP5yAGSZ&
z8h!Lmfhy%qgX8QxXHFtG8?}*^r>NHsX<$*5%_c4PXO6AH+piDXSGya=4c-782Wsdx
z!HiN4cy-|5HUnxpCD-!M%$-$ecCn)c0n5yE5P;DtXAbH#0W}t8+F#C}m?7h!6*F#G
z#N(OpK96d6v>5ORDk_lKSJ&3k;wvE3)y7v>5-S9NtKt#B`#`LPvJS>2{r(dkZZqNQ
zIu0gA7+m1-W`j1>tO^c;z}`(F&bPk%jvbm3)GbAAvc5NV`+9{aCAPlf=j`=w^s$Ja
z2CEnmY=0=P@+42jfT}2HUYyAO)KuJJWlb%u)_5gQYzJtCVo~@@zdg9;t^dTON>hj%
zYUvJjgm+P{2ja3rxDcD%qtSUY$T1|37_u-^io@Fk@37c+gr;lrpVTz{{r&f(0v{RH
zQ<Dz6bPmDeUWr)KmkR|21x{N-gBoI<4J#Qy@@#BuCJNv$qi6-ZyBdziXPxl7gqU+H
zazlsK2IL9wWte(Zb)b?zV@4lQwb=1h?bHa`l{#^3D9Jm$s(XF%$AJIdedrW9QDjk!
zPh6&({OsOx?g(lKLeV}0Wn&9aOx<BitE$c;7~3JB#D7McQT~I1zz5Jh5KoQ<D*y6#
zo_gjiPQt%lR86bQoEfr%sOw75Lt!qxzHBr39s9V~e?QwT*@va}wrtNHk?gr$xvg(U
zyiKL0_kf8L7)*mSKqd%e(}1xCON}t}Fp!woaAjc6*5GYAb;$MEb~oyU(0(gRQf{nu
z%C~Yqm+NI~e2iF9z|coMN-8dD+5TCKfF{x6`VFpms;te#HqdF``)&J4M+6jX^>av^
z!w&*#;4d&|2f_L<reH_z6^UWs$Tek2v8I@2miapDQ2~7G6%xFB5NB375BmwU^<xqd
zL>t{p51O+#ga#4F1imZQD##nwzDBILKrBPCr=g~n5Eln~%YOC(NZ79lDt*t)(5W*f
zH>&-_?E+88*1-N2*nFREll5Beb!_%{eVLzm@Ckv@W_uh{ZL4mK>#-y9X*0Ai`ELU*
zGpgf}W7RR{*DO2pfUJI{!ALPv0o+2ktzvp^hyIlT*z7JRV5eyZNf8`Q+w9WDvpTI`
zw^J*S3>vM@R)9%~=i#$Je?y<za`jvFE0fM{BZK{<Eh6<HG8A1C5ok>Vs8Ep50qECj
z@MJ+M3RE;ybkBukm&VuEu$Y{t*+uhz{(^JauA6;*6@R!UZ_Nfj^We}>LKF6#Qo&+N
zHMZcrgIlu*C~FDnoN7@jq)Wsy=l2O}bUBE!YAO1~gI&dmv3ztN7YRY`UlAalI!ZGX
zG(9`^S(_S1kBwLJS&{22!tBBV-rG_>%Fe8H+DO{2!S!YOUg{U8587cOq{(Pl{PhDU
z8ePr~6Um->oEflm-m29vo%1Kn%SevIEzT#PxX>$930SFs;yYz}tgg0Y%X$CsFDlXU
zCu&&Y;bogfyVoP->z=4G8O@7@i}2JZ(bq6xhrPkCZ8Wzg1N<*vm8F`qd`hCj%E$O)
zpZiymrV$H2zU9HejgE{QJ^z(L&p_^D-j-GQ4Nv!(?t#3Bpm<d~Ua3#BiPAk79f!dX
z?k$0x8+Ru-Bc9s@+di+{aSn7hDJmK?u0WO`y@#%w6;J^93g3!Gus1^hA|Hg}AG1GV
zzyCuFj2Zv?)^Y9L2DldvFVD}LrAtU&xAwZay6c~M%R5?D?#DrU=-t5#B@InUSs9YG
zM2OTIX#E4taEn`U^i!rv>*>%zPv_sxPCPveez!vg)tuU5m+R~$E>Z5>ECp{X4{v23
zJL_0#CoimDpRQG2c6x`&5^=wN2TiKt5lhPUkUgR<j^#5V>OwEHMKAmEL&aC@Uno?9
znx9&oxv8fO8g+Vzhv$geVo~%~a1hP#oy5F#E@@dg77DHU70|j~?Nr6e-st%_?yX)?
z-$K@|ji0$|5C!JOGk5@YqYdDn6KU06_xRtIfRL$9m&sxC-P`*WMB6V`9VQ_EGgB_2
z=w`_7eVO=L>v%8?aJgLzz<vQX!T$m%?z^ZfAW=u$a9i6nVzvHrXy+27biqNXiI;%k
zLO!!VI%Rq*PAAP}RY8~NZMHUH&Ds258UwNYc0W~&>ty_Wyjr8RJTKJ?G+Ju#hai+A
z4fV1qW+ba(D*o0>l>ADfepO1B(?yk9=XY4al`uM4nwj;;-KjGIpZk7Ox$NtH^yqKS
zx6|H;PRbNXPa<>Dt79IluU$88d0XIUaTkmFId;9^R=iWLbMe6h5-NvEB=EB{4|E4v
z>}4d!->T27eW(WWW$>BrLgF)m<A>A!<V=V5^oJTnb_&MANstDHM#79^NiDX?!hVj;
z#f;=ULE03*`nARHiyo4ZwIEFV>j?cs^}Ta-`Imr6Bs>WVhCp-2nNH^Yob=v25dhZv
zZS*d`;LvcxG;-UVj+mt8F%=AB5W>mo-G58&eOFS=oyWCBlZ{ih(kPyTB2b%`UNx&V
zU;SFg&Czl)_fBSp@y~hp%iRVM0fE;^->7jd<PHohY^ibydxmMXItvR6L>@$D`_m~;
zXBi0fH?M<YKDuWhV-kXrvh~UET&jRBCX0DGQ2Y!RU2_+K15WCIln?AlBn@Cn(=2`P
zuCwLSp>2G?pCm?ILOi?`#k(8=*9sF0jOUI0&CO$uznKrw6ikZ>O7u=MUu4k_p{zu<
zo9BFl*c|n*f(M6`B+?Qacosv_$;{H~_oFvn-XpP)ktJHL^+wrn;UjqsT#Cly3F}vz
z2rm2+q_0-zrH3I#<R9$@npHOqK6|eal_gGxEc~Hn^)Hm*+__15(sGLF_f7hR8C*s|
z^27nGV)e>q&dbD@QTptKKU8*#Rj}L`33S$UKQfV$@($6~SlHsfeL>CcLq`f#a<4Ew
zS{7w@2(Xb?-ramEk&JM$(MA|66rqqgU|wCDxf^WP3Awe78&NUy>NmaaSBco;A+U_h
zkv~#&j~di`#Y;y#F%?k%*{Ca`&^5J9C@ezCdbjyK+_B&BpuuQPQEp?i=sxdnZmmZ{
z1#yOKwMcp@7lP~IXt8j{46Fc#H1|-s1@?kU;+2(Kv>(PMRAc4Kr*m?WdK+Z}ju!Gg
z3R?+uv?-WM&X4{iO@eoe`|25*h<NW3_rATpO4_{jqLG-bLH*-t+{u?p=o!}SaBHh5
z7^WotJ6fEs|1azL2j~Xmzt$}5ZHlB-J6XTBFjc+`6Xsz|A3IyNQ1-Of<@oX5O9Q`G
zlZCB|={Un>{a~&2F5lNFrQYIo>>PjJ<l=81cLuTmCGh={k>w@YTu70{0m?24|1&Bo
zkY4sOJx=Y)#o_D#P~PEccMSL`VuuXD)E*+y$jAs(F%|>-(KL(UU`$?K9=IHxZFIcd
zZTRR`8w6=HG_IU<!_Ai`EP+f=xo_tQS1cI)w&qR7^S{>p6xnI?{5h~y_25AR`@ynH
zKoO5{$!r(HM3pY&QEF=k>t<7!&5d&VLpxuayVl6?xYcs#$hQ2$@K3Q<u0#*F>e}P5
zutFa#Rfp?P5_;&*a5CyJIm*N?Ww^<~82gfwY#+&~uP)cMS+aV~FwNLCgMNheA*=hM
zYxq2A45YGUaE8ZV{%|66t8^te4~fq~psQCb-W4#K>O9LbNIjRKRQuGcNXemB)&6??
zxaLM^;1oXIVI!c}F*xg9DoQ5EXm&hRayebO;X_)#7dkn*t-|l4t)xSUitE6_@pKyU
z*19u6^m_mByUT^Q#c@jugXm!+tfy6#;nncGDTQaAF_ZJ<1OCS_a>bCj8oNG@J3ekL
zn%L*(xl&%(jSh<!Ilr9h*Br>wB+s~I2SXW^on#x{xOEpx%RR>NOg?ABxBe%Swl<TI
zaNXUGI4;xahPe$eb{SOsy;k#j#~8B8HZry;GlO&u{c+5LuXsg1QT1tHg6I%w{kyjy
z=8*Qa>3sN!)McaF+(RrYPp+bMg|O|xRCq3t{rs{Jc}La?eLL|u17DOlYud<!CBx7a
zchS)yHs{x`ZQt~Sve(myEB^GNuA+r{ZhOhO9AuskmA<)fpXqrX`u>J(5T)$jd9LSf
zyZhz$L+nKTW3A6ZYDlK{oTUK+|Kj^9MJ**zHud-M(0-ZA``NYgzYNCi)0R@Pa`zOl
zfk$K`u&2vXo{_!ezWB2FN>ap|0q2u157>TzF9kqdSa2iHF_K+!kn8g1%#-Ofpo$iN
z8#cLz27(TNnn6n#DE1<zqmw2>hkOuR1|~p~uX(+COaj~_FLQHqzN(<o>csr(4)Qy?
z&TU|A>1vA(3-i-jQHYa?MgCH38-eRNqV;|C(6Z?Jo6R?`r|Tg8;9U8N72v@N?8sH2
zwW}WdOg`gSAa8u_7!hHCv|7s1p)dZt!Z%CXrWL{51KnZu6m|QhZ=D;*DbGp9YURfS
zG;1VWZJ>Vz!8}T;6|0d&D*1NX409w>UnTar%?{FVPN)cOcylK@JxLI3Wv8-=yzX)@
zWJ2Nm3RVs_Ml8BY%FLt5g&+S&6a~=+OJMj<cBB?6)oL8B7N6GjF^9>fA*3Mb^w-_O
zHxK#W4g;dOk0t01!jWm;Afo=UVSSX%TFi=JmzUne>>J#s+1FPDS&$<`$wXC~>vM!&
z(ITN@Hurad&XUxFJXC7bR_s!W{lt33b|`J06mNP54>ZNn)aYSHC5*GG$*rGW;DksM
zTX(DE^M!ic|B#)qq$pA-DXS%8r4OFYn_TCm*jP9bCP(S%vno+HJiDBEa@LzM$s=4a
z^7t5PO!3XrBlPe#HmNfvRa<L{iUjpE{JCGetc67j^Ypi|<bUH#CE?_O*k$<~-Kjs)
zo>psRr8m_4?+&Gn=-y^XjWLV=OG8ct1x0b;+)w$0_yX$bFm1aW!_LVzp4(G?+jG)R
z{|S(L_^&1y%zMV}pa&dJS3lJl0jEAgqe_J!BVqX_>a?W}ZlKnDOd*x2;#S$^rM*B4
z@DM_f2=XARG=8tNVRq}3n8e=jIBNqZ(=W!OgTupzfJ}c>G-izV)s;zL1*~uUplxP-
zoEJcsyrZ(1106vL)gEyFU{FZA0?0dnNx+7rpY+Tu5+JC9sRnR70vDq^+-5%r)j7rl
zLRagZbP2!<7t^+{hrWLCHF0meI>M8zbq<kjS`byUQt`5yyFfHJJ2wnJ#^FHvNJ8E>
z&`mqC45uDRp93ZzRQ-PKIB1&$B9lIhkNs>XRPMKBIu!y=+}6CD!Qb2$I;r>6`u<We
zE`WwlVc)gBX4>%RrxDCAJU6OgSX3s(olLAzf6oXtjeeN=as~#^6CRvkul7(DcnEl!
zi?8-OX&vD^2mNX)a^*QT&c+W8>`&|xiGc{uNl6_>EVRGlAz-%<j_g|T*d5t8Rezcp
z{}Ay{@yYp&Kc}MLD~AcJM66$qomf^(oI|1a)2mfskB0rLqn;@xQco>AqtTNwUzd5}
zSBtB-!Fxg#tbEF76Izv)$JERCZ+DO_Tj<mh+-@;?^7GxJTU9$mFH#lCW{#PVIq=c1
z8ysnG&yNd14)AE~J44Y%2wYC^Kf-)7x2@X^tp2Hg>8L|=(T55C%^L8-v~A|Qe&Z&U
zITQ`dcCG{r20888TwqzEcb;#CLF;u?xEw5%vKeb$PtIgZ<@d`lIf0^a9XW+a<<(Ta
zUt`7-`$@4$>mRBDvYs3s&bM{kTb>mzzN14_K{&?6#eo)sBX`{ir}_0Z4@e6T3ecv!
zwCi>fj1On!vf4wT#zaUtMo2~~u2HA!v;r43r2=U;pgMrYhGS<Q5vY#w-_yWM_;&vf
zC7adM1zg52x?qW@5+xz%OovIB0r5<Z_a;HJe7)I$65kz|)7;KZp!C*o-Q3-84`yH`
zg};Aa2RV)V*wI^KIDUZr0G3z^GO|@dH-@PLp;JPia=nlogha98`Dw#}P88|Dl37iB
zixn*i^%;ov%|gLRwo9ykBK<)R17zlIp61_&k$=>Secn2Fvl+iou<+{X3Yc1Baqmw4
zrq&k1IZEx#{C0E)H$Td-ZphKmv}e*RKBaUrvqI^ur>t4EKA=+$(hBF;mQ}vJtGrO`
zmCxhWg$d@K6SpTU&8o%o0~B{{Zx<$vm?`T%X3r&kx-FkPGrg}e{4o+8vhXl4GjU>L
z_>AU{%5=U)CZw02qlCGgA4D744~0}p5AmdC%+@a~=Vw{J{!6n{(&clY*)V34GD5d`
ziwS5|E4;@4gtlOHi7}Cw-sp8b?1d#*O^OED#-CJ;BbM)!b$*T~W`jj6Wv8$dywQ<*
zy(netRw+#s>tU+}FuBx6{OEG}MaeSNd{<^f8^m>H0!3zrSou_nfjy!>EUsSNU3)^{
za%_`J|IK>yzWjTHA%EBU;7+}^`PlKb{S?8lml#_r!$!c+(DLV8w>;TrrBGo~9-oWd
z02}X@kNmfyalW~`^OLwtwb~4@^JZSn#YIJ(Ol5sJAz;&ioDqm{oAUN0^Cj^m^e6Up
z0&{IrQc~jg0bLN^KpcII^g`esSavUGqEt)k!IZ#P!&VoV5f4DC@75M1HSDdw_<tRI
zX?4&-7mKjETe%RhGcz+JI3kzlJt)wYT=-GW)2SQHj6G8Mio}k@<$zWN+GXoN5RjR<
zTIYjN+j%!)Oy<h_Du%mfrP<~ii^yV~eD_9LlvCT;DTU4eDVmo`Mi_19|HSAcV$AAl
zZ2Ikd-*->+WWxmJpQ`9&r^TwBcPK*GS_5w!F^&jBUuqrWSa}Pt)~MGN)`T$n0`KE4
zH-tuIVKHW!zuk`Kx#*_jpshG<RPa;sJ|^{?-n+fXA-CoeyV$r|x?ApzGMex!x>s}>
zRD6h(xVeTOT53D3ZOjy6)-ImTzsBhju#izQU_P|Irl)04K7z&Z@^`VmXJh5IJ7}~4
zzXN9D%b$n#S0R<MTn?A#Ic;gXZ4c)9>)sG-a#`6%h;JM|rw)_r1BJJx<uot1J%z-w
z;^tZUN;KheKCc~xU%dk0gwXM0_sJN8utbFZ#<~-sw4LQAH(c-ac|G3FeOiU8BYc78
zj)s#tI{uikjU}s>YYfe<#@-dId$8>AGi_?Y*diU$aWQ4wEP#UlBG$*2GVbWR`_s3A
zYfLUJj-(CJ)lPDo#VW|uUs3}Lj6YcVqV4NLC4EIe*aH$05^NEY`Iou1n(5cRFVCsu
z&*F*dbivM_8X(IdnjN`s+dI|n139-aHmN}uh?$VqLN537foA#q+FAzD3p&KnJfbyy
z0{nu!DrlrxnV^~auVu&8HAF*U&hZuBtiI&=*|zwnGxuS{I4Mr<1&S}iyqURe>KG0~
z+$W?PQIl;k6ruc@g;{xaJdbexBc;97VXV|pAod13h$4xWf;%`;{la{zl+^a=d$T8R
zf-N!DaP60Gh%<ry%K=e|S$sdrMSE)ojgfI(&5TOku2WX$zr)tm-%X^)`_Q$vH(XXH
zW4k{*q#TaPbu<iaRT*6q>>c3IBt{VV{Fo|UebMCjAujTjB(~%J^vpIvCr(iWrwyur
z?+T41X{mg4(=J;0^NRe)&tLbW+04-fRO=r1m_b5TB_?DnTrdGj=riw^%Xh84PA@M}
zLOLhf>u0TNJB154Tqiuua+-6nmw((Jo^HKOI%E;7b$poqweFI>z7}BLa1J9R&vRgU
zF?~xkE+Kx3<eP~0D+Vp0h`6G^GdX1Xnon2)og@Q^U+i6HHizraluI0K78I0M!7ag@
zt+J4a(v#>e6%-sMJzyROW?M_)onHO1{3pMn0@)0AG_`uMv6K9JGr>+e2x<trW^H7=
zKXy28*2MTwaRC`Hf}OJKqDi#8&*4)idtGSoP9Y+s64Hje$$-_I^MI?^sQq7YmzJEq
z&PeFu?x$fK(V8ejs?!@ns_^I1g-I8~MV4@(WZxTs&jwbodX$c8uj>-Fr5JTa$Q7<f
zN!|GoeYlY#h0*T&u|IUj9oSjbhe!Uj+?*fGS=@b*Gw<mh+lxpP^ou$)4@=Wp{UL|%
z?o+WN#7v@Qn#(Q9e;*^B-wl^*x<j<LQ0WKvq4)q28ul#frA4H)J~45C@1~CXJ~b(A
zvjAFiF^u@cj_Ich!5~)&Djd)m7s4*TV9mSRG_!XdJ(fK}g$jg*HEmlzL&K@WNK>Fh
znWsDXYa(`b_Y9zPMpQ;@D!_%`uOvdi$QLC(d$+avZFLv1YDyOdVSLD3xAon%99!f4
zv-yd|-J@AHuv2jBe@HsZpe(yC3X61ylr%_}bR&&)cO%j%-AGF}NOyO4gOqf4cQ;6V
z=bi5#GYrGb{XF+Md+)W^x?&>qX`qPMak8qo0?CS#As;c7tQ$psg@kOHZeea&rsvqZ
z9a&_UbBwG@=1@1ZbYSb3y`!GEt2aNoVCi8xp*=X7A`cPG0ogwwI2A$>kc9wDa>k4e
zI3g+sA_@K9(I!{`=N8Zx_Q%ozAZ=YrN(v0M{=4wc&(~3sKJ^8(^s>j#f^gP)t<@i&
zAuK{$Qc6yb)va`E+gi$?dMA6@bix+Hza32ad#Hcbt+Jgr37(eZ88YHt+=Ka`pl<9o
z6qqBd6Tm~@ykO3p>{~HBmdQZ(Wtp-xyXE-<Ss<BXPdibuIg+e-FWDzb{*AcB!YhTy
z+=@trqF6o8q2Gz(n&svW0(KlTz?$qZGatPECOF?rta3J9F*^P!o>p2?@>N~{DjXM!
z<+US6z^9Ze&4{LXgVRppLf2(`s<g6vL)dlQAA{z&5seYM=|e{k)wyku0D?a0J0FCT
zO<yFAg<PclXa&DDzRszLPa5y_;ag_w5lq|DwST~57c(W0YPhV1Q@_LcS-KImBOc;9
zknv1>{vP$A;F9jCWPAPV<2%NG5Mx<1&X}-Y9*Z<CEK*4Ptl=h}MGGELe-yF_97$n0
zsj6iF_W8}#)e)C0Oan0GgKMdQWg?;$8M<W&q}ljEBZ5>gz?9DeogpZ;*DdM+8|mra
zzer*My~=qX04V|k2(Vv6Xj=mPP!GJ~&MZ{a@6=LD-nHbCC)~Q6*gbQd_otM^UTyh(
zUi12EQ%nE4H+zLx=whwWaFm3qN;?|qB*5_YdK%O+tZs7i@-pDEBSmgH{;#~WBaSYb
z^)XoAmE=}ojwb<cvHr(p#ci0_7RQ9>#Nebo@w&gm8ofYMrZX3PKF$^P-%4(0D4a0!
zLgkORB(ZelJndgNus?(urjkhtGtP^PZz~l~jnC_;!=ffmTbY#2m56X-EqXXkGA~6>
z4ALk^`MijA*HA<*EtLkz#TCEK+pax*8#4;~;*;Ca!Erv=acb!kH$2hV@XT#{7d~zx
z&|>o_9D}=9Z`eO&E6@dx*&^igdX+Hy-H+)wkwNF>nDZNrg+<ZROW`=7^V6syeNwKX
zZza^K)+Vk^Zo0>aJQ;Q378WT+B1v1By}kX>@iDK0A6T-Kn2DsU`MLHA1T<iV19?uL
zKp-#B>0lFioKJphl?SCP_Q0d5F($P(Hv{+9E<m=Qulo$g(=g6!zBh0}f~d4wX=0|M
z3v+q;aScrZ1oEYSq^O0fiobm%a@mn^S)KmAjI&~XiYvBKyB@n0SiinFei4uKK1i0&
z#c1I@y?coN(#*XqPcWoTUH>g4oIIv?5kFYYmGZ6cODklIgmHkzQb9wz=Q)vx=eH%^
z^MunCcf*0Z8h#&&FK_xrQYp3BzNF?U_|4E4Ig)oD4HiDS1l28%+?ynirPr&f4n>Gh
zSz*&9e2e(gYI?p=y`5(Rqpg~sU&m&B7F>0`Qc$WBhmMo2t>$gYJpbilMmt(E_|B@R
zqRsB^X7V{Vc%I?qTVK2U%5B$ma1BSsXL@S7FE1}t^7}*!vS?&*;*%;O?Z(^0>t&Bl
zdb&;wXq(-gb3K78dCX;$oXCFFty$Vg8q{ir#j9FwD8ojfE_u<UNl8Gx&w0ZWN<z1t
zs+hGnO?#Jj<L+f_Orfv=Dta|w{WKat8T{T=T&!FOFf71Q3UPqo+%RSNESqTH@3c4!
zJpj1dBO@c*TU#Ira3Zz!hWh6t=enl@Xh9n(nMO%0(vP|e1@x|uzv92?pruEnV}FdQ
zK}?w6_?FxntUoumx;*Fk8Cx2x|0&pBoUuDzE$Qz=e|74%Q}illcr%;($vmCJ;9B}D
z%pfPh)fiwMO-p{WgNm43AHLpY2&9?hF>FH5H(lXkm8!~MCMo^7XyF_e5w3Gpds}@S
z+TQ-Y=K9jlR;yc_X1{pYR7&RQULeT|M+cw0eI+U`4pJ&2!dt4mj(xdpg$J_?KUMJH
z-@;_B;`^wUV8ZLdLI(t#uD46dNT9yfXYX%F`jVo9mIXE<oisrbg6;_^vjyxLu0g~g
z<foAIQAM3fA8{-gHfHd7ldzSr9;aRG$)Y!?A2SKLWS}Hrk;s(_7oa#?W7%(C0Y;JF
zWaJD(Nl}qP=`64&;(c%Vp&Wo41fiP{AAiv`Gcobbad&?oAk^8tpC14-6NC`lRSytJ
z%gcYJqia2`XgzD*&j1zmXgV(^1x5eza%+3CA^gwVN<aJ+aDHv40oEXVBOeFH-BQHE
z(oI>z+A~`3q(flg@iFb|d9Rppe}Y2>AwGJl6dFdpl)AR2j&n8>4Zm)=L+bre-r37J
zgqeg4zRK^U+N*ukpcVdO*RipslA3L9UWut>7gwsFO)gT5T6u!ucA{m3Um>A#kLv`(
zCeR#ym6!7T(kY`k1%3Fj${VZ(7ih1RfB$Ocjlw`|WxDC@?hibDitxD7Ol;@l<5OyF
z;fw#n|H@|05>i1rE=d));?R^jiBn<o%F7xg@2ZufFa@_=#UaRUSj&a-T)(-{!2oam
z^3D{a1qFQlYhN2b!-s?$9<*yGE}vk>I)1m-#KuVOOU~FndEd<GO{!Qn^j_{aIi{m!
zAjnNabc2(nux#_H&kzpM(E|iU0wx2&ua`QqiU3-F1T5`<F|-JlmpT`?0GtmXWe5KN
zlQSL?j2Qw0_6T?d{=eI@;mD&(J3B7$rlX?52GH6DqBMoh2kZ*Kl*gpz>DiW)gu`?N
zGL>{iG?VnziXV?4=5v5EP47l+dpGAhF0~<@x9fn4e!kOnG>zk#II*&Bf(oVlF~9TW
zv-%TKYTEUDP>PnbrgCj@q+!u(ZXv^)x3lr%<8!XZfWVcw*7>VPqxD*wy^x*j*5*k>
zfQE3a%Di4~o%=nuI$t|AyC5;2E<1MFNDe6@hMVzSq8Zx(Mekt&V*hL~>c_a2K`w2@
z$$E4Kw8<^E&s0wMR~OggxNVTAr;8KZMsSgvuZlz92ufu(SUHfarIjA%vQiVKcjh^P
z9FR+W`74pyucVAjn3rSY^+(wGROen=OcMPMcNID}d_Z6s$BGV&9Gd=$kSIL-pOi0X
zqbCcx_+;T-_zWx19T<*?hX~zAgoz(+#o$D~9(%2Pw;+{g{QUDLXfmC%pfb4~3SQ_V
z!tEIG!90TiWdJZ*C1L}J?(-z$><FSFBfkJ|3Lw(^b`=0tJvKIn<y;vt*t-ITxPaRK
zWF=0{M&}y7$afmnag$~NrZ8t`z?=(`sdaUAk!PG@3`sEI=Hd|ULuoJ(*F0dY4AK}+
zIh*FNANHI21>PS!^5mI2`Te=Xb$<Tvf^+e8g|Dr!lS{zkDKjysB_yhC4<GZ(P6icH
z1_b0lpT%uP;dK<b<LSD`!V6yd{-8%@ufodc2KQ4ceG0iRzHqKGfipP^hb(=}5SB&z
zWE44J(=U(U1N|0gB%Q$NT_hN5GRB$PQ!+S*z>W1j<d3Ws{buF6yUV6B_EFO81y0v8
z=X)_}WJ)^xM%}1D<!RqJo=16|&A$<z{HZv7;*3vDMv*)2o9^TJyrdE?R5BdaldJqU
zkq7S7L<Jd_-RrbwJnCc_6C;Mn;4f5w_}Cut81Gfm?6(vF7i<MZ(Ce;=oLlB2Lc@sd
zz-eC2(<=Ue>uDhpU%)bEF6+qp6`x5aCEYB+MTJM5q=OmiThvg5gtNU8w)e~67sY{E
zNSD|E9Rec3E}Wd>6&yOtPN<ZOOj~j-!92nQZUYD}|MlxvDy!BXkBXKpt`BVKfIqR?
zQjPc|K|V1~RjzjIb-y~0IpQOXtFOPFq~|{Lt@`3RwLH5twbL7XeC340p@5(aCNJs8
zd8(?av+W)(Nvz&oM`dO7)Mae~Y)yfH_&N$y;%te>hljlUeD;BY&`<=fzUc+AUEoXs
z;ABqDIsd6z>tzmVy$I$Bxq9J&9?Yd4G(0hu*X&K-Z24MSdWTA~0rLE-$VwL2D3b$m
zeFgF%T)v335jx5o<@dep$0wFUa^hrhf1D(9&B*BsCP^cDhbL4JW%(Er=F)kZud~G(
zU=V336`Gu1Q3o`~wN7CE$QD(5;11$q(=NQ=j-81%$;Xef*x(1h8KOo?lQ)#uCr^$m
zsVQBIpaO+S`QHP0J1<WXv!g=4eH~nC!uWLfJ$C8|8fri#5y#_SpoPY=Bo!J)sAR#*
ze(e^k+qaOF(O%e!=mHu8d<V$s^6}q{tHHu@5C<BvR=RfgpDKGltvXD!JEubb3XYc0
zdW(K<P>i<UynCMcp*S^;QpcUb4~M<fV#0)PSWa9De(D<z5x-Dl&07Te<8GmSh=nNm
z;g(mzC{yUxf%VK+!RnDwxfQ2*-SX2%LwcGO%y40CtIrP=HrifnI`wRLqsgqM?;#-{
zlivOARR3d@T>Y?fnQK|qeg61$bqxO76K9?MDy27Q&!(n;#gguw8ZXw0Rg<Iw<-78f
zC<DoSr6y}WomwL%HM*6-tSl1m{Jby+9dfWNgVU~zu-`)@Sh^Qw<K@MVNrFyARD~O=
z?F?;=4uRj!!<`nvC{Ce-`ThgOjE#{5MmKYxiIJ<1oS^zQ_~A}FWJ3ZD4y`ppO#KZY
zf6E0IDv_DGEHOl6n5WF6#?NYboJ2PlU}K@<U|H=T^fDfZy>UjV<v0Kp?7|Y4G{}k>
zE0gzfbpLVPI~xK1{(PBOK3qhsCQMF<8~<(ZR`R+s8s9y)Ftrdz2Xckq?<YRhdtpC%
zWVnbu{tLVA$AOFp1=<*<(W&82pUGv%R!18cXL=dqb7w;G2tHot>QN&!;>U)tJNOLG
zvdc_!oExiDbz?Zv^&1Sjc|;^Ph*LWm+PtcxL)L}W&tXhuw^-{fbcvnBUL)mNUQ*w5
zfeo9A9eMQn-$%zK!?^!Ueo`G1SGR=6>vDdEQ8(Q|A%{iQG&CetDFp0UJXyaFXt9V5
zj5!r^&!Kck0xgrC{`$D+Qdy%W{>Ui>U}dt^@sRADTI+|E4A5YLRVm?80(^XYLPBJU
zUMJ9zg6ewx_7*UI0VTPtqGE6Vff3{6zbn(y8*|I^Fh3~>>Ejlyh+MGoW~{Zl^U~SY
z*Mt9r?0f6!mXAvA;TIPy*crp??dHwXhR6|TKtw!PoOav$mvYcokr%hvYGh<!c2d0k
zG%Pj7gjw!%eGtp6lAlPt)_6RzCX1%s=<VY67<8&vpHom0V7upmlu|T#l!CfEK~BN$
zE-LG@vSeV)RXMam+&^ZaxWdtEBk~N_NW2NjRKfrDV7Vkx9mOa+zqg;u^+$nx*RCr!
ze2Yv~;g`ogrjtaGEUn8f%mlo67IHl@TDev!M0AfRwJeKMy{c3_{&9cCcRTcD>AW<g
zOk?^27JBb)?+W?e4KAr4U43WSizCJ%$o}7%$lkN3TA{S6_ErS<+v5ggbCvpVAx?!E
zn$<pPbHIdtGFUKxh<8x=H6_77E0_M<xv^mv3ro+14l<;Ml&SAv9!hD}ZVf-_FsE6<
zC^{LMkGU-4DM}mA3pJLki4-gKAdE|@8x<+pvzO|KiUrY(r`zahufbfw_dD7A!A2Fj
z^%iSX;v$udymVTK%3hGQkJ~YFgo0WBhJ*i36&$$0OaPW>7-(piQ%5I6waO<vnfR<A
z%)6-svL>W>P1JW0UsPl3oeb5(VIWi%Po00sjt%wp_AW0k|A&ZgwMTnbs=5ShkRZBb
zV^dN_=4M;X){I|MzaE8<=Q~SsN>VL$#IY~=RV0B%`_8uFeP?vL!*0v2{w<#Cc;h+$
zq{9TceCNh`XC|T<1z8{T!2Lksdjrzr#8G_a%jDZmpX4c{cptlmlKxC>hJua3CSydC
zsN^eQW6euc;<x>dfwi@&=P(E(q68Y%E^e}zha9yGC*q@RLJrRfW0rU3N6{p0?HF$f
zKgwrU9_oLfzCj`>WjNS9&3OE9C8&3o6|Ey>9x65c>|~H7S{S_D-!C>;9s7rrZK>LR
zQoT@aXF~3)f!W^!nsMw5u7>AempuFY;%t+NgTr@8wgQ|-8RnH#j<Tx_&g^LTX${t^
zWckAT<kp|gJ;r)@&H8ih{dzD^zL!_h^M6VlZhIl?;ibUAA;N#!@Zos9-0ny(#gZzA
z`${F_b1l<dE#U3_Ry>arBHA|v?Etpu0fVR&D9<|NzK*D=7dvCOohk|GAEbAjEqgaS
zOajFz-WgTD4&lmd;#XX~4b;TOT8I}jOu-y!5A(e5HuJ_p62F)sIY@-BXPMz%3F1mG
z&e-fzZN`n*a@_x(47ko%5Qrt0;o&x?r1fmF;~-n(-_0Qq207iKMglbr(@4Pb`TL*H
z<e<ke*n;xdh|9d%#^>!g^>^eL+hmfthKVu9APD>o!U+B1K+|pAMf0&x`*-hqgL<j1
z9tFy+tu31Zi0!3%%gwKE@YW1iE=bkdqy47x2^r(ZYd(H5q+?5Mv}`=}>qQ<5`1Joe
zvBJLml0Kw}qkEjrx5o+!i?`r>%QAc0P{>vPIc>OF|3kA=ak|BEyh=0rLM}Z!i9)%k
zUx|h{rBqRhd`jBqaZ9sTdMYqW7WMt!(rhS|Livv{=__K6DF%)?21=CHqVY+#aLSl0
zUXC&WZ@Ymq^-hZPovq4sE^o8*P~!DdRx7D_JrVFV)p^*Qj?4V5t?6zvG++6Z;@Qxq
z$cd{=u9bnZ*tB!=Lt~|W$H6oXvD;>CPg`0?FOkII+Wql;CMsOmvA|VFTG?rSf8f^|
z7aRST-m-b@1LU<%2G8?(=-S*ZRun7k4x`oam#?xk+^M$goGJ;}5vl)5S_@G*F9NaB
zdH4>i8~uAkyq|2=j`Y9yIq0g(#wBUMSB;b_Ug%3hs!+>bVLPb*{SE>sNDK%|i|7J#
zqz8MDA%val#Mix_PQlh5PiQKPU>pd4um>Ou>-S~H$_-pk$v)R2eXaPr<z=n`Tl#l?
zwK@%BT#=9?!qee~r}O$PpqNtn_HAp_g?N5=-iwf<KzaY{e$<oKa>TYYY4n``K`*XY
z?f6Vg`6PB6stR3JS&r(DoDTb#&nE6!Rf_uajj!--gU^2G{@N?@FQEdJIFvJM(Og?y
z+5FjWJP-4DAu1J<?hg-vVQ`D1A7v(8j%J>M^+l6TovYNI+3b1F1?|TbrRt{+4T#)c
z+jF1pd*YIo9N-SW_ZVUDd-;ck$x#*{|14d<+5c9oBBv;ahZB;|k|3TAmPuaIElcR6
z`!PO}CJrWGGz)`Z!d-iGzJ_;6g^}md2RvQ91Ncix8UB=GAfdcae(*P}KEJbpwwa1)
zzE<!iSA+qb&x=O>RLRU4Ka5=bAf`v-%MaRlR@3u8H)}54%09PhsBMNH$z)IwS`vOb
zT?iv@Irbg%i>yH7<d!QbD#n0e2ooo+7&t=zvuUAxpxm389PtOwvwi)P!#V(Wwf#^Y
zoz(j=7pRPUceg78?noK&?MD64Kc=%h>>Sszla)RaEV|uJxglA~h%c6L1ZtrgFuM=?
zh>-Q-c%5mx(hiIWJP)qP>au#oQ116cWu7w|_>CQ~-xi}{(Z=U-eY#J*wWovOkEPSJ
zswz0(dS9lZuM6WMPA-giWj`VvO5ohuD-;5kR^L~`NCn3{F&piXq47LRcSiKu(akK^
z8bPd{D?xSR-G@OldYh=>0~fKH*9l+Pt>XVf!lI<o&<w_1M*O@>PLf~k`JqCT)~Hnh
z7dv%9`gl+7SN=EQ9y{lECw`j9?DH);FvAftEOi@ybtlS8u5kl+^z_EdFRgCWJ>a;f
z@SIMUZl$o#P9<=I{uA`nId3Rdj@5RnqM?&Y01N`~WO`Ks;BqEECVAct=X~y1?66V%
z?&&`N*H@|dDy)&{>GB%2rh$=|>0eA&6|S_`Xb-CXlhqwtW|y4{szB|>EMJ&dcqDoH
zzq||V4mU%&n(JO{Pa}<{!#fD5nHy8rg`M7SL!Z~YFH4(0$0wxqUN{H+M#8{LsB;-0
zp2bq#&By6@dVpT<k}$(`w$=zY9LzppkSpxvB+2P0Aebn5%JN9^dBffp@@Jc$?doJ$
zDG|bJ5AHSDb4AWhlS^Uu5H<^{NjdK2$=^F!b$$J-IV@T6_EP$5!7)(DvZPe<Faw^x
z)p`^aH;9$(BQ6m!cKR0a3j7gm;q;v4MZjd-8UB~eVk6iFJsfhZBW7^7>(Q`lM$M+6
zBSl;ybt`1&n<W5_gdrPV;3kYvTL5~Q4?xTk@HkR)a&l5r7kS*DH8zm*zdc`r`b-X_
zPAH`$4>rXoS9<%<a`Mtx+es8MA_U&V;CvYwT{N!MBJz0DhBPI=Igr)|4o9r?34U5q
zUD01eu3MkVTa%i74>2=0Pw}@*ZalZ@iKB>L>G&Ef9r>W5|GHjUI(Q+UV+$8gk)Hm=
zg{$Bp%~zis>dhQY9#U|0KUdtWuHGhgGXh#C(PHE5w~AE0V?s_;0e=^!!zvfK<8_Av
z%x0xe2}7JO%@<bP%xPU`?ia=(Drd*Uks%tD$Tk_?QV~QP-|g$yHl~Xm=Dj}^c(dP2
zCTJDT90Y~?>>RvyN>Clg8{h2USPXyuWsK0?ZF~7V4<{_l3gkCdNa1a>lm-p7^wdI`
z3X8=TFU#zY)>`M9B%oX>IM>xN9V%fJ;g-1#!LG?o00Vp%;PGO^i+HEu2i5g2n3j(2
z{&ZPgOY7+H@Z*OM4kKZc%eI}!<454C+@$Y>6z=gCUMzNu{Z8O4UZLW2%8j;3AQ~gr
z5Tj-ZTJPX12$D7zK{T-%+mfLKgnUY*o&$b94<y`O1T<W{v*CABlV{=O+`+032Tz$5
z<rV0g0aB%Pn!l?K0!&Rl7nd{69`VC7BjDJt|6OD|Zbow3nzc2HB`lUYWe(3lNAFIF
zR>pLAD{G`q@pT9ePlfO(GofUor72T39gG$-BKmva(YR_di;s-dPwsSzSg0)%-sm$(
zmsuXPlKR}Y?75?p?;r4$Y6>kO8U8$;fGEzh{FBDPy3G(2e9NQ!!euB=-)8(sLX2Oa
zN2!yvCxlLYmPnJ;Vhu2XMSe^8{7x+xGrkt=0}y`kTmWml(;(rs-rVUDKW|>&hY(|W
zxQkD$ImN{6f$)v38s@jz*-AX>xOUhy0e^MdEPdPb<l3@xkkQwAtr50-?2d1^TP7Ed
zh7<zfeQaLV_ScICd7<OjIC(8O#!cyH;IoS!!HTD|<^HT%*7%vR@WFr)>4mq%@?LlM
zo5v=Duux->(%%*Z$jtUt{~P;=Xu|UNNi!={>#wDy3MMN}KT6drvENC*E5oM<>yM3#
zgZv4S8GLvB{r#6Ed-U87DK^h^nh6aU3o4Gej(S&eXj(dTb>Kua{IsYDM6_#)#l)y7
z{|#h!;?Q*AsaH3f6=mp(cgw}VN*|;BN&XI}7`7{X*Px{D^YUNUqkTwsnTSZ64B%L+
zJF`YmT`m5iu{)83yg-n9w+Rq7W%I{@ETlz*GoC&lGDw8V&1hm+Qp<}fAP#=%ZoaeD
zVS*|uU9qsNiecx#Z)Bnj<shW6`zx%dhVTg;Z!?iX@J(+QVWiZ8%eY>|YVBKkbbI-H
zAR^Ag?ln&U6OuN-M%8y*(E|y5grrTWI6Nxqe5QEXdc#R%;#8UO5gj%Nn?+;-OYB#S
zErQ%QWBsqigjvmi9_~akrWq4c8eQE%M(jZL_t>ol%)X!Mk-_G>3ha-7Ys-=MAMf1*
zaleiyTO(seFp&|`VAV9<9zDLDq{A9u_P-7^uIP12pC{bNVZ6_t7Zeptf&1kLEhHrB
z^+k;MKsnQA<b$G6KUJ1rP8J!Nn0t)eK{h!lnuG*tyUzOR)7u@T=J-TxbO8C^0oRk!
z|3U&!#yksO3iLbgW=Uu2bi=EXVd$&ypnlzh=UPA7B(zM%!ZNkK{&vp(Sq!0dZ`B$?
zP#WLlcRNLjE}K{{{@NF{8bK8rsi}BwP1gXl=?jD?@~hFH+CN82*@DOGoC2`7DwNnC
zoj)Lal%kg8YMp{QwWg3@75@{RQP<}?Fghk~2UNOE(JlkuSrlAA$_&M#d!?+BsA;K*
zA0MGSYiMJ_MLrAYxUC$~4hh}jOa7B=v>f7>gqAPH?OEru4bX^K*ag|=(9+@8cejzz
zc4bu?N&cu0m}-^L{rM*CG51%oH3Z{}ca&f0^ttI2?MA8Nlq}dOP84mHlOz{1)2og&
zZPX3LGLlcvHmUQgpv%OoKvA)<pg~o5$6SGc+5<cep#6@Q;u}RlEaMF_UK~mK+}hMs
z7pAuYj5RYJiWC@&8(*p^m4^sZqe;%~((y58$0{z%GbtG>h>H2!Bx@-CcEvK(F(aR!
zot$p34;GQ|YPiw~%lQAi6Zb)l@`kSveHpW6xsUB=ON)?pY&xSl64lCYP3_|qe7vX1
zWGt!(*X&3&c>MB(QFeLzF@u7Qt&T7RD`OupPQ9Nm2Y~v(p5xf#TvgT8l2KAp0#Xlm
z0n3t{ybjT~-mo{w9dhU5`@o<6)sb;JOg%~6INn#U*!nqQ2|ifF>8`n4l0VJI(1{`2
zfB9T;Gs{dOS?zajc_T9iE2-zT;XV>>S0t!x<yk|~CP<N)%hy`~^=aS-*S6L#kNhVb
z$64^gfsiv1Vd1QpNye=*1?r{w)=+bk7_p7f3}zQ!kw@czg!ALPn;BXLzQl(J0}z-A
zmY1wKX9dK-N@W?iKqL6k<?U@r2s>XnQb$36+1TJ<mid2JOER+e_jccwIvPq?{R0tM
zWJ<r)Ur`~_!LQ-%mR(NMN?lSr8Bx>H`r#F>#<P-xi^Jam8L^B~Nlgs~fiMLVn4bXB
z3YbPuk9B9w*j)c@@)uW0uu&i#)5#nQ>sFL?Xc&>0@eIqBMo;j0L*e%VT1geN*kAoh
zW!R2J@E`#P3jmRW0|S9)v(l@W4iH-)z<b|6e!yQ+X>m{1H;Z4OY8mi1_Gp^t18Mel
zI{|~MYt?0-b1;sE0^6oNJR-f}&&Ac%_ST5I1ymK_35*PXZ=?mI6K$w<>o!7PLH0M1
zg!{wxUe^}9M#Oi3iUIrbrxXo*<MO|mNEsNAO?40_V}jvkEt~-VYRUE)q!{Uq4^!{y
zp{ttxLc_NosH4pTQ(YR&Ib_Oa%Q}1W{4u`|`HCRfTd;lF1_7_sX|_Z)>dQZ~?TlEH
z)9$UKsyT?7sCvU{4eHPwbFFWX9XZfZIiEaZofVu6d;^>L!SmumKbs64GpW(%GRvU(
zLujrVd`l!3ka#vmUMh2vZRyu_w7Dya&UW_2nm)d&(5TgIilpQ}B$|qfilrWyN`WUf
zKQr@tbnoiws-%QgL9VU55)+=1*#_=-o%96hM~Ie`V=x-H`%6pddYQ7i;-&IiTU&L!
z=NmkZxZX=w&Wkj-d3bDVZvMWjtde;0+m1Z?o>5f9bdi?devDXZfUSSDK^;tXuO|()
zj2vfCE=6fM$xBizUCQD_S#*%IN|^OpvxR;nUIVUB;8X#bt#vru4}V$5>&EJlU_?wz
z_JC$I(S`$JZk37!|8a3~4Sr{tAq;E^B&bW$Y(u_DFxH$whJnpmmXekhs_Vwu#C;D{
z4XqAAxcKk7iuYF+Fe~!d@4%5;f|yt^VZHQ-JjBH~j=aUv)U|%L2-G>n6RW$P6sME?
zJq)NS#)(789t`Lbp+#jyhpEwvwS}yce)obzL!YU*7^j3jZsh&BeoGP5)ciPeN!V^?
zaf7xAIFfUf`jxX5AOjf0Ne<G?%u<z5R5LGL%!s_G9thGVghp;%k+3bnl}Hy(`*JMQ
z7>AXX9%l*pi;im;tP)9d09s;UVWEf;&=?oz=No(Z2EdN;Z#HwK)YUM&>8afX{d63c
z9BJ3uKkQRf4WH-73a6tna;SApcRyo@8bM=sJDl>OQ->;Gs-pKjCSq3~1|~oa1Y0Kf
zMp~o>y2xyUbGiv+tjh(vgJmRN!{0WmE!mH%68}~V?>+gAomtUgzKwwh&5;pA(KV3!
z2r2<>hh)<yYz?3mP|2kY4h{XVvjcIZ2L{SLoex`KKw$dj>l77QYLdDmr{#tn06pGt
zjRH?638&o=egBP2VItP*5V~KbdM#Qp+h2-iShaTogT5-|UHrl+bwieYBBL%3h$$6E
zequ9>O>S(w2jckM=`!pV3{;U)aUC%lW`E*~>9*c^OC;S75K$>88n+7^<3Po@b@w`!
z|6?)mp6>JK^M}jrtZI<=FQ^NQ&M0>k-XP@@3}&GA)>JeWVtEUkh?`dsR()ytg_L#M
z(k~tirWYElwSf)OgE<hoe*{EHfX{7x>e_-U(g7H!92@|Yj*gm|#LA&+hXc&yW?*`m
zE@&!{+pG`2F3GCY&p_A@e`om^A<h*fkEUu;`?2EvRoD19YEE}!#coUkU6m`{pjKos
zRQ1wcO*e7fez_W3la`KBY+|Ab3qB;|`%i!nTiTqnBs!-iO|BI{QMO#B+YJ9U(crT@
zJ$5n9e^0<zbvD^Db_bO^M<9nRb8MHLw`5f(krz9b5vgIo9s%~?8*&T2sKglk2{%tK
zUbkb&SAw@kK#Bebap>QW(vTSv=w7R^kIgbbl45}7Blhc#5U!PoKF7ue+X&JIc?K)x
z1Uk~QblIsj^?leb0}0bDjK8AkPk9At>{?AGr*19oT5Ckt#Ent4xgKrJ_XN;xfh`zr
z!aWiMGi!X(327YXJYEPl>eg>0#<gUknnE&~<`QPHiP4zPl9C}8UloxgS>pq;^TJga
z)&0WNsIjE**+L@J43;E@=5>^-m>OY2ZKx?uw3Y*!V&SFmGirrJB8(<^?5N#NJhjT$
zM0%)f%U|Hz7PXw5%0)A(IEQ;3dK{g8Jid1gI=(8i;}OG9kg3K#UiH{$>V@95n;8&0
zEs5PO%rRF{SI=etak?{9=>52xM47g*li@T;;ICDVUCxxX$>;GBpra5R_tHd~g7;a9
zk-XD_SMk*b88MwKD4cQWAI*x?xUZhRveCrhZOhScN(zFAs%Av?A2?3AYbE&4RP;(q
z!%P9;WHW6264W8#IW!nh^zi~1q}}8s;a!0x$|b_+{hFHM6!|mtv(XccVlxParA<Ly
zwBKW}L{s4%S*VR8cLSl*P1cmG*=zHB3rotv0}CVQ&4V^(wetUH<~ymG*MW1WSgqJt
zNoUUBOpX}a&?E1MR-F~02*z$cML#sRQnK&?)xL%)XXa4}OPmm_CP`eW&We}pA3Q2`
z`E1!id-X~kmV**_I@J8QLR&krNA?Snq#=#S&n@m^+Z*3FJ`PJGYN|28XHRkAA@gYW
zlQ5^=$W`bOjHsz5{tU~l4K58npG^xJJNp8@^=51d`lBxQC!&*_NA;K`$gj(`4R8PG
z06_HqV5j5hF2luX+7ZD~x5-Z0P*GLzr@rStm)*^!le5FL_rD=x<K31HuTSFP2Ms=N
zk69#@N3<s01F0pY5&p0PNFOme&8IKVhPnxCUC&poQ6gs`KVf*>!Y_BQr`svGrZl6j
z>sc~Yqw>cSeB1;}(ywdnPhdZqQLhb`jKz339tfd8`d{;TdjaWsZ+FYK*?bvayjs8!
z0@mk2;~$fl*kCbB8)W#OjeKL{ztRx6$$R$!O%oHLzf7|>D}&eb;bJ0NgwuAd&FNSz
zLY&p(&dSUTsO2UA7`=ha$IHv>Z}j8G4>>uxx7Qa?`ydwr4$04La1C{}1Nj@2lLAgh
z@tK*#0m%TX#)jAGbbJT6?Z)4~2LuHP$CFT^MF3m}*k>T<0r#`pN%a6we$IDxFbN3S
z>^6JAfd$@Uu=nN-JWyzng@yYd08<NOK>J4Fu_M?}v9Ms|+=DeObyd~;yu1|<I)%0$
z5CBya(?!+y(FQr^Kc*?D^$#6eK(M54yE~S5OIT3S67-#}+PB6ylCKpX3L1Z(8x#Az
zRJRwkJngz7%3l2p%9N|5Yf91Au#;7{u2YG%!V>$T6sVG$HDe#5MXD%G4Wp@2h9!HD
zxdgZPwN#BQWYo=4H}$yXD46_6)=%ui`q7HS<hVXIJKT*x!1p~_ap?%(>5omc{$gLH
z7?h~!aw+OiEQkecQBhrj64`gw{-d(u;D8B%d+?`A1v#g~DGG9OsLp7@sJgm16qIEV
z;WXPBNs8jJ&uh11l`T0XJ0Jadkx!7=J>v8)hOds!=fAp%AzR(Yt(e#Bto)-fsvN|(
zK8P%%F4b$^{1fudy6MD$YU=LohwFZ&mT4nn`x$J0{YzuMq!;nVUlYzuIogD~o$OK8
z*ZN=EziM)N8Z$Ztst3GS0`c1V?{Tl9f{il0jQXpBDUH*I()hnzWuCvepY3!^<*fXi
z7|Y7{gzTlGla?o3(sHFJy`T8%`O?c#_K&S#<XtQXOI&B&tLBDvDZ7LRVctW@rHS+{
zo|}JJD;dbjW^Tn;*ak-`5=42*fjW09Zh|*Br8E+<&F-&M!MP=<*OXORWDpliQ1KMP
z<5@H{D~o|io@Z(zshUZA2gZe1G}UoiB34lZP}*Ks-}^v~aEa(q2|>%s&hE6<<~ILU
z=ddq_wh~7rZ{unPu54Ho0uXXsqhZq$sSfIl53}5nkeL#;-OSGc;W0U?zII4cnsqFp
zl(qhdH9>(UKR||q`=&oE+WG{Hos*OG0KW!I?(0<kNm{tDZnc<LlbM9Rx;TT;4hs%+
zM3AC&Xb{faS52`O6}n73WoQlCEt8kl;r43z(sc4t<?k$JmBW~F0lYQ+mV5M+ag&a-
zS)efF;~x;sbVPK7LqWW_waKp!1&g82XRYU;+xgmB_3Pg$l8kg$^<37khu@5sYGI4K
zB%XbJm#wc0L<BJxT>&4(bH#FJ^G;Xk4K0xO1s8WWr_C=8%<*8q2E`m&ShT(WG&Svv
zM953?^!x)p_uVXXg3vvLQOk{-@o1XTY1R*tRsQEOqUD!`GM~NO_~+)+VEE}h+W5X4
zmtjWJbiB8jHfUR!%NuyPCx_m@&C=ANduNd-1(7)MIH}yIfoy+AA);i~dHE&5`Eq}G
zIcZTps&I>s#FJhzbY%<x;-KQsie|%;wX(7j6zl?`y`b3Rzkg>7)sRq`O2t6dm6MkT
zlw!oedJy-)_VeK6gaA0Yfnr3&@6N@;BTNE->W6dX_z#`OVF4+c2D|(EtL=|ja~u2F
zXJt-y=sbCYOU%5>I=39{XY+H(6n)VmL2;5wjLNj%X{mY=s)Dq+91a8hMD`iK2btWT
z%}Wp0HC5NdeEQnZv8ySwte{RVG$;4T>{zk>7M0WaYi2>ZlXil^(>7iys_U2qvrz70
zk8tgxjD*>q<I>sNi%Y{~(fOoLxNv^`v1E>PXoctfBONBiA?8x^(@)sm+}H?8FK2P*
zv;3O?B9V#Ev|9mh`{xburV+)s{eU82O=;^vL9rj3rssS{h79|W=gF-G?X8WLZ%@Q8
z=cOMq-K?vVGNXpf+Ige!g)$gQ$TT=4vP12sF`(AoUuV3_m<6p5h<ijPT0u&W2mO?G
zvprzaQxB$ZY-|KAUyJIh0V1oMtnBUGT?aTik7i3jc0&`OJfLZS`K|Z$D5vS)-<Laa
z^4OS|^qMu~l$0=xP(6qh{WbI}pkY|3x5P0k`_J#Z9VGzMzEG*(*$~|`N>epFEXDcU
zQeJA3H>W(}`@5!w^VrOS_=t$6q9uq?R(VYh;)`fkaV@O#hgR6aI@d<P8+x9KY^d*H
z^LbM(y*E(AB&Bc84-8qGAkVQH$<NjdpoFQ$rt>t;BOm`zwkWj_$v{a*ja0AJuUQr!
zuoFlj1l1c|X5GTM)QBg?nObIs#|0%U9Wb;Zo~xLz*d>&^C%y9Ql_iH2e@L(6;)A0^
zJ@+8)6rz31Griem#nI;?pZsqeRR*S1hm^a@2vSTM_oGm?aLC5qN3L7qO!IUC(sZdx
zEF}y|K60Cplz!TBBRdt&ut^D}nS}wp<0Y4>e$fex6r*DVA;S*7QhPfh=1XWTVNcts
zT|GX0O!T>CODUOe>v<WyBowxByyTCKj4rJz*~fq1>E4$z{kWy1S~7uJ_MWQVyP2}E
z3w53?%0t4|xJR*XZmVwnv|gqbD?!ea4qgHyFebKla*BwEfQFb6oL(o11%W<724dpk
z|82XjceLl^yx$5^Lj?Rao29y9u-UW$YaLiPY32@KCgs|kaYKDfNL(GD#c<dk3zUb2
z4F-239@#Xu%n@f{7f(`*Vw%1ZUK-uDa9+HO#;NHkNx@N8yR5RXmTEHH@ZvMm`P>3w
zt?Vg6q`B%3`MFc^1-L*8bK(66uOti|i|ZxhMbl{@gVjgckSa>DG#@Q=3(Q!24O^V>
z7z}u@d7(G)UVK*f^3M$lPXR;eiwuFg=S#>@3EkE9fiHJg4VfL0vUoeh7_X;=*M4NN
zu5&r|cC?=vXj|NWY~8rAC#d54Xt90kxmI^z<$QVOK45GXzU=CKv%A0AZGsWQuk+KP
ztwwNh_d@@?=v0012${V7tPAUCPmFQ0d7KqLHN}(f^t8<R(Xp&Qd}{M5aN69*h815H
zg|UKuz$BCZ-~Qe$!3cM=YeLcvVKCbymlEdb)}AHD$DCFqS2w9GMB6uw-#&^O-W8SH
zF5gfO@M?!nKA>S^6Ao#~^r*PNCGRtsv<JKVj0>ZuuQ|^DYxEKvQFH6|qo=YlEKlrW
z;FFMrz_N<QJtLbLG`#w`NnpRPU%l4x`mRYjMD~(MNzsyBQyE@>T}{+=`gthw6gP-~
zrl&6(f|QRY1Kx_`nc@#?8V&iSxDz5-T6i9Fv!&`dpY^QPJ5eGfj<cLW#`jPngEoK(
z?{05TH`?k)^ERH*XPM(+&IS{E!>xg$h{OHH3{BMx4?6%G4eg!pe<}W~remT);MTJ3
zcr*dv(GA#ud0@2M6b3`Hm;25)WORR6)I2@ygA6k{UugR-e}r}wSISD35wYFV?5p`f
z9qOKjfASJHJR)k=9m*pdn;F8a=hp2SZGoIvYWgh&Bc)|D<#m`aj(DN^ax!6Gd~<p%
zz-WhIXxQn-A(2`PpD*Hrc8`Z7hF4H{RQT!T?$h{}e<x2wYkKQGm(JjwnVD36U3oq}
z%D1I-URSic1>>)E#0ouJE>ESie8l69OaZSkQ^vCnx=z<m{HNo7EA($03$yy=%y<?p
zs7<!F>gT*3|Bh)#e6+5_g`;ME%1v@7Q&nQ=y&7J&O~&o_IUd&kxZTQq;zaSX)AA3c
zjcpRg#XjK&!64?^mEi_UKTGOes7NUe`&Bni3s<HxE8=+w{t_G>^N<ggoBs63%1vp}
zm9#Vrsd)Kn$tFknX_FW;VdlwqMAH<`@X^7^RVQi(BG;job)z&aRsZPs$AtWOTB*=1
zsf!zAA||WQB-_Dj+ZVKDr)X`xpHka92U~8JE0=UQV}3s6xrl?=T~)3TajE?>)GA9)
zfByai2~wgmNe~HG{TtNkB|+iojE*s@7zy#OFIKOps@!>_WXP(G+WAb0G8p0?^wq|!
z7s<ApwHz=ccqiFZ6^Bw7)G85zwgYMfTR%yoW27``nW^n5pCuWq)848_VEd76LnCUq
z3<LB5EE4VoNK5$-mFgs)RIgZ12v^qZu-|dN<^d7~Mpqoozsum+ll3*Ea|CTh3ifl5
z(g;5M>Fdj4Lm#D9QBzAyNI-9Rfg+U^v;v&@z@Q)=Zf;d|^>z0K$OrXem0a-%zj!b!
zG5q!|M>rb|2NI+V0w{yOg?@)8Hx!~!H`T8aM%|X5B_fs_F?nH;k$NEC>HBx`1E%j}
zrQ2}yuG!{FTYp3kWD@d&a(b=^TyF{ED^L({^817s6^G3eWO77NY2;@rHfwEjwej_G
zR}4i@Q_aobKh?-uI2e?d`Ia+R^L$cQwk|1R!aS7WNr{tyug53sQ>GuO7hgA$lZ&ja
zb*PmQ=&KV5G}fk&7Gjr>u)aN%4db0@;=a4JnfvY>b#)tx>UiOz>|tg_brn%0R~8_Z
zYciUF_Z5c<M?OJ(Ov1Q%(KPC0)${HlGv-ITL<*Oi*|C4r_=v>1&+S$I$_XoJjAXiS
zkBs<n{Qj3L>bnQuh_@$$0^xG6^HP5M{D4>{HVTbreD1?cZ69rx*AO>6s`=6+R^64C
z?UuV1*Vnp6pC$u>Y{OOcXfz77>9%%LcyXGNiKR6v$0)X4`nW7NT>^RfaYn5S-2)P%
zKTs_)@VDP=G@-A`>Kz)tC}1YbsBwPogw6b|no7<Gfk#b!vZzI9LYaesG1L<MSDcK5
zE4*F<mY-?Os)nbP0@0q9oW9uQ^ci(d823i4GwY%&+73=LTj`eQ`5l1<{oKTFs9)&h
z={ngb{AK}*o~eh<NU|A>B`Z35q8hd;W+Iam)D!r~r;`mg&GxyO<Q%oW(Xa6&En5T$
z9g(z87)|g}P&P*32zq-Q_u;T!y4mnY73PP%-38|sDDmDdqkNukrsV-31_2TA3H+3O
zCo3)8>U^ptB-GvcdRqy^ho7HjViXk>Keyjtr2V%NUsT)u_9=?*YK-@sfZIL~^qT%K
z$nK!388x{E*_!KsI@Y-6UYe6b#>t8EUS3u<5N+cKkjdZfecoVaucHKBAC@dDyF;Gt
z&oh|}-|OT9FEBUvV<3)R^bnL-tJjnBg|ezDz^R^}o+AJFZ#*^-McfJc$G4YrABDxY
zr}a0O5GG(Zr&F&GtVdS-2kddtga}+HC@4V}n^b57#GV%rW`62=ZqSUNn`Ux4Qc-}f
z?0n@(@kBl&{NoInqP_-D@a|`Ufq|el_74gMkf%Hu9i6noLaLMyRb^#|Wu{G01&^#~
z5?&H*^)d|z#)EP}OH^Wylj_6iLa-z*;W?=DJ(KVhKjQA$_gL6lXiu1k|7JpjP|hHG
z=mZK;7~ypTaU>OacGfKche3^XbRxXUTZt@xS4uqhd!4;FO;XWEDOy~&YWA;zkkqJy
z|B&U5^_%TJndW%=3NF!5*PKoNORDn!hNj8pZ?D1RWwduA9ws+FcOauGE;s&za$-Zc
z;3^<qX;`wJch|7=C@a43ac(K66foZqvFUMHO_1jB?+JQDEb{YX>0ntbLrWxwrKTD(
zQd;EjyDNxfm-prukp9Hv6>Hg2&mJPsezxHSkz-8(ZY=@s9xiv=yE46{l61DUP}FUt
zX{WlM=te5A_V;z^{=!F{!HkCHddxMuL+|Nux$Q03l>3KGDnNEnr_j?3ZfoQUsS~Cz
zRF-kQU7R7)poW)ypxA5LAq9yU>klLQ3V6Z~;v(#6sydFhJJ}4->MZ--&mJN$!fu9f
zrnEDfV$)I}c}UBwXDvYOMp#RB!wj)ViOF?9NVwlJ;gjFW6Kspe$U$vm2MqjW-I6FC
zY1|y6RnYr)eQ_${OPLmIaEwLK5T**!elbd=OzlWI40h&vOdmsssk+aoX#ylA;Q~h|
ztuQEyCS#Z0hZjH_<xx(bo@efsW!q>`p@kAGiRIZKHz?%AP}bH<4YY8v7ERigTQ+LZ
z2v=^CsA;i}UOE{&>e|d7G)ct?^}xB$4E~T0bfYbwOTkP3O+7o?@<;Cb(D?ZH;NZ_C
zl%wYDfhd1!H{gNtdDsj-Ik8d@Mr#LScR!AQ;1Uozqt|Xg^5$_lTe;dDA>|aB`?(L|
zSgn>DkjXJ6D!}YSK@NlzEw{RSCh%`bVK#yp{0zJe|Fs3c>j33;(~qMcpOD}M%%KXC
z-r%2Pdfk1TskCjo`~wC?a_KyQ|2Q^|fK(2{d=Dm0Z@^eONI?Az{sj8H*<_B`IN!C5
zrzfANIY5qQAqgt_iu!*5^$;)M+JQdZ&vCiUjrHN}AUA45J#NVH@yZwu7OxA9a*!U)
z8SRUw*HLjHrCgdTP*r_BLB^d&FU%mcovl9wauM41{8~lR)rkpAsM%%*Q;GJjt}e>o
zwZR0wXduasoRB3ArUpwV8s4=iQV2o-V2PvA{fuQoc2aFSe8XW-vkC$JYb;X$wPvlq
ze|OO|6S^Al2zzIVp-i|=+E-PbcV<zJ;v>VZ@RW@LLRDKJs|ZbZ3VfVzlbYzBKjwB;
zTHUP&^MpphE{4{y0unM7V*kPkskE8Yw^CWCxD(8jO37ah;*$<SWUOlSFNRPocZ_gU
zC^vDVbJPSqPTbiO#+LI4m)O`#PiaFvDcl)YjG`=<W@f^}f)LWQnB-<c;<)cBkkh_$
z8dGRj(&2{wZZKj(o-WDH2&_E_zi7frZ;Q=zo>a?J{;nG=+YV{?^xie(d$?%#Oz2PA
z-h}q#izLS2y*$Vm+~waLaCDZ%?4-Tbd!U#(Bj%;$A~SqJCC=ojkuOj|CSX21+9mpW
zSBB5On~)Z+9Owou$H*w){V0AuBPmtyym2u=p|tCx@5RK{fZtY2GUJMZM^^v}yFET`
z!3qUrJZ5&z{gd7B>vp9xI=T*bnr#ipT;pntbctJENnw%(b=`@d*k)%7eIz=Tm)U<g
zQT0i1d6Y^CPL5|r)~zLe75Wn#DYn3r+`;_fqSirj*IjxQKyJaKj_&yu%iqRV!#cLR
z``xZgLFp;D4=PZsfS5PU>0j1xcd>RRdgNH-t}&Lm2j`4R0(8)y0jE=CUBw?J_n9Vf
zLfJE*F)yC77*CgKP4s~-&yEZ~&#$Z)Y<JAq)~NqON}C;}gNxAoaytLJ`3LhCe)pD8
z{GZGB&q)c@RB|&&1UmuV^{uKbyxRJj-IUJFYbe-mCmOrSwH1sN7B{-Zh4<%A%Zrq8
zmUdOPxkRhruG!w`_E(toCAW8W)&nd>Gn{Bq;G!eobG-nWzTo#p(F&51l0rg4AW;nb
zaCv<V30(^=Au}1uB__Oxtlo{%%F53wr3#0BIqpCRPfttBQX$}Vrk9-ti3tD`^WR`(
zW}v^nUxA`GpV)Q77u>DF42V~VJCRxpD|mPeEpM++E+-4j4tsw=&w$(fDf`_SS~4JP
zg3wHYrMgVdEBFIp1*@#P2|0QNx8UI5|K^Yth)x_cm*?&GdRA8S)B?Z$%R~I{>H{sQ
zFq@#JUx`1pFQtF9(3)@8d-z{>_%{B#NG&hGbos%ivl_YUn6SOAjZ)_KL;$)59P-sc
zdE?sq2xv{zfADN{1X&+-FQ$(xJ5dC>jhO5<1b@-$Y=K!YbVS(E*StnS&yijG=(fqp
zNuaoL^N|u-$38`*_L*7YXJ5q5oQa88ocv3a&{Gh`j^-igPA*T2nYa|ivNg62s);Tr
zCWIoj-1mKDfQ9xIn`1v1>{Nry{+xIE9b=JIELG!YG)6(7Z=zDM<X3o7-@l}lwHbja
zKJ|#C=NRBhwmG>Gkr|j!$CKZWe&W&Rjs{4X)eb19@m+n9W6#rft*3OB4Kpa!B5^%^
zQ!F9Fvd8IYMF`I0<K}%`ykgUgMBWX>SOI^!RmozGZUUr^%YN7kczDW338D5=-A5j*
zJbnAa928R+p3!n4Aa72%vcl)ZLv_#Z@{LnPB1X{=^32EaJ_syr$0_Z?N%<u*MUEX+
zM~$y`*c2z}Uo6nP{d3+FAk=M>@I#F{Uc7L7W{W3eF$<HlnXzTKoTWWOwDTx&5cG?3
z$jWUQ`|i(lo@)JD2rh+G8ljT@?Is@#pT4JaH$5hOetkR(O;7D$oly}VxQ9rG<FvP%
z|5I++DMk2nvuM<+p0>j2HpeS1;0ZKmdM;Y?UR1<T#LrI;!7tCJt-S-IJWa<*kjv`w
z886+HBLZ+J@{ZSMQ02U4$K{%@zCcMStXhEN_2G80IL|X(qr^8k*Cdl+&$Y=*kfa%9
z6`mB=?^IC`pHy0+&98h5$#JtW8&)7*H>qufb6NxRymhyILNp2zE<qE(*7M!?>Fxrq
z3k6xQfZV7+BOLL%o1`y{1$UdHxj;1fejNW-A((avlcaLmGSbjMAVY<`ucu$ygu1QC
z3i)zD=L(~kuT<PcczS~9?dj<$Sk&DO)|)22IBtAE*7YSWau<3rt6xI@B;GeL;J+c_
z6w)+Ar~|hpzo1qGkyX@Xyxd@o_5dW)O`T{prDDv!Igkf<0lvDzgv99R+0%!6AmPdd
zinL2J>k(X~NazxBaxmi{JJ=O?^EV@x3c3j;#u>C5{$}vEf=fw8cy&{h?Rx`4J3L6y
zj)2VZ{JIR6V>IX(KeP27?g7i%jQXq*5;dx6KyCnA!)JWd{Vg<x<Rd%<#Ys~CjFXA>
z8wQ^m@2-RYPpg-`yah~(e!D*Bj`B)rzV3>it>wM4C&1w@V?UED!xZV~o1xpwCW10O
zj;X)xMaXO`$K15abxk`R62lj{m}@7tDWWO*NhY^hbSH~)c|>r4bv|A+!=qb&`%Q${
z4o<oJN6PCkSvJ0mEg|zIx8uep;lsiS>ZUtJ%G4}eubzBI(>p#`u|JeIxWih1D>Bxg
zYzg0HI=efCYzg@vDZ&D4*PlyErk0F026wzsqkB~TO;$_3jEc91wYub%8EOU&sj3xp
zXo>1GeBgool7T5YdqzFXIr_{WFiXQ`xKZ^LbDQYp-*zL)$x@Mu#R|V?@3%M&#Qm+K
z`m5UcKm3=K4?B4eHX`;lD8!4cA60rjvA&7L1w`pDOhsi7Gd)-T?t3jZqP!#ia+y0%
zX__wS;OLBs6n2jSM+v_)*)Kw79QzL`DpY>r*zwSu7ti}`E;ZF?uV1#O;wj<H(p>Sy
z(VvYaS$6bcg9wCzPUTBa7tB^@J%B1E`xUJ2TwGlZkB&kQK}Ui~inzzfPx*GeD2u+7
zloYUy!4D37FoA(ehF<D7V9NT3QHQ>Qf54<50FwLu`}%<9<vkBPri_XT=F!LZsCE~i
zDFVv{w;@y+T;PoUk57S*|39w2GOViY`<m{SE&%~)5$TYWZt3nukQNj{LOP|TQ|XXy
z6hS~5Bt=0aRJsw~dG5Wx|A+T{@KGN)=j^@LnrqH6#~j1h$OuPt6Hprle+DU{r$7_}
zbF6~jNJJU~YeG*8*u{vFH#Rna0>EQXgVfpo;X_Mvvs48PL!qRInjC`nVQ4+WIzZ^i
zN=;7FZxQr;Xy0j?^u3d+fc$J7EQB0-iIDiV;SfRuc^WQ<yhkQ29xTi{G@I(TT#jcz
zMG2(i#GIzsGE`HOlS7U*Usx-yK^jT44S8C~OZ(H^ZwbVCtx(mi{rrj9!b))35H_b@
zd8g))R+*ujlgD4Z`Lo7ni9T&|R=mHJt*1Nj9ZpbRTm`s|9Q_s2YYCD0QF63HwNABN
z?J+xV=Bj5fX8oxBGlSbM$9$_g+w!?SW^E06-G{A>H5shNx{B|S4k$$2`P=ABzcN*4
z<|ikd=&&&ra@_h^xb;%T>TOy6_(d^~)@!D5>Uit~)x6!ea-VDS*1byc)WrNMd2E=_
zK%h?VpUwM>1K7sv8LR4lpgW&#SgyQ{c4E&*?MEO(l)Cu@GnD2?fcB%CdDB$Sv?<SQ
zOggVI>%*$^uf}ma%L*q~f=9(+c(;c0wkS2Ybv(9bDsOZl+N^J-z?bXtbPwi~WFAye
z_!L(@S<kSSdU|njQTV_Tz!jJgW{gOIKarhgf`X7v*@cBE*GMDuH64Mvb@SO_VtxI+
zOz*(`HKj6XP$ZXbgV|Ccr*}p?X?IMTiDZykkdE%Yjz|R;!GqC^j0{*NT5oiK`(++@
zW@~0f&&CUb;-s=;PGx+EILSyGF$`;#k+zxE1icdwoNnFDzsCzOy4oCu&>qHZrYqaI
zK|;dd?>+>gr%um=!yiIoFCt7gMZYNUo@j0M$57h0z@A$Cb&8_fi#n67okl#$3_17D
z)^3cwBNX42f&sq>yM*;!Wk@#2GaOzvgoTEo4orf7F+#BC&ti+~q+L;Hw*{}Ok>k?$
zZSx<dO`GgS=Ju9M!omGB+(N`Qv0dxjw|W;&Vhr4FL>z_Nztb@iXo*O}I&d}ozPR~!
z=|VF7vC~)ChhH}Y+=I|{US;GtuwE>V=ec*iX#a#?e*b6}yYtm!l&Ml}wH#$J<Wf=L
zmf+)8gIFDLT^@TN_==-gd)v%}i0J!JUFe`9C7ysaeE<u`{k?dB$e-%JHboprm3$H;
z5*q~HS8FO1gaA-gh?=0upf^)tDEs9&M^-{9VP5fh&@~_s47mkN(t+SKF|JP}0Xf=t
z7EmeE)EwwaPEP*2B}ho~eO8m^n3%jNnv8`4hltb|9Jx0}zG8@CRN6g{gv2TO<L+b<
ziwZ+Hw6+J5{POTkq68W_%K^#Hn__fLQDzxnPgrGemqs4V6mT9&<<7H`4l6A#MwIk$
zt`UGmw!{*-orz`ebdDd?a;0intf^|0!)k4>6}7jw?Mlme)ij1;?qSYeH*XmA{K(u-
z`tttKZGx-Xqo(4PxlJzTNTpwCqIUCy(dPCd2YVsL?SEwgieuCly1qTXd3jH~@#DIH
zd5r%d%e(%w_dROPU4*Uf$2H{&Qc?~sXHf-TpP#-Tnas7GgE{!e6=9Y|94Y*4{C`%C
zrz^rrSx%yqzCqNJE(Vha(X}OTh`>FX2!6ZWo#ozeSQ)Id1&uv6Z_RSqa6D<x8faOd
zzQJjA`aS;+x`Gfrmw|%-p($~XAX3hXpSrfYmmkI9H$IIZUMXscrMocpAAWRhy#(n=
zb3>P@S--QFVGnMr*zO1S-Q;XeLf?uaZPi%Y8#G<3JIk;q^xZy?vWnLU(>^{N$}RrA
zWMK64Xx#p5e1uvBTlG_~^$WY?+MQ?dQdk}tmp!-F$tcW%eMCYT9+vg1gIdF%!bxKH
z$d@HoZH$78VtBqoZ_SmIus7&yDc(MCtD!UG3AOitausmSx3jggB>YY|?Q<^lA|A{U
zr6BtqOj})1A?~#S`c6Z@I35{U>U#bh=yR~34nPW=oQw?7v{Nf;+n%UV!{SQ1bk^q@
z&kON8c=6a^p-z(jQ?%Z_{0>>UkMnr-BRIrA-zEB}JPvJdAZb6U&K(o4#-MK^?mS!1
zf*tqWi7>>m_`F}4?bWBXKz0Yyx;Z9F6nrdfT<mJoM^=_$*fv_&ODlv?H=_rg1P$L2
zsLRT$$%Mtux#&7KbYLvMl&Mcg&kFc<cTX#Ob=!%+(q2C9os96xJ)So&EzodBNn9-_
zCMP{TJm>>{-F;1ZEERhO20IG!@{KRLVT|G62paY(Cft6jK5-+|sWSQL;!pOWS$H3E
zc}@MexVWA61A^C`&}{&?p`@rNs0zhf*yoplP5UZ&6wb33H?bO11ZI|q44!A8vQWue
zHl`<#$SlO+e6*=Fs{0)*Jtz3(o6@%+qEbU%k~d)jh6Z|-V^XV0t1a^uO5bjWC=r^I
zdZc`?YRu;3>i^-gK6}l#&7eAg9?42M^w!hOm}Th|`$Ko)pq_@hem?47su{_>jWdui
z9eovd7sL(l=|BnXvFONnZv0m(zzS6@#!Bwc|L^tHNf*dH1D_KlHh@+~u{95eCO*e!
z``l-Zz~4mxm@q~JrpLgJ`A-%8t<GD0^JgiRlr1JXiHXQO0O)D9002S*F@2}&`U-R+
zpb82nyctNS-X9dTH+VbOWhHRfcY+X3ObQALOlp1B<a|e6cO<7lr<Y}CQYyrP$&gnP
z0}bX9BCw~Yr?g#<VP1#-;YKYi9%zmWf9ZNI$=Ae~qn=d6_7*9XjJ%?I6$W>n<Y11n
z?GkX-uo>0utR1gXVKOSQMIE1P@Yihf7MnbnOu`S)m)(#3Be`j?-oqJ2p>X`HxuErM
z)|9jD!AT^plBl1ZzNOOg-;Vy;*I^~hRQeOMzpr|FjbF6OVEWK}t9bm^`^2|HwA4>H
zz-{q*XuLjvJ(8J^;gRBr79RK6<DojFow57b4;gMW(wY7I_ML2!ojB>@g4-P9Oztp-
z4r|_d``g#c4q2wZ*2eZUw0NNJ$d6NYCk;4_E?;Uu5`We#;5PtECa_^{Xox>P-L)h#
z0|ii+aCj~G{C*ivf*M1kncp|`1S{ZH26^5wYv1_&`|oCHE+kv=<$9Ip@K+NPlQ?<_
z(P!sgSottZa+24L5?K$bSbEI~IvnT%v^Q@)2LarPi3!kY$X36ds7Oh}(8%1&bBAA%
zNmC}Tcm*kx`00HJx{86=VwnpS*>9$|5c=OaXc3pN3@|VU5-|CmqLZK)>d8*vT#C)R
z`}z{%;K;0Bh&6OGy}4z7((E81b-sa@!YLSNX{DB|T}qMq<8P~H*mBX%EQ_wpJ!66@
znnhO|>AC4?u~c3XQTDo@iT47eUMaItYu733Uv0*_X;AL#sJdU?5!0)f+xtC*X}0L;
zqVm+BiTfqNP2rC1TFZOV9hHmwlF1)VSGw8T;@mhE4ou6;ZSw2~1}knQrhefe?)Ypb
zdNz4%s}-D`%;f(9OUxs%ONTX{Am(;WcdrF+x?m*mr#wd`Ftr^)^&GUISNmfx5SXAk
zV?EaHHjP{RT}b=N)V|$LcsMW>03J_#dLmZuBc`Tw%7T1<&wH;8BpTM+;e+TO2w&0p
zsr##p@!!KYsua9?mzV%gP|8~OOWE7EGHud@iJar|8~D{P+UI^!@JU6PtWc7sgEUPh
zUTID6v1~i%Vi==LLggQI`p!Rr{)Gs^4J89cEp_{w+a%LN!<q5fl3(sH>awP+n+^@O
zWKK(dyShvg7w$BAE!29=tX}gP^+|XA>rI*E42GSAm)i8@Gy1jS<vL|Cc74aUwo784
zvWqkHTTDpawem@+>b1Fh){2RCAy+Y9cbJ>}Rcqi?jGQuw&HS9?ZM;B^3n#nd=>x6o
z?>}N*m(0(+dhU>X1hy5xEbAIg7h}g$ifVKXob4<pN+ORMEt$7+_!`OJGOjFCn-ruR
zMci1}9vF3(#kS1Hp1#*bP&Ne*MTIpP=xvC8EW|@~FRw!obBmQ<9nQGdGYU%`FPEVb
z1E2a3{tEwP4|010zqq&hq<j|g!7PmY*K1H06YxpL^SsTlwEF8;OpH~;Cvcm{aLwak
zJFO5XG_fzHGhC(^X)7e)jg&(nQRYeOlQwRfY$IYUR(<DmQMXD#uuk#QjQg|UVf=JL
zQd_*+7Fm`R@ANP6tB)&diDp%uX;pSPT~9fR7f=`CDu!A;)a~DHt=;H9p#A8nPTiD7
z|Lmm6^lMksrEZQzY24GnzQHVJwlRCIA<mTf{jH?xz>Bix0^aUhr#;f~^|X?VKgM^2
z?%aRXslceK&5Yjb{QNxbwnDpsnXdoJ)aT}eM&Y!l!07>>mu?hXPy1duZ7mZin{3CO
za=a%|ysuIciq_0j(W1(@DzPFTMTx#r9H^*p%4sqwRU7pDITUc@q=ADw^7hHMFpA5+
zf1g1yFT-tExArN86DqWUk&%(nQS%xL<jf;lpbUEaP}bL<g=iiTfi>ma``AQH4PV=l
z=<_d#$;0WjPY&#eEC*bsCB6`Yi4KM%%RFjZTLx#-c%t?x4;EM9ocr_mTG`h4w-dU7
z$3tyYE%teiPww8iLG9R{((yX?*}GGZrVV78ldA9;`Sj;rdVexvF9P>{_Vfn@7;GJ*
zTJ_8{jkFFwz4GOJJLE&RaQY*YP}2X(INzHok!o1LR`)~TpWt|c?8KaBE`7_n29|f8
zSn^z+_B_;gHDt;!&cD*iXxaS05|%}HX`*dvb+^_%iWfswi4yykivrU?b6eLC;<#PL
z*^atP*M_C*OnO5h)u4r&ZpF?)o;8ItD*=nzwM_#phhYf~^>6HqtX{bx>voAYy7~3P
zrbnSoz5(;UNzsDk3#Hrc12>Z{LmANq0AGWZ*@OflNy#pl%7eJaD<~)kPGq2^s%Z(6
zixl{ZJuLt^hK}qyLfnQl<QN)u0e*g@6ck@SXce`cY3@Ds@Yn|~JZR0+6o<O^%$K02
zhRn}><nA7t&ZL}|*qJX*s(bP0?lb$CXZXvxgq;E2JCUv(s}Gmk{QMM~?*38FLC)#<
z`p87sdbo>}FKpa~!Lh&Bki5b_+p;KIww2w+saTcG6JK89RcFU{?ZElt%B(`L9x2XV
zGA=G>z$U43sG%h3YrCob_28hY`eD*bH?h-;qKn+Xyc4vLIo_Z3r4#k>FWQIL2Sn3W
zt?MXFX%|f!{v5M1|G|N@yN{4<UHt*J8k*0Rq7Pl=i4#+T&_cxSj5{r;UeeJozp=LI
z3JH+~13ZUY_b0+nonPU5;RS;KRb<?F5UFL>K3;B>AauA7;o<l{c@jJd<@s{f4^+j8
zncVYObUj=_X_WRC@0@NEN$gI4t)F~@>lpfKBg;K^!~j(!Z>Z)F_v4!O6Q`!Tk;F@C
zcGf}qiaTFk5p}u8-5@3WSeNs8c~ZV(|De&WiPnJAl363}sad~bAFB15_J=RQ4^u0z
z*A8+ek<y61VwuNFWu}H+d>o__A>}_g39PC4#S!{OPlP%A#70DqBeB@$=0k(bou6}?
za{b?i&M1U)cGA-4Z{H95spyi2;W-*b@*0co)>WhBI|8e(=9PK~rOCY7Ocs73giAN%
z?F@W69MckW=LG;EFMc^}5E6-OQ8N;-R;CkfzP{}D(2vD@KGb<LGPHJI{9}D1o?XIU
z4$huJH6dxjVBE`3ibb@9PM>5R^1tqVOx|WGmSkBZD*JBG#eJf=*Eh93=sA%psgfq?
zL#>A#);7v5)PD#9lg8XdhYUp+*%t09jf;;KJn@uyS|QH<<r_(bd*Taj+MKRIB1Sdk
zeJ*>}`$E0a&mMYG!<1EAbTlV7w<|8{LVBZ;(YzAo%ioNQpAG(6{As7W!~O2Hu-QGf
z4|9#C6JG;c-SaEzJizqG{<Ug)_$0u=Q&Uq<4%SVtC&9HFIzrdLnES5N%I#|zQBx(t
zvcd63Gz+UBdd^D5ifWBOw9#$Ykc(C1R+`F>yxfH3Ffx}G54{(wYShK#MJayd=h$8}
z1FZMlJl9&bzfZ20bmfS6_QUK*IX@y7vY4m)ZJn$YRpjvYm@v*&@D5vk?r_x};knYG
z?EGA`Th}3oOhU8xlnM|fN>!D-*=>=k$Jw|rAQeyILmB*ldiZ=lbH8q@ZsM(W_M84;
zqu~l{KFY;P@2#kMkLhrZ-H`T8wbtXR+6E);KHmS{roQh$oPQOp!oHN%*EBc@CpF%D
zkeSM5e4zCBNup8Jcfb3r!dk2k(^bQZ%9g*nU0L;i(f<*Ha=AufcD8XbyJXs~wD7*J
zsLU)RS)p-zE*k-%|A<ZIrNqPVj7K8-0R+pp<>fTq<T-20`Do-Dzk2K16Q9xlp<fzx
z5af+HOv@f}KAh%q{>(irFM@AaCA7&No+DwIqssKt<zdDA#XOaZ2_@VdUT(ApS~NnB
zVEpu>(&Ib0T*@+cOL=IgX}r1YBMG;8C`pU)8QvBRn`4MOWWKF>b9r#8muV;E?M<+~
zwYAc7K>OMHpPRge><zLNvX4a<S5Z_}j0`(pk>d%$Hc6PmFNsS;v*oA3QLdh72>p3B
z(Ea83k=u+_?N|eE<xR;FxS|lpTM@FMv>)^TB0tV-Fb=l;!5-D#HQT(lai29>NoL&f
z=Sd`r$)^Dr<Y2P&%fa2n3AB3e;$DlBN;gbCGgT$jOef;81_T93Q0u!)x8hA-IF#3H
zw6pt565qi6w%@`Ctzm~x{pB%N4VH|3nV@mZi(1Xp;^J2ytoSlw8S<-5+8Q2>5^6`P
z@;q!7d15vob~5z&M@%U4^Q#<b?EFEK0D7jy_9q90@%N*0wcrV4`NuJrmyd*nrOfVZ
z;Kh+(=dcI2Ad8QVW(n;iD$v({eYA0`y{xWf={@}iJ$2fNZpOJizPu~Ux-yjP{X<pv
zqznOP-MCdu30wZH5xeAZs|c)!XYSqByVDM0Ll%4uzA6SFez&<uwP4<F!P|7hfZtee
zJvH%h2wk>eYHW1hkS(uJmGSk?^;I>f4aJfeq!X~fu#Y6KBju2xaF2u7;A0mrO%yi!
zxOXucPYRBuYYhVlk7G~E4Za!FfB3Te5^E1Ns>k9{^am>f931e|xv7q$+Q+E051nT`
zJiPZx<M+|@aOaNsGh*NMEZiTT5eix^t3N5J?%E^x(*Z^&Cvs|obzJJ0s)c!MPEfb2
z`F$}OARr$-&=X5o#jj=|P)l+!r=X!Tv3N}DY!zE%LAN~5*i;ktG<3mA1jZK;>v&Qw
zPeRkg#D$lVi#&SHg$ImP-o6Fn6^2qNJI1}2hd0hStnReSai-(-DHdyke(bc<w;RvA
zy}UxJ=@cx&!W3*?f6+EFDN7N%*YN7LRO~*Tv_7^7TbX>woMyinzS6!PCx4~;5~BJ9
ze57Zx=ARE;M*gc~WR#hb0%Q>DM(Ig@HpVa+<Xjl8h`~?L^P(#Yi7MN!lZnDn0-si?
zfP9SvXErG!C#aVcn|jziT4+%~R2T;b2c>rUyu$>jyNjkv3ZQPy_1kZ`Ma6}zkcqDN
zRa6PH17oS_b93WAi|3s8DrMq}8A`d^wMO+b-%yt#J&A8F`|^b{$|d%xKg<Vx8-%0{
zu@^@Orure_iinN%_Vsn!bj}8V3}EU!KS;YkOcN#@<(O*IG>-%m8fUd<bth2V{X33g
zu%<A>8`1`CzyfY~WJJPq9nYi{*dmqgrQ9qvNcQ$=uNc`=mZTq;wWU99X<$p6orGZv
zqatl1R+x;E<H)DX*B|&~JlMw7qG<e+G<e;~Fw8p6e&lt=j}g0>_gbux;ibB-O}JyR
zkM{OXe7qlroi-UA+JSBgEp3bn@;~LKSe^_>IwHzN2<+q?V_?z*?v5lRBsv^qnGRtX
zS6lek0wxqQV$F<s%PSsE@8-XLy~zV3D_#CaTcD)bwBBqPUBTovCfZ|e;Lx11qN1Ww
zO-81#tG`tq^W#AZS+Rfea&LlmW<nB|tT9z)kR-O__Ie$De<G>U^jjk><RuGb{b!zc
zW+O|DZt4}Spt;=Gh-jtq>J=2_(l9WXuu7>BcdT`1l~*s%CgXX;krJX;sn>$?sEY5+
zWtI3}aGbl#gYwVvU^2yHrlO%K*WsWE(6bIpl*wm<by-z~G2X|ExAj~mc(Epa>+_BZ
zS`}FL#>iX4feol7XEnN`;XQn2>6X^!o}1@R#QjQY<TC}6o8{$i%Q>AmIGynXFx*-E
zUi?)2Y$HHZ*`D!}ORpULklT^$3N7P-RzqI1%U{)ZpUNLGYmBKXDiJ?*t!84xvN<IU
z-)E!0uM}QXjK<Bv!iPh^*6j9)BTYGlBdotiX**BPS$gYjXv<>~_8@%*E4YFZR9USl
z@C=du%P-x@zeUQ=;CHtFBPIqf79X(C`rs0!B`c|#U@ekc7`k0~_f%PlbTLBmOG+?8
z>7IH+hIw@4ntv4Ut6(u5lBhUNlvOyBv3tItkrx~K4vp*SmtPI_41H40Fc9C9>#924
z7@pjOecSTl^}HFIB2QF_lUO_3LWyG0?&8?1F=Bb#>xr26$2X0P7+flD(SFerLwrLx
zza|>?>iR#C#;r~{d0SX8Xp2KR24wqNTU__^-u%&&yfqkB(xl?D=)y@a9Q_WNvG2A~
zRD>5<bA$)JI_B91ND=1}1;UP0AU9~z&O>8K`SdMb^Sga#D(L0*+}Ql~EjSqkv7dfZ
z@bBQf0wg)PzP`R0DWM)22m5~c+qZJQq0e$t9iHPV@z`A8pvW=d9p0b~iIK(J&`)si
zzVYHTl``5z2ns0)08y{D%B%b1Z^r-omLuwpj&I}(Ye%9SSu)Vil}J^~vZ7AgzK!`~
zhAu_*`WGe(nRq)~A5|HD{m^IQng(+N{pyksG2ziL2F+}a7k&gdoW@)4o{>k>)w{JA
z3Rg}B1F-~9Blq{+(+`l{b!85FOsKbjXpeHF;FQWLpx-I%Ua`ma^d0>4i7!KSgk|=T
zpzT%;I&MW{G-8N0G;YCX&Djeh`|}v1P)ct@UFX|3<KH^4?#7~5GQ~thI4n-uZTHBa
z`W*iOCIh@J&_lzKXxjLQak(H0yZAk6p_QOEGGP0l^mt*P)_H8fimwF&{p`C}H@_YS
zV9w=^x0l@)GA2tk>}_m>MMNIV?ZPtY{lh=dF6P9`i+Agh8WxYkFG972@4^I68~1$B
z$qii7wzixyRA-zf3GY@$cHzG!fE%zh$X7Ui3JtV~ho8p>7<3HER^JvBSV1ogoI~~x
z4sZzw;^O1o{8or`V19GX<#>M|g)s$WKuDA;^*}0FT2rwKmP+sh3YETz30|7RkYm{G
zmL^je=IL}@X#C~{O%Y1fh2T|TO)Y3}e-H%bBQ6fk3KBeLCRh(PHa4%td<o=8Mi1~`
zXMNxu1~78A(ztZmNxI<gw)yqM_7U(SGey0(03if@v=3GQ9()FMc)}j&M4g@|eiB6g
z)8o_zilow6NTsNV>@t&XOrqXyBva7U2zqxkf#eR<#oA|MvV_4=bwY9OKR%_voL(Il
zXNoeg(`994fdU0;5G&gsqA6(J)q#2M4wTKXMXNiGjbIPJy};$zI^3MBt*s>@HDMDG
zX^B<g<f@q$1y@W30|QER%>N>;)_o8S%9nj9sBFPF=8)a2fbXHhMhespO;>Oq12p3T
zS3ukb%LW*tP=95KdOHDkxF(ri`taA>JxJV#)9(WL64QIyY=*-sc-n`G*8)i$4e{m;
zXbcaR5nau(F;=#FIX}16EKYWJ(?PyBB&07}0Z(ok2wi8uD)EN;RV9swJQ`ij7)Yf+
zgNFMZaI}?@oz1<BLSpRt@p$^H4O`#<V%vwb%p!&HLop22w|3ZS`I`LEt#H~S2&Ucr
zK%Oyp_z-o^%flloJ|2v{83%+xAnD?-XJ*YAKe++o_aT!fA8{D`8*acwo;+wHn1yg*
zP9E&MI(JUBg*j{)85uBq9^h(-Ni5j}q8pe~wgEcyIn6w9PH+;3khsw_&lS+OvZ5m9
z*QAJd+}sUnRaR3&e-OqzW$f0W3yyIsD@X;OK76o+C$hY}%+LjJ2(W^{1_x<*r9#ko
z7z=hCF4n>Bt~=Mi`NS`S${B#-eYR&tK7K5%z1^t!$}a~-w^2pVm2o>o#l+fLTbcUy
z@>;<>y~mU_SwvLSgO-Ahj$6IksS5vjCWW}%7oR78k7f%C3fx8ii4!bS@NBGs=Qmwq
zg)W2hhSSSMFzXv<-4_B59M>~E9(N@3Si$*{Rwj2sJ>&Hep|9^FgJ5;1rv@<(LOmsD
zX(zfoPKDUqh#)8wUQkwP+*DBcm)cv;`XyGPA!ftkPSux(QfcAB4g1r3M2!FZ+zAs*
zx?^A56(YZV`?jVau+UkPBTF0;yc{liQ^|GR$(qS&;ifgW78VxD7dnoteULD4rEoBo
zlb1g~KmT6z&)yS*2xAKnCXC&H%)zJ8(X?6Q{kTi9_apXWU#;9|_vEH@<-e4qWw-=2
zSQ(NR=~`G=czN-gkm7R1bb|;Uc!A!x>_z+c@i_Vb$n-ipJ4M;H@Uv5|6pi9*xIF6E
zevsAx)mcrWUF?aM1#HZbSPLt+TtnU#F6)VZpMJm{CjZxf#)@GeUM7DR?8ZGkLsZ0s
zh53D$NpUL()Z^(TGC%P0{BzAmE5g8RafD5Zuvf|EEQsUu^*tFFQ0$!<Et=ef3hT(f
z1MXplsv?K<`!VDRja{-xUj8ji96SOk-n)1qXjG!%3DP=XQ2EXXAJdgFthU>!&1Jp;
zo1PjG@u0H7))dk%RCnxed6<{VFZk$`lSH?yKB|m{iBy4PVV^+6z~UV$^@3|Od<vy%
z-;tV;krCXJtXQ)E4a<L*SV+rH2BkWfKN6-h(!BMZ*`Xd#AsRf4|2{yh4(~P!xxw!o
zKtvwR)uI0zmUs;;EHh&v(g?PFAo*wS2!JX`CjTao5@IFxstl|@qTo)x22N__^Xn^N
zI>Zj0{1v2b1Oso-fL4zpM*&ThHf9zUgtQK#E|yAKL(D!A6T{*9zqK`j`albUpHpw7
zUqnqldrUGCV#UE*;Z_8oI~f0h!s6erGmpir^qrmy;+RA<Id`ky9@GEgnD{8DG0lpI
zh^UPj2p`pSJAHk6IIaNW&j0&Pu)l8S_<aX-QB9b*)J(QJd2xXU%xO{n7p$0-K(>8i
zWTdjz-ZD50o&29Cn@$6H5NKFtl?=OY39yAdCi&-kg*fK5_DUGwqn%j1GeykihlYlN
zI`Mzuz;9Qa&|}1gFC{GvBuF-n{Ds$D@^T}xeABhOdGQJxfO4KU?bH+25R6W~UJ^qi
zggAKm{+GKCqzw<Nf}wh>{G=0w03{x51xOTXYHAu9rd$N0m2pE8-xDOL@vGg!Mt8!#
zU+EKsQg6V;HPnmjjM~X0fFa!z35oIK<PByD+UB-4>)^06n!cBWUB>a~h)WU`WRQav
z8JrPfAXU-NQO|0^1Eb-boRHAqsKc-=PFQbWA1c9`hsXf?_Z<n{*w)a$Wh}Imu5ck^
z?(PqS_1@_4@bG{j1+)=id7uUUJ<=CXBSJhfZZx&YO3k4SuhykDU$CRUm`@nA$t(NS
zRw%V4u=;~kP)e((GXJU)SUA8t4!r(*0{j<8wN(XJzMBd+Z=)c-p%F?{0gRFV`SxwR
ztUi->5QgiRI60kHx`U}><!P6kTP|cg@Sn-JP=!DC_J(AWgNJ7sT5kV~?nXpJH^Hl_
z(w*_<&0L6nzZaSa-@i`A50jCe4?eF=__<B^i1<2-F3)rP@C?`x5CTqLDKZ;XHVQnX
zgs?mWhjw;$wz22=zX5H8Ky4CYc%C0*0r^g-6b*kg>_RLlA3qYy{Gz_le6-7A<QQ>(
zPIRTbmLOXl(;Ucb;G*V=sgGO?t4KZ%_66vm+yutGIu0U~@{2L3Q9F<4IeIoq83m7N
zl~0$|<GdomVn`m;dH67doTR{F{Dt)QR(1BfNypDjzcVoKZ7^J+$>3C>=bD+Bxies(
zq&eH-n!znI1tFOO^}l_HH7Rcc@e+2on!5U<FlU%CQ2egQOcE<!IPH{pNL*>QCs-j=
zkh4ruobK>mT8`F}RHNNERjZceq;Ux7519DWXqeDu0{=fMQ7_os3Lnf7%vX2AI-AIi
zI{Q(2_Y63=9Sn<_oBcpwZ6!S;gWW%1yRxa<7E-%{A!wZR{D8BZ%#_ExQye-`V9f$U
z{JJijm#a6gk=%eJLEiBU9{9>WtoA4#Xwjml0T%}bmLmBc&o?-(_^os!k1s$Qo`464
z>KPlLU&`qI1X$#U{t_PSckUo4@;!GYBuo#FmjiZ!hd`i9E)7nk7emo^I@zMMBJRBh
z1%z+MZST8|=bcwvms-6GhQMA7jR#S>KS%=~hoB)C<*YVs3pZh4fzL2>Uwr4Bw&4m=
zP%Cv7Jt*TpfJV52@<c~hH_YTc7nIQH8~EyP(rf`Wt4gzVcYI}QXlPi_grLxxF!UA-
zK?m9F&d`e8x72N0D&`^ldb}hpFA>jm)ef!@E-6DF5MD60p}I7>GsJ*~g-Ode>~DCy
z<oh*}$GFi2nZob&qikDuU!h?>Mf`DeZEO>U55Ma1CT`F&x;}7&e5f+bHsKE25JPDK
z?i$@EzJU>cLyXedAwEA2__3S}_}3^|^Chs23UC*(n!7!}Byfc=lXOT=Eb$Jl{H_`0
z8;F3P$w22xcwB(n9<qXxf$L`5!Bzitk7C)uJy_v^SFplHxFJUI`y)dP!k^rAc%PVF
z*=mYT5Am_}$hqxi2I0Q)X!=|Sg>}d(JSsUiU_lW#cdKx;b`Rn5K)@!stru;GQGLl>
z_X}Jx%F}G2>CkGJDlN_IAA*8o0&*75#?f)^!kbn^8VbUcjeBT;#$ltwIFtL?_vkxY
zwsVl7{;qfF4aHvZ14fd+VWY>7PjHhaRPM~#Qw^{W@bSyMj3Q>c1eKgjhLp?)E|IJi
zE1YFanI%-=VD9YEVv?^3c9ekX=#?jude-FEBF7Dkp(0%sYqPTn+OXk<IfCaN&x?SX
zc^+WrZ6MLN0sj(GLcjU<=Fs^sC@lPavKji3z@*#smr0mC4`_WYtNNKeaO>>sTp0m5
zXs^d!UT750pFbZ*r#EaC^<RAO5%^hHRP>L>p)X6Oez><sY`P+|f}$Z==lmj*0z%KO
ze^BAZ2n5mgxoWdu^B!~*wCiJEQ%Fp!6E;S`f@RrM_UYCGdNaWYacX}Gx*pV5s{kAo
z;1(gh-uU^`{`u?*6Sb}M?;<!-+-q~GBmYoO7<vWk)0r?(eF)2SC!(hI@8ha(a>eL*
zfx9>bPcM<ULz+2XyLObXnOOKP14H-yeVE6ZwWlg7?bxIsebQX8fih?e%P=9!HlwuE
z9@b|7=?=9F79pXVMe3Xa{r8x<;j5}1)Ts#I#WaoZHJfyBp;BCMg_O^>IS){{2ivsY
zA7T)4yGVuA5z#*G(C~bSAt{02I8nh+Z%6upq1|;}0ax3Ru}?jhtRUF~w**62*M2A;
znpB7RE(ZGEjScxNaD|8tU&%F#4e(tw;c4fYrRFnz4>z=v{7Pz@@fY!%Aq$R*sXb}}
z+(VB}Q(*!4HCv{dUZ+Z{z8~mg2j{`vM`pRUvlKD2_8ID>_3`5VL%*UUvTUgw2==%`
z%4Gw@SXoPAb)GcM$o_u(oWA{y=7A@4GeKPzV*G_K8RCRW_mPHb<Ke@HV0`QQR|CS3
zDexIo?sPCa-LJhzX!CVM&$fr1fk&F<>w`h$t*-X=rx5O%G5-P9peQWJ(M2atwVkan
zyp=Wtxi+NZzs0^}x?}S%-&VJ#2)LOT-Rw%BCB#|o>O%&3#6NjVNj}3poFiITlMWSN
zAO^*tu$UNdbzV&DA09U3HjEK<OFERm@IJ^MS!RydHEa>xXCcAf5QO@q)&QiLK0a1-
z?3rzJOr!Z<%7m}0@87W;C?jFHEsuh)qpkhIE*oO$Z@_H6c0OaMk+M62RA<@mJNMKy
zY+xbRd5CK0nU2uI1{bp>NPr=D5k%prnb1fEikmD!z75w2)h;ml&mxF#t#EKV(b50!
z)3^x+=mH+<4p5S9$&>uP1vqM@UirAg*yoTYfjso9QE0uu9FAHh{~I`gfcywUJ2%)$
zfeiD`NCNDKHBI3J^!4`s4UX&Zt(KOSPJm-Ji%&qXE?k9QLh`?(n;H#^I!xxS&#y1r
z&y5;g47Id~**M@7Pft&WUHh2ZNp@XPixk0a0CQr12;q)3JSFjtWK_W)zzG?&iHePV
z27Uu(Pky9;EX8n^P`oAOf5~r8gSDnT8CItMWX`bNy@-6o)FSWJ)SHK>AJKk?*cvuM
zb_F?8=oF;C;Ae#$$56xoG7GbIwziPQK`BE>&5y;e2QbrnWYTn~T|jR%%klrxM6nl^
z>Cj6Ne6q(tt&In;t|OFfp`=*vV3rZqA7$v&?zcV|<4_{<VJKaZfs=N35=b<)kQ@N_
z9FJbS+0}{5WsnZBL@8B6r0l34Z3Nyfp~5o0X#jFMkedOqGdU(E2IL{&D~SjT2l=7=
z{;|2a2`H96atAoek%Y<YLAN(#D^v3M6#^D$)B6XRLA>P&8rM*3TN~nFB#B%@m_mbF
z6wph6;q()DPGn^0`?%sDvj%8LE{uJ}e6T{6J_dJIsGyM-dVr9Es6krp<`uNJx97mY
zNu<G0@0TM)9Sd_Z%t{kBeECm|V15(kIvc+rrLjLO39_bX7!Uei5-mSgu=K#;!oH|D
z0hdJMxPS3Fx8oov`upj^DV^`f$F%N;%jH2>99BKcHBEB0C(P8=R{Z@ABnLuw#~ljT
z-7?wbt)r=}cgWt$Br;j#EAG${RDHczR9iGb(z=1WAwKwWv{gu~?Vgxe*G|J%USsoB
zrSw%jHc>f60QcZ^)Xqzb&IN@eyxz_fU!3E1Q1D7rtcEMZi~0N8aLVEsfNCJ(HTnWc
z2(;n+jW!=GU!u7uxX|HG&&+`H+{5mIe_#IcQ-unIsHh>s!^25QB((-y$%EYzCOm0{
zWcgJJAG9M9%2SLgQ<aNXI2QR~y0r^@kbf$bWU70V{`Ur&ac2}ais0Af<LU9olr%J|
zr=prMejJ>g8xb=z^+mL{(Jph!tW%|<wwS1=-XKA)Bm$F1#_rEh2ux3>G>;bq{d-vt
zj#LMYIB6q3e4n2;;?)EDqF6m)hB!(uOd?~37Wvl-jhW<FX!7#%{YJ=@1CrN;7Z3mM
zLgP)Zt1!zGLyZI^sx{ey3{~&E(&kLjV@A3c9X<48-%or$%`4<xZ~Om!)-+CpT)91~
zh*y#r*?+J9yQQT?_I<c)|MyS5qTB7{@hHHi{QrOOB`F<K(f_{vg9pgbQUAQ&daG2D
zjbQ%Ym(wAwDf{m=-&}Uv_n+r>yYl?pA0j9z&frz2oYOn%pL??d0}&$Z$%E9?)Q3k$
z=qSOD@W9YS^4n#HVAhT356$RR-}n6Z`);Oqo!}JxcO}zCUI*(VFn0;UgfPSeN*sWr
zz6=j1$%6Cw03lDMrw8fT@Z@B2s3c4}LT(J%UngXTbw5l@O_v}uzGL2LqN{8B=+QE4
zMnKNs<N2D{*w}=<HZ-lQn6QTD=S4w30!Fm>f8I>lK;!!F!YWmuW&&!BqLLD$90(Gh
z?0mh33F(-dlJxfQ9*~M4%LC`uxXuQ<g&9;gg;|KOkZh1D=I7@@a$;wxjpCY_hVT}K
z)B=c7tNFjJtFI^i2B_ff4U`q~W?Flgwp2X0PK-FVkjUGh{b#+uz0LSW=X_E_vbdxK
zpe0vek!1<GQVTsY@%BCf{zyVrmI_xBEU%Q5X~^&ZCmGNU;z(4qv9OT(bq+urP|0ka
zoN!PU>THKD&kn+57zw28PIdD&8RmhuqoFYh1F0)M&0z*y2z(pZmm8dU{z(NA|86J^
z88{1oP|eE93UqjET--h?3r&zk_V@RP-Wl-eRm3jQ3Q+K}L8PodhAP%d^NkLmpAR`w
zKxfSW{AF`;%oG)|3M8JMy2I{taBz71`0hs3=+Cap{UM<2H^WHK%S9$Z!5P>Xo#-6@
z-RRL*uwr1-f?SKKiOB#Jbb*|mx1mIb4a-WIHG*Lc{?cA>ihu&!@RJoCQ&T#beZO`v
zEJ>K#3l9&6ArO+t&_llzXIncva!N|YD!A44wY5Fm-DZbmm%fRC?-lOj<8Hv#C&dZd
zsv6+-y5^Hj9+nG`s1&9p&?uh~^ileEac?PM*^z|b&?6#Gd>yO>u;l*kE)h;xD<iT2
z+?TXF=JX(8`R9q1Cb5#NEUM=O)T3}V^!B2BjG#h(rOZ+xa7JbiWB9>dOo<VlFBJAk
zt^=6;#DK;MVahMw&(Ny2xv^1?BjwW%kM#%1`jHbdS4n3+F_c)hkckW!h=P`m-pM?!
zo7&oBqWE`%zAc@+wsdf4etNbqwCoqMlK6->eH5H~Lc_xD3X<4c2t!s3#G&xqR-fNd
z)~|E<9VbAK*22Va{)z*{B)jK8XgBB)%ox^mB2ZE1>W-NWa-H}!{QJ#LPEPP}`R?88
z(G5)qn)S<PLxt#5Qc_}4iKU;|71}UBN7Zemm~F`gtx~=|^BU@i%J%lxUg5;Ybxlpa
zK0b}LwNLh!McFJMdDYUA5Xf+x9tZ{clZ2?~IgrStSWJcVPuZb`36B?sCjdQO|JSwz
zb=d0CE+Z>TBZKb;fbp<ndDz$};UNPKZfWBElKM?fO}CU^)|)qPN{m3(74<Eaq(HPY
z-UH%<R*IjAe^mMMDgtsM@uzgb11_h{{Tqr50*M_NiTyW>P2b}*Xj@xb104b@21_{v
zn@x4t$-#k=-+@S_%>pqe+TY)AqnJqf89Fr})B7A|LjYpAfaz#}M`mFs!8chLA5S#7
zA9(3^xzzr|6J#|sA<P^=uN=*LQ}k1Te^PH&ZyN@GNXi}wG}$(vp2v^PY~)dOe)FiT
zsBm$0eGEo|4PdYi6=u+Gj##&h*}eJ&tOmhPo$_reFAP$Q?q<Kl>)1--x<?r2?Yo<E
zD4{Jxk2uye9u(Ov*IIuBwI>w6?+0fB0s=7DV2gy?*gZV#0!1@OC5ZU`q5UjGy@-vE
z?>bvW7YN-89Uw#^3h09tyAf)>A)J(_AQ%W&rQw{CkPtKgNy+ll12qGa%xlEs*YV49
z1+*7-=n6&*`hgnj1o7l`Iu7OLcNFF+=P(i!_vgJl+PPkivQCNPr>_%q_^de6hCW!`
zy@C+#t~wSa&9rX1b$qdTRX?7^`f%Ax!O8ntX#>Y?_WgS~1|s){-rFy$DX!n&jy*VB
z&4<I(e-U~;G=eUaPV1nC+=I5Ew^M^sgPz9*ZgD_G0rAWm-AwN!xFFO5O60%yf#M||
z6~Yze4hS)Ua67aNs9{KVSXo*cnZpOTh#<5A5TFONIgH<J%~qScySr}><G1Mf`9;dT
z=qfr18=hq)f2-z;)7_2}Cez*wI9)gSm7|S~96`77aMVk3q&RkZ?#uUBA5i6x%a|O3
zQP(PAr*?EmB&^OMb3LV0q`xY7zj|jgPX-5BRCSY4Of{cQ)~<<olc1V!V&s`zG~Y`V
z>La(!<AA%_32P;)qs+)+udKC8sA{Zd8dvTpgMdA%J59U-IqMisA{?DtUC}z9Z?LK&
z<Q#yxV><*kxn9nGQ<r7M<BRyXxGL)EGZN<d`iS|mg(kNym@<asKP;PokgyB%ieRh*
zap)L8771u-?>mG(K*l_T);kIh9(?HUH|q-Q&_&jBb>&XKB`GP%$%*@1MOhh8bBpwd
zIT<U<Rf`ZVZf<D|Km#q5jg5`(-K#IfHNO7-$3{Vs!7W5j(c00GT|LQ?Qzqf*{hL0i
z>E7XJUI7N_y|NYJcemwQOK80w#0YOnNH?&d7D*Pjw_jraoVG^hdX)l+u2W@#j7;^+
z%*<)@6p4q^VNPcDYX8%y5pkh3l|{RT-SeyttwP>bAtto&S=5yWj8Y`-LB>e6$X#q3
z_wV12_aVI*hNp`ff3i4{RZ<QBRu18^n>h$~9Bt`76&|g8EK?jxeQfz#PE{3e>(5V-
zubMOvXgU(_AicfKHDSk^n$l1;NHx{bx<sj(E$J|p2O``B8+=ECRUM#IsH}{$DujF2
zz|fEp<9jo5Kh0@alo7O(kb<}q6+?w1H=k|wh6JN%9o%MSUeSVXmZgJYH5ru$Bc_cK
zoppYKKCf&}P7WO)ZHq1S)zxl=Dae(%Z<W5{q=Uky!R)semsPue2Cf#1ZWcMt>J(D#
zg%%8SlUlON5y)8&#2_I}RvxT9{2Re(Li+5BWYJAw6c;aFUxmy>BReCqzMSj7t`esj
zg!g|bpI7ZB4YV=hy&NU+kpPreKwuh1n)&$;wPKmcNmJ8oA9?xeaOjM#<~%TwF!V@u
z`?*5jFHh*NWNZ8E^T^IqQ)g1;&z_%(_Rne1?}&3*6tiY~lGClbqmSB`JQn#hrRr(k
z6-Qc=Q>FR5w>dQ}&EC!qh1i`HR4DTDknB(rruf@I5gH~Ln_L(AgD95sva?NLjq2%<
zUqu>GpL!pxt4)0Y=wpq%v9ZyijjyR2`Oga<KGlgywLpN{ApU@w3U~(ZhT7bDkbvw?
zG>1~iJ{9F|5905_F?f!Ncggb%02GB-D$@v&5%?;+@~%Td&k9?n&_Z^P2W7ODK6BWS
zYZlhBuj`wBnV=h(_|5;M7xhIvMU5skLPVldo_O{MyT6&h*_b7$on|5cd(Fe$y*uOe
z>(|h=hr{kTacXKs#PeZiahOh(AN}LtkGdJJwpXp6?5YHHlrXJPDzH9R7qfnaV^$n>
zU89eUcAiRZ(zxuI>3A-lTK0OhK*czxQ3^FUI2gLq^L4f=aL|__;*S&yOay)(f9n`O
z3zRpYX{uuQDt4(WDh@y^mpD?9Stb;Lr+NIqIjw-TiG|v_wb*h1^(lz$D?s5vgyk->
z<@)|Bq=2O<?wSlSt5CaVq^C!eGD+|NHV-2%%gf7tg3RxShw(I2`Ul(xK~cbMu~}N1
zj)*A8f`x^}(a{lV3CK8LqD8SeK7JIc)V|(cER*||vS+7d+jEZd61~j>Q!=DpCG}fW
z0|H4nC_`-L-CU&pk#hTGnY|nW#>FTx_v3Z1yHuLbMLyqE+t>Z|JZmAdC;jKWNlgm_
zCuMyNbCAUY%mYfE7)W|xf}lg{U}1jV9}qt@V$HcEC2G~Ls6luZ4PYW2%8Y>kBASnT
z!*Fv0&)E&oernN-X51@<Q6;Y5n$%XZ&NtbTU%d)72Dx<Tio#Gz?B43G%}~x3Fbp8b
zVUh&1?{!1Q85kG{%>`_z#RUb#=snhlGrm5*&c;g)&L!tI3cZwWOc<fPb?a6lzm&1E
z@+Sb2)pNu}U@!$OU_XxkO%AQax8D$bP|C-{0WZXiIXHW|G`Q}nGAyc*>Z6O2NeAUv
zk$KwZCy2W4oC2VPNx;D2DL(!AnGPv5Hg*J-eZcWArNFRhEPQ;H`j%@xEt5Ym_XKH@
zlo1+(`yenFo<bJ7wr0bNnb8=mnEvK9RtwDOL0R#g97$ko8e~!-3p-!CVXUQ9>paUd
zW(oT2^rKT#r15tF>rO~WAYc5{7Y^x~prqu@G^8vLAXml^0>}9UX915jMI>?(EC*CO
z1i}TJL(q}W;<bDM&G+Qm7_|Tmi<`)u15b$#o@vE%u?LiCiQCDLv6FFCiV-fEM?S>p
z??BqC?w_F2a9Icn3l$L)E4-_vtqmILx5hpJ>n!w<jm>+%+=(Tfh-sV9BkWtG+qu@Q
zt@n1u{vhA^-q&vqXXbMzGRUQE3Ro)H-atWj754NUlX@gIHw{Uo97r?C-6C%c5dnR~
zCPeBT_Hzv{$Qp(ZZLXB+N0xky@+ZP0r@hgxnbE%^X4^(zi^v8cDZwC{2Lx*4oZhUQ
zoVaqx%oD3XHn;<ZXIE0>Es0PQNMDiD(Lt2{Tvo>R<&9dF;8OEr>z)_r!#uO`x@yEY
z&8RDF{zuT1<y@|Yw6lKsz*6dQC5#_2cNcxvO?nr4A~0h^jLObyW9_D(pkOydR|8^d
zB4f1GG{i~WdBk=UbalzvG#FemX^N7((WeJeOi*C}L1e&Q>e6iY9g}C)fZsjhZTkBU
zsQfQ{FTL)(wsN#L9P|#gPjz~5nUpw-@h$Az(#oKBembK5-7;69$RAiADGMGac$qOK
zuxt}9e~X|`=?g{wpDiOy(`qelLV=YM2XUb`9sGFYTSw;di&oawz&J^RG|bQ9J}5E>
zIZhN^_}qb_;4i>7Kqd3r4+;tb6iBF;QyvR-c>m-?5>^c4#yy;XgTvN`6Mt*6bkzEH
zJ#q`mdW5kL>!iE$>mF%&c?{lhSYgaa6%F<E&WA66veNwgI&h3^|0Wy8A7(`)V$O=v
zQUzK9qMx{2zgPAFO5FXFkPL1(0)N7Uxw*L3M{@}mK|Eyz!kF|=2rjUm32<>CY5oE=
z=1i4obTaV1JAt?jDh<o)$kE=uTldeH2lS;Wles=Z;hvI`Qe+=L$C7oplX&@Ki7W$S
zfUDQ0G0=rPhng6~Q4D_%o(?i_N)FN|oDLnb@ZCxet%x+|Atl&P;Zq^=3SfORUxj5Z
z<Y5$@RIGjVOt~%i!rb1gZ`B~akF^c2M&RBb@4qn)_AfVcv>fk@TYq)EH`ZQS;AG-x
zZ*L#+z~Xw0RN-BW5ykNYSZ2VG8U&KE*et!HvM4~}aMK-Tq*=IX0VxI2)BreP7NYk<
zgLoDwKGbKs%;F04eap+8ra%CKU=-|;ISt`iuhJ;2sK*RAPuw8B2VEhx+(ySoNMev}
zz9@HBKtj&B?mU6I32O7qe|58QDq3KgP~qk?w1>C@eovq2=j8$^jW~K3Z;;qLi5Y3w
zIYSQ)Na*X@ixThMSUz&=`Wrs=?eB}1h;DRyyErtEcQu`yIBMzuVq6J@US1*WK$wz*
z{zNF7l=W#=Qj!OB?x2RkxP#?JWC<#!`0t-WgRZ9<F#?Tw=gytbc1RKdCI<B51%NO8
zlL}dwTqPC!b(RBGB{vj(g_!!$*@!nqtrkTSEY$u+Z2gIy96;xleGt>6-EYrcuOLK^
z5oX|fK)at-Tt9V?kx{BK9Z^H7ERfd6bSJgC`gWE6)HG+s@R@K(?&(u?*Gdy6U4u-T
zm0Y$Qj^e03%Y$Z@;wW7+Mgf6wh1Ivx1+SD|vFS0eg(+8-zIk;-s!gizDm`71I7KSj
zBKNTU$vLeoYMf3<!H3AGC@eYj9AUp*1{YpK$Er3-Oa@2D`$5Cbsa4Dka@(0oV=%2T
z+ErGhEQX^MQs^K?H)<)S#9xq)g(+J2TM%2+gBXc?EH%2apVW>x5D5_a02?^G$O8dC
zvwcDAoPJG4d>HbBftt<57SA4X!ki4On5;l3Gk`n=)G35C4rLi6CGo2tK+zfop^Df~
zUnC2<Evr^EDl(&_1Ks6?w}mS(Tq(Oz7?JaW)huqk3I?GQhF(~8`MeCdFw%3I6el<m
z8yg#>hYY&{B{a$A1}1n~6^8xjpiu*o?Ki<^x7w_O=o(zmyKN%s^Yf9@7}mij=9ais
zbbP!*I79Engewhd#RU_^c2yd02~Fc1afjWi<=;u~HXf~|?cR$xk?*;!_txi??eQjU
zWq!3b-btto$#TkGv<o523}>W@6t}+GYJc&(6H5R$D9<pm-|pSG8P&5Kv&*CX(JmFU
zrn=}#0ry;Q)`FGzKEoge&%_?idrx1}g<iz}crBh*uJb1QSBzQq58UH(*OSU7GyLJ<
zw-?`<vIM;O2(lz37I9CHrZw1c!f=Xgnb)2)Q+nezE*&o5-(b`z{ymm?UT`~bzVT;c
zJ|p4T%<_=Sz8_&Qvi?c2rj|tRix22%uO$Lf=OzlZTmhZKcg9D>mO?y^LV7M8<!(A&
zIo$P<iV8$`vJC(aAZI;jjC(|iT|vm?m>(T&kO8G7Wx%EDlkPY+35jQbzDdb9RCVjZ
z;p8&&7fm(_Xo3(ch0Cg|C80k4f`vis>j>3x-a&ppo0!+eF7&crC_;q9nnCtq@Xi+X
z_FvnHi}@<BP#?zS?e30+g#|P<hnZTcgL5J!b@k8iMWQJr9)Fj6h1vZO2Hql$*9Mc%
z&d#9Si;suL#lzF-^P4(JewfImAu*9S39`@_n?G~)KjHZ9rFnmlK$doj`&wp(Q4kKM
zpjjx+rvP&=1p_cg0>7o9fD2h7dC!9%xi^(;-}*<&ywUV*cJU;>8N-wK*2#%XxmY=i
zhD#RN$U@2>uGvgWXTrk%){4iGjka#30Z;NZnS5@wJ@X0*I+nuT+4IEv4mZL`d8Zk)
z9J-@EU=&c%>}}cNypfyKu(s&FOSYHk*|gw~UMKEZ%O+NRH5K+Et>lc9eERvB^(W4I
zm;P|Bp8d=|NQ(wS;pJiZ+8ur0y<^h9b*nzAGH=?-m8_h|l1~4+3Au9NU!C}remSkP
zw%<3)o__RUJNT~B4@p;zkHIZe*Ow_)Ih|Jl(PGNBnP!}xo>z?$R6ahv`X!B=)d^R-
z3%|qZHr+aZai(Z>7x-79m!H7|H&DrX$@x_JB7&LYga&!;64ls&|B(69y|A{nfLk<Q
z2kf>5<1<Ry-n?P2IE6kKVfkW%Y?;=>*O8%)4av8I2R~{6OA_-lQo2`ZoPf5i?GHF%
zrLCI<u&`;zxJ=<h0|Ns&1qG-!pr~qVXwb<g%Qy{dOTOF#7~1efLJ$|>Mi{LDY9<&k
zL_|k}VC6Az1`fJFo-(p!0FocD!9mE>Tb@%if1H~;16G2R64C}@ro4|(awWauw)f-5
zj5k)m&??eUp*J{Z;1bfp#3u^Pfb^+@2h%_TBf@<SU||@tRDUfDEi(gDRMc7nFy@A1
z$DG-mDe-V?dK*A8AnMZaT6BA28pP9%=WtTtGzSot(1~Q*+jAxiyei{aeo~2QvGH5?
zF2QlQi|fhs24j`%xfrc*hVQOHqf{Q%=S+d|p-<YopA~B5WhCN!M75eM7V`hn30=8A
zTeC=`d%k>T@i;GoJ$`8XqU(24MI~CsobH>Zx81r@T$nW98nDf1x-?Q1f1n^YmB|13
z&6p`!PnTOd%W8(2HuQP;4JSwCwdJ#uoyKKa({(1k@trR{PD4A6y3<L4`98;uWlDzG
zD8ro#9-i+leo}<D&Cg@~S)0N>&7|+D%B~1p$_VFZdS15F+j7O)Z<5d0lvmcX_-g07
z4KwNf;S>L9fu!=i2YfB-W*u#FC{HT6@l9xB#Z6;B;D5Tl5Yc5lv2?~HdQ+C8fvnf~
zXbGp)O3%AzgM=c)f}&d*n8T{9x2#36P|44ZX3de6PPRgW$hyOLM{TwUE8HLvui(Qb
zOg7QdLRP{1?r7;oMG~2vO*hw#dfW*-`0n?^_j;0Ph28T2X#-oE7X4OmL3*-2OqKow
zz-Zs)Cz!r2q!=2|BJqZV0DcJCjH`}=;?{Nfv`_H(DrtV9YsxA@B@MP}$gI?i>m6&G
zn=L?{s58B_0>uy==#~28YMx@*7U&LHCh#*L{tp1<<!W=u@6V6kftm5=U-R#9cL=a=
z0uTx*GXnmBwrCJ3Xw9F3A}TpKIq1%`A5N$Q*=gRQoSK****%0r`&J{kkw8ZC9q9+o
z+@GDDc-+CQm(bHg(C|nvxLi_XkKTvM%UCKso3+ULaB%75Otw=Md9kWE({1J>l^ef|
zy}nsX>XfS4E%7AZ{o_sFt0v~L4@!Q5Z+C}3pa9$+vNf5K9UCSdraZE`rK_VHOx!s0
zB8tOt|M#chj^8*qEI$kOB@Kz6e)Cv9)%p{m$E52a@(Ux9?^fGYJ)!8Cf8<2{)_NBm
z8LiE9)5}<s<#~O*x_8M1R^L_XJZL_Z+ps$d?9C4Ko{R8gf4%au>G|;`DOPgPsJ86y
zX<}7*n(zI`_jh`WU&LlTstC9<@JTyDRF6kLj%MA;&6)H`@ygMO)%j6FpmShQKC;T2
z-{LF}-)U0l>kVqV>2i{C&}&qy<gqm4y)V&u^U9+UIk(TQd|X*UaAHE`XmJYy1+U+5
zg}s3Z1w|U*v}kB(E6l1ckW@$Dgs0*yV~6#^b3z#4j`-hXkV9z$*B18#oH=)*e##2e
zLKXQsfW9oUpm!tz9om3#vIr+=jDX5#2o>vfMR_@J?yum{1sPfh@LBsorymsq&%vih
zGTjkI4{dmMIIG)XT&7n}-QNo)e5F%Ci9u?(C}ad&-hq#@7RrnoKG19rRs@ei??F-$
zB)-ey@e7V1;5pOZwR#`o5{~;h9TXj)mVSIo$`Y*NR<m}m?wrd>CFd~}oj^BCkzj1@
z<3~)Y|Hsl<h6S~C?V1irMUV!84M>-Qbb~ZVNFyaBB_$z^NF&k$(%p^H-AW_f(k&tJ
z4c>G1Kd)_EtToph^*r~8D3U0EEge%$ULK-=$wwk-h6?Q4e?O-{KF6S#gu*A$gjfb;
zN?~CkNG(2c*WoLCLV&dB4tN!}#0F_7Be4++$PR%cgZ~BxMt+pymzQ6|c9LQ?j<?Ak
zN|}w^_fL6F-nh)wOZ9QjBCa!En?SnZKl*qV%nFPX-eSW3kAEwvre=g0N|p53XIyz?
zjC^X68e|?>a}x*`HT6h(pWt_AzB&4MQmL%)q_PIzCqoqPzE((IADNHJ9vl5*vA9dY
zziU&=S8WXf&yDr|?Ao>|>{_h_{Aa6@+W5-GuD$tz*7}~Q6MaTY@BE*(wT!^ZnQ*F2
zw3Dm%-HP(>KD>5l-|02rrgx*{ORY3>T_<C|C_m*HooZf4dgf4N{mSs)bc{9qa3luR
zOS{)yw{KPy2xos;jnAa~r-mxVUoXymic^Z|{SM0t73~rY&FJZGU#ZipEts-#e9clu
zeKtHY;@BBN$PuD|!0{1^b`Z;JtE)?*-Gjb+3;!T!by3JcGOh(h%bWrE)XsnMaV^;G
z0WqyjkUfTzaIYK88SzERl7{EBjwB~07VA`pBzPZC*)s?UrPPH@#!Av4hTPpb2Hz4v
ztG8Jd@U(y1{tQM0T&%3&HnL#}h*mxvE&o+4!}w4LlAjMq;*9`KsY6jk<b=M7?<epq
z!SYcZpiJ!HI#t%zHrvr7zx@39GZYP|{Ifu%CEm{8Z|@1l4uU;FY2R|y@=;7zd`LQx
zX=s_dA}IRLsesW2PNDw{ZdA<=9HV_rPsxU;(R?<cH})cc&wtXFW0km;_T71EAG!6t
zSCLw#GH2bDoh-@y=4-1HDWOc4*P=Ju?}R>{);2p9OU{^O%*m@}zh)U@u@S0){lqR+
zWeL-}Op47R&%)G3Npg(y*Y0UplnwftJlB4{Ot69V5zl4$_<5aNv04n@xVPf4X7+5}
z5Bq#Nt{l&QymJ)0*x41&7F}Yy$3sI|S)b(J?#|3l#GxfVcYbLY{%4_b?<(7Gi&Wbp
z__RLHnD<R|a?Ih!G=@cmZ)q3Pp;Egui5bSl`OzeQ-eHAwFbjW5=AWnKRkpDzvNP@&
zT@6>$*Ol>%ut2-{Y^S~>k_6lALB{4Sz|Hp2`M;8@p5EEE2fYy@+(eD5xpPH1&WLe)
zA?QShZ0Xx)udcNS^g3A<$F+6RNj^1wpYYAhP0Y?!DM-}5ve_*ws<HaFZ9FUQ#Y^)5
zubx8wO`YMfpw;rqa;X{7R&(U--}u%MwjLwO)K75*PqE@6ccLWZh;24tgyp;$(gTLN
z-~-@Y;8TkK7Z(*}U;1LfRHgLS3y4`@R+tU_VnDnD8Ag0u+<d4~Fu_6221rLwK(z^>
z1Yzu8DsLF^g(BiMOzWuWzNNxg8NeCN`pGoEK`CN0TUQRDad>}kPuOyVE-NAtIThAT
z5fTRWK-&P}P1eGYX5pPMC&p!e{!SRYN{9=)@#0x^C!Ea8XqOOyR_e35Q0IXB1v5{|
zwkp-wCtjS~cPsUA#9$JRD7nV`b{bubbNfm-_qG~ld3n-t*l$h5&?;i$H>m?9y<s!h
zTxs_)%_sJjCZ!{CWEa>;G#QwMg9}mT`g@gEnbeNC3ON&vR##fzJ7!9=?eu)uSvBLp
zRqY`be1ZB7%klfi!4QzKQi^=|0biJfI#@7-N6PK174q+G@7K8*{7coZ_%P-Eu8$Az
zS?KQW>mNoDRFTLrndL8@P51@NOZhMmJZAr|*s9$%zmop_?^l?HDbqt3!Qa&U%egA7
zo@%O;I64zG)F)ik@Ji6cx?)x#J#YOGPPWHi7wNB_)6&n(Xlb<Vus(cpYR~=Nb+<Y*
z_nkj7>x|?eu2P<z%0S9GE6=LBW-rUYIlJ;P*F$@)=F#_)Hv_b}m8`4*1Tx>Jr-?uO
z6^n0Yc!!tTbL99)k$i=zL@SJR9jX6j!t++>V?{(-FXzJpO*Y)B>Ss~1v2jFbCP94E
zX@vJ;Ym*&nBZz(-W(TAXD4Ys7moc%u4SvBWb)n1O?6pr>!<ASNYlc<WAiY9^i%{^I
zwpz!c1@&#FcAoQ2=d$BeP>^1|La$8pNE`OgTrn1zPc(-3hH2J$`m(Az^C~*@<+YrW
zZP{Fe!mgrMDde1v^V0@-!=n-o1%)rEYnt&52S1N7W1l>C3>05k6*sK3L)-J2>=-wB
z_dY3-;;d8getpifpXAmJ$cXl)3Yv!7#uD_CES($#o0)yleR%|nn#FBx;s+=u7(b6p
zpY>X1fq=7%Xc6HNlC6TG;=Wl~aw-ZMVkHc=f_L*uN``uSEz|$yPRl|l_Vn@sxyQg)
z@XT2~L|Zq3&1oD5W%nVW6LXt0#3Sb`vz_C=3hDkc_x%hy)?}!`5fRc~8F$@`?Ckcv
zBUJyOqodP$ii#rG6F52l-O=WnoF5u0St|<aBzf*=3Tc6@7j%w4Twe+m@v;|8V7v;D
zKM=~w$yxRgT@u|!G{agW<G_uR+zzO7X>{HuLc&+RfUw=6jryCU;~g^%V!WxjdB!Uc
zV@Kym0Az65mBO`E#9@AR_N!YVa^(uMxSJ10iBy&8bN?Fj474<&R1}f){MM18*p<ww
zXzg$}x`2*iP~jW|xM2rKnq)LJQN9q>MSS~c775SX((;ApZEcxg!fU>f;MPZKkn)0S
zL-`>lG(&)a+^*QGa_Q|*6Dt3DG1e+jy?}Uj_{LQ7CaE;0E7GYcPUW=!FHg9LLU!Mb
zK97x0dtz{#Mw&j}3GYlfd#1IFe02E-X_vwEg;5+M@SzG=`!+{vD;6t^YIhok6Yp@m
zZH*0lC%9XLV`S&>VIlf!(JX(x-hUj6E_+67C0c!}Ry<-Gif8W~{$BiTdcG3$y!z%f
zd!oWzb1emzUWPvVr?6y>K8cke#q1BRs!@6+s}9c}BtDpE^l#SAMUbyodx!SEf8*Vo
zKo4HohvJXzZo*u+0z>-6LbYQsdpIA-q{n|}_z-A$c6{IY-k+?d8L@2b+<Z+}%!;wE
zznrKFM74^UlB3A()gOIi<(2Q-4wWNgk-S7gbRAHstyH~0l{yXbj8Kaa%{<JUz1iOw
z>pVv0DQSCEv@_dq>*X>yCTTcIk*#^QY0GP#(7%t)HLTae&9OK>)|dOy19!(PEr$JO
zEBE0Qfm6r2{etJTp=n2QHKXyoLNgRz_PaMG)4FG-o|gs(d)JB1I7g9j&Rxi{adHM;
z8zW)%`@bZ<imGlmD~iW8e$S&dG~91F+%d^L6450zersmWU%_$czUDVA%q$!+F?ynG
z|B&evt9?#FqKNQb->YIRXlzzjS7(ugSuH3PnoDFLG01QARB$EWsrQ^A6`7l*Yd|l&
zo`UHX#6I4K19`R1b8MRG>OA-Cp?d<BCt?cX9FQ7RIIZia@Hs34O`*H^HEs?VF#ts%
z{k^*d8(LYI&oEwWLl~+2e%V5|q(j^UNgy2q!-@ekt_;hKQFm1Pm4z*SQX^=?cy@;r
z`zJ&vOH7+%pTH4pgZWxJs&8Z+*DyX|F>E4FL%;ViCWfHJ7?eYx3G&&7Rw&Vb`_NlP
z`vYQAn82b;+RoP9FH)4AxNF$}`6a_<Da`_fn2d}z2zt|yuQ)@J4b4~aPhv*dYVUz;
z#-k|u?5<vd8IG8V1<^N7-{lBLZ>Zj8ukT`AcUVSHBzXt-9Vdbt)a0C;4ueTgF`#?8
zkcp!T19xa{L-T#b0NShc#;>X@?r$M|l?=#gbcUH15j`2rICOJ6Sr4iacn;%F#t|2R
z1OQWv5IbzcyVV+`q^7s-mT>9skXhkL1R{I(%dc09kZBmvFAt}!{i2SJ=2%8U9r8SP
z!N*p+OxZf5)t3o+?#r=0d{FcVBo*1uuqUU2&yK2G#2;%hX<T|FeK?5ows>TnueT!T
zI`S%V7RkXmTvGS3Rl|P<DVt_ieaOLlQ=}gnD&D2MnxLQk_&8K{|9*RwY0g7=NUKuV
zPbX!mj8un4zSawvmrn2%{M1Z3ec))&*?}oc3tLCa$DBjDjv3ePy)PUj*bR8u$ZK#^
zEEE08-SP;FQlDRE@)MzmUGwRd&4Q@+yLyGdE^m!$x(jo{ia=BSw<+X5>KtD%m^@a_
zS2;xeD*x-h<~_Mvb46afM=LMy2YQqD?JZj096ov>Oqnshf4(RzvM+mk-XCCAiZ<K#
zg<L3x*XA3o+x6;&-<M=#AIlHX=U1^I+63E3o{D&#@!7K_rA42QPM>eq7GxOrWvQJO
z*_YSG=M{;&Z0f8HU6aT^LRlnn#M;uZayC%C?(T1J^GK33cyf7ge7-+%+QQxQ#H4!O
zB_fPuR_qX3wGHuPOcmwmi766nbU6Fyj|w!$Mog!C2TmVLNZ~OHrrWa4IhF7fxK}M5
zR#DSImo8`RYi#T(xGQ}Q4hR&+A-zx5!6D9s?G4Mq1%W~+_g}+Q;dQL=`Jz9FYeAUU
z?m3VmP-}MV%XcUXf<X=|kU}jMqbJhdCKQmal5Ot0F?kF|FR`2di>tZ!N*3+F7#O#p
zSwSvBa6-_936M_#_y!(gwEcso0&2dG9l|*}9_3dqvwI|>k`u0*BWuvk=<XLyqz!dG
z9EFLnmzUSZKqB%hu@|UEF^Yr<%ToNlukU*R&=5q$JXke0(@5r2PpuwCAZkFFDC~VB
z7{X`qgq9Y$lhhTleCg1hwU5dI@9=DM6g?VY(*C&|w+@}rlLI}dGT)0Ixr1Cw=T&3~
z#!EFd@DbvpEjhT3<Vrn|?P3EliD-ZvVSMM!q(*FmHG^V2d!8)!LkmlecYg5-IVY#j
zOz1BVP(|?|>#l4Q@<n1adGM)CwkL&TuhaZ`H~nES2mb)7NNe!X#a9vnK{K^%y>t><
z(q}D+?Pf6;<1E$c8BWezpRKNA<+J+c=WKYq#MPv9OV4go39~HOtk=o%znI!5D$W*G
zRQ=n?dolB{G@&qGj8M)z8G}fhEKj9IX!tQ2k~&h7gQx`Z;BAt_Yg}gjrmDIhlmVMt
z7CWYIELtW_TE6s~O@<I|un}UMldH$JifM9UX49fScdrjs3AhaU9pqF|l=o$Ib)u=6
zFRHW@eKzqX<KJ{B>ZbO1y8ZxDVfOR)#-12!8X@2Q(ySJLD*s^b^FrJ)F)i}XWq1g+
z2(22bjMO7#@?A|`_GbI~o^JVoHbK`AYX$N5dTRA5E#n(YGg??D^_QLzEj|Kewb!4H
z-*aM`rP|W76ihHJhkl-B!a-X$u>LN~!A0)NVOnzO&3k;i%v3R$wCBHhBS*hTtM4O~
zfVnQnHr?!fJDALS;VIm+2?Tdr6kd+kP~&lUmnF#3hIM-V+h}>kp=R3R0Bwh|^g;go
zNe%Gl%8DSR!quIdzY)wp3pmUK5qt*Ro<h%}d1hx1a!jq(4)6i$YHJHEv8GXR8l@jR
zCQw!Jd2|l&5$I_mE`hQVQ93KjPp7E3SnN5Y#<#Bk2=H%|on#Dol4k*y+Vd)ytIG&p
z)4JksfYU2D4#gh*Dx&`v(XZ?I9?lR)Q`1$jf>~Kx-`|PVGHCrC78=^V0E5Om-!`bP
zKwW}j;(+DoWBu!fTAuJ=fY0CY2W(p8z?Va&^Z+d|sD&C>S<6(h_VWQADn-&sx}X4`
zoR^nSqM7CE*GqeQxO|n>)&Eg+KFQxSlN)ag2{zxWA4+&IjS;C`k-KZHT5y|0Q{;<K
z_9fMP`z5M`5^3)CZ-Y4Zx9nIyeQgT0482_qYA*Np$g5paxol~pE$COGES?_FU3*|*
zb+C^sh5i~<+M-W+<GoVtf+aG?V7hF#O53F2;!s{su4!3MM_bs{r?<FX@V>e8Kb#<>
zl5$SG9~!ExOJ%1611G-eymsm@*5s)0qJKt(YN3=UHmQc6R3ASiIe320OxKU)bWTk1
zbZ&F?T(<I^b+1c`G*U@r<B|xOs*OV<4Q-}$TI64}naO?ydaY?4Oj)l_%hVi;2u)%(
zf)BND3jJgbsdoPBSIDxnvBCFl#C|M*o-p5=|HhKOpz`vpB2ux)W?xrZpLu(FT!&sO
z(}IFu<7abjxOxFUWxR;>=SO{&p)qA9KI5*<^Ta><eJvYSN=W~8PY{qC^6+L_byieW
z(N)t-dlK2ee&dOqAB<yZfY?DKYGG`#_fg#wp!u7iuBzH9ihxV{wD@&TPZ5jyP6Kxy
zOiCju1f-wM+*uNBN$<b#^t^%>esI^G>R@HUHL@_W)%olC6!h2$J#eGOd|&}dU|jtu
z__eyQd}7nm(o$1z9wK59k=qf_`P3>)JNLN!9*}MyAm2vMeXSp5JU6GAFzu6Y;{KWB
z&?pFK;0fn(XScSyK7mzB+|*>onMRLSRBoaK(^WA3nA<-<+V?j<xD+!294+h5&pSK;
z#v$BwC=c6qS{2+Y55)Y&@t5G9)hgDJsyQ;hYJ0q5zxd}5hT!i8XXcPQP#^wlNl6qP
zVvJ9<p&6J*)>YHE+j}UU6`6FFy3~%6!Eg3{S2J6DvMKMNt6ZDjTh$toYmf0*AS?*W
z5fJCmvUug`rSvwXYq}wj#E^dU#C>!7U6z`eRQ*_=UupNRQDTuPR-wTH(b$~Oz--M5
zp48cD>BG|0x2Z(&Rj=Iy6&vLGv&E51qVMBP$Y&=~chH1$k~0#P`6Uf;1iE}Qkw8Qr
z7L7yyOd{XG3^|Ffhi^O2YIhea-*2rJ^VE8=jH()*me43>pR%NX52QOd+XQix?eL_v
zeoI+4@7BM&aZC@*d~MJ)H8Xm(i+Zzg^;t*f@pbdlIh^xZeed~-T25l2vD28+&jkf^
zmwGPRfjf<zVnpj`R9=*&b35AO)Ne}lW?Q>PfVnUsBK-O()+aB^0y`rQ?!cf1?fUo5
zi{@WMD+<)pRo>SVH&;{t><BKL3y5}R?LD{B+Z;Pg6-VS1P`;Y~J=J;q8+kBPj+C4t
zpl;Pl?~_h;RrUREvS)bJ(_W17Y;P3F_Ty5Li(8%Q`}!rE1RCADsS<a+26%!?j2Y;)
zCMM;dX4cxcXjHR6;<6Vp@-!>0eY)q$ux4S4+*HEgE0j(~Y|Y<<`OA$5IJ6pOOswNT
zt_kbxKwX+YrP`YD1k26p_j`YC2-PO^g6YneZWG1}uHQt_LfcPt?h|B^A&mL`6_o#e
zq#EA{x!}D7QBnzUaVL)&{H0VOkGm-R=P@o;4<EL|JPeA$3SqCsWE-VlT_?D;Xh6s0
z43`$<zda*FsfKh9e3?Mp7I|PKT#>h(|HJ)96MP#h`jeBB@n60mRDuNQK)vjhtblg3
zwBUIRp`)o_^tJNl-u(d^wJ_pfW>0#wwzp+9W%XGC{yY9xpf&u1h_z4l0(BG{sNWao
zV89)OeHk#<YI#ddH$o08v9+`|R#zpzw&73;p2OJb+_}XEQIyS8#@?QT#FoK3`X%ho
zfqrqz8nC%RT)P0m@t`8f9uVrDz_-!RK#JbzekzXGHW}&?nU=QThl&LoaX}aN5y}L1
z?TR}MTTdVuw>F<)F$MzmQndV$fg9o*P!0vSwRm#9W&Qx5Tf4?n812^*Q#IiUhlEWa
zlak;yiK@?xw%<5wN$VMZ`kd|J%#%p6hiUrhhfc%xu+yLwJEiLt<C(BfQRLS?0SC5Q
z|5`tU*Bo}LoMr^l-#xFS{N(bHd><EV68u<x&?j)7e70vxL7~;KEvo4+8DaSEv?7gT
z<hpImuj5O>1-DleiB@TBcSk(+)#q3(oIpL#L#{+)S?}C*WOA|8PfrN9n;V;s1|yzL
zppku$eZpK=O3;skDwuxX&b;mn`jVqv9(8>8&L{?jogd>F2J}oJ4DVR5>m6%kl-6#p
zI_xoJUv}@-B6}+SbE>pV5vDN8QZ{51^saZ?{obmC+jexXH*Su^Y)wr9S*ato@4CC<
zjYW{5DsMRg{v)<Ww-xChzlR>?AEO#gj5xmN8!Sj``eSBCJLN5yo2732#-v59hO=Mm
zCGE>6<ECl7A#%M`G8M}&`v@Jg6Z3tWYZ(Q!j=IxXUcO94Of#{{@D?aE|3^iFhUP98
z*f%OM_Wk?r9<uAi^}=aXgr=@*ZaqH<`nh%($<|eC!})venRKGrs<riV&OMh2zva(p
zc)Y4&zOV8%FW)D|eVIf0uB9cfs92Y}mr;G|x^iIWMO*q%_P+vThDvE{mk%Cd9=m>T
z*M5!G=Q-Dt<HonA3iW!Nj~%lqot{Tw$z^|3UZ<yvPZKo6|2Z_)uP+HSAM^C3-<5Ba
z)z3};AeiGhbCFJgBJ6EL*RGhLzet3`fBMn-7%$q1$4kNeV#`aYU4Tl~x^djf8D@qk
zfe?#NxfvKZqAz#@)!qj{Ynu8B79od`7Ab@126Q1H2~txVflUDTx>y22?Rkjn#>U1z
z7O(<@6`AP4+WLABdLCfZ`umZ83KA+^lkrvgr$@o=!0i$NG}A{4BAZq;sU=RGWe?LO
z#Pv=0@TWUJKNpQ#W}m-5@-M)nAQj)pGVbm1MQPLJ7U0VRAE5npb#Oqe^^3ZL^?-ek
z>KpQ^AykzH+(%!iukN<FedY5t@zcxFjeMv%($8x<%hxgrU*UZ+AIyi?!eo5*iv=2m
zDm@*>oWe>R<Q!P>D{r-RbedrH2Xkqh#NG&+h$%?aaVZ6Z9c}FFh6h~eT<M0x93zSC
zt)ot1{aiKk5RV;2*;6pLa}c#_;LT%Lyl;H{(t&R$%{9xgS@rZ%{zhD4Z+K?Z==Ak-
z;eXHG_j)#qdRP8AKN@aQe#$#qO2~|x#&%>Ef8C|Gki;*gqxm-Fm8#yv!P3akIUx@_
z*RO>i+@qs|eC&olF8jBSb1t0lYFHR;&(|lDAB#;Ssiqd`>=I`fm{qf|7V6NvT%5EM
z*|oKP>&Dq&I==DgF$F8dPQd;6(85BqT$&@OguUJuC@U7*bat0>GhCj#hpIf*4`)w%
zHh(=9cqN2hc~e`J8H;-Rvv>AvqSL#Ei|<-#u*n3q)i=)VCTxda2KH4{|20Bnim_Ek
zspfTce%6qpnjEW3Hqv`<Eb!Twb)^s<<uEEg@jafK*~VE#X<Vm-@&mQz)Hr01=K)St
z7Ez1>=sH90v>AqYGh$xk{O5^%W^ZkR@jKsdp(vA)Nz}Vgw1;NSVPSQm20H&Pk$Ec8
z;yI5!%wJxV_o{2--R##ehH!_%0!tOGm{hduDC&OYd90h2pD6?zjvg+R6uh&j<RV@_
z;uG_!mmLv9PG&9VVQjCdF2@k&P{}cB$k8p6Z$w7s0KY7+;(!p_ITo;x`;j&2@!uLh
z+#4ciXSrl1<W(j)`j9^XzlQQ_3kMW&>|c2KBU$`A-BME9T}P~B@KCp=cOJ+2W5!!n
zOCb|koaJFzYn%QUr$<&^o;KxP-YwX}P-mzpDRH?Gf4jL;wJp5#Yf&hp^<f~spMb0u
z-md0Tf<b~0{AO^+JU}kp?j_(s76^<1-&KQBrS1HW3z#jn7Ez1yoI)jWZ^h4K7AvpH
za+H2#{}lQ+HD%>^MPw}02!$mjxLr;#CTGpX!b7tTm7x*95Ylh4>hliL5h~2S{#8nY
z67ACm)|6yegYzJ0SypZXJaQ?qv4M{SVeYVuvh=^2w+oS&e1TY)^`Whyp&?hD^xs)D
zb)fXE(CYng<9v0;5L@o}^o{w8WeZVMFrNiN7OasG^Y2l+-$6i1D)*Hg|8qMDxi@g^
zSDpO^4s1kg7Z;7d7$Jzf4EuWVdfEQe;qyufVg#|HtkuDYU=@?9koQ&8d#}cv@+L=z
zsM2^@8jYq?E03r0*SqU8ULLRTcFfT8NQHkQhB-gak)&G=r+Q6A_;RE=CObW<e{#~_
zQk_{FGk>j1JT={Cl6Ooqt$Y3Oq(q<n?DQcH*&h}C%){H0OL7rrEaWm8wu{iMlPOQH
zmdG4Tbf$um*f-{rb+mY4Cs?6mwpkjb`XpE5k-Ys(WaPWp)?sc4eCWFAnJHyedNdF1
z%^XjsLjwuA8!r9@XQ{10q*3MU1Q7@MZlLcjYtz+})51t`Z0r-huM^+R(#?;e%%cO$
zsgl3`_?_}^FKaIUgLRXLj^YR5oQS`EI3ih7Gxt~rF606ohfLF8h?`kLRC>u`xyMrq
z3Jw;1{3tCI54Hlg>8-l6d2I5ZGq@K&T@d6e_0`TTToV<Z#1y)b|Lyoi`Sm-lpav<r
zPv3iP&)x!zFVZMjxD`f3FM47vG8h}@!WZ<(>EiQ6jUMD9eG5u6BwylU8o=aCH_hM(
zRX8V*u7}Ppvb#XV)6sul;8${HebKljq=uR{aq-_>CHynqq04`f6hu&Bsz#m=rlj$<
zdlx%#ou?jT<x4nW$gSW{ysmWg%SF&a&}4~0POI23&+;{rW~qUqCRa4>Cs0TL{!6_Q
zrdrsTm|_Xi?|P|f6B%Zn8`e7pjva8|fUF)`ncapt(P11G<=cO&z(0b^>WzZHvK8To
z^aFv1rMOuI?Z-iSiikHQ8deupuO8gzD;0>+_wt`{ap^!4G!N2#>&0A;XaYy<8a&>>
zK;U3?XV%Q>0{cz;TLIYqCKDMnl2KUH@WCG@D`rX_o*^3bAD(F^{S(iQaE89B%uHI$
zppkFiOC&4DlmyyB_V1t+bs$E05XW$1-y8Ofy1A=*c<w)@MY;+7$jqYe?eV4$$Z=&C
zX#05TX#<dX(q(0j4p;JJn@Rh?HPJ294swGuss&M#o$8W@zQVH&?)8<8QFUtF?@efN
zi@ua|PPUJ`$%=Hdd&^SrjwnWECb~kio-S9D_@I7$9nFX<&V~I)pWLVX;81s#$Js}r
zioA3WrYiy|&ISL9@N-r*^2KT#`7<1=*{V-GV|4wnFr$#=eWUjJb$MN$ijF!BnyAA2
zR*GlXnhGoE2Kk8;ik>!YV~L4>`VR+^rVnkbu|7x<8U$PIaBS>*H&!1HvmngABth~P
zO(*uV@Sb(qR;rO%pmgzfpJBgdY{*c{ao+nzE-<j`seYIyQz4>9il40Ru<EqOu<vwl
z)8YxwawkJPZ7o*lR$LS5PudP5K9B!u>b%)!YN|82DPtX;wUTek>D@+hAJGqD|8TDn
zue|iF*DOY*78)eQiWC25X&r=I)y#GB;wFEa-CyeJ<0h%d+tmSz{gTFWW;6$XKh5R0
zcN<)p+1YPFNC?4sv)j*ERNyaQ38-1ejx8u-gf>%G1JXg}yRB66UsDl@i<t8StW2HL
zrZM^k3b0spYmEFE99V{odij|9Gs&c8R&q#!xQ`C)$5;3}CZPMj<GhoS;#UNgJOLXL
z(yJCej+gyDf#|eh!4^~#<ER?eC@g5{H<s;R!q<a%9X|{|oHcLf_}bC1-K99GB`|vL
z^(J;UuNT@n_PcNY)Wh9#onE$*i%j4dRAzohoE+@rSaN@#`<Dph!7@r~*$er*i`JwL
z*|KbB4~gxKN=CS?|D9F^YWs<i{+zkF%FbYamJPvCjZp)lQ0Fnyz~Fh(^MfSI$s|r0
zJND6Q21jcvGYI7$t~0tf7XI5HoOmvfpgzgurWYX`sZXnUaQdFZ4A;f)>=C-d=~O9e
zv!_t?$nZ<2b>sBv*w=cF^_j)LF7o`!CG<(ne8jV#5jpCogqu8IMmsG>U)NBVe`z}z
zMzKyw__AZAV!^HVHr%zeN5fr+zuF*e->CH_y=L+yGf`39SYxHLLHfCp(%fo!D&~{y
zvNb`<f7R1X-NS^FV^11fo?UQdu8*&2{g@47*JDc+=$z?pH{ITwxd_C8%zlF{mc?7>
z+uL8`v{_X-y*Wa1>WZl3iTut?q_v>%duMCQ=I}lcja3D~`TR~K4t5vVO9nF&Na79+
zXw4$^SdH%41mx#$LJ<VE&t4LvLBM((=J6@hSMeOhb~-WtQRk{iN+LyR@AY`DA#+7X
zxk$fKT$LZZZ~I`wivcCZ%$<(V3A3jX;Z@|#lYQGC?NRs+5q^#m{8b4?XGnE5#u;_w
ze*>aR_Pt4m$2Ty~-M5?Nz08s(qi%4!ht`WP`0KrulaE!UPH~P9g?3$bhl}h~mUX`h
zbiNsm{*hrk7;;8hu2+ezlD}y%vQn|#(bwSqK9cQkgo|{)Nc}ULZ!gWVPaO3u&)6pR
zhNLe#mlbDhzw?vs&ZiLyPiW+;XifI0Tg5hp+qc>*bl!$qMlroR+WIg(H99i;twQ>l
zO<&?v$B`1^y0i1Wx5}|O8-)!zY_Ww12J*r`YAkh=YQOi+(>_l@W|{jM&cu}U;1gHR
zg3~hJS?qR6f9#g#%tt9bb(XIy$xfAA47D{Wxq1H0_5Q{7zunkh-Zx~?bgLuXJumqf
zNU|`i;JxzkarujEXX6WxP^9W)!iwgbIuCKVMD>CzQ>m!PkHNN6;!@6rNr_;b0h$|V
zx=Bb#Aaf2OO|5&@p`14kA64_s<u;6pLE%}s_I@@}F8uec>CR`%Mr1Rvx+T0N0AVjI
zTmU!=DiPhkADaeBn&q6w8pKSX1I57Plh{gnYXlIEn0ihyEwMUX#85;yzbHh#|54Jk
zLD!m6`kT+`*q<#(!J)dyY6g4wQ#v|2e*Ol~_4C=id9$&(`J#*D*Pq^@A$mzWTiXaU
z{1wuwVp%pVRCMjeTl1fR%z?(`p1<UGAw^x?d?)N#xYGLaefQ9+P6C!D>#nI)!T$DJ
z`j{uArg8$ht-NU{j~?<8lR0!_J1=c-M?0(c1U*LH`MMLxSLyg-(RZajTI(LDva+#|
z++C`rHENCqTWE9NRUTVGrb+R<=RV`JH7Pvd$d{AfFg8u=O`GgoO5C<WQ^h50i(i!t
zkG8k>tR*QmIkf8!NO_79MRunO4t4(YS+QWhIw;1K8D3rJ?Zr9bCF31PEbb;HSx4cI
zmL<$=`w9%z%#_#GF6G4z9euA|cP+-NGpoD06U3*fRjcgY<V=Ul=1Vt#9wJsw!(Y<U
zvX|=ll+?Dc9IJ#>uA0CUrruY*r*FoX<h0b)@$x{me|df$M*jQ=#xalB4ZxX3$9#lg
zo=y)Y8IIq*upVA)6tP-{EnTI@=99eM%eEYZtl(w@4jiB1&dzLbQFKs<f}0O`t<^Tu
zTzW`XBXc%W(4ok0SwoPi2oA}nD4;FeynhbDUdRxt%F2Fv`GC!971<$$5Fh_%TPB=_
z=$XW%q<L2gLbnKegKceH8N@<DOsNZSJTgi%Ml))F`OLW74P<@L7vYB_7P8yM#>QU!
zc`%cIciLRu+lv^^++|aU>ir@lUgY6Yty-W?E>t5KVjeZpH)3>yO*Q2>xN4ZF#-e%h
z$2gEZt<GV8e30lZ!6$|1yQqUrZr-c`s`(6IPKapZyo})iKc2@l_N<+U5{o*fAhU||
z>lBQU%4pYxMn7(Io8-0NBXS6eJo>p(rY`q1aX&*XzZ>UWYjqv|*ni_4-yHr4zxn(K
zDR`Sun6m3e_~y5+g??<st0W_}!Bj6j-0j%ST~o(wg&f;KRz}lg$v2Mtlp67IJ<6u?
zU!^m98)5>$n?k9Vm#1p!Uj?IBf3#!pVuO$|_z`l&B+e@ojY|+$P%WHbSD<V`lOJ(6
zI`uLB3%E!V*q=R%o5m{#OcV6gM5#cS=J*;^X)OwOqca7VhA9MSYHCu8PvwJU1As(b
z(~=MsL6GJR<6@Bc7lDWy8b{!jlzl>sk$(d_s$j5fFJLMQ|6liyr38lxDOX2t?`G2g
za3XMCnOb@oZ}NwI%kVkX+LR$_;|=;8?icK*tEMI%C-v=px&TXX>HSuajU0Mq&{fy(
zG3$3-_B$?ApA4kBhV91p-_C1CVlG&?bG4%kTrEpCnuT|%^s=lpd)4t;VP3zp<-*kT
zKC63TdPSR{G;rtLzb%vao$@&y_>VBE_A>#pg(#)z%|B@8`O<@d*sW+7KQDGK@v%e@
zf;%{@5RoN+xFCj=7&Z^_<@<5^X@mf!x%dea)5vbC6*w0}?~TPKBw)ly4$=BTL*yD*
z>)YFRw#BeCVAOu1DuT4O!zYB4-UgQ9vDOtbva(7U2}YKebJF~<Yrtn!iOkj~_=_zd
z3D*+4RM$F4V0^j)<gx)=Ov*i4rpj>@64?s&F?8@kB=K0PB_{{n(P~byL)~KOp4LQ1
ztI{$IK>Mx*%i7vn{BZ}B>-+Z?7sne^yhcx-61j!N8@NAt!8~G&p0D@aMR5`<54t9w
z5kh02ggk#Cvj~<)Xz0@_Ezc!AP6n$CV{9LctiTQ&{nn+2j>&i(-ZC^sACZ&Kw!K5@
z2b#QnEcmqiZCRa^eU77+f@fP>eYHnqr4YCGY5a`&K^XA5J!mP0o0Ibi8=LtDspqsf
z6kKW%BcGljZobz1sY(V9yg)M(WQ}*5LDj|nDu8Z*J*ia@y<TP9-{hwby`Ep+SL}A7
zi~DRKW`!lOORsxGUK@)_HINOtd3c0MW&pnhWDQyx8l3Ms?FkVW!G{eGfQH5xRQ#)g
z4+H=R;qwbt+Trg)Ht=a1WvUvJfIf^;sNt8UU^pB)F90D<iLJh{u*d`ZbpLRqOdBK!
z05=g56g<({wKW^g`z`H~iSa<$7T=OBO8kZS{dIskJ$(3WU?~j<nNM}njW|89)Sy4C
zD&(A<n+vGu4QLL*V)A<XrM9K^kG;|#!UNpDYn2-0ZS|7lvBm4EtB=|A#GT4+d5eaz
z#kX|)VIu~IIlAo9A{;zXl6A0kGjrU3{NICK=(oPka$2!jXu5{2WaaPxzzO$x@Em^_
z3VEFz=G89XVu3|AiY)*e3+uZbl9(H~j#-M4gX3zWbKE~5_W%A(>LV4GoDsF;A#u2D
z&leXLcP=OLZ>JJOA&?ujgB%Og>x|Xs8xTf)w3SCFIPSng8d&0}xHeoI9E-;n;^|R!
zUbfG&_5vOsC`w4Qd!LEl?7PXk;=fd`T<{k^OH@=)XmH*RiZL!fU+xTTI3wjYR{&Mk
z=dWMBoPcP97fDhQ)rm~llkbK`0U#D&pzK#hs`~xoJvT|(d$4qY%|Zt^aw9A}95uNO
z_wwQb{IH`B&I3*vKVp0;MfpNj@pL6KglNqY^c^h4v^q!1o*s9**zK{tz7bZPt%Z=$
z&@|T5eZXjWviCQ*Y8LEEc^V#Ub0um|nJZ-2wGm~uMm)6dRrG#jE4{)J{4AHfDs7r#
zlzCwgDF-3s3Pj&6-r(E>51TQ3;1+j`v$J^*SShdv8Woyoi}@e#2kuGc?6)i|h;Var
zLtEm%|D;?q+oj<Gm@j*Mrw)_<p0)xJX+QZfc$dKhAWBb0M%K<ZLbCUktn5c)BW#mw
z>4)CTdB~XS>4J$ZDP|=n!-{zPZ0Kf%dq9AUxodgVC^uw0Z*6Qyz36Tq>$8-k`gN<8
zX%A-})3M2vbZZLRL^xDE|64Wj@iWuzlL!8(I)|lurRxrBHbO%LL(H*B#cJD!CtsA~
z%iYNT(^c-xaR1E(8|g4m7AcYLv<pBc8Ekk8-b0ztB<lM{SiuKno<2SOeSHbPgoM);
zdiKXM)gUB-IKkm)wHJiy<RTwD0bVko4CG}NM#ghk{~R4hA>ab^59Q=%I6<E=0fYP#
zWYT(}2yozmL1fL3*H}{nKI2LdbJ9yh)lEWd=`}4S`q8+;@KXaklk(p&mHP=c@_!>3
zEeVitnPSXaK&Y87QDKzS{xvztP;xoW?;gPW_Th|o*w<p(3PQZYF085tp`GV#{(gQx
z7cEw~ZWcC#<6|`!^;nl$aD^hh$ZX7{iZ3K~5pisXS<B;}6l)aZ@-z%iJbZ9EI)fxl
zAAb~fjyLy33uD=~dd2ZV`B~`!s)IVyGeg4*r|axLoB48m7lOFEavps^%0XX4NDWqP
zX>DwH3vFir^(Nj%xKH)=embN-^^ud674=9M2$eBod+@1euPRcn3=0lTNLW~hJ^(+^
zjF24XSl!%V$S&i5RXHq-e6R~-sZH@kNGrIHM*+JI?d!PI)DN2@+3<iqU)$eaPMKAJ
zmgM^8-#!FI+97c<8wj=%wj5|6m!M;?n`;2K2%9|_r5(80mAlA<$4yXJ;wIQ-fqCOg
z3;sEfEHbLWO=PMN-a;f<bKfFhe$ek%=5C<X1>Ji}&t5m3Pm(mFA$$*m0MmWw0CZqs
z9p$=tgFW1Lym@IeiRV^C@tMzfJcB=Y2<R3jvX`ogG}ilPcV;_GE(hUIWPET>%(*>4
zreKdq`!8nLSZLZW=sPSuPW$qO$7|#yw`o=~viJe%k+!<BMxHqEjo{XA9cutp3^oo<
zb=6h3boRFp0tO|HSk{6y5UN#kv`jjcyahxS4Bm*bkoX;3U27{U+!Z$O;o?$)nF?w(
z@NM6LeZYamO`*y`10ZR?#KdV}#D5BaIT$FN@8{oX*+APP_7&I`97&7m@JAqa{R7B(
zIUH!8)Q#aZbZ6*|7N|2t(JUtlxY|}4gpgwD1+Kz=1pM0UMvt=`vwdv@mY_fS)y9_J
zc|S2|S2W@Epk9f;m9Ke3htBAiB_>hhO_TW{Yy)-9Ap4)+Bg}Se>d(_gt3JWcHMfET
z9uxEgh(ESM<Z%tFLgEr`+C_~rB_QC(xlM1NIZ+5p%i&($5g@F!`!5h@&tH5b=tz-z
zQG}3cXk4Q+mN3xKa(AWjt@_*Tf4k#_lMp9f_!IraCm^T<#T?Ar8|v#3(~a0gwV<fw
z&hu0M;aETW`*+ebN||L~<X?L$tAg5EUWdToAO~~vb(ry$>eaV789si1@N=cG*Y_oy
z!0wopa<ID0L9+KEhJI6+Zg20;pSrg*&%P0cQH#?vFzip2BTu0(cOcWECHMoRYEi3V
z#reaBrdKTVWcz3+C<>{9?;(nwIjf7YQ16LzO}Dkt2nt>qc*wu3e$g@#Tdp}Ef;qbw
zgKv$x)n<4V!!k%+m-#b9!O?WRY+Fg6!7TVWwFoCmcBr9gD6+VX>1W!F5*4e%MqgAh
zb%ZDBnx@`pTPy)v2I3L~IB4pB&I%6mosxf*k)OkKWdtx)_m|oMFag*}DKB}_DF)?K
z5T5`j?6HrAii*$Y_7;4bjxZALy=r4z=cmT!K$ja%5s-0tAc+malrUPi2mYm{`|#mW
zSvN%GK?VR>8)cW-XpSNfb;1iU=#~H$jA}^%UV8B3z<2aqM@mxCr=(|eS@n?Fa+j91
zCj%V)E4_g1NO;})@7{YXaVcTycaTBf^{eIQxUpU-HlqhS;Xb{NEs~&f%ARTLaN>H3
z^kjshlRDZq^3gl?91m#dy%W7QQN70UC4}hZUx4pJNKUTcs`OU7W9ab0lV<|P(3Il?
zQU%Xgf$#(G%I}95f+-fMrwUxyV375mrh7XYPfn`<KI9yQ#1Zk#M<U~6V;vnG9HUCX
zx2{Kp3iJ}p?m%FO{Qd~N7WDI;0NglS=>}>7Kn%{{vA_~`-mO1dkXaSrR*klN0S7t)
z3*A>IPW+crM*UFoQd56}Z1sGm;$2Y=YYUiEKJQpgf%O%R&73Q*MZp{NvORc-Lj+!&
z>cuJmG_o+xXzLpqLKDJA_g6m~fz0aHjc;|&@Gv_QlRKk;*eP})oIJ4IUIRcG_MZUR
zZuEgU5&|xQ^y%rTXaEe^nm3Cwr7I<qa0Q~2z6AxLVPS=WrV}`zd7CDJi{uOFhBCm$
zyM&07nFlJ<ZwK)6yMtg!(Y2D3i)*Whkkm$$GXNsAv@!fsikC|V*`5cj=pd8zm@0p$
zt^)T%WMm`|*Fk{<eAL``Gfx0~R*e{~-w1blQbJzy&&w>IaX+JZ@PWSQr|f#b>H&m1
z$qvli>gv<G7r(sh^Qh=Ma~(-;5Vb!LQuS-q8sb;DQKEUav%ZjQb8vDZrYXXGHvP+U
z`M>+Y66+aN9NZ`yzlvy@{ig8i0uk|HO#%3|njw>bqzp`Ai*(;iL6DM!qp+UMVNC`Z
zrl>4H^%s>)Lt!W{vBs3Q2j&n+gQP<6H(*~n>8`%w9mlaC_Fk+FV0}n7Ac2Dx2}p<=
zj<NEcP-%U0p7*j5)4hs-78Vu?QWCd%mTUk#O%xPZ3IJF_^EYn*x#;J1?kU{T58L+a
z7gttBSxyp?k|M}>Bb-1&PP9t}IR~h0y}fVYr(Wo<N49-PN%;W`A|PFyozw@JGE_be
zFuQ@Y@O(>53+RCs)32YTlIv9i`3m4*zU2tISVSzu&upf=KK4YD!QEpBzNM){xUj_@
zAOzzjqyYg3UI;@!8nE9N+_#J2UH&qL9p&{pieBx4#=uZ%1kElS_kpf7^<f_fA-+0z
z<Gf6AV?Ap5PC&38^IB+pNJv<1w;&ArSxn>g3W0yI;Q9`)VB@9ey+j2xPch5KxL%M(
zwt$0p@Gl*rKY}veax83p_&mf-EEZtrdjm8yhlmh?5XlU5l6rXs1r#R8)Rtc3a|a(Z
z>EcvW&HraV4!p`}JQzUV(PXij=01sjxU=EayoJ>%h-xS~dKIR<-f2^~HSo+lK#**?
zbjAKZ9wXlG|4i)cBD<`?*_xgGAJZCmBDm^AxpSj~X{oBRqMut>0(=UgEJ`1|cuBG8
zns}6yD1R3wvynO}%WxFBjwqRqT3T8l;(7nut?iKi2VImquVH&TIyNza<o8L9^E=rf
zY*j~1g!gJYRd#oMHBJgLEnj&-^8%_1sTjOou~j(hc084-TTeoORO$YUvgnO2q!YRg
zPL{Nj!Rlu;#kKS9)<AD}nsF}JP=So_PKXU<MsGwvlJ7V8WFZjT4P6RX478+VWbO_x
z98o>CM*~&h@s}RG0)yQ0%1R`l++cSy><{`$Xfp^cb*l7!=HLEsT9JsxU#e(o#sQd3
zfBVvhiIo*KOs$(yeK=R02@trmaLCv}d-C%qf;qtQ;CtQvm5I*L-`*}k_u%Q<4?rA%
z09f6^rH9+4Q)LkiP&T&Vp`nQI@J7!IM?i!9QOsATX@h5FIhyl$iuNQx{O;fU|M<m;
z5~v4Ze02Tq3^@`(8c>)mAgOo>#~WsnkoX=D?4TO;|NI%HkZ~s`hvuU7vK85DNY7h!
z;a=;oBf{o2Zn=Qk*C&9|^p^bID`f*G-2Vq#9XI(>UVaD+CjcN)5)c4$GZEm!P!hMb
zwE_F`D<rQn2m}NKS8LX&NOw=kp0C5h1;jvVY7ZRh!lB5H156dDdUj#Il)r~t?j1CB
z{I@f#Uby=l_IlCp@3g{e2lw7Tm6r+NoPLo$f`Ns#4ci`o2noq3DDgmla|gBA+7i{_
zGn#WYm8%QsUWpD@sMBL>qPC9(3%*P-{4}}=EXx18ITY`Dn-;=qE$*V}zQQ(B9Cs8?
zNhIGE!$MAzt}k(MpD8epkB=SnUcRIy3SD!2J}vdgFdP~Zb$!qxgF6c_jlX|i8l*Pn
z-GL*8uue@X*|PHYV)dOe7zj09`lj8aHFEn#WXPSlIcuEGrwmbkjzZ~aBUOFYj!TQ2
zk>Nwb#LdLtM55YZHg={rL^3SEmw7xSSo>OV>synUSRh6p5s?|MEH#QGwT*U<_{cPW
zia}w)!lYMuu5!RnZSyZDx30#zUf(Z2)HXGZT~BJ&HYMNp!9pqdssxBx8t4D|x%#b#
zi6S!RqOj1AuzZ54>%O65pp%j<vLTeXX>LLdYft#~dJzeMA64H>?lX!=z;hemh&IrC
zWJW;1e}&)^0hU}_^cP5C0+jB59uIV(B1lr#Nnwa?v|Re9+_e$xkr1en#89vh?*4;+
zBJIoa@-keq=Z_Vj&@ri;UPMPgKp{f-MmtezXlP)7D-zHP^>C3U^A!SuPYV))Q-Ee+
zAVFKV1rH4#(cNExV4v;HExR*DqRv#ri1)wWqlc-C0Ds{tN2_y01O(sl!UIG8m1U9>
zMo@H#Qx+X03VXTh>5;?V7|i3YL0N>B{C$4is=|YGm(rT~x;};Nlhz?xBeC5?2k|(O
ze}i%r8#8LCnV;<wG``24U=X>-fPg?<Rw5Vi<>~It{MKjFh!tlmVQKa*Nz0Gf-BEFJ
z!6WYft@#a({@kjlsT<OzKp*1q_?t$RLK4r*G5?M5#<>_4LH#j+M^GYcMjevCPqK-$
zEnazC=@qL~YS(ojTuvXZU0P0zqU3z|GOexmUhXIc@`F?4&nHDHs&((G|IRTKdrYMC
z?3s|qP{3}Xy=l#IlAllnb=`a1_+a37(07DCbAVBA#f)Yyd)QgKsdCyh(q&oy;^oKx
zKIhRqmwMx%roOARexmtVLitS3yy6LWr|G+%g*ctt@<QWPpFi4}FFnfM!hT+eBrp$V
z>xwnN{HOhbw}sID5kli<_*Q3U_0H43$H(8&+&6NSlj%=Z8lOs`eBPTu_Om--y4z;#
zG%S_5w9>n(kmgrL8t=0~;|FGm+ihYPg1O7jb7kJY*|to{b2rk-(fL#U<n}Y&(u<q<
zKEMclNl6hhA0V!yA&1pSsqyh22{94t8h%>v*o*USE@5aYW>#huU7TNN=E}%@;>K2p
z;Mxv6#@Vw|=Cxxi_+{DA>ZK@gsWU<#kd!vIb)fl*BDX+SY4SIPZL<PNED5)Zif34F
z+M<KUi`_i}oZ1KlifF>!m$H3M<@sD1MfN(;hMq5nay^*mUwK>o8enP6d1G$&iAM9+
zUbRKF&ZU>bU(8z`99Kkm{SBR683k>liuIduy3*O^bi_OvA&MVK<CdDeH)6eFHM^IN
zx(L5B8!Ilq&3qYSg0pLNUh?DpZGO<DW~6rJUVK(s%p^Oj=H&918p;ywnhTpBFKo)*
zTj>gU>)D5^GW4k7nHs4)jM%9EPM=l!uV%eCJX?8~GE5k;gnH0yde@~L@AdMjd-OAG
z1bp9<0ao$C!Ryw^jRF2azZWF*jV({UI_3W}q1jjdAth(Me|Ac>Tk=DQ{i5sslbuZI
z<bQ+Vxfu#c4$m>Qy|5ireaB^yPNNVqL<$FWM;BEN^%h=9d{LdNJX?@OzejU6Kk@F9
z>XvTleyA-XzY&-?0P_PlJ665>xZslqax!Sm>`~!kEPS`aUR`osbD4Ah3BkvXO7t`S
zAWZsX33unYL(BFDIjeuu+a@Q|242(*kZ&&J$UV&VatcvQT>jwptgJhozP|Bj<Z1UK
zrQRL|&dfJ=H^d?X!7DhGT8}hET;3@y@agC7O@E@9oZ5Q-ZnSrYE{5*kj;-0Rfua&c
zt^Fr?FS?m`t<SUs9k!`c&_Xfb+ecW;#ecOB%Ue3Dd$G!jypqAApJ2mwPp|ML8~@xl
z#-<;>hwjA(F(Pg<q}z6=Z|HGD$l~sY4<WLBn%RZzK?&6q^td09V`dQ%?#oWD@DMt`
zWp>dJyy`D1$!8Y-{5(b}!Ci3~XOjM!e2kEmcF4Y@1V;#2F9MSIJFf15L_!g4Hix?D
z02!VRGs|zik&gm>l;@p3O_-N#404M|^$-4RpPU`PAdMxm%X{lWE5%qxP8r#~=Gcn&
z+D~B*0Rf{($*8)Xh2B{yBwt`_>kY={j}yt4?~*5%;(k7F$-W&t5PT?+I}2C$|1QXT
zp+w(jz7csWFiIfx8{>Oc3^UW>3DmKuU@u7+Kiort`&eIr=l9OR7LT8Zow(iD<F~f?
zSAKIO#iQ0J{z}F74<#R;Gw`S2-Y+`fB*soy!bJ!cZQv6!Hc^e$TDSc!tg+?nI^s6(
z?IhE$%VQ<Bq`_Y;$B;L`&pDsbI~c4OGLb$i$;T4@9d2pnHec4h-s3tsL<CWzz}6%$
z!b9`9)mh1WUL}otY;;pwQOPrcgKziZp5;%h3+tPV249_Ob0YuKS<d8WLb`i-Tsj%n
zhB0PoIx44{xg6uNAK#2&nl}owig_RE=qa%lTe7lL+Y0HpdYKOlsOJ9>g+GIE&Z!?Z
z^Urg(Gxn<odsE9-*B4C*vTbSdZQVF>PZw@OZ<L2fopOdQY6o*?4F&=u`5*_l8%IE(
zfvyweOQ<4uw|iS#-lL+osTe1ZMs-#B4}T?B7!Niyd%mCDlNA5hlL0etXvV<{p4$Bz
z7f1BJI73LZiP=?o`ZxGADa$@&V2~=!MZftRgv@e1oA@t+GcXteBB?Q8Z`B8cy9d(w
zO+B=mdH-UbwA>_o`PjOMOomP>c|4GT>}L!OdKUfu>=U$4(ufdOmoin4v2t-4`P6iE
z%py(0*Iw35n~c;@HZJ}(!uUk}!+`xOKD{i@J%r$&g@=23p;S+-FWa{WZjZN@t_iT?
zzsq;6#?$G~s(cCU$3<HRN~2<U^@7o9D~Hx-&E{XXbi10o+@nbeIs&Twl3-2@Zkgru
zw%``?%6h#LpiaR}40+%~DbD0U_{OO-{urO+x314S)~y$fb9zWpr4{KZWk$O}2U=cA
zYR&G$@nVi5YG>z1$oijzciEksY*t)djYH~td$i_VT3k#hC001jPmcS*GloI2cc2d{
zpX||1Yy*@?GTsk+voi}`XZ|B2F>2J2NQCQaYjf{6QkV#V3!Dpm;8&o2OWsk{^IQed
zoleE-A@ov<wJZ6nQXzqrO3XYG8P>{IcW+EBIC5_^b?^Pm02IiEobr<4hz0vHtDxnT
z_XAHiuO(4^sM<O#c-k-#d@!;`YcYm(DX45k{;hYtH1}WswK;uuli_V1vgz0mfHDDN
zgawa%{ohlyt_#P*w;LY&jS@2_TKf8@uo&ob290IsaT72@uQrw0M`KG^`mL(%cc#j<
z3@$P=&QW}|@~__Up@@A0rtx(xMAD9~uAit5CMGNXc*12nrTuv|euJp6dSfc-=|z#_
zgV)|S$7x=|C0VN+<LwSism<U=JGP4|q4|FDi+5oME8*aFvNN&n-XrS~_a7kyu9$as
z9R9a=_lp`ACLev#OAw@Uxas)7kF&2#;G9j4>fZR6pZ|CB>u=#x8>#<>4_6orT=m&7
zbHLQ+-+C~>-JGj@w$J_>$cO;#7-~BGB~uuLOL4iLTpFmkX7BFAKX-k`?)fJj-S1I1
zvzFHtRrB>*1siOQn}4~fKrL5j{@^uk^;CmW#Z55w$IYeT?`o@~FPJBnuwRQ+=j4wc
zs;h&qZh(F=Bh5d)P}L~Y<`%B415fS!4IrOEy#$nhf9AF&z-T;6ehZc9|ANT&NYS*G
zLsi9Td2;0n?4Xk^ba9*AgINuL8`yMCW}s&tg|>`zwsZAdUgPWN=F!E&kN$LDf;O%r
zT}Fv(j63D3b+Ux$UL^8ZiaR>q^V(i)%@Ff<{PX?v6y`KVX}oq#I;?yYL#S9pW0R9Y
zhaDz>HS@DSth30hs4!mZQ<k+vrJrGfHtW_5Z{TnCkgU9iwKJU#daguQ>3^}9hKyAv
zc?HTpDA9=uRc2+OATfKo-iPEDu4;Mf;5FT0w}*Sp>(~>)o|CJ=8H`rd>#*ph;qULI
z{ig3<mFg%4UM;^*hx;R(*MK%#imPYSDJ!SxuDkln;^<f_{tG#P_B+-bS@bWvJ42~X
z3wcW!o;=%3e3LpjG^F$WFIMKS)s-(kEf1h@G4R;+Mjj4fKDpyipPW3*&Lz;&R!EW-
zNM#AdkX@rC)I9&$tX&7$wy(3L@VtikJ7(p9KKfrY&Jsy=dPC>u31<CqFqX7~7CObi
zhgdp0AivEw23nnpNF|JJI`iwp(Ht|0WW8BWzOG#m?l$F09;C0ajU3%nP*(O@39lt$
zbw7s%@K66>f4y~ZAAUNC&CbGtJyg0SzQamR`gU)-(&Sefjiga4X3B$CvZHr7d;<!)
zT=AQ2^5Fr>*)>Ttu_>M-?aKcv>CD5S?A|!;m8_wky(vp7lRf(y$&zKV8<E$N#AI#k
zvJ@d9TZ5TFj3JC75wbK$mbVOM@M@3}jlCwjhToaq`Df;u>ptgP*F4Xh=bZ0-pYJCq
z`bXDiea40ZW1oLk`6>Q>1fP@h6hD_lrWwHH?93}aQ@XyjRhJMK8MLMWDprrxo}&4F
z>E7qo3<iGb-|6)C4J>HOa}S2xp-C4{cH#!ByEU7IytyN%c&}y}QH`KG|B92d=X@l}
zFQ3DYIQDmT4<>n(A&ri=NUHKD!_PgECRpa;hij^eoP=GiJ@81l@R(ritvntRHgtPw
z@kI%K;Rea%LBuJaw$|yOy(cJ#c>qrdd_^xs6kGSf94?k2D*O^ee*9qL)Jz*hbKSO~
zd6!WnI^0Q^Zz0-=GF8Z=E@BXGb5qmq(_l{ZBzKF+SLNl50h0@N&aaYSEi`+ncMl9$
z`~~7Fs;jF33%8;oSxyBF`(UMs&2;K+|DUk1X=Sy_b8z&K!=4NEr|s!3nUQ2xaVh`Y
z=^*}twf8KISM@kVi^`DnlHMC$Go@P>QaKXeEfp4u-NFn`j;I9N>g=yp6+KqkfpMT5
z0&6WOpGpz8<^Fk2<kRuPv<sa)`A@r7lWWqIt1o~dqi^N%(h^O}N4y1xV+GqRu#YO?
z`S^mwPf=*qxk7-4EB-KkMh8haVoH+rEG(xTSVisb5`b=e64HRw{*)NJm=Oz<F2K-)
zKNmSdCRKpqmAh-Z!kK^ZrRE*QEs)-NZ!X!ab>0PaBB_Xnm0nUItqMwUyYr-pdB8pn
zl}oq?sAeRC{Zk~e`9d93ULIWVWW2oJ_Y`&lb$S}GfJ*%D><x*_$NC(mLYfNEs3t%^
zfecht11r#YAZ^VmJp%`RBEb^{s4wJ)EdbdD_*$P*Q=}pJYpvf)fSZM#6Cm78cHGrE
z>4%7Yv-+B9_V|<q6(n4k=JH7m-e6J!7I>wrbUL!;(H7n=(;eg<fp4r$Th1aAOJc$j
zn5P5TTI<+$hbSYSIuYOi5h6ngb9IF{H34H(pl6gOqCs91XdOBU-RWP!6jXm74N3%n
z9vsrc`(Xq8K9+Y!IW6nJv#fpYu^!EQvDqCI)pn?ofw=sQ*Z%ZP%$BmeymuwS<n8i{
zHhTvKx(BROfR%wsCE6WdE&;#-DB$MYQd)X%3n~~!0W%l#5VcwdfFU4d^_G}S2eex1
z>j4@tB7pT-S61uG%BDSjOks)BGBkYK(2$FksWz!xbf{SZk5w7@vdU^rIb~Vd$<8=E
zz1uanLH-h?gPsMBa)YJ+8RMJt#gQ|oQ%M+&bhJ!g?geT7VLNc7`a2-R+^j?#f@;6p
z0vd&uRYm89aguw$58)<8wi_5)qHfQzI&=db@&JrHF|YyhyXZv#I7l4uyDiX4tHcK3
z0&@+R&i>)?w{&%M(D9r|Wx%!73IgYCD{A`Hs~dq=fgKco2530zK$Nd8Lg?wT?e&>z
zNa{rdfDB$Oe>N9=tIDq2Zy!`kQ8)@+adfav9cR$07HQ@gxg7oK49teH?Rtg4k~PrI
zFW&=GDATsxkp~C?x|Zs4vV$I4C6Hoa!ysF?35qZ&6hIpkl$Ec8f@g~ddojyL_!Txt
z+@dY3)Ci#f*{FkE(GRx{kH#PtWk=Z(c6zLEG=6PyUB~tty@qZ|-}#^a+FXCSOFNT(
z*!g=J+~hE9#1U*o{1T-V08Lgq_a(GLE1x+0{I%9n>~sLIWRiyQ88@d67#skh<^7B-
zd`v8d=n5b^E@fKG12#K91p&aCT3jfiF&E{t{2mv|1Kply-Oe(%sSjbzZ0Yik6j|kD
zcl>wr;{L-ybQI1j*Hq(L^o7!HR%q8SYo?b%>E&|BKc_^FT^VsMMC4Dah?(JjqR^EL
z;~uWAYkZ5d!xscHhmFYU?kOn+g$MqkW;ZHb#L@<hd(0`0U=9KAjzcg9M%hg1UJ_ke
z?4H+O0^?_E&Nf;&a`6ze?d15`$NJBsJXE4&k~dan15O9u^K8{+QM>B&vUigeZD2Bv
z_taO8qA)v&{*hYhEXR-G3$(9y<364-@#wF@v|*W%p)OnLRY^$i&D<xJpDM7v^Wr8d
z^DKr+zA~4^C5}Bw$#<CVYK50w#aaG)0M<VD!*f#L+Z-MRhWZ!NeQwek4rVXs)^OPL
z7r<6#l!Wi<(HtUhLCzNDVk@I&RGvP`)$#D{>fbyIzkPZJ7F*LMcpn-iF!vfP6F(KZ
zZ?#<^l=1kKEWaOoZL~XT-50hLSP;2<O+P&JwO+M+LSsOrPp-?6aIn{9xhEy=gA5M(
zg`p(6&c1o+=2e$mP58TS=`A6k)Bm#WDQ2f2#<U*uY3gMqvE1v2gPsfITDI@sUYj|O
z-uDF$j3X}evN4DL!lhubmBtEJKFIk8lsn0;2P^&>9DNm<;z!Ys{nJm#QFyIIC~lBX
zvdO{ODRYRwQ@0>5phzp8<-c);xD?Xu$V>S`lZKx;$@NjfeLPby)}Lef#-`%q2CG)I
zHzb$?g}Hk6VjA5iztiP(c_qKFrc+S(^UGV#&YIdK=wd<dZrl(vtfd`En|&pg_h~+V
z$<;0Poz1(i(JyMcb_1(72V88OnIW_kqQKF3diIX;qnh9TvR7VXg(O8qE7F^3OV{0K
z>VHDs5T)ttGA$kS99688StC{`IbD^rXB4L?USsr(xp2MI%$9H2`%yga4Kg@7-B`fX
zTDa@Jg3CgsM}gbtrHl6C58}bTndROK9tCN&UVR_isf2`>fCNOjRLBkd0%c=YyQvhT
zec@mh!KuI;G0fyz<iV{B*a?i6OH(s)-C|kXn>;$VS(KIc&3r=?p#a+j>LSafzN*+_
z3u66x6eIskI64ldR<|rDS>YsfsH(fNpOf8ZB-E<R=g3pEzA#cv(`EKdJ8|DM>Rd%>
z%K}yHYB~Em*r_5Z&O~cPKa;hup()%@*$#>WI6+@m%Q%QsQ=R+JPhqyYS0Z@r7`CTv
z*LJfS(q?w%p?)xhQ^o8#F?5atde*fO8BDo`>lc0+sH6}Wweudfagy0;qn*fY=PE(?
zI2N$|@81m{PsceU?#7N^Y8s}hz9l#oNreQ97Ks<1xTq>G!eD2%5Fei2fZMV2GLC-M
zd>#E7MVV36HO-AdVcALuK_O$*q9n4~FoGF5tP)FtN0R%W9PvGQeI=K;Eg`w<>v3la
z)BVdKRYpvmRhO3;cJQ24-oR4t>{w%Gm1XaCNi9B+C|u(AW03yfbQ(>C8L|_}qi`e0
zJtjPz{B-CNjTd4ytAjP3v2}}^c%U98$_)9f&T6Gd&l>t*U_ajY(^C;qOW1QSJCEf4
zem8P?kt^w|{S9845;KxBb<MyuO6Qc);yft}dVS+9rpQaBCXPEYd_KrCix;l-X6A5d
z<sMtlbl!eh9kazORODKG=6rs$(1cKdMwZy|P~#xUJa<|E#J&>w@W)dNq38rh>-;v9
z%goyu+#~9K9Aoe6Cu$!)WAL%@73R%HBwhAY3E(58B#l7{tH%3gnf)0yS!BZ4eYA^#
z_0Ky7$!+*(m23mtN7;45vDpoCtt?m$O5R^azzj-Q=^JXE(w8<R*vWD~3o|2e0acUX
zp%dBFxfqg3EuYdmccu$xto+|NR-P*0Ptog(eGG4m@~QAhjP`saJA}*9xDDI0vKf&h
z_){YreuiZ#p6Rlk`1<BW!c^mzH1WQd<`R>C)30MK!y!)C>m{mZ?}WjN;62R~A)V>U
z@hDN-n3_vf83(?RgQ-KBBE^AE&iZth?f^wgUnGKgTM$Wb&!dR?R;wWm)R^9i#N?M;
zry|mg<9Rq<%EJ_R^YoWZ%ST`5D3JK57)nc58vFCv5DTkcS%ygO2+P_vBqV*Ba+i@l
zy1~XMdWk@7243fz7*}t5W&a_1@=i<>k<Ve)31T-~6>U^OH|J*LwBCBwJhCQBXfCb^
zvdYr>Hvf)q$=`^?yjn!3GxdqtEq7wh7C0jsTm7+aa>Ak~D>AkGO-h_&JGEcI6%W)}
zOfdl;4{D&nC&U8n_dm-YP}AL{=<gD3;Mnhn5l<E=Q|q^Ga`aeVjo7|Vz6um)9}Byq
zs%BNc)f%IU&G3;Dbt@<z>xD*$!KW&V^s%h|j7&|$Fp%n5SVEe(Ylj-%QuYQ)ejVAz
zr24+Y_bm&SZ{o`#t0gIL(tYx{pwrfg9ziHy2U2=ivw$+Xa5~y|obZvo$?V$*7qgG!
zWvuBTZ|1#Gil0#$6HU<+);ju~ToSaV#eY<BjvY#?fB5IW1C-&6+8wziYSnz2NQZ^;
uSLZ)-JjiK)*QH=~wQS}GmYBjrQBRgvRF#&`hbxNAZ!Ao$O<r8~O#DABg1Gen

literal 89995
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


From 7440088bceb8c149b7c42642f9c01588c4ccba70 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Wed, 6 Feb 2019 18:36:31 +0100
Subject: [PATCH 003/123] Fix ENABLE_LOG OFF option

---
 src/main/CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index b154cb855..8565a04a6 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -37,7 +37,12 @@ target_link_libraries(gnss-sdr
         ${MAC_LIBRARIES}
 )
 
-target_compile_definitions(gnss-sdr PUBLIC -DGNSS_SDR_VERSION="${VERSION}")
+# Disable internal logging
+if(NOT ENABLE_LOG)
+    target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1)
+endif()
+
+target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
 if(ENABLE_CUDA)
     target_link_libraries(gnss-sdr

From 97e8d9931e6218c6d738bee35276d3bdab37a211 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 09:28:20 +0100
Subject: [PATCH 004/123] Make use of Threads::Threads target

---
 CMakeLists.txt                         |  4 +---
 src/main/CMakeLists.txt                | 18 ++++++++++--------
 src/tests/CMakeLists.txt               |  8 ++++----
 src/utils/front-end-cal/CMakeLists.txt |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47b78e114..2e5cdfeab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -437,7 +437,7 @@ endif()
 ################################################################################
 if(CMAKE_VERSION VERSION_LESS 3.1)
     find_package(Threads REQUIRED)
-    set(THREAD_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+    add_library(Threads::Threads ALIAS ${CMAKE_THREAD_LIBS_INIT})
 else()
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     if(CMAKE_CROSSCOMPILING)
@@ -446,7 +446,6 @@ else()
         set(THREADS_PREFER_PTHREAD_FLAG TRUE)
     endif()
     find_package(Threads REQUIRED)
-    set(THREAD_LIBRARIES Threads::Threads)
 endif()
 
 
@@ -1101,7 +1100,6 @@ endif()
 
 if(NOT ENABLE_LOG)
     message(STATUS "Logging is not enabled")
-    target_compile_definitions(Glog::glog PUBLIC -DGOOGLE_STRIP_LOG=1)
 endif()
 
 
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 8565a04a6..603890a73 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -17,12 +17,6 @@
 #
 
 
-if(OS_IS_MACOSX)
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        set(MAC_LIBRARIES "-lc++")
-    endif()
-endif()
-
 add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
 target_link_libraries(gnss-sdr
@@ -33,8 +27,7 @@ target_link_libraries(gnss-sdr
         Glog::glog
         gnss_rx
         gnss_sdr_flags
-        ${THREAD_LIBRARIES}
-        ${MAC_LIBRARIES}
+        Threads::Threads
 )
 
 # Disable internal logging
@@ -70,6 +63,15 @@ if(ENABLE_GPERFTOOLS)
     endif()
 endif()
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        target_link_libraries(gnss-sdr
+            PUBLIC
+                "-lc++"
+        )
+    endif()
+endif()
+
 add_custom_command(TARGET gnss-sdr
     POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b22ee1314..eaff83884 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -96,7 +96,7 @@ if(NOT ${GTEST_DIR_LOCAL})
     set(GTEST_LIBRARIES
         ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}
         ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}
-        ${THREAD_LIBRARIES})
+        Threads::Threads)
     set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
 else()
     if(GTEST_INCLUDE_DIRS)
@@ -110,7 +110,7 @@ else()
         add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
         set(GTEST_LIBRARIES gtest)
     endif()
-    target_link_libraries(gtest PUBLIC ${THREAD_LIBRARIES})
+    target_link_libraries(gtest PUBLIC Threads::Threads)
 endif()
 
 
@@ -459,7 +459,7 @@ if(ENABLE_SYSTEM_TESTING)
     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}")
 
     #### TTFF
-    set(OPT_LIBS_ ${Boost_LIBRARIES} ${THREAD_LIBRARIES} Gflags::gflags Glog::glog
+    set(OPT_LIBS_ ${Boost_LIBRARIES} Threads::Threads Gflags::gflags Glog::glog
                   Gnuradio::runtime ${GTEST_LIBRARIES}
                   Gnuradio::blocks Gnuradio::filter
                   Gnuradio::analog gnss_sp_libs
@@ -468,7 +468,7 @@ if(ENABLE_SYSTEM_TESTING)
 
     if(ENABLE_SYSTEM_TESTING_EXTRA)
         #### POSITION_TEST
-        set(OPT_LIBS_ ${Boost_LIBRARIES} ${THREAD_LIBRARIES} Gflags::gflags Glog::glog
+        set(OPT_LIBS_ ${Boost_LIBRARIES} Threads::Threads Gflags::gflags Glog::glog
                       ${GTEST_LIBRARIES} Gnuradio::runtime
                       Gnuradio::blocks Gnuradio::filter
                       Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index f96f0158c..2b39b6837 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -26,7 +26,7 @@ source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
 target_link_libraries(front_end_cal_lib
     PUBLIC
         Armadillo::armadillo
-        ${THREAD_LIBRARIES}
+        Threads::Threads
         acq_adapters
         Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
         rx_core_lib
@@ -35,6 +35,7 @@ target_link_libraries(front_end_cal_lib
         channel_fsm
         gnss_sp_libs
     PRIVATE
+        Gflags::gflags
         Glog::glog
         Gnuradio::blocks
         Gnuradio::runtime

From ab0035d1a15939e5fdb5b965b464d567327e72a4 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 09:34:32 +0100
Subject: [PATCH 005/123] Reorder link targets

---
 src/main/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 603890a73..0008ae648 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -25,9 +25,9 @@ target_link_libraries(gnss-sdr
         Boost::system
         Gflags::gflags
         Glog::glog
+        Threads::Threads
         gnss_rx
         gnss_sdr_flags
-        Threads::Threads
 )
 
 # Disable internal logging

From 5519df8924d9280647530e812238a179ccc9deb1 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 15:21:47 +0100
Subject: [PATCH 006/123] Fix for CMake < 3.1

---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e5cdfeab..4f08aa5d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,8 +436,13 @@ endif()
 # Find the POSIX thread (pthread) libraries
 ################################################################################
 if(CMAKE_VERSION VERSION_LESS 3.1)
+    # Workaround for CMake < 3.1
     find_package(Threads REQUIRED)
-    add_library(Threads::Threads ALIAS ${CMAKE_THREAD_LIBS_INIT})
+    add_library(Threads::Threads SHARED IMPORTED)
+    set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
+    set_property(TARGET Threads::Threads PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+    include(GNUInstallDirs)
+    set_property(TARGET Threads::Threads PROPERTY IMPORTED_LOCATION /usr/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}$pthread${CMAKE_SHARED_LIBRARY_SUFFIX})
 else()
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     if(CMAKE_CROSSCOMPILING)

From aee9decb54b12491b2d80c20e75a0aaf72672553 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 17:05:26 +0100
Subject: [PATCH 007/123] Turn Googletest into a imported target

---
 CMakeLists.txt           |   4 +-
 src/tests/CMakeLists.txt | 150 +++++++++++++++++++--------------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f08aa5d3..85350c107 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -465,13 +465,13 @@ if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
     endif()
     if(GTEST_DIR)
         message(STATUS "Googletest root folder set at ${GTEST_DIR}")
-        find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS ${GTEST_DIR})
+        find_path(LIBGTEST_DEV_DIR NAMES googletest/src/gtest-all.cc PATHS ${GTEST_DIR})
         if(LIBGTEST_DEV_DIR)
             message(STATUS "Googletest has been found.")
         else()
             message(FATAL_ERROR " Googletest source code has not been found at ${GTEST_DIR}.")
         endif()
-        find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_DIR}/include)
+        find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS ${GTEST_DIR}/googletest/include)
     else()
         find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS /usr/src/googletest/googletest /usr/src/gtest /usr/include/gtest /opt/local/src/gtest-1.7.0)
         find_path(GTEST_INCLUDE_DIRS NAMES gtest/gtest.h PATHS /usr/include /opt/local/src/gtest-1.7.0/include)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index eaff83884..3ed306c0c 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -76,14 +76,6 @@ if(NOT ${GTEST_DIR_LOCAL})
       )
     endif()
 
-    # Set up variables
-    # Set recently downloaded and build Googletest root folder
-    set(GTEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
-    # Source code
-    ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} source_dir)
-    set(GTEST_INCLUDE_DIR ${source_dir}/googletest/include)
-    set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
-    # Library
     ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} binary_dir)
     if(OS_IS_MACOSX)
         if(CMAKE_GENERATOR STREQUAL Xcode)
@@ -91,26 +83,69 @@ if(NOT ${GTEST_DIR_LOCAL})
             set(ADD_DEBUG "Debug/")
         endif()
     endif()
-    set(GTEST_LIBRARY_PATH "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX};${binary_dir}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}")
-    set(GTEST_LIBRARY gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    set(GTEST_LIBRARIES
-        ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}
-        ${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}
-        Threads::Threads)
-    set(GTEST_LIB_DIR "${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest")
+
+    if(NOT TARGET GTest::GTest)
+        add_library(GTest::GTest STATIC IMPORTED)
+        add_dependencies(GTest::GTest gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
+        set_target_properties(GTest::GTest PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/include"
+            INTERFACE_LINK_LIBRARIES "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        )
+        set_target_properties(GTest::GTest PROPERTIES
+            INTERFACE_LINK_LIBRARIES Threads::Threads
+        )
+    endif()
+    if(NOT TARGET GTest::Main)
+        add_library(GTest::Main STATIC IMPORTED)
+        add_dependencies(GTest::Main gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
+        set_target_properties(GTest::Main PROPERTIES
+            IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+            IMPORTED_LOCATION "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/include"
+            INTERFACE_LINK_LIBRARIES "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        )
+    endif()
+
 else()
     if(GTEST_INCLUDE_DIRS)
         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
-        add_library(gtest ${LIBGTEST_DEV_DIR}/src/gtest-all.cc ${LIBGTEST_DEV_DIR}/src/gtest_main.cc)
-        set(GTEST_LIBRARIES gtest)
-    else()
-        # If the variable GTEST_DIR is defined, we use the existing Googletest
-        set(GTEST_DIR $ENV{GTEST_DIR})
-        set(GTEST_INCLUDE_DIRECTORIES ${GTEST_DIR}/include ${GTEST_DIR} ${GTEST_DIR}/src)
-        add_library(gtest ${GTEST_DIR}/src/gtest-all.cc ${GTEST_DIR}/src/gtest_main.cc)
-        set(GTEST_LIBRARIES gtest)
+        add_library(gtest STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest-all.cc)
+        target_include_directories(gtest
+            PUBLIC
+                ${LIBGTEST_DEV_DIR}/googletest/include
+                ${LIBGTEST_DEV_DIR}/googletest
+        )
+        add_library(gtest_main STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest_main.cc)
+        target_include_directories(gtest_main
+            PUBLIC
+                ${LIBGTEST_DEV_DIR}/googletest/include
+        )
+        if(NOT TARGET GTest::GTest)
+            add_library(GTest::GTest STATIC IMPORTED)
+            add_dependencies(GTest::GTest gtest)
+            set_target_properties(GTest::GTest PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+                INTERFACE_INCLUDE_DIRECTORIES "${LIBGTEST_DEV_DIR}/googletest/include"
+                INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            )
+            set_target_properties(GTest::GTest PROPERTIES
+                INTERFACE_LINK_LIBRARIES Threads::Threads
+            )
+        endif()
+        if(NOT TARGET GTest::Main)
+            add_library(GTest::Main STATIC IMPORTED)
+            add_dependencies(GTest::Main gtest_main)
+            set_target_properties(GTest::Main PROPERTIES
+                IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+                INTERFACE_INCLUDE_DIRECTORIES "${LIBGTEST_DEV_DIR}/googletest/include"
+                INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+        )
+        endif()
     endif()
-    target_link_libraries(gtest PUBLIC Threads::Threads)
 endif()
 
 
@@ -312,7 +347,6 @@ else()
 endif()
 
 set(LIST_INCLUDE_DIRS
-    ${GTEST_INCLUDE_DIRECTORIES}
     ${CMAKE_SOURCE_DIR}/src/tests/common-files
     ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
 )
@@ -331,6 +365,7 @@ if(ENABLE_UNIT_TESTING)
             Boost::chrono
             Boost::filesystem
             Boost::system
+            Boost::thread
             Armadillo::armadillo
             Gflags::gflags
             Glog::glog
@@ -341,7 +376,7 @@ if(ENABLE_UNIT_TESTING)
             Matio::matio
             Volk::volk
             Volkgnsssdr::volkgnsssdr
-            ${GTEST_LIBRARIES}
+            GTest::GTest GTest::Main
             gnss_sp_libs
             gnss_rx
             gnss_system_parameters
@@ -362,9 +397,6 @@ if(ENABLE_UNIT_TESTING)
             system_testing_lib
             ${GNSS_SDR_TEST_OPTIONAL_LIBS}
     )
-    if(NOT ${GTEST_DIR_LOCAL})
-        add_dependencies(run_tests gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    endif()
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
     endif()
@@ -390,7 +422,7 @@ if(ENABLE_FPGA)
             ${Boost_LIBRARIES}
             Gflags::gflags
             Glog::glog
-            ${GTEST_LIBRARIES}
+            GTest::GTest GTest::Main
             Gnuradio::runtime
             Gnuradio::blocks
             Armadillo::armadillo
@@ -424,12 +456,6 @@ function(add_system_test executable)
     endif()
     add_executable(${executable} ${SYSTEM_TEST_SOURCES})
 
-    if(NOT ${GTEST_DIR_LOCAL})
-        add_dependencies(${executable} gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    else()
-        add_dependencies(${executable} gtest)
-    endif()
-
     target_include_directories(${executable} PUBLIC ${OPT_INCLUDES_} ${CMAKE_SOURCES_DIR}/src/algorithms/libs)
     target_link_libraries(${executable} PUBLIC ${OPT_LIBS_} gnss_sp_libs)
 
@@ -460,7 +486,7 @@ if(ENABLE_SYSTEM_TESTING)
 
     #### TTFF
     set(OPT_LIBS_ ${Boost_LIBRARIES} Threads::Threads Gflags::gflags Glog::glog
-                  Gnuradio::runtime ${GTEST_LIBRARIES}
+                  Gnuradio::runtime GTest::GTest GTest::Main
                   Gnuradio::blocks Gnuradio::filter
                   Gnuradio::analog gnss_sp_libs
                   gnss_rx gnss_system_parameters)
@@ -469,7 +495,7 @@ if(ENABLE_SYSTEM_TESTING)
     if(ENABLE_SYSTEM_TESTING_EXTRA)
         #### POSITION_TEST
         set(OPT_LIBS_ ${Boost_LIBRARIES} Threads::Threads Gflags::gflags Glog::glog
-                      ${GTEST_LIBRARIES} Gnuradio::runtime
+                      GTest::GTest GTest::Main Gnuradio::runtime
                       Gnuradio::blocks Gnuradio::filter
                       Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
                       gnss_sp_libs gnss_rx gnss_system_parameters
@@ -505,7 +531,7 @@ target_link_libraries(flowgraph_test PUBLIC ${Boost_LIBRARIES}
     Gflags::gflags
     Glog::glog
     Gnuradio::runtime
-    ${GTEST_LIBRARIES}
+    GTest::GTest GTest::Main
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
@@ -519,11 +545,7 @@ target_link_libraries(flowgraph_test PUBLIC ${Boost_LIBRARIES}
 target_include_directories(flowgraph_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
 
 add_test(flowgraph_test flowgraph_test)
-if(NOT ${GTEST_DIR_LOCAL})
-    add_dependencies(flowgraph_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else()
-    add_dependencies(flowgraph_test gtest)
-endif()
+
 set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -541,7 +563,7 @@ add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
 target_link_libraries(gnss_block_test PUBLIC ${Boost_LIBRARIES}
     Gflags::gflags
     Glog::glog
-    ${GTEST_LIBRARIES}
+    GTest::GTest GTest::Main
     Gnuradio::runtime
     Gnuradio::blocks
     Gnuradio::filter
@@ -557,11 +579,6 @@ target_link_libraries(gnss_block_test PUBLIC ${Boost_LIBRARIES}
 )
 target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
 add_test(gnss_block_test gnss_block_test)
-if(NOT ${GTEST_DIR_LOCAL})
-    add_dependencies(gnss_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else()
-    add_dependencies(gnss_block_test gtest)
-endif()
 set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 
 #########################################################
@@ -572,7 +589,7 @@ add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.
 target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
     Gflags::gflags
     Glog::glog
-    ${GTEST_LIBRARIES}
+    GTest::GTest GTest::Main
     Gnuradio::runtime
     Gnuradio::blocks
     Gnuradio::filter
@@ -584,11 +601,6 @@ target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
     Volkgnsssdr::volkgnsssdr
 )
 add_test(gnuradio_block_test gnuradio_block_test)
-if(NOT ${GTEST_DIR_LOCAL})
-    add_dependencies(gnuradio_block_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else()
-    add_dependencies(gnuradio_block_test gtest)
-endif()
 set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -601,7 +613,7 @@ target_link_libraries(matio_test
         Gflags::gflags
         Glog::glog
         gnss_rx
-        ${GTEST_LIBRARIES}
+        GTest::GTest GTest::Main
         gnss_system_parameters
         Matio::matio
 )
@@ -620,7 +632,7 @@ target_link_libraries(acq_test
         ${Boost_LIBRARIES}
         Gflags::gflags
         Glog::glog
-        ${GTEST_LIBRARIES}
+        GTest::GTest GTest::Main
         Gnuradio::runtime
         Gnuradio::blocks
         Gnuradio::filter
@@ -635,11 +647,7 @@ target_link_libraries(acq_test
 )
 
 add_test(acq_test acq_test)
-if(NOT ${GTEST_DIR_LOCAL})
-    add_dependencies(acq_test acq_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else()
-    add_dependencies(acq_test acq_test gtest)
-endif()
+
 set_property(TEST acq_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -656,7 +664,7 @@ target_link_libraries(trk_test
         ${Boost_LIBRARIES}
         Gflags::gflags
         Glog::glog
-        ${GTEST_LIBRARIES}
+        GTest::GTest GTest::Main
         Gnuradio::runtime
         Gnuradio::blocks
         Gnuradio::filter
@@ -669,11 +677,7 @@ target_link_libraries(trk_test
         Volkgnsssdr::volkgnsssdr
 )
 add_test(trk_test trk_test)
-if(NOT ${GTEST_DIR_LOCAL})
-    add_dependencies(trk_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-else()
-    add_dependencies(trk_test gtest)
-endif()
+
 set_property(TEST trk_test PROPERTY TIMEOUT 30)
 
 
@@ -690,16 +694,12 @@ if(NOT ENABLE_PACKAGING)
         Glog::glog
         signal_source_adapters
         gnss_sp_libs
-        ${GTEST_LIBRARIES}
+        GTest::GTest GTest::Main
         gnss_rx
     )
 
     add_test(control_thread_test control_thread_test)
-    if(NOT ${GTEST_DIR_LOCAL})
-        add_dependencies(control_thread_test gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
-    else()
-        add_dependencies(control_thread_test gtest)
-    endif()
+
     set_property(TEST control_thread_test PROPERTY TIMEOUT 30)
 endif()
 

From 0162a05e24ff0f2e11bf71ffd2d93a8d83b73b5d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 17:21:32 +0100
Subject: [PATCH 008/123] Remove  variable, replace it by Boost imported
 targets

---
 src/tests/CMakeLists.txt | 63 ++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 18 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 3ed306c0c..6800c1e2b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -419,7 +419,9 @@ if(ENABLE_FPGA)
     )
     target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga
         PUBLIC
-            ${Boost_LIBRARIES}
+            Boost::filesystem
+            Boost::system
+            Boost::thread
             Gflags::gflags
             Glog::glog
             GTest::GTest GTest::Main
@@ -485,21 +487,25 @@ if(ENABLE_SYSTEM_TESTING)
     add_definitions(-DHOST_SYSTEM="${HOST_SYSTEM}")
 
     #### TTFF
-    set(OPT_LIBS_ ${Boost_LIBRARIES} Threads::Threads Gflags::gflags Glog::glog
-                  Gnuradio::runtime GTest::GTest GTest::Main
-                  Gnuradio::blocks Gnuradio::filter
-                  Gnuradio::analog gnss_sp_libs
-                  gnss_rx gnss_system_parameters)
+    set(OPT_LIBS_ Boost::filesystem Boost::system Boost::thread Boost::date_time
+        Threads::Threads Gflags::gflags Glog::glog
+        Gnuradio::runtime GTest::GTest GTest::Main
+        Gnuradio::blocks Gnuradio::filter
+        Gnuradio::analog gnss_sp_libs
+        gnss_rx gnss_system_parameters
+    )
     add_system_test(ttff)
 
     if(ENABLE_SYSTEM_TESTING_EXTRA)
         #### POSITION_TEST
-        set(OPT_LIBS_ ${Boost_LIBRARIES} Threads::Threads Gflags::gflags Glog::glog
-                      GTest::GTest GTest::Main Gnuradio::runtime
-                      Gnuradio::blocks Gnuradio::filter
-                      Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
-                      gnss_sp_libs gnss_rx gnss_system_parameters
-                      system_testing_lib signal_processing_testing_lib)
+        set(OPT_LIBS_ Boost::filesystem Boost::system Boost::thread
+            Threads::Threads Gflags::gflags Glog::glog
+            GTest::GTest GTest::Main Gnuradio::runtime
+            Gnuradio::blocks Gnuradio::filter
+            Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
+            gnss_sp_libs gnss_rx gnss_system_parameters
+            system_testing_lib signal_processing_testing_lib
+        )
         add_system_test(position_test)
     else()
         # Avoid working with old executables if they were switched ON and then OFF
@@ -527,7 +533,10 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 add_executable(flowgraph_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc)
 
-target_link_libraries(flowgraph_test PUBLIC ${Boost_LIBRARIES}
+target_link_libraries(flowgraph_test PUBLIC
+    Boost::filesystem
+    Boost::system
+    Boost::thread
     Gflags::gflags
     Glog::glog
     Gnuradio::runtime
@@ -560,7 +569,10 @@ add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
 )
-target_link_libraries(gnss_block_test PUBLIC ${Boost_LIBRARIES}
+target_link_libraries(gnss_block_test PUBLIC
+    Boost::filesystem
+    Boost::system
+    Boost::thread
     Gflags::gflags
     Glog::glog
     GTest::GTest GTest::Main
@@ -577,8 +589,11 @@ target_link_libraries(gnss_block_test PUBLIC ${Boost_LIBRARIES}
     gnss_system_parameters
     Volkgnsssdr::volkgnsssdr
 )
+
 target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+
 add_test(gnss_block_test gnss_block_test)
+
 set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 
 #########################################################
@@ -586,7 +601,10 @@ set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc
 )
-target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
+target_link_libraries(gnuradio_block_test PUBLIC
+    Boost::filesystem
+    Boost::system
+    Boost::thread
     Gflags::gflags
     Glog::glog
     GTest::GTest GTest::Main
@@ -600,7 +618,9 @@ target_link_libraries(gnuradio_block_test ${Boost_LIBRARIES}
     signal_source_gr_blocks
     Volkgnsssdr::volkgnsssdr
 )
+
 add_test(gnuradio_block_test gnuradio_block_test)
+
 set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
 
 #########################################################
@@ -629,7 +649,9 @@ add_executable(acq_test
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc)
 target_link_libraries(acq_test
     PUBLIC
-        ${Boost_LIBRARIES}
+        Boost::filesystem
+        Boost::system
+        Boost::thread
         Gflags::gflags
         Glog::glog
         GTest::GTest GTest::Main
@@ -661,7 +683,9 @@ add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
 
 target_link_libraries(trk_test
     PUBLIC
-        ${Boost_LIBRARIES}
+        Boost::filesystem
+        Boost::system
+        Boost::thread
         Gflags::gflags
         Glog::glog
         GTest::GTest GTest::Main
@@ -689,7 +713,10 @@ if(NOT ENABLE_PACKAGING)
         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc
     )
 
-    target_link_libraries(control_thread_test ${Boost_LIBRARIES}
+    target_link_libraries(control_thread_test PUBLIC
+        Boost::filesystem
+        Boost::system
+        Boost::thread
         Gflags::gflags
         Glog::glog
         signal_source_adapters

From 1738bfd10f5610996d264b338ff9c2e3e8205bb9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 17:27:21 +0100
Subject: [PATCH 009/123] Fix building for old CMake versions (<3.1)

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85350c107..c70ef80e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -442,7 +442,7 @@ if(CMAKE_VERSION VERSION_LESS 3.1)
     set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
     set_property(TARGET Threads::Threads PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
     include(GNUInstallDirs)
-    set_property(TARGET Threads::Threads PROPERTY IMPORTED_LOCATION /usr/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}$pthread${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set_property(TARGET Threads::Threads PROPERTY IMPORTED_LOCATION /usr/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}pthread${CMAKE_SHARED_LIBRARY_SUFFIX})
 else()
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     if(CMAKE_CROSSCOMPILING)

From 3ddbef49ba15d4348d0bfb598ee62498a406f2ea Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 19:26:09 +0100
Subject: [PATCH 010/123] Fix gtest includes

---
 src/tests/CMakeLists.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 6800c1e2b..476d1c7d8 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -85,6 +85,7 @@ if(NOT ${GTEST_DIR_LOCAL})
     endif()
 
     if(NOT TARGET GTest::GTest)
+        file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/include)
         add_library(GTest::GTest STATIC IMPORTED)
         add_dependencies(GTest::GTest gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
         set_target_properties(GTest::GTest PROPERTIES
@@ -114,20 +115,19 @@ else()
         add_library(gtest STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest-all.cc)
         target_include_directories(gtest
             PUBLIC
-                ${LIBGTEST_DEV_DIR}/googletest/include
-                ${LIBGTEST_DEV_DIR}/googletest
+                ${GTEST_INCLUDE_DIRECTORIES}
         )
         add_library(gtest_main STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest_main.cc)
         target_include_directories(gtest_main
             PUBLIC
-                ${LIBGTEST_DEV_DIR}/googletest/include
+                ${GTEST_INCLUDE_DIRECTORIES}
         )
         if(NOT TARGET GTest::GTest)
             add_library(GTest::GTest STATIC IMPORTED)
             add_dependencies(GTest::GTest gtest)
             set_target_properties(GTest::GTest PROPERTIES
                 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-                INTERFACE_INCLUDE_DIRECTORIES "${LIBGTEST_DEV_DIR}/googletest/include"
+                INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}"
                 INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
                 IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
             )
@@ -140,7 +140,7 @@ else()
             add_dependencies(GTest::Main gtest_main)
             set_target_properties(GTest::Main PROPERTIES
                 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-                INTERFACE_INCLUDE_DIRECTORIES "${LIBGTEST_DEV_DIR}/googletest/include"
+                INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}"
                 INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
                 IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
         )

From 627ab017072dae1de1b507c9a471b0c1bdb7ad5d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 19:45:31 +0100
Subject: [PATCH 011/123] Fix Gtest detection

---
 CMakeLists.txt           | 2 +-
 src/tests/CMakeLists.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c70ef80e7..3d2735b50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -465,7 +465,7 @@ if(ENABLE_UNIT_TESTING OR ENABLE_SYSTEM_TESTING)
     endif()
     if(GTEST_DIR)
         message(STATUS "Googletest root folder set at ${GTEST_DIR}")
-        find_path(LIBGTEST_DEV_DIR NAMES googletest/src/gtest-all.cc PATHS ${GTEST_DIR})
+        find_path(LIBGTEST_DEV_DIR NAMES src/gtest-all.cc PATHS ${GTEST_DIR} ${GTEST_DIR}/googletest)
         if(LIBGTEST_DEV_DIR)
             message(STATUS "Googletest has been found.")
         else()
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 476d1c7d8..0202a4ec0 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -112,12 +112,12 @@ if(NOT ${GTEST_DIR_LOCAL})
 else()
     if(GTEST_INCLUDE_DIRS)
         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
-        add_library(gtest STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest-all.cc)
+        add_library(gtest STATIC ${LIBGTEST_DEV_DIR}/src/gtest-all.cc)
         target_include_directories(gtest
             PUBLIC
                 ${GTEST_INCLUDE_DIRECTORIES}
         )
-        add_library(gtest_main STATIC ${LIBGTEST_DEV_DIR}/googletest/src/gtest_main.cc)
+        add_library(gtest_main STATIC ${LIBGTEST_DEV_DIR}/src/gtest_main.cc)
         target_include_directories(gtest_main
             PUBLIC
                 ${GTEST_INCLUDE_DIRECTORIES}

From 54473809f79336f35f34abdcc623ab97f0371c8f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 20:31:40 +0100
Subject: [PATCH 012/123] Imported target for GPerftools

---
 cmake/Modules/FindGPERFTOOLS.cmake | 49 ++++++++++++++++++++++++++++--
 src/main/CMakeLists.txt            | 12 +++-----
 src/tests/CMakeLists.txt           | 37 +++++++++++-----------
 3 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/cmake/Modules/FindGPERFTOOLS.cmake b/cmake/Modules/FindGPERFTOOLS.cmake
index 67dfff8af..1c778574f 100644
--- a/cmake/Modules/FindGPERFTOOLS.cmake
+++ b/cmake/Modules/FindGPERFTOOLS.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors)
+# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -33,6 +33,12 @@
 # GPERFTOOLS_FOUND System has Gperftools libs/headers
 # GPERFTOOLS_LIBRARIES The Gperftools libraries (tcmalloc & profiler)
 # GPERFTOOLS_INCLUDE_DIR The location of Gperftools headers
+#
+# Provides the following imported targets:
+# Gperftools::tcmalloc
+# Gperftools::profiler
+# Gperftools::gperftools
+#
 
 find_library(GPERFTOOLS_TCMALLOC
   NAMES tcmalloc
@@ -41,6 +47,8 @@ find_library(GPERFTOOLS_TCMALLOC
         $ENV{GPERFTOOLS_ROOT}/lib
         ${GPERFTOOLS_ROOT}/lib64
         $ENV{GPERFTOOLS_ROOT}/lib64
+        /usr/lib
+        /usr/lib64
 )
 
 find_library(GPERFTOOLS_PROFILER
@@ -50,6 +58,8 @@ find_library(GPERFTOOLS_PROFILER
         $ENV{GPERFTOOLS_ROOT}/lib
         ${GPERFTOOLS_ROOT}/lib64
         $ENV{GPERFTOOLS_ROOT}/lib64
+        /usr/lib
+        /usr/lib64
 )
 
 find_library(GPERFTOOLS_TCMALLOC_AND_PROFILER
@@ -59,6 +69,8 @@ find_library(GPERFTOOLS_TCMALLOC_AND_PROFILER
         $ENV{GPERFTOOLS_ROOT}/lib
         ${GPERFTOOLS_ROOT}/lib64
         $ENV{GPERFTOOLS_ROOT}/lib64
+        /usr/lib
+        /usr/lib64
 )
 
 find_path(GPERFTOOLS_INCLUDE_DIR
@@ -66,6 +78,7 @@ find_path(GPERFTOOLS_INCLUDE_DIR
   HINTS ${Gperftools_ROOT_DIR}/include
         ${GPERFTOOLS_ROOT}/include
         $ENV{GPERFTOOLS_ROOT}/include
+        /usr/include
 )
 
 set(GPERFTOOLS_LIBRARIES ${GPERFTOOLS_TCMALLOC_AND_PROFILER})
@@ -76,10 +89,42 @@ find_package_handle_standard_args(
   DEFAULT_MSG
   GPERFTOOLS_LIBRARIES
   GPERFTOOLS_INCLUDE_DIR
+  GPERFTOOLS_TCMALLOC
+  GPERFTOOLS_PROFILER
+
 )
 
+if(GPERFTOOLS_FOUND AND NOT TARGET Gperftools::tcmalloc)
+    add_library(Gperftools::tcmalloc SHARED IMPORTED)
+    set_target_properties(Gperftools::tcmalloc PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GPERFTOOLS_TCMALLOC}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GPERFTOOLS_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${GPERFTOOLS_TCMALLOC}"
+    )
+endif()
+
+if(GPERFTOOLS_FOUND AND NOT TARGET Gperftools::profiler)
+    add_library(Gperftools::profiler SHARED IMPORTED)
+    set_target_properties(Gperftools::profiler PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GPERFTOOLS_PROFILER}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GPERFTOOLS_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${GPERFTOOLS_PROFILER}"
+    )
+endif()
+
+if(GPERFTOOLS_FOUND AND NOT TARGET Gperftools::gperftools)
+    add_library(Gperftools::gperftools SHARED IMPORTED)
+    set_target_properties(Gperftools::gperftools PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${GPERFTOOLS_TCMALLOC_AND_PROFILER}"
+        INTERFACE_INCLUDE_DIRECTORIES "${GPERFTOOLS_INCLUDE_DIR}"
+        INTERFACE_LINK_LIBRARIES "${GPERFTOOLS_TCMALLOC_AND_PROFILER}"
+    )
+endif()
+
 mark_as_advanced(
-  Gperftools_ROOT_DIR
   GPERFTOOLS_TCMALLOC
   GPERFTOOLS_PROFILER
   GPERFTOOLS_TCMALLOC_AND_PROFILER
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 0008ae648..b5d9f35bb 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -30,13 +30,13 @@ target_link_libraries(gnss-sdr
         gnss_sdr_flags
 )
 
+target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
+
 # Disable internal logging
 if(NOT ENABLE_LOG)
     target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1)
 endif()
 
-target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
-
 if(ENABLE_CUDA)
     target_link_libraries(gnss-sdr
         PUBLIC
@@ -53,12 +53,8 @@ if(ENABLE_GPERFTOOLS)
     if(GPERFTOOLS_FOUND)
         target_link_libraries(gnss-sdr
             PUBLIC
-                ${GPERFTOOLS_PROFILER}
-                ${GPERFTOOLS_TCMALLOC}
-        )
-        target_include_directories(gnss-sdr
-            PRIVATE
-                ${GPERFTOOLS_INCLUDE_DIR}
+                Gperftools::profiler
+                Gperftools::tcmalloc
         )
     endif()
 endif()
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0202a4ec0..bc8419cbb 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -151,23 +151,8 @@ endif()
 
 
 ################################################################################
-# Optional libraries
+# Definitions
 ################################################################################
-set(GNSS_SDR_TEST_OPTIONAL_LIBS "")
-set(GNSS_SDR_TEST_OPTIONAL_HEADERS "")
-
-if(ENABLE_CUDA)
-    set(GNSS_SDR_TEST_OPTIONAL_HEADERS ${GNSS_SDR_TEST_OPTIONAL_HEADERS} ${CUDA_INCLUDE_DIRS})
-    set(GNSS_SDR_TEST_OPTIONAL_LIBS ${GNSS_SDR_TEST_OPTIONAL_LIBS} ${CUDA_LIBRARIES})
-endif()
-
-if(ENABLE_GPERFTOOLS)
-    if(GPERFTOOLS_FOUND)
-        set(GNSS_SDR_TEST_OPTIONAL_LIBS "${GNSS_SDR_TEST_OPTIONAL_LIBS};${GPERFTOOLS_LIBRARIES}")
-        set(GNSS_SDR_TEST_OPTIONAL_HEADERS "${GNSS_SDR_TEST_OPTIONAL_HEADERS};${GPERFTOOLS_INCLUDE_DIR}")
-    endif()
-endif()
-
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     add_definitions(-DGR_GREATER_38=1)
@@ -348,7 +333,6 @@ endif()
 
 set(LIST_INCLUDE_DIRS
     ${CMAKE_SOURCE_DIR}/src/tests/common-files
-    ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
 )
 
 include_directories(${LIST_INCLUDE_DIRS})
@@ -395,7 +379,6 @@ if(ENABLE_UNIT_TESTING)
             pvt_adapters
             signal_processing_testing_lib
             system_testing_lib
-            ${GNSS_SDR_TEST_OPTIONAL_LIBS}
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@@ -410,6 +393,24 @@ if(ENABLE_UNIT_TESTING)
             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:run_tests>
             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:run_tests>)
     endif()
+    if(ENABLE_GPERFTOOLS)
+        if(GPERFTOOLS_FOUND)
+            target_link_libraries(run_tests
+                PUBLIC
+                    Gperftools::gperftools
+            )
+        endif()
+    endif()
+    if(ENABLE_CUDA)
+        target_link_libraries(run_tests
+            PUBLIC
+                ${CUDA_LIBRARIES}
+        )
+        target_include_directories(run_tests
+            PUBLIC
+                ${CUDA_INCLUDE_DIRS}
+        )
+    endif()
 endif()
 
 if(ENABLE_FPGA)

From 5d9dea953775ab94468d2557cc9343be77acb1d9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 20:51:50 +0100
Subject: [PATCH 013/123] Clean CMake scripts

---
 .../tracking/adapters/CMakeLists.txt          | 18 +++++++------
 .../tracking/gnuradio_blocks/CMakeLists.txt   | 27 +++++++++----------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index a7211b02d..b9380c539 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -26,10 +26,6 @@ if(ENABLE_CUDA)
         ${OPT_TRACKING_ADAPTERS_HEADERS}
         gps_l1_ca_dll_pll_tracking_gpu.h
     )
-    set(OPT_TRACKING_INCLUDE_DIRS
-        ${OPT_TRACKING_INCLUDE_DIRS}
-        ${CUDA_INCLUDE_DIRS}
-    )
 endif()
 
 if(ENABLE_FPGA)
@@ -104,10 +100,16 @@ target_link_libraries(tracking_adapters
         gnss_sdr_flags
 )
 
-target_include_directories(tracking_adapters
-    PUBLIC
-        ${OPT_TRACKING_INCLUDE_DIRS}
-)
+if(ENABLE_CUDA)
+    target_link_libraries(tracking_adapters
+        PUBLIC
+            ${CUDA_LIBRARIES}
+    )
+    target_include_directories(tracking_adapters
+        PUBLIC
+            ${CUDA_INCLUDE_DIRS}
+    )
+endif()
 
 set_property(TARGET tracking_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 5451846e2..bf342a553 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -25,14 +25,6 @@ if(ENABLE_CUDA)
         ${OPT_TRACKING_BLOCKS_HEADERS}
         gps_l1_ca_dll_pll_tracking_gpu_cc.h
     )
-    set(OPT_TRACKING_INCLUDES
-        ${OPT_TRACKING_INCLUDES}
-        ${CUDA_INCLUDE_DIRS}
-    )
-    set(OPT_TRACKING_LIBRARIES
-        ${OPT_TRACKING_LIBRARIES}
-        ${CUDA_LIBRARIES}
-    )
 endif()
 
 if(ENABLE_FPGA)
@@ -91,20 +83,25 @@ add_library(tracking_gr_blocks
 target_link_libraries(tracking_gr_blocks
     PUBLIC
         Boost::boost
-        tracking_lib
         Gnuradio::blocks
+        Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sdr_flags
         gnss_sp_libs
         gnss_rx
-        Matio::matio
-        ${OPT_TRACKING_LIBRARIES}
+        tracking_lib
 )
 
-target_include_directories(tracking_gr_blocks
-    PUBLIC
-        ${OPT_TRACKING_INCLUDES}
-)
+if(ENABLE_CUDA)
+    target_link_libraries(tracking_gr_blocks
+        PUBLIC
+            ${CUDA_LIBRARIES}
+    )
+    target_include_directories(tracking_gr_blocks
+        PUBLIC
+            ${CUDA_INCLUDE_DIRS}
+    )
+endif()
 
 set_property(TARGET tracking_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES

From 8fc749cf726f0a992319ad3b06cb9583914ea4f2 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 20:52:24 +0100
Subject: [PATCH 014/123] Workaround of a CMake bug in Debian 8.11

---
 CMakeLists.txt | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d2735b50..2b1040daa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -442,7 +442,15 @@ if(CMAKE_VERSION VERSION_LESS 3.1)
     set_property(TARGET Threads::Threads PROPERTY INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
     set_property(TARGET Threads::Threads PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
     include(GNUInstallDirs)
-    set_property(TARGET Threads::Threads PROPERTY IMPORTED_LOCATION /usr/${CMAKE_INSTALL_LIBDIR}/${CMAKE_FIND_LIBRARY_PREFIXES}pthread${CMAKE_SHARED_LIBRARY_SUFFIX})
+    # Fix bug in Debian 8.11
+    if(${LINUX_DISTRIBUTION} MATCHES "Debian")
+        if(${LINUX_VER} VERSION_LESS 8.12)
+            if(ARCH_64BITS)
+                set(FIX_PTHREADS_LOCATION "x86_64-linux-gnu/")
+            endif()
+        endif()
+    endif()
+    set_property(TARGET Threads::Threads PROPERTY IMPORTED_LOCATION /usr/${CMAKE_INSTALL_LIBDIR}/${FIX_PTHREADS_LOCATION}${CMAKE_FIND_LIBRARY_PREFIXES}pthread${CMAKE_SHARED_LIBRARY_SUFFIX})
 else()
     set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
     if(CMAKE_CROSSCOMPILING)

From 60637c61258c134945f1ee62af90aa83c5baa8a9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 21:31:40 +0100
Subject: [PATCH 015/123] Reorder dependencies

---
 src/algorithms/PVT/adapters/CMakeLists.txt                    | 2 +-
 src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt             | 2 +-
 src/algorithms/acquisition/adapters/CMakeLists.txt            | 2 +-
 src/algorithms/channel/libs/CMakeLists.txt                    | 2 +-
 src/algorithms/conditioner/adapters/CMakeLists.txt            | 2 +-
 src/algorithms/libs/CMakeLists.txt                            | 2 +-
 src/algorithms/signal_generator/adapters/CMakeLists.txt       | 3 +--
 .../signal_generator/gnuradio_blocks/CMakeLists.txt           | 2 +-
 src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt   | 4 ++--
 .../telemetry_decoder/gnuradio_blocks/CMakeLists.txt          | 4 ++--
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 2bf0e3e95..61a6e6f7f 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -31,12 +31,12 @@ add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
 
 target_link_libraries(pvt_adapters
     PUBLIC
-        pvt_gr_blocks
         Armadillo::armadillo
         Gnuradio::runtime
         gnss_system_parameters
         gnss_rx
         pvt_lib
+        pvt_gr_blocks
     PRIVATE
         Boost::serialization
 )
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index e9ce9906e..fa8361704 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -31,8 +31,8 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 target_link_libraries(pvt_gr_blocks
     PUBLIC
         Boost::date_time
-        pvt_lib
         Gnuradio::runtime
+        pvt_lib
         gnss_system_parameters
         gnss_rx
     PRIVATE
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 434c7e5cc..6780c8b50 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -92,11 +92,11 @@ add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 
 target_link_libraries(acq_adapters
     PUBLIC
+        Gnuradio::blocks
         gnss_sp_libs
         gnss_sdr_flags
         acq_gr_blocks
         rx_core_lib
-        Gnuradio::blocks
         gnss_system_parameters
     PRIVATE
         Boost::boost
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index 091b2ee38..0d77d88f3 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -35,8 +35,8 @@ add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 
 target_link_libraries(channel_fsm
     PUBLIC
-        gnss_rx
         Gnuradio::runtime
+        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index ee3f854ce..1d9760397 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -36,8 +36,8 @@ add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}
 
 target_link_libraries(conditioner_adapters
     PUBLIC
-        gnss_rx
         Gnuradio::runtime
+        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index d4c0e73fd..3b056f3a6 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -109,9 +109,9 @@ add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 
 target_link_libraries(gnss_sp_libs
     PUBLIC
+        Armadillo::armadillo
         Boost::boost
         Gflags::gflags
-        Armadillo::armadillo
         Gnuradio::runtime
         Gnuradio::blocks
         Volk::volk ${ORC_LIBRARIES}
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index f82258f93..3c33feea9 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -28,9 +28,8 @@ add_library(signal_generator_adapters
 
 target_link_libraries(signal_generator_adapters
     PUBLIC
-        signal_generator_blocks
-        Gnuradio::runtime
         Gnuradio::blocks
+        signal_generator_blocks
         gnss_rx
     PRIVATE
         Gflags::gflags
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 8d82e6ee6..2325d0acb 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -32,8 +32,8 @@ target_link_libraries(signal_generator_blocks
         Gnuradio::runtime
         gnss_system_parameters
     PRIVATE
-        gnss_sp_libs
         Volkgnsssdr::volkgnsssdr
+        gnss_sp_libs
 )
 
 target_include_directories(signal_generator_blocks
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index d83fd26d5..fb76278b4 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -60,9 +60,9 @@ add_library(signal_source_gr_blocks
 
 target_link_libraries(signal_source_gr_blocks
     PUBLIC
-        signal_source_lib
-        Gnuradio::runtime
         Boost::thread
+        Gnuradio::runtime
+        signal_source_lib
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index 6b1c70661..aabd596ca 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -50,12 +50,12 @@ add_library(telemetry_decoder_gr_blocks
 
 target_link_libraries(telemetry_decoder_gr_blocks
     PUBLIC
+        Gnuradio::runtime
+        Volkgnsssdr::volkgnsssdr
         telemetry_decoder_libswiftcnav
         telemetry_decoder_lib
         gnss_system_parameters
         gnss_rx
-        Gnuradio::runtime
-        Volkgnsssdr::volkgnsssdr
     PRIVATE
         Boost::boost
         Gflags::gflags

From 4b7e3992c605d2bb2b22dbd805b1cdb2fbe93ac7 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 22:06:48 +0100
Subject: [PATCH 016/123] Reorder imported targets, add gnss_system_parameters
 to control_thread_test

---
 src/tests/CMakeLists.txt | 46 ++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index bc8419cbb..b7c07ea6d 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -357,10 +357,11 @@ if(ENABLE_UNIT_TESTING)
             Gnuradio::blocks
             Gnuradio::filter
             Gnuradio::analog
+            GTest::GTest
+            GTest::Main
             Matio::matio
             Volk::volk
             Volkgnsssdr::volkgnsssdr
-            GTest::GTest GTest::Main
             gnss_sp_libs
             gnss_rx
             gnss_system_parameters
@@ -420,17 +421,18 @@ if(ENABLE_FPGA)
     )
     target_link_libraries(gps_l1_ca_dll_pll_tracking_test_fpga
         PUBLIC
+            Armadillo::armadillo
             Boost::filesystem
             Boost::system
             Boost::thread
             Gflags::gflags
             Glog::glog
-            GTest::GTest GTest::Main
             Gnuradio::runtime
             Gnuradio::blocks
-            Armadillo::armadillo
-            Volk::volk
+            GTest::GTest
+            GTest::Main
             Matio::matio
+            Volk::volk
             channel_fsm
             gnss_sp_libs
             gnss_rx
@@ -541,7 +543,9 @@ target_link_libraries(flowgraph_test PUBLIC
     Gflags::gflags
     Glog::glog
     Gnuradio::runtime
-    GTest::GTest GTest::Main
+    GTest::GTest
+    GTest::Main
+    Volkgnsssdr::volkgnsssdr
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
@@ -549,7 +553,6 @@ target_link_libraries(flowgraph_test PUBLIC
     signal_source_gr_blocks
     input_filter_adapters
     channel_adapters
-    Volkgnsssdr::volkgnsssdr
 )
 
 target_include_directories(flowgraph_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
@@ -576,11 +579,13 @@ target_link_libraries(gnss_block_test PUBLIC
     Boost::thread
     Gflags::gflags
     Glog::glog
-    GTest::GTest GTest::Main
     Gnuradio::runtime
     Gnuradio::blocks
     Gnuradio::filter
     Gnuradio::analog
+    GTest::GTest
+    GTest::Main
+    Volkgnsssdr::volkgnsssdr
     signal_source_adapters
     datatype_adapters
     input_filter_adapters
@@ -588,7 +593,6 @@ target_link_libraries(gnss_block_test PUBLIC
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
-    Volkgnsssdr::volkgnsssdr
 )
 
 target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
@@ -608,16 +612,17 @@ target_link_libraries(gnuradio_block_test PUBLIC
     Boost::thread
     Gflags::gflags
     Glog::glog
-    GTest::GTest GTest::Main
     Gnuradio::runtime
     Gnuradio::blocks
     Gnuradio::filter
     Gnuradio::analog
+    GTest::GTest
+    GTest::Main
+    Volkgnsssdr::volkgnsssdr
     gnss_sp_libs
     gnss_rx
     gnss_system_parameters
     signal_source_gr_blocks
-    Volkgnsssdr::volkgnsssdr
 )
 
 add_test(gnuradio_block_test gnuradio_block_test)
@@ -633,10 +638,11 @@ target_link_libraries(matio_test
     PUBLIC
         Gflags::gflags
         Glog::glog
-        gnss_rx
-        GTest::GTest GTest::Main
-        gnss_system_parameters
+        GTest::GTest
+        GTest::Main
         Matio::matio
+        gnss_rx
+        gnss_system_parameters
 )
 
 add_test(matio_test matio_test)
@@ -655,18 +661,19 @@ target_link_libraries(acq_test
         Boost::thread
         Gflags::gflags
         Glog::glog
-        GTest::GTest GTest::Main
         Gnuradio::runtime
         Gnuradio::blocks
         Gnuradio::filter
         Gnuradio::analog
+        GTest::GTest
+        GTest::Main
+        Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
         gnss_rx
         gnss_system_parameters
         signal_generator_blocks
         acq_adapters
         signal_processing_testing_lib
-        Volkgnsssdr::volkgnsssdr
 )
 
 add_test(acq_test acq_test)
@@ -689,17 +696,18 @@ target_link_libraries(trk_test
         Boost::thread
         Gflags::gflags
         Glog::glog
-        GTest::GTest GTest::Main
         Gnuradio::runtime
         Gnuradio::blocks
         Gnuradio::filter
         Gnuradio::analog
+        GTest::GTest
+        GTest::Main
+        Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
         gnss_rx
         tracking_adapters
         gnss_system_parameters
         signal_generator_blocks
-        Volkgnsssdr::volkgnsssdr
 )
 add_test(trk_test trk_test)
 
@@ -720,10 +728,12 @@ if(NOT ENABLE_PACKAGING)
         Boost::thread
         Gflags::gflags
         Glog::glog
+        GTest::GTest
+        GTest::Main
         signal_source_adapters
         gnss_sp_libs
-        GTest::GTest GTest::Main
         gnss_rx
+        gnss_system_parameters
     )
 
     add_test(control_thread_test control_thread_test)

From ae005c62f2de5d78d231993e97338d991267be29 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 22:44:31 +0100
Subject: [PATCH 017/123] Reorder libraries

---
 src/algorithms/PVT/adapters/CMakeLists.txt |  4 +--
 src/algorithms/PVT/libs/CMakeLists.txt     |  2 +-
 src/tests/CMakeLists.txt                   | 31 +++++++++++-----------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 61a6e6f7f..6111ff795 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -33,10 +33,10 @@ target_link_libraries(pvt_adapters
     PUBLIC
         Armadillo::armadillo
         Gnuradio::runtime
+        pvt_gr_blocks
+        pvt_lib
         gnss_system_parameters
         gnss_rx
-        pvt_lib
-        pvt_gr_blocks
     PRIVATE
         Boost::serialization
 )
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index 9b9237128..df4b2a533 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -59,9 +59,9 @@ target_link_libraries(pvt_lib
     PUBLIC
         Armadillo::armadillo
         Boost::date_time
-        gnss_system_parameters
         gnss_sp_libs
         rtklib_lib
+        gnss_system_parameters
         gnss_rx
     PRIVATE
         Boost::filesystem
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index b7c07ea6d..06729131a 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -363,8 +363,6 @@ if(ENABLE_UNIT_TESTING)
             Volk::volk
             Volkgnsssdr::volkgnsssdr
             gnss_sp_libs
-            gnss_rx
-            gnss_system_parameters
             core_monitor_lib
             signal_source_adapters
             datatype_adapters
@@ -378,8 +376,11 @@ if(ENABLE_UNIT_TESTING)
             obs_adapters
             signal_generator_adapters
             pvt_adapters
+            pvt_lib
             signal_processing_testing_lib
             system_testing_lib
+            gnss_system_parameters
+            gnss_rx
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@@ -435,11 +436,11 @@ if(ENABLE_FPGA)
             Volk::volk
             channel_fsm
             gnss_sp_libs
-            gnss_rx
             datatype_adapters
-            gnss_system_parameters
             signal_processing_testing_lib
             tracking_adapters
+            gnss_system_parameters
+            gnss_rx
     )
     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
         RUNTIME DESTINATION bin
@@ -495,7 +496,7 @@ if(ENABLE_SYSTEM_TESTING)
         Gnuradio::runtime GTest::GTest GTest::Main
         Gnuradio::blocks Gnuradio::filter
         Gnuradio::analog gnss_sp_libs
-        gnss_rx gnss_system_parameters
+        gnss_system_parameters gnss_rx
     )
     add_system_test(ttff)
 
@@ -506,7 +507,7 @@ if(ENABLE_SYSTEM_TESTING)
             GTest::GTest GTest::Main Gnuradio::runtime
             Gnuradio::blocks Gnuradio::filter
             Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
-            gnss_sp_libs gnss_rx gnss_system_parameters
+            gnss_sp_libs gnss_system_parameters gnss_rx
             system_testing_lib signal_processing_testing_lib
         )
         add_system_test(position_test)
@@ -591,8 +592,8 @@ target_link_libraries(gnss_block_test PUBLIC
     input_filter_adapters
     channel_adapters
     gnss_sp_libs
-    gnss_rx
     gnss_system_parameters
+    gnss_rx
 )
 
 target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
@@ -620,9 +621,9 @@ target_link_libraries(gnuradio_block_test PUBLIC
     GTest::Main
     Volkgnsssdr::volkgnsssdr
     gnss_sp_libs
-    gnss_rx
-    gnss_system_parameters
     signal_source_gr_blocks
+    gnss_system_parameters
+    gnss_rx
 )
 
 add_test(gnuradio_block_test gnuradio_block_test)
@@ -641,8 +642,8 @@ target_link_libraries(matio_test
         GTest::GTest
         GTest::Main
         Matio::matio
-        gnss_rx
         gnss_system_parameters
+        gnss_rx
 )
 
 add_test(matio_test matio_test)
@@ -669,11 +670,11 @@ target_link_libraries(acq_test
         GTest::Main
         Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
-        gnss_rx
-        gnss_system_parameters
         signal_generator_blocks
         acq_adapters
         signal_processing_testing_lib
+        gnss_system_parameters
+        gnss_rx
 )
 
 add_test(acq_test acq_test)
@@ -704,10 +705,10 @@ target_link_libraries(trk_test
         GTest::Main
         Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
-        gnss_rx
         tracking_adapters
-        gnss_system_parameters
         signal_generator_blocks
+        gnss_system_parameters
+        gnss_rx
 )
 add_test(trk_test trk_test)
 
@@ -732,8 +733,8 @@ if(NOT ENABLE_PACKAGING)
         GTest::Main
         signal_source_adapters
         gnss_sp_libs
-        gnss_rx
         gnss_system_parameters
+        gnss_rx
     )
 
     add_test(control_thread_test control_thread_test)

From e5b7eaa36669eb6da6047191e13508ab827036b6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 7 Feb 2019 23:07:24 +0100
Subject: [PATCH 018/123] Reorder static dependencies

---
 src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt | 2 +-
 src/algorithms/data_type_adapter/adapters/CMakeLists.txt  | 4 ++--
 src/algorithms/signal_source/adapters/CMakeLists.txt      | 2 +-
 src/core/receiver/CMakeLists.txt                          | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index 67d639da4..a6d16be63 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -71,8 +71,8 @@ target_link_libraries(acq_gr_blocks
         Gnuradio::runtime
         Gnuradio::fft
         Volk::volk
-        gnss_system_parameters
         acquisition_lib
+        gnss_system_parameters
         ${OPT_LIBRARIES}
     PRIVATE
         Boost::filesystem
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index c88b1f473..ecc220bf4 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -48,10 +48,10 @@ add_library(datatype_adapters
 target_link_libraries(datatype_adapters
     PUBLIC
         Gnuradio::blocks
-        gnss_system_parameters
-        gnss_rx
         data_type_gr_blocks
         gnss_sp_libs
+        gnss_system_parameters
+        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 66b580ff3..d8004e9fd 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -188,9 +188,9 @@ target_link_libraries(signal_source_adapters
         Gnuradio::runtime
         Gnuradio::blocks
         signal_source_gr_blocks
+        signal_source_lib
         gnss_sp_libs
         gnss_rx
-        signal_source_lib
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 915e7f545..857cdcf49 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -142,6 +142,7 @@ target_link_libraries(gnss_rx
         Gnuradio::runtime
         rx_core_lib
         core_monitor_lib
+        gnss_system_parameters
     PRIVATE
         Boost::chrono
         Gflags::gflags

From dfc89868af10e7d7933f5420735985a1c084a67a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 8 Feb 2019 00:05:14 +0100
Subject: [PATCH 019/123] Fix building

---
 src/algorithms/acquisition/libs/CMakeLists.txt | 2 +-
 src/tests/CMakeLists.txt                       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index aa753b054..d3f0aff29 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -41,9 +41,9 @@ target_link_libraries(acquisition_lib
     PRIVATE
         Gflags::gflags
         Glog::glog
+        gnss_sp_libs
         gnss_system_parameters
         gnss_rx
-        gnss_sp_libs
 )
 
 set_property(TARGET acquisition_lib
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 06729131a..8a676331e 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -669,9 +669,10 @@ target_link_libraries(acq_test
         GTest::GTest
         GTest::Main
         Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
         signal_generator_blocks
         acq_adapters
+        acq_gr_blocks
+        gnss_sp_libs
         signal_processing_testing_lib
         gnss_system_parameters
         gnss_rx

From 5c9710afadad9fb4d696341d240c77224f61fb8c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 8 Feb 2019 00:31:13 +0100
Subject: [PATCH 020/123] Update Arch Linux list of dependencies

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7398372ba..f8f48bfd2 100644
--- a/README.md
+++ b/README.md
@@ -112,12 +112,12 @@ Once you have installed these packages, you can jump directly to [download the s
 
 #### Arch Linux
 
-If you are using Arch Linux (with base-devel group installed):
+If you are using Arch Linux:
 
 ~~~~~~
-$ pacman -S cmake git boost boost-libs log4cpp libvolk gnuradio gnuradio-osmosdr \
-       blas lapack gflags google-glog openssl pugixml python-mako python-six \
-       libmatio libpcap gtest
+$ pacman -S gcc make cmake git boost boost-libs log4cpp libvolk gnuradio \
+       gnuradio-osmosdr blas lapack gflags google-glog openssl pugixml \
+       python-mako python-six libmatio libpcap gtest
 ~~~~~~
 
 Once you have installed these packages, you can jump directly to [download the source code and build GNSS-SDR](#download-and-build-linux).
@@ -596,7 +596,7 @@ $ pip install six
 $ brew install openssl
 ~~~~~~
 
-In the last step, Homebrew installs OpenSSL but it does not link it into `/usr/local`. Thus, you must manually link it instead:
+In the last step, Homebrew installs OpenSSL but it does not link it to `/usr/local`. Thus, you must manually link it instead:
 
 ~~~~~~
 $ ln -s /usr/local/opt/openssl/include/openssl /usr/local/include

From 29cf3ffb60c33fb4f29d369d42c9ac4be8e20f16 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 8 Feb 2019 15:16:39 +0100
Subject: [PATCH 021/123] Fix error in creating imported target

---
 cmake/Modules/FindVOLKGNSSSDR.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/Modules/FindVOLKGNSSSDR.cmake b/cmake/Modules/FindVOLKGNSSSDR.cmake
index 448187cad..57abd1d99 100644
--- a/cmake/Modules/FindVOLKGNSSSDR.cmake
+++ b/cmake/Modules/FindVOLKGNSSSDR.cmake
@@ -59,7 +59,7 @@ find_package_handle_standard_args(VOLKGNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES
 mark_as_advanced(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
 
 
-if(GFLAGS_FOUND AND NOT TARGET Volkgnsssdr::volkgnsssdr)
+if(VOLKGNSSSDR_FOUND AND NOT TARGET Volkgnsssdr::volkgnsssdr)
     add_library(Volkgnsssdr::volkgnsssdr SHARED IMPORTED)
     set_target_properties(Volkgnsssdr::volkgnsssdr PROPERTIES
         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"

From a63d7834f4617652ff56850c0728a455385dd10f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 00:12:19 +0100
Subject: [PATCH 022/123] Remove unused include

---
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc             | 1 -
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc           | 1 -
 .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc          | 1 -
 .../acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc  | 1 -
 .../acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc    | 1 -
 .../acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc    | 1 -
 .../acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc | 1 -
 .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc      | 1 -
 .../gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc           | 1 -
 .../gnuradio_blocks/galileo_telemetry_decoder_cc.cc              | 1 -
 .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc            | 1 -
 .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc              | 1 -
 src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc | 1 -
 .../tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc       | 1 -
 .../gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc      | 1 -
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc   | 1 -
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc   | 1 -
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc         | 1 -
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc   | 1 -
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc   | 1 -
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc         | 1 -
 .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc       | 1 -
 .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc       | 1 -
 .../gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc         | 1 -
 .../tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc         | 1 -
 .../gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc       | 1 -
 26 files changed, 26 deletions(-)

diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index c884bcf34..7b127007d 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -36,7 +36,6 @@
  */
 
 #include "galileo_e5a_noncoherent_iq_acquisition_caf_cc.h"
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index 275b8aad0..ef8fe300d 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -30,7 +30,6 @@
  */
 
 #include "galileo_pcps_8ms_acquisition_cc.h"
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
index 51b821e36..c7a67b47c 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
@@ -32,7 +32,6 @@
 
 #include "pcps_acquisition_fine_doppler_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_create_directory.h"
 #include "gps_sdr_signal_processing.h"
 #include <boost/filesystem/path.hpp>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index b01652ec3..1037aabc7 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -33,7 +33,6 @@
 #include "pcps_assisted_acquisition_cc.h"
 #include "GPS_L1_CA.h"
 #include "concurrent_map.h"
-#include "control_message_factory.h"
 #include "gps_acq_assist.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index 99841b5b6..13af36da9 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -36,7 +36,6 @@
 
 #include "pcps_cccwsr_acquisition_cc.h"
 #include "GPS_L1_CA.h"  // GPS_TWO_PI
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
index 0944b9ed8..0838fee7b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@@ -50,7 +50,6 @@
 
 #include "pcps_opencl_acquisition_cc.h"
 #include "GPS_L1_CA.h"  //GPS_TWO_PI
-#include "control_message_factory.h"
 #include "opencl/fft_base_kernels.h"
 #include "opencl/fft_internal.h"
 #include <glog/logging.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index 11c13a979..7377aebae 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -30,7 +30,6 @@
 
 #include "pcps_quicksync_acquisition_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index dced14810..a6013fcaf 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -50,7 +50,6 @@
 
 #include "pcps_tong_acquisition_cc.h"
 #include "GPS_L1_CA.h"  // for GPS_TWO_PI
-#include "control_message_factory.h"
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
index 0553023de..3a18185ec 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
@@ -33,7 +33,6 @@
 
 
 #include "beidou_b1i_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include "convolutional.h"
 #include "display.h"
 #include "gnss_synchro.h"
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
index bb5b68a9e..bece79c18 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
@@ -30,7 +30,6 @@
 
 
 #include "galileo_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include "convolutional.h"
 #include "display.h"
 #include "gnss_synchro.h"
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index ef2988629..8dec53b5a 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -30,7 +30,6 @@
  */
 
 #include "gps_l1_ca_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
index 705df32a4..75b18caef 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
@@ -29,7 +29,6 @@
  */
 
 #include "sbas_l1_telemetry_decoder_cc.h"
-#include "control_message_factory.h"
 #include "gnss_synchro.h"
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index cab1780d3..8f7e5b44d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -43,7 +43,6 @@
 #include "Galileo_E5a.h"
 #include "MATH_CONSTANTS.h"
 #include "beidou_b1i_signal_processing.h"
-#include "control_message_factory.h"
 #include "galileo_e1_signal_processing.h"
 #include "galileo_e5_signal_processing.h"
 #include "gnss_sdr_create_directory.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
index b683e6a15..24b5e4e77 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -42,7 +42,6 @@
 #include "Galileo_E1.h"
 #include "Galileo_E5a.h"
 #include "MATH_CONSTANTS.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_create_directory.h"
 #include "gps_l2c_signal.h"
 #include "gps_l5_signal.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index a79232993..bf97d8eb3 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -39,7 +39,6 @@
 #include "galileo_e1_tcp_connector_tracking_cc.h"
 #include "GPS_L1_CA.h"
 #include "Galileo_E1.h"
-#include "control_message_factory.h"
 #include "galileo_e1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 77603d0aa..7eefb338a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -38,7 +38,6 @@
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
index 96009c777..ed0fecde8 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -38,7 +38,6 @@
 
 #include "glonass_l1_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 70cc662bb..482ea0140 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -38,7 +38,6 @@
 
 #include "glonass_l1_ca_dll_pll_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l1_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index 0299968b3..81fbe50db 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -36,7 +36,6 @@
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
index ec9db011a..92d3e1bcc 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -36,7 +36,6 @@
 
 #include "glonass_l2_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index 62b90e984..2549f85e0 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -38,7 +38,6 @@
 
 #include "glonass_l2_ca_dll_pll_tracking_cc.h"
 #include "GLONASS_L1_L2_CA.h"
-#include "control_message_factory.h"
 #include "glonass_l2_signal_processing.h"
 #include "gnss_sdr_flags.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 5db4bef9b..9701a6810 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -30,7 +30,6 @@
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
index 457b7e65f..847806647 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -30,7 +30,6 @@
 
 #include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
index 36d27c0f6..6fb8197d1 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
@@ -30,7 +30,6 @@
 
 #include "gps_l1_ca_dll_pll_tracking_gpu_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index 20c800430..8c250036c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -39,7 +39,6 @@
 
 #include "gps_l1_ca_kf_tracking_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index db7a28465..451689741 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -37,7 +37,6 @@
 
 #include "gps_l1_ca_tcp_connector_tracking_cc.h"
 #include "GPS_L1_CA.h"
-#include "control_message_factory.h"
 #include "gnss_sdr_flags.h"
 #include "gps_sdr_signal_processing.h"
 #include "lock_detectors.h"

From 59841057e9f6777bffad8d32aa6eb4f4ee0c0af5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 00:16:57 +0100
Subject: [PATCH 023/123] Improve consistency in header guard names

---
 src/algorithms/PVT/libs/monitor_pvt.h          | 6 +++---
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/algorithms/PVT/libs/monitor_pvt.h b/src/algorithms/PVT/libs/monitor_pvt.h
index 4cfc8f991..41f22a1de 100644
--- a/src/algorithms/PVT/libs/monitor_pvt.h
+++ b/src/algorithms/PVT/libs/monitor_pvt.h
@@ -28,8 +28,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef MONITOR_PVT_H_
-#define MONITOR_PVT_H_
+#ifndef GNSS_SDR_MONITOR_PVT_H_
+#define GNSS_SDR_MONITOR_PVT_H_
 
 #include <boost/serialization/nvp.hpp>
 #include <cstdint>
@@ -137,4 +137,4 @@ public:
     }
 };
 
-#endif /* MONITOR_PVT_H_ */
+#endif /* GNSS_SDR_MONITOR_PVT_H_ */
diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
index 713e9eff3..bec163986 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
@@ -29,8 +29,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef MONITOR_PVT_UDP_SINK_H_
-#define MONITOR_PVT_UDP_SINK_H_
+#ifndef GNSS_SDR_MONITOR_PVT_UDP_SINK_H_
+#define GNSS_SDR_MONITOR_PVT_UDP_SINK_H_
 
 #include "monitor_pvt.h"
 #include <boost/asio.hpp>
@@ -50,4 +50,4 @@ private:
 };
 
 
-#endif /* MONITOR_PVT_UDP_SINK_H_ */
+#endif /* GNSS_SDR_MONITOR_PVT_UDP_SINK_H_ */

From 53a813b3a16eef23c1425a10b6bd4268ea4772f9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 00:52:29 +0100
Subject: [PATCH 024/123] Add includes, remove unused ones

---
 src/core/monitor/gnss_synchro_monitor.h  |  5 ++---
 src/core/monitor/gnss_synchro_udp_sink.h | 12 ++++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index db991a9ae..4346c9fb5 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -34,12 +34,11 @@
 #ifndef GNSS_SDR_GNSS_SYNCHRO_MONITOR_H
 #define GNSS_SDR_GNSS_SYNCHRO_MONITOR_H
 
-
 #include "gnss_synchro_udp_sink.h"
 #include <gnuradio/sync_block.h>
-#include <fstream>
+#include <memory>
 #include <string>
-#include <utility>
+#include <vector>
 
 
 class gnss_synchro_monitor;
diff --git a/src/core/monitor/gnss_synchro_udp_sink.h b/src/core/monitor/gnss_synchro_udp_sink.h
index 8f055e90c..d72b2f18a 100644
--- a/src/core/monitor/gnss_synchro_udp_sink.h
+++ b/src/core/monitor/gnss_synchro_udp_sink.h
@@ -29,16 +29,20 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SYNCHRO_UDP_SINK_H_
-#define GNSS_SYNCHRO_UDP_SINK_H_
+#ifndef GNSS_SDR_GNSS_SYNCHRO_UDP_SINK_H_
+#define GNSS_SDR_GNSS_SYNCHRO_UDP_SINK_H_
 
 #include "gnss_synchro.h"
 #include <boost/asio.hpp>
+#include <boost/system/error_code.hpp>
+#include <string>
+#include <vector>
+
 
 class Gnss_Synchro_Udp_Sink
 {
 public:
-    Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t &port);
+    Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port);
     bool write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks);
 
 private:
@@ -50,4 +54,4 @@ private:
 };
 
 
-#endif /* GNSS_SYNCHRO_UDP_SINK_H_ */
+#endif /* GNSS_SDR_GNSS_SYNCHRO_UDP_SINK_H_ */

From f1bb647124e0f69409b67054b846f0f93c8faa21 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 00:53:08 +0100
Subject: [PATCH 025/123] Remove commented line

---
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
index 0aaf14e2c..d46259cc8 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
@@ -31,7 +31,6 @@
 
 #include "monitor_pvt_udp_sink.h"
 #include <boost/archive/binary_oarchive.hpp>
-//#include <boost/serialization/vector.hpp>
 #include <iostream>
 #include <sstream>
 

From ce051e040f4be7651408714bc03c5620b9e30aa4 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 01:13:02 +0100
Subject: [PATCH 026/123] Improve target design

---
 src/algorithms/PVT/adapters/CMakeLists.txt    |   6 +-
 .../PVT/gnuradio_blocks/CMakeLists.txt        |   4 +-
 src/algorithms/PVT/libs/CMakeLists.txt        |   2 +-
 .../acquisition/adapters/CMakeLists.txt       |   6 +-
 .../gnuradio_blocks/CMakeLists.txt            |  10 +-
 .../acquisition/libs/CMakeLists.txt           |   1 -
 .../channel/adapters/CMakeLists.txt           |   6 +-
 src/algorithms/channel/libs/CMakeLists.txt    |   3 +-
 .../conditioner/adapters/CMakeLists.txt       |   6 +-
 .../data_type_adapter/adapters/CMakeLists.txt |   2 +-
 .../input_filter/adapters/CMakeLists.txt      |   5 +-
 src/algorithms/libs/CMakeLists.txt            |  11 +-
 .../libs}/rtcm.cc                             |   0
 .../libs}/rtcm.h                              |   0
 src/algorithms/libs/rtklib/CMakeLists.txt     |   8 +-
 .../observables/adapters/CMakeLists.txt       |   2 +-
 .../resampler/adapters/CMakeLists.txt         |   6 +-
 .../signal_generator/adapters/CMakeLists.txt  |   6 +-
 .../signal_source/adapters/CMakeLists.txt     |   7 +-
 .../gnuradio_blocks/CMakeLists.txt            |   4 +-
 .../signal_source/libs/CMakeLists.txt         |   4 +
 .../libs/gnss_sdr_valve.cc                    |   0
 .../{ => signal_source}/libs/gnss_sdr_valve.h |   0
 .../telemetry_decoder/adapters/CMakeLists.txt |   6 +-
 .../gnuradio_blocks/CMakeLists.txt            |   1 -
 .../telemetry_decoder/libs/CMakeLists.txt     |   3 -
 .../tracking/adapters/CMakeLists.txt          |   5 +
 .../tracking/gnuradio_blocks/CMakeLists.txt   |   1 -
 src/core/libs/supl/CMakeLists.txt             |  17 +-
 src/core/receiver/CMakeLists.txt              |   1 -
 src/core/system_parameters/CMakeLists.txt     |   3 -
 src/main/CMakeLists.txt                       |   2 +-
 src/tests/CMakeLists.txt                      | 367 ++++++++++--------
 33 files changed, 292 insertions(+), 213 deletions(-)
 rename src/{core/system_parameters => algorithms/libs}/rtcm.cc (100%)
 rename src/{core/system_parameters => algorithms/libs}/rtcm.h (100%)
 rename src/algorithms/{ => signal_source}/libs/gnss_sdr_valve.cc (100%)
 rename src/algorithms/{ => signal_source}/libs/gnss_sdr_valve.h (100%)

diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 6111ff795..d7d3423ba 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -36,11 +36,15 @@ target_link_libraries(pvt_adapters
         pvt_gr_blocks
         pvt_lib
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Boost::serialization
 )
 
+target_include_directories(pvt_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 if(Boost_VERSION LESS 105800)
     target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
 endif()
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index fa8361704..6341a80af 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -33,19 +33,17 @@ target_link_libraries(pvt_gr_blocks
         Boost::date_time
         Gnuradio::runtime
         pvt_lib
-        gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Boost::system
+        gnss_system_parameters
 )
 
 target_include_directories(pvt_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-        ${CMAKE_SOURCE_DIR}/src/core/system_parameters
 )
 
 if(Boost_VERSION LESS 105800)
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index df4b2a533..5eb9e4f88 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -62,7 +62,6 @@ target_link_libraries(pvt_lib
         gnss_sp_libs
         rtklib_lib
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Boost::filesystem
         Boost::system
@@ -75,6 +74,7 @@ target_include_directories(pvt_lib
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 target_compile_definitions(pvt_lib PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 6780c8b50..161824ab3 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -96,7 +96,6 @@ target_link_libraries(acq_adapters
         gnss_sp_libs
         gnss_sdr_flags
         acq_gr_blocks
-        rx_core_lib
         gnss_system_parameters
     PRIVATE
         Boost::boost
@@ -106,6 +105,11 @@ target_link_libraries(acq_adapters
         acquisition_lib
 )
 
+target_include_directories(acq_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET acq_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index a6d16be63..94bea3705 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -81,15 +81,19 @@ target_link_libraries(acq_gr_blocks
         Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sp_libs
-        gnss_rx
+)
+
+target_include_directories(acq_gr_blocks
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PRIVATE
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 if(OPENCL_FOUND)
     target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()
 
-target_include_directories(acq_gr_blocks PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
-
 set_property(TARGET acq_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index d3f0aff29..a58bd0f3b 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -43,7 +43,6 @@ target_link_libraries(acquisition_lib
         Glog::glog
         gnss_sp_libs
         gnss_system_parameters
-        gnss_rx
 )
 
 set_property(TARGET acquisition_lib
diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt
index b3507210d..4b9cc6564 100644
--- a/src/algorithms/channel/adapters/CMakeLists.txt
+++ b/src/algorithms/channel/adapters/CMakeLists.txt
@@ -30,13 +30,17 @@ target_link_libraries(channel_adapters
     PUBLIC
         Gnuradio::runtime
         channel_fsm
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         gnss_sdr_flags
 )
 
+target_include_directories(channel_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET channel_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index 0d77d88f3..570de7dc7 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -36,10 +36,11 @@ add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 target_link_libraries(channel_fsm
     PUBLIC
         Gnuradio::runtime
-        gnss_rx
+        gnss_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
+        gnss_rx
 )
 
 set_property(TARGET channel_fsm
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index 1d9760397..92f967849 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -37,12 +37,16 @@ add_library(conditioner_adapters ${COND_ADAPTER_SOURCES} ${COND_ADAPTER_HEADERS}
 target_link_libraries(conditioner_adapters
     PUBLIC
         Gnuradio::runtime
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
 )
 
+target_include_directories(conditioner_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET conditioner_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index ecc220bf4..a43c8d37a 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -51,7 +51,6 @@ target_link_libraries(datatype_adapters
         data_type_gr_blocks
         gnss_sp_libs
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -61,6 +60,7 @@ target_link_libraries(datatype_adapters
 target_include_directories(datatype_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 set_property(TARGET datatype_adapters
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index c7a7c68e2..dc7d46bc6 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -50,13 +50,14 @@ target_link_libraries(input_filter_adapters
         Gnuradio::filter
         input_filter_gr_blocks
         gnss_sp_libs
-        gnss_rx
     PRIVATE
         Volk::volk
 )
 
 target_include_directories(input_filter_adapters
-    PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 3b056f3a6..e9ab0f43d 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -22,7 +22,6 @@ set(GNSS_SPLIBS_SOURCES
     gps_l2c_signal.cc
     gps_l5_signal.cc
     galileo_e1_signal_processing.cc
-    gnss_sdr_valve.cc
     gnss_sdr_sample_counter.cc
     gnss_signal_processing.cc
     gps_sdr_signal_processing.cc
@@ -41,13 +40,13 @@ set(GNSS_SPLIBS_SOURCES
     conjugate_ic.cc
     gnss_sdr_create_directory.cc
     geofunctions.cc
+    rtcm.cc
 )
 
 set(GNSS_SPLIBS_HEADERS
     gps_l2c_signal.h
     gps_l5_signal.h
     galileo_e1_signal_processing.h
-    gnss_sdr_valve.h
     gnss_sdr_sample_counter.h
     gnss_signal_processing.h
     gps_sdr_signal_processing.h
@@ -67,6 +66,7 @@ set(GNSS_SPLIBS_HEADERS
     gnss_sdr_create_directory.h
     gnss_circular_deque.h
     geofunctions.h
+    rtcm.h
 )
 
 if(ENABLE_FPGA)
@@ -122,7 +122,12 @@ target_link_libraries(gnss_sp_libs
         Boost::filesystem
         Gflags::gflags
         Glog::glog
-        gnss_rx
+)
+
+target_include_directories(gnss_sp_libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+        ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
 target_compile_definitions(gnss_sp_libs
diff --git a/src/core/system_parameters/rtcm.cc b/src/algorithms/libs/rtcm.cc
similarity index 100%
rename from src/core/system_parameters/rtcm.cc
rename to src/algorithms/libs/rtcm.cc
diff --git a/src/core/system_parameters/rtcm.h b/src/algorithms/libs/rtcm.h
similarity index 100%
rename from src/core/system_parameters/rtcm.h
rename to src/algorithms/libs/rtcm.h
diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt
index c1808b1b8..fcfaafa8b 100644
--- a/src/algorithms/libs/rtklib/CMakeLists.txt
+++ b/src/algorithms/libs/rtklib/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2018  (see AUTHORS file for a list of contributors)
+# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
 #
 # This file is part of GNSS-SDR.
 #
@@ -65,20 +65,14 @@ source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 
 add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 
-if(OS_IS_MACOSX)
-    set(MAC_LIBRARIES "-framework Accelerate")
-endif()
-
 target_link_libraries(rtklib_lib
     PUBLIC
-        gnss_rx
         gnss_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         ${BLAS}
         ${LAPACK}
-        ${MAC_LIBRARIES}
 )
 
 set_property(TARGET rtklib_lib
diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index 4ef4fd054..943b74717 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -31,12 +31,12 @@ add_library(obs_adapters ${OBS_ADAPTER_SOURCES} ${OBS_ADAPTER_HEADERS})
 target_include_directories(obs_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 target_link_libraries(obs_adapters
     PUBLIC
         obs_gr_blocks
-        gnss_rx
         gnss_sp_libs
     PRIVATE
         Gflags::gflags
diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index 7c702aa47..58d7e2099 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -41,13 +41,17 @@ target_link_libraries(resampler_adapters
     PUBLIC
         Gnuradio::runtime
         resampler_gr_blocks
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         Volk::volk
 )
 
+target_include_directories(resampler_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1)
 endif()
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index 3c33feea9..5be8348e8 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -30,13 +30,17 @@ target_link_libraries(signal_generator_adapters
     PUBLIC
         Gnuradio::blocks
         signal_generator_blocks
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
         gnss_sp_libs
 )
 
+target_include_directories(signal_generator_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET signal_generator_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index d8004e9fd..1547605b6 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -179,7 +179,8 @@ add_library(signal_source_adapters
 )
 
 target_include_directories(signal_source_adapters
-    PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
 target_link_libraries(signal_source_adapters
@@ -189,9 +190,9 @@ target_link_libraries(signal_source_adapters
         Gnuradio::blocks
         signal_source_gr_blocks
         signal_source_lib
-        gnss_sp_libs
-        gnss_rx
     PRIVATE
+        gnss_sdr_flags
+        gnss_system_parameters
         Gflags::gflags
         Glog::glog
         Volk::volk
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index fb76278b4..f4fabd5fa 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -75,6 +75,6 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
     )
 endif()
 
-set_property(TARGET signal_source_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+set_property(TARGET signal_source_gr_blocks APPEND PROPERTY
+    INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 39a507961..7741b5b0c 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -49,12 +49,14 @@ endif()
 set(SIGNAL_SOURCE_LIB_SOURCES
     rtl_tcp_commands.cc
     rtl_tcp_dongle_info.cc
+    gnss_sdr_valve.cc
     ${OPT_SIGNAL_SOURCE_LIB_SOURCES}
 )
 
 set(SIGNAL_SOURCE_LIB_HEADERS
     rtl_tcp_commands.h
     rtl_tcp_dongle_info.h
+    gnss_sdr_valve.h
     ${OPT_SIGNAL_SOURCE_LIB_HEADERS}
 )
 
@@ -68,9 +70,11 @@ add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_H
 target_link_libraries(signal_source_lib
     PUBLIC
         Boost::boost
+        Gnuradio::runtime
     PRIVATE
         Gflags::gflags
         Glog::glog
+        gnss_rx
 )
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
diff --git a/src/algorithms/libs/gnss_sdr_valve.cc b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
similarity index 100%
rename from src/algorithms/libs/gnss_sdr_valve.cc
rename to src/algorithms/signal_source/libs/gnss_sdr_valve.cc
diff --git a/src/algorithms/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
similarity index 100%
rename from src/algorithms/libs/gnss_sdr_valve.h
rename to src/algorithms/signal_source/libs/gnss_sdr_valve.h
diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index 1cdd15665..52175e1b7 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -55,7 +55,6 @@ target_link_libraries(telemetry_decoder_adapters
     PUBLIC
         telemetry_decoder_gr_blocks
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -63,6 +62,11 @@ target_link_libraries(telemetry_decoder_adapters
         telemetry_decoder_lib
 )
 
+target_include_directories(telemetry_decoder_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 set_property(TARGET telemetry_decoder_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index aabd596ca..dd605a575 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -55,7 +55,6 @@ target_link_libraries(telemetry_decoder_gr_blocks
         telemetry_decoder_libswiftcnav
         telemetry_decoder_lib
         gnss_system_parameters
-        gnss_rx
     PRIVATE
         Boost::boost
         Gflags::gflags
diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
index d86e85bae..5bab58017 100644
--- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
@@ -39,9 +39,6 @@ add_library(telemetry_decoder_lib
 )
 
 target_link_libraries(telemetry_decoder_lib
-    PUBLIC
-        gnss_system_parameters
-        gnss_rx
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index b9380c539..a0c878a57 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -100,6 +100,11 @@ target_link_libraries(tracking_adapters
         gnss_sdr_flags
 )
 
+target_include_directories(tracking_adapters
+    PUBLIC
+        ${CMAKE_SOURCE_DIR}/src/core/interfaces
+)
+
 if(ENABLE_CUDA)
     target_link_libraries(tracking_adapters
         PUBLIC
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index bf342a553..082e2b677 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -88,7 +88,6 @@ target_link_libraries(tracking_gr_blocks
         Volkgnsssdr::volkgnsssdr
         gnss_sdr_flags
         gnss_sp_libs
-        gnss_rx
         tracking_lib
 )
 
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index b09ade6a4..ed2b2b827 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -35,18 +35,25 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
 add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
 
+if(OPENSSL_FOUND)
+    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
+endif()
+
 target_link_libraries(supl_library
     PUBLIC
         ${GNUTLS_LIBRARIES}
         ${GNUTLS_OPENSSL_LIBRARY}
-        gnss_system_parameters
+)
+
+target_include_directories(supl_library
+    PUBLIC
+        ${GNUTLS_INCLUDE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
+        ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
 )
 
 set_target_properties(supl_library PROPERTIES
     LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${GNUTLS_INCLUDE_DIR}"
 )
-
-if(OPENSSL_FOUND)
-    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
-endif()
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 857cdcf49..915e7f545 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -142,7 +142,6 @@ target_link_libraries(gnss_rx
         Gnuradio::runtime
         rx_core_lib
         core_monitor_lib
-        gnss_system_parameters
     PRIVATE
         Boost::chrono
         Gflags::gflags
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index 70ca4f70d..389af1bb0 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -45,7 +45,6 @@ set(SYSTEM_PARAMETERS_SOURCES
     gps_cnav_navigation_message.cc
     gps_cnav_iono.cc
     gps_cnav_utc_model.cc
-    rtcm.cc
     glonass_gnav_ephemeris.cc
     glonass_gnav_almanac.cc
     glonass_gnav_utc_model.cc
@@ -75,7 +74,6 @@ set(SYSTEM_PARAMETERS_HEADERS
     gps_cnav_navigation_message.h
     gps_cnav_iono.h
     gps_cnav_utc_model.h
-    rtcm.h
     glonass_gnav_ephemeris.h
     glonass_gnav_almanac.h
     glonass_gnav_utc_model.h
@@ -115,7 +113,6 @@ target_link_libraries(gnss_system_parameters
         Boost::date_time
         Boost::serialization
         Glog::glog
-        gnss_rx
     PRIVATE
         Gflags::gflags
 )
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index b5d9f35bb..2cf04932a 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -34,7 +34,7 @@ target_compile_definitions(gnss-sdr PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
 # Disable internal logging
 if(NOT ENABLE_LOG)
-    target_compile_definitions(gnss-sdr PRIVATE -DGOOGLE_STRIP_LOG=1)
+    target_compile_definitions(gnss-sdr PUBLIC -DGOOGLE_STRIP_LOG=1)
 endif()
 
 if(ENABLE_CUDA)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8a676331e..8427d40cb 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -362,9 +362,9 @@ if(ENABLE_UNIT_TESTING)
             Matio::matio
             Volk::volk
             Volkgnsssdr::volkgnsssdr
-            gnss_sp_libs
-            core_monitor_lib
             signal_source_adapters
+            signal_source_gr_blocks
+            signal_source_lib
             datatype_adapters
             input_filter_adapters
             resampler_adapters
@@ -377,10 +377,12 @@ if(ENABLE_UNIT_TESTING)
             signal_generator_adapters
             pvt_adapters
             pvt_lib
+            gnss_sp_libs
+            core_monitor_lib
             signal_processing_testing_lib
             system_testing_lib
-            gnss_system_parameters
             gnss_rx
+            gnss_system_parameters
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@@ -435,12 +437,12 @@ if(ENABLE_FPGA)
             Matio::matio
             Volk::volk
             channel_fsm
-            gnss_sp_libs
             datatype_adapters
-            signal_processing_testing_lib
             tracking_adapters
-            gnss_system_parameters
+            signal_processing_testing_lib
+            gnss_sp_libs
             gnss_rx
+            gnss_system_parameters
     )
     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
         RUNTIME DESTINATION bin
@@ -496,7 +498,7 @@ if(ENABLE_SYSTEM_TESTING)
         Gnuradio::runtime GTest::GTest GTest::Main
         Gnuradio::blocks Gnuradio::filter
         Gnuradio::analog gnss_sp_libs
-        gnss_system_parameters gnss_rx
+        gnss_rx gnss_system_parameters
     )
     add_system_test(ttff)
 
@@ -507,7 +509,7 @@ if(ENABLE_SYSTEM_TESTING)
             GTest::GTest GTest::Main Gnuradio::runtime
             Gnuradio::blocks Gnuradio::filter
             Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
-            gnss_sp_libs gnss_system_parameters gnss_rx
+            gnss_sp_libs gnss_rx gnss_system_parameters
             system_testing_lib signal_processing_testing_lib
         )
         add_system_test(position_test)
@@ -534,107 +536,131 @@ endif()
 set(CMAKE_CTEST_COMMAND ctest -V)
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
 
-add_executable(flowgraph_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc)
+if(NOT ENABLE_PACKAGING)
+    add_executable(flowgraph_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_flowgraph_test.cc
+    )
 
-target_link_libraries(flowgraph_test PUBLIC
-    Boost::filesystem
-    Boost::system
-    Boost::thread
-    Gflags::gflags
-    Glog::glog
-    Gnuradio::runtime
-    GTest::GTest
-    GTest::Main
-    Volkgnsssdr::volkgnsssdr
-    gnss_sp_libs
-    gnss_rx
-    gnss_system_parameters
-    signal_source_adapters
-    signal_source_gr_blocks
-    input_filter_adapters
-    channel_adapters
-)
+    target_link_libraries(flowgraph_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_source_adapters
+            signal_source_gr_blocks
+            signal_source_lib
+            input_filter_adapters
+            channel_adapters
+            gnss_rx
+            gnss_sp_libs
+            gnss_system_parameters
+    )
 
-target_include_directories(flowgraph_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+    target_include_directories(flowgraph_test
+        PUBLIC
+            ${CMAKE_SOURCE_DIR}/src/algorithms/libs
+    )
 
-add_test(flowgraph_test flowgraph_test)
+    add_test(flowgraph_test flowgraph_test)
+
+    set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
+endif()
 
-set_property(TEST flowgraph_test PROPERTY TIMEOUT 30)
 
 #########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(gnss_block_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
+    )
 
-add_executable(gnss_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/file_signal_source_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/pass_through_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/adapter/adapter_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/gnss_block_factory_test.cc
-)
-target_link_libraries(gnss_block_test PUBLIC
-    Boost::filesystem
-    Boost::system
-    Boost::thread
-    Gflags::gflags
-    Glog::glog
-    Gnuradio::runtime
-    Gnuradio::blocks
-    Gnuradio::filter
-    Gnuradio::analog
-    GTest::GTest
-    GTest::Main
-    Volkgnsssdr::volkgnsssdr
-    signal_source_adapters
-    datatype_adapters
-    input_filter_adapters
-    channel_adapters
-    gnss_sp_libs
-    gnss_system_parameters
-    gnss_rx
-)
+    target_link_libraries(gnss_block_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            Gnuradio::blocks
+            Gnuradio::filter
+            Gnuradio::analog
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_source_adapters
+            signal_source_gr_blocks
+            signal_source_lib
+            datatype_adapters
+            input_filter_adapters
+            channel_adapters
+            gnss_rx
+            gnss_sp_libs
+            gnss_system_parameters
+    )
 
-target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
+    target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
 
-add_test(gnss_block_test gnss_block_test)
+    add_test(gnss_block_test gnss_block_test)
+
+    set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
+endif()
 
-set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
 
 #########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(gnuradio_block_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc
+    )
 
-add_executable(gnuradio_block_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/sources/unpack_2bit_samples_test.cc
-)
-target_link_libraries(gnuradio_block_test PUBLIC
-    Boost::filesystem
-    Boost::system
-    Boost::thread
-    Gflags::gflags
-    Glog::glog
-    Gnuradio::runtime
-    Gnuradio::blocks
-    Gnuradio::filter
-    Gnuradio::analog
-    GTest::GTest
-    GTest::Main
-    Volkgnsssdr::volkgnsssdr
-    gnss_sp_libs
-    signal_source_gr_blocks
-    gnss_system_parameters
-    gnss_rx
-)
+    target_link_libraries(gnuradio_block_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            Gnuradio::blocks
+            Gnuradio::filter
+            Gnuradio::analog
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_source_gr_blocks
+            signal_source_lib
+            gnss_rx
+            gnss_sp_libs
+            gnss_system_parameters
+    )
 
-add_test(gnuradio_block_test gnuradio_block_test)
+    add_test(gnuradio_block_test gnuradio_block_test)
+
+    set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
+endif()
 
-set_property(TEST gnuradio_block_test PROPERTY TIMEOUT 30)
 
 #########################################################
-
-add_executable(matio_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+add_executable(matio_test
+    ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/arithmetic/matio_test.cc
 )
+
 target_link_libraries(matio_test
     PUBLIC
         Gflags::gflags
@@ -642,100 +668,115 @@ target_link_libraries(matio_test
         GTest::GTest
         GTest::Main
         Matio::matio
-        gnss_system_parameters
         gnss_rx
+        gnss_system_parameters
 )
 
 add_test(matio_test matio_test)
 
 set_property(TEST matio_test PROPERTY TIMEOUT 30)
 
-#########################################################
-
-add_executable(acq_test
-    ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc)
-target_link_libraries(acq_test
-    PUBLIC
-        Boost::filesystem
-        Boost::system
-        Boost::thread
-        Gflags::gflags
-        Glog::glog
-        Gnuradio::runtime
-        Gnuradio::blocks
-        Gnuradio::filter
-        Gnuradio::analog
-        GTest::GTest
-        GTest::Main
-        Volkgnsssdr::volkgnsssdr
-        signal_generator_blocks
-        acq_adapters
-        acq_gr_blocks
-        gnss_sp_libs
-        signal_processing_testing_lib
-        gnss_system_parameters
-        gnss_rx
-)
-
-add_test(acq_test acq_test)
-
-set_property(TEST acq_test PROPERTY TIMEOUT 30)
 
 #########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(acq_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+    )
 
-add_executable(trk_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc
-)
+    target_link_libraries(acq_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            Gnuradio::blocks
+            Gnuradio::filter
+            Gnuradio::analog
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_generator_blocks
+            signal_source_gr_blocks
+            signal_source_lib
+            acq_adapters
+            acq_gr_blocks
+            gnss_sp_libs
+            signal_processing_testing_lib
+            gnss_rx
+            gnss_system_parameters
+    )
 
-target_link_libraries(trk_test
-    PUBLIC
-        Boost::filesystem
-        Boost::system
-        Boost::thread
-        Gflags::gflags
-        Glog::glog
-        Gnuradio::runtime
-        Gnuradio::blocks
-        Gnuradio::filter
-        Gnuradio::analog
-        GTest::GTest
-        GTest::Main
-        Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
-        tracking_adapters
-        signal_generator_blocks
-        gnss_system_parameters
-        gnss_rx
-)
-add_test(trk_test trk_test)
+    add_test(acq_test acq_test)
 
-set_property(TEST trk_test PROPERTY TIMEOUT 30)
+    set_property(TEST acq_test PROPERTY TIMEOUT 30)
+endif()
 
 
+#########################################################
+if(NOT ENABLE_PACKAGING)
+    add_executable(trk_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/galileo_e1_dll_pll_veml_tracking_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/tracking_loop_filter_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/signal-processing-blocks/tracking/bayesian_estimation_test.cc
+    )
+
+    target_link_libraries(trk_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            Gnuradio::runtime
+            Gnuradio::blocks
+            Gnuradio::filter
+            Gnuradio::analog
+            GTest::GTest
+            GTest::Main
+            Volkgnsssdr::volkgnsssdr
+            signal_source_gr_blocks
+            signal_source_lib
+            gnss_sp_libs
+            tracking_adapters
+            signal_generator_blocks
+            gnss_rx
+            gnss_system_parameters
+    )
+
+    add_test(trk_test trk_test)
+
+    set_property(TEST trk_test PROPERTY TIMEOUT 30)
+endif()
+
 #########################################################
 
 if(NOT ENABLE_PACKAGING)
-    add_executable(control_thread_test ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
+    add_executable(control_thread_test
+        ${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_message_factory_test.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/unit-tests/control-plane/control_thread_test.cc
     )
 
-    target_link_libraries(control_thread_test PUBLIC
-        Boost::filesystem
-        Boost::system
-        Boost::thread
-        Gflags::gflags
-        Glog::glog
-        GTest::GTest
-        GTest::Main
-        signal_source_adapters
-        gnss_sp_libs
-        gnss_system_parameters
-        gnss_rx
+    target_link_libraries(control_thread_test
+        PUBLIC
+            Boost::filesystem
+            Boost::system
+            Boost::thread
+            Gflags::gflags
+            Glog::glog
+            GTest::GTest
+            GTest::Main
+            signal_source_adapters
+            signal_source_gr_blocks
+            signal_source_lib
+            gnss_sp_libs
+            gnss_rx
+            gnss_system_parameters
     )
 
     add_test(control_thread_test control_thread_test)

From f4c1fc8b67a3b75e52a9c8dff553f2d67ebca47c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 01:14:09 +0100
Subject: [PATCH 027/123] Find Apple versions of Blas and Lapack in macOS

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b1040daa..7977ec0bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1121,6 +1121,9 @@ endif()
 # Check that BLAS (Basic Linear Algebra Subprograms) is found in the system
 # See http://www.netlib.org/blas/
 #############################################################################
+if(OS_IS_MACOSX)
+    set(BLA_VENDOR "Apple")
+endif()
 find_library(BLAS blas)
 if(NOT BLAS)
     message(" The BLAS library has not been found.")

From a6b94eaccf4ba56ab5f694292d65f9478c055119 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 12:40:03 +0100
Subject: [PATCH 028/123] Make use of cstdint typedefs, fix warning, remove
 unused variable

---
 .../beidou_b1i_telemetry_decoder_cc.cc        |  95 +++--
 .../beidou_b1i_telemetry_decoder_cc.h         |  26 +-
 src/core/system_parameters/Beidou_B1I.h       | 331 +++++++++---------
 3 files changed, 225 insertions(+), 227 deletions(-)

diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
index 3a18185ec..8da254729 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
@@ -8,7 +8,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -73,7 +73,6 @@ beidou_b1i_telemetry_decoder_cc::beidou_b1i_telemetry_decoder_cc(
     d_secondary_code_symbols = static_cast<int32_t *>(volk_gnsssdr_malloc(BEIDOU_B1I_SECONDARY_CODE_LENGTH * sizeof(int32_t), volk_gnsssdr_get_alignment()));
     d_preamble_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(d_samples_per_preamble * sizeof(int32_t), volk_gnsssdr_get_alignment()));
     d_preamble_period_samples = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS * d_samples_per_symbol;
-    d_subframe_length_symbols = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS;
 
     // Setting samples of secondary code
     for (int32_t i = 0; i < BEIDOU_B1I_SECONDARY_CODE_LENGTH; i++)
@@ -115,7 +114,7 @@ beidou_b1i_telemetry_decoder_cc::beidou_b1i_telemetry_decoder_cc(
                 }
         }
 
-    d_subframe_symbols = static_cast<double *>(volk_gnsssdr_malloc(d_subframe_length_symbols * sizeof(double), volk_gnsssdr_get_alignment()));
+    d_subframe_symbols = static_cast<double *>(volk_gnsssdr_malloc(BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS * sizeof(double), volk_gnsssdr_get_alignment()));
     d_required_symbols = BEIDOU_DNAV_SUBFRAME_SYMBOLS * d_samples_per_symbol + d_samples_per_preamble;
 
     // Generic settings
@@ -154,15 +153,15 @@ beidou_b1i_telemetry_decoder_cc::~beidou_b1i_telemetry_decoder_cc()
 
 void beidou_b1i_telemetry_decoder_cc::decode_bch15_11_01(const int32_t *bits, int32_t *decbits)
 {
-    int bit, err, reg[4] = {1, 1, 1, 1};
-    int errind[15] = {14, 13, 10, 12, 6, 9, 4, 11, 0, 5, 7, 8, 1, 3, 2};
+    int32_t bit, err, reg[4] = {1, 1, 1, 1};
+    int32_t errind[15] = {14, 13, 10, 12, 6, 9, 4, 11, 0, 5, 7, 8, 1, 3, 2};
 
-    for (unsigned int i = 0; i < 15; i++)
+    for (uint32_t i = 0; i < 15; i++)
         {
             decbits[i] = bits[i];
         }
 
-    for (unsigned int i = 0; i < 15; i++)
+    for (uint32_t i = 0; i < 15; i++)
         {
             bit = reg[3];
             reg[3] = reg[2];
@@ -180,6 +179,7 @@ void beidou_b1i_telemetry_decoder_cc::decode_bch15_11_01(const int32_t *bits, in
         }
 }
 
+
 void beidou_b1i_telemetry_decoder_cc::decode_word(
     int32_t word_counter,
     const double *enc_word_symbols,
@@ -189,31 +189,31 @@ void beidou_b1i_telemetry_decoder_cc::decode_word(
 
     if (word_counter == 1)
         {
-            for (unsigned int j = 0; j < 30; j++)
+            for (uint32_t j = 0; j < 30; j++)
                 {
-                    dec_word_symbols[j] = (int32_t)(enc_word_symbols[j] > 0) ? (1) : (-1);
+                    dec_word_symbols[j] = static_cast<int32_t>(enc_word_symbols[j] > 0) ? (1) : (-1);
                 }
         }
     else
         {
-            for (unsigned int r = 0; r < 2; r++)
+            for (uint32_t r = 0; r < 2; r++)
                 {
-                    for (unsigned int c = 0; c < 15; c++)
+                    for (uint32_t c = 0; c < 15; c++)
                         {
-                            bitsbch[r * 15 + c] = (int32_t)(enc_word_symbols[c * 2 + r] > 0) ? (1) : (-1);
+                            bitsbch[r * 15 + c] = static_cast<int32_t>(enc_word_symbols[c * 2 + r] > 0) ? (1) : (-1);
                         }
                 }
 
             decode_bch15_11_01(&bitsbch[0], first_branch);
             decode_bch15_11_01(&bitsbch[15], second_branch);
 
-            for (unsigned int j = 0; j < 11; j++)
+            for (uint32_t j = 0; j < 11; j++)
                 {
                     dec_word_symbols[j] = first_branch[j];
                     dec_word_symbols[j + 11] = second_branch[j];
                 }
 
-            for (unsigned int j = 0; j < 4; j++)
+            for (uint32_t j = 0; j < 4; j++)
                 {
                     dec_word_symbols[j + 22] = first_branch[11 + j];
                     dec_word_symbols[j + 26] = second_branch[11 + j];
@@ -222,7 +222,7 @@ void beidou_b1i_telemetry_decoder_cc::decode_word(
 }
 
 
-void beidou_b1i_telemetry_decoder_cc::decode_subframe(double *frame_symbols, int32_t frame_length)
+void beidou_b1i_telemetry_decoder_cc::decode_subframe(double *frame_symbols)
 {
     // 1. Transform from symbols to bits
     std::string data_bits;
@@ -287,9 +287,9 @@ void beidou_b1i_telemetry_decoder_cc::decode_subframe(double *frame_symbols, int
         }
     if (d_nav.have_new_almanac() == true)
         {
-            //            unsigned int slot_nbr = d_nav.i_alm_satellite_PRN;
-            //            std::shared_ptr<Beidou_Dnav_Almanac> tmp_obj = std::make_shared<Beidou_Dnav_Almanac>(d_nav.get_almanac(slot_nbr));
-            //            this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
+            // uint32_t slot_nbr = d_nav.i_alm_satellite_PRN;
+            // std::shared_ptr<Beidou_Dnav_Almanac> tmp_obj = std::make_shared<Beidou_Dnav_Almanac>(d_nav.get_almanac(slot_nbr));
+            // this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
             LOG(INFO) << "BEIDOU DNAV Almanac have been received in channel" << d_channel << " from satellite " << d_satellite << std::endl;
             std::cout << "New BEIDOU B1I DNAV almanac received in channel " << d_channel << " from satellite " << d_satellite << std::endl;
         }
@@ -321,7 +321,6 @@ void beidou_b1i_telemetry_decoder_cc::set_satellite(const Gnss_Satellite &satell
             d_secondary_code_symbols = nullptr;
             d_preamble_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(d_samples_per_preamble * sizeof(int32_t), volk_gnsssdr_get_alignment()));
             d_preamble_period_samples = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS * d_samples_per_symbol;
-            d_subframe_length_symbols = BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS;
 
             // Setting samples of preamble code
             int32_t n = 0;
@@ -345,13 +344,13 @@ void beidou_b1i_telemetry_decoder_cc::set_satellite(const Gnss_Satellite &satell
                         }
                 }
 
-            d_subframe_symbols = static_cast<double *>(volk_gnsssdr_malloc(d_subframe_length_symbols * sizeof(double), volk_gnsssdr_get_alignment()));
+            d_subframe_symbols = static_cast<double *>(volk_gnsssdr_malloc(BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS * sizeof(double), volk_gnsssdr_get_alignment()));
             d_required_symbols = BEIDOU_DNAV_SUBFRAME_SYMBOLS * d_samples_per_symbol + d_samples_per_preamble;
         }
 }
 
 
-void beidou_b1i_telemetry_decoder_cc::set_channel(int channel)
+void beidou_b1i_telemetry_decoder_cc::set_channel(int32_t channel)
 {
     d_channel = channel;
     LOG(INFO) << "Navigation channel set to " << channel;
@@ -387,11 +386,11 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
     auto **out = reinterpret_cast<Gnss_Synchro **>(&output_items[0]);            // Get the output buffer pointer
     const auto **in = reinterpret_cast<const Gnss_Synchro **>(&input_items[0]);  // Get the input buffer pointer
 
-    Gnss_Synchro current_symbol;  //structure to save the synchronization information and send the output object to the next block
-    //1. Copy the current tracking output
+    Gnss_Synchro current_symbol;  // structure to save the synchronization information and send the output object to the next block
+    // 1. Copy the current tracking output
     current_symbol = in[0][0];
-    d_symbol_history.push_back(current_symbol.Prompt_I);  //add new symbol to the symbol queue
-    d_sample_counter++;                                   //count for the processed samples
+    d_symbol_history.push_back(current_symbol.Prompt_I);  // add new symbol to the symbol queue
+    d_sample_counter++;                                   // count for the processed samples
     consume_each(1);
 
     d_flag_preamble = false;
@@ -399,7 +398,7 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
     if (d_symbol_history.size() > d_required_symbols)
         {
             //******* preamble correlation ********
-            for (int i = 0; i < d_samples_per_preamble; i++)
+            for (int32_t i = 0; i < d_samples_per_preamble; i++)
                 {
                     if (d_symbol_history.at(i) < 0)  // symbols clipping
                         {
@@ -413,7 +412,7 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
         }
 
     //******* frame sync ******************
-    if (d_stat == 0)  //no preamble information
+    if (d_stat == 0)  // no preamble information
         {
             if (abs(corr_value) >= d_samples_per_preamble)
                 {
@@ -428,11 +427,11 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
         {
             if (abs(corr_value) >= d_samples_per_preamble)
                 {
-                    //check preamble separation
+                    // check preamble separation
                     preamble_diff = static_cast<int32_t>(d_sample_counter - d_preamble_index);
                     if (abs(preamble_diff - d_preamble_period_samples) == 0)
                         {
-                            //try to decode frame
+                            // try to decode frame
                             LOG(INFO) << "Starting BeiDou DNAV frame decoding for BeiDou B1I SAT " << this->d_satellite;
                             d_preamble_index = d_sample_counter;  //record the preamble sample stamp
                             d_stat = 2;
@@ -451,14 +450,14 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
         {
             if (d_sample_counter == d_preamble_index + static_cast<uint64_t>(d_preamble_period_samples))
                 {
-                    //******* SAMPLES TO SYMBOLS *******
+                    // ******* SAMPLES TO SYMBOLS *******
                     if (corr_value > 0)  //normal PLL lock
                         {
-                            int k = 0;
-                            for (uint32_t i = 0; i < d_subframe_length_symbols; i++)
+                            int32_t k = 0;
+                            for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++)
                                 {
                                     d_subframe_symbols[i] = 0;
-                                    //integrate samples into symbols
+                                    // integrate samples into symbols
                                     for (uint32_t m = 0; m < d_samples_per_symbol; m++)
                                         {
                                             if (d_satellite.get_PRN() > 0 and d_satellite.get_PRN() < 6)
@@ -476,13 +475,13 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
                                         }
                                 }
                         }
-                    else  //180 deg. inverted carrier phase PLL lock
+                    else  // 180 deg. inverted carrier phase PLL lock
                         {
-                            int k = 0;
-                            for (uint32_t i = 0; i < d_subframe_length_symbols; i++)
+                            int32_t k = 0;
+                            for (uint32_t i = 0; i < BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS; i++)
                                 {
                                     d_subframe_symbols[i] = 0;
-                                    //integrate samples into symbols
+                                    // integrate samples into symbols
                                     for (uint32_t m = 0; m < d_samples_per_symbol; m++)
                                         {
                                             if (d_satellite.get_PRN() > 0 and d_satellite.get_PRN() < 6)
@@ -501,14 +500,14 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
                                 }
                         }
 
-                    //call the decoder
-                    decode_subframe(d_subframe_symbols, d_subframe_length_symbols);
+                    // call the decoder
+                    decode_subframe(d_subframe_symbols);
 
                     if (d_nav.flag_crc_test == true)
                         {
                             d_CRC_error_counter = 0;
-                            d_flag_preamble = true;               //valid preamble indicator (initialized to false every work())
-                            d_preamble_index = d_sample_counter;  //record the preamble sample stamp (t_P)
+                            d_flag_preamble = true;               // valid preamble indicator (initialized to false every work())
+                            d_preamble_index = d_sample_counter;  // record the preamble sample stamp (t_P)
                             if (!d_flag_frame_sync)
                                 {
                                     d_flag_frame_sync = true;
@@ -518,7 +517,7 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
                     else
                         {
                             d_CRC_error_counter++;
-                            d_preamble_index = d_sample_counter;  //record the preamble sample stamp
+                            d_preamble_index = d_sample_counter;  // record the preamble sample stamp
                             if (d_CRC_error_counter > CRC_ERROR_LIMIT)
                                 {
                                     LOG(INFO) << "BeiDou DNAV frame sync lost for SAT " << this->d_satellite;
@@ -531,9 +530,9 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
         }
 
     // UPDATE GNSS SYNCHRO DATA
-    //2. Add the telemetry decoder information
+    // 2. Add the telemetry decoder information
     if (this->d_flag_preamble == true and d_nav.flag_new_SOW_available == true)
-        //update TOW at the preamble instant
+        // update TOW at the preamble instant
         {
             // Reporting sow as gps time of week
             d_TOW_at_Preamble_ms = static_cast<uint32_t>((d_nav.d_SOW + 14) * 1000.0);
@@ -541,7 +540,7 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
             flag_SOW_set = true;
             d_nav.flag_new_SOW_available = false;
         }
-    else  //if there is not a new preamble, we define the TOW of the current symbol
+    else  // if there is not a new preamble, we define the TOW of the current symbol
         {
             d_TOW_at_current_symbol_ms += static_cast<uint32_t>(BEIDOU_B1I_CODE_PERIOD_MS);
         }
@@ -565,11 +564,11 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
             try
                 {
                     double tmp_double;
-                    unsigned long int tmp_ulong_int;
+                    uint64_t tmp_ulong_int;
                     tmp_double = d_TOW_at_current_symbol_ms;
                     d_dump_file.write(reinterpret_cast<char *>(&tmp_double), sizeof(double));
                     tmp_ulong_int = current_symbol.Tracking_sample_counter;
-                    d_dump_file.write(reinterpret_cast<char *>(&tmp_ulong_int), sizeof(unsigned long int));
+                    d_dump_file.write(reinterpret_cast<char *>(&tmp_ulong_int), sizeof(uint64_t));
                     tmp_double = 0;
                     d_dump_file.write(reinterpret_cast<char *>(&tmp_double), sizeof(double));
                 }
@@ -584,7 +583,7 @@ int beidou_b1i_telemetry_decoder_cc::general_work(int noutput_items __attribute_
         {
             d_symbol_history.pop_front();
         }
-    //3. Make the output (copy the object contents to the GNURadio reserved memory)
+    // 3. Make the output (copy the object contents to the GNURadio reserved memory)
     *out[0] = current_symbol;
 
     return 1;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h
index e3ce59392..bd5eafb5a 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h
@@ -9,7 +9,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -78,13 +78,12 @@ private:
     beidou_b1i_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
     beidou_b1i_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
 
-    void decode_subframe(double *symbols, int32_t frame_length);
+    void decode_subframe(double *symbols);
     void decode_word(int32_t word_counter, const double *enc_word_symbols, int32_t *dec_word_symbols);
     void decode_bch15_11_01(const int32_t *bits, int32_t *decbits);
 
 
-    //!< Preamble decoding
-    unsigned short int d_preambles_symbols[BEIDOU_DNAV_PREAMBLE_LENGTH_SYMBOLS];
+    // Preamble decoding
     int32_t *d_preamble_samples;
     int32_t *d_secondary_code_symbols;
     uint32_t d_samples_per_symbol;
@@ -92,20 +91,19 @@ private:
     int32_t d_samples_per_preamble;
     int32_t d_preamble_period_samples;
     double *d_subframe_symbols;
-    uint32_t d_subframe_length_symbols;
     uint32_t d_required_symbols;
 
-    //!< Storage for incoming data
+    // Storage for incoming data
     std::deque<float> d_symbol_history;
 
-    //!< Variables for internal functionality
-    uint64_t d_sample_counter;    //!< Sample counter as an index (1,2,3,..etc) indicating number of samples processed
-    uint64_t d_preamble_index;    //!< Index of sample number where preamble was found
-    uint32_t d_stat;              //!< Status of decoder
-    bool d_flag_frame_sync;       //!< Indicate when a frame sync is achieved
-    bool d_flag_preamble;         //!< Flag indicating when preamble was found
-    int32_t d_CRC_error_counter;  //!< Number of failed CRC operations
-    bool flag_SOW_set;            //!< Indicates when time of week is set
+    // Variables for internal functionality
+    uint64_t d_sample_counter;    // Sample counter as an index (1,2,3,..etc) indicating number of samples processed
+    uint64_t d_preamble_index;    // Index of sample number where preamble was found
+    uint32_t d_stat;              // Status of decoder
+    bool d_flag_frame_sync;       // Indicate when a frame sync is achieved
+    bool d_flag_preamble;         // Flag indicating when preamble was found
+    int32_t d_CRC_error_counter;  // Number of failed CRC operations
+    bool flag_SOW_set;            // Indicates when time of week is set
 
     //!< Navigation Message variable
     Beidou_Dnav_Navigation_Message d_nav;
diff --git a/src/core/system_parameters/Beidou_B1I.h b/src/core/system_parameters/Beidou_B1I.h
index f0b3a7bd9..76ac02f2c 100644
--- a/src/core/system_parameters/Beidou_B1I.h
+++ b/src/core/system_parameters/Beidou_B1I.h
@@ -33,6 +33,7 @@
 #define GNSS_SDR_BEIDOU_B1I_H_
 
 #include "MATH_CONSTANTS.h"
+#include <cstdint>
 #include <utility>  // std::pair
 #include <vector>
 
@@ -51,9 +52,9 @@ const double BEIDOU_B1I_FREQ_HZ = 1.561098e9;        //!< b1I [Hz]
 const double BEIDOU_B1I_CODE_RATE_HZ = 2.046e6;      //!< beidou b1I code rate [chips/s]
 const double BEIDOU_B1I_CODE_LENGTH_CHIPS = 2046.0;  //!< beidou b1I code length [chips]
 const double BEIDOU_B1I_CODE_PERIOD = 0.001;         //!< beidou b1I code period [seconds]
-const unsigned int BEIDOU_B1I_CODE_PERIOD_MS = 1;    //!< GPS L1 C/A code period [ms]
+const uint32_t BEIDOU_B1I_CODE_PERIOD_MS = 1;        //!< beidou b1I L1 C/A code period [ms]
 const double BEIDOU_B1I_CHIP_PERIOD = 4.8875e-07;    //!< beidou b1I chip period [seconds]
-const int BEIDOU_B1I_SECONDARY_CODE_LENGTH = 20;
+const int32_t BEIDOU_B1I_SECONDARY_CODE_LENGTH = 20;
 const std::string BEIDOU_B1I_SECONDARY_CODE = "00000100110101001110";
 const std::string BEIDOU_B1I_SECONDARY_CODE_STR = "00000100110101001110";
 const std::string BEIDOU_B1I_D2_SECONDARY_CODE_STR = "00";
@@ -73,29 +74,29 @@ const double BEIDOU_STARTOFFSET_ms = 68.802;  //**************[ms] Initial sign.
 
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
-const int BEIDOU_B1I_HISTORY_DEEP = 100;  // ****************
+const int32_t BEIDOU_B1I_HISTORY_DEEP = 100;  // ****************
 
 // NAVIGATION MESSAGE DEMODULATION AND DECODING
 
-const int BEIDOU_B1I_PREAMBLE_LENGTH_BITS = 11;
-const int BEIDOU_B1I_PREAMBLE_LENGTH_SYMBOLS = 220;  // **************
+const int32_t BEIDOU_B1I_PREAMBLE_LENGTH_BITS = 11;
+const int32_t BEIDOU_B1I_PREAMBLE_LENGTH_SYMBOLS = 220;  // **************
 const double BEIDOU_B1I_PREAMBLE_DURATION_S = 0.220;
-const int BEIDOU_B1I_PREAMBLE_DURATION_MS = 220;
-const int BEIDOU_B1I_TELEMETRY_RATE_BITS_SECOND = 50;                                                                               //!< D1 NAV message bit rate [bits/s]
-const int BEIDOU_B1I_TELEMETRY_SYMBOLS_PER_BIT = 20;                                                                                // *************
-const int BEIDOU_B1I_TELEMETRY_RATE_SYMBOLS_SECOND = BEIDOU_B1I_TELEMETRY_RATE_BITS_SECOND * BEIDOU_B1I_TELEMETRY_SYMBOLS_PER_BIT;  //************!< NAV message bit rate [symbols/s]
-const int BEIDOU_WORD_LENGTH = 4;                                                                                                   //**************!< CRC + BEIDOU WORD (-2 -1 0 ... 29) Bits = 4 bytes
-const int BEIDOU_SUBFRAME_LENGTH = 40;                                                                                              //**************!< BEIDOU_WORD_LENGTH x 10 = 40 bytes
-const int BEIDOU_DNAV_SUBFRAME_DATA_BITS = 300;                                                                                     //!< Number of bits per subframe in the NAV message [bits]
-const int BEIDOU_SUBFRAME_SECONDS = 6;                                                                                              //!< Subframe duration [seconds]
-const int BEIDOU_SUBFRAME_MS = 6000;                                                                                                //!< Subframe duration [miliseconds]
-const int BEIDOU_WORD_BITS = 30;                                                                                                    //!< Number of bits per word in the NAV message [bits]
+const int32_t BEIDOU_B1I_PREAMBLE_DURATION_MS = 220;
+const int32_t BEIDOU_B1I_TELEMETRY_RATE_BITS_SECOND = 50;                                                                               //!< D1 NAV message bit rate [bits/s]
+const int32_t BEIDOU_B1I_TELEMETRY_SYMBOLS_PER_BIT = 20;                                                                                // *************
+const int32_t BEIDOU_B1I_TELEMETRY_RATE_SYMBOLS_SECOND = BEIDOU_B1I_TELEMETRY_RATE_BITS_SECOND * BEIDOU_B1I_TELEMETRY_SYMBOLS_PER_BIT;  //************!< NAV message bit rate [symbols/s]
+const int32_t BEIDOU_WORD_LENGTH = 4;                                                                                                   //**************!< CRC + BEIDOU WORD (-2 -1 0 ... 29) Bits = 4 bytes
+const int32_t BEIDOU_SUBFRAME_LENGTH = 40;                                                                                              //**************!< BEIDOU_WORD_LENGTH x 10 = 40 bytes
+const int32_t BEIDOU_DNAV_SUBFRAME_DATA_BITS = 300;                                                                                     //!< Number of bits per subframe in the NAV message [bits]
+const int32_t BEIDOU_SUBFRAME_SECONDS = 6;                                                                                              //!< Subframe duration [seconds]
+const int32_t BEIDOU_SUBFRAME_MS = 6000;                                                                                                //!< Subframe duration [miliseconds]
+const int32_t BEIDOU_WORD_BITS = 30;                                                                                                    //!< Number of bits per word in the NAV message [bits]
 
 const std::string BEIDOU_DNAV_PREAMBLE = "11100010010";
-const int BEIDOU_DNAV_PREAMBLE_LENGTH_BITS = 11;
-const int BEIDOU_DNAV_PREAMBLE_LENGTH_SYMBOLS = 11;  // **************
-const double BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS = 300;
-const double BEIDOU_DNAV_SUBFRAME_SYMBOLS = 300;
+const int32_t BEIDOU_DNAV_PREAMBLE_LENGTH_BITS = 11;
+const int32_t BEIDOU_DNAV_PREAMBLE_LENGTH_SYMBOLS = 11;  // **************
+const uint32_t BEIDOU_DNAV_PREAMBLE_PERIOD_SYMBOLS = 300;
+const uint32_t BEIDOU_DNAV_SUBFRAME_SYMBOLS = 300;
 const double BEIDOU_DNAV_DATA_BITS = 300;
 const double BEIDOU_DNAV_WORDS_SUBFRAME = 10;
 const double BEIDOU_DNAV_WORD_LENGTH_BITS = 30;
@@ -106,10 +107,10 @@ const double BEIDOU_B1I_PREAMBLE_PERIOD_SYMBOLS = 300;
 
 // BEIDOU D1 NAVIGATION MESSAGE STRUCTURE
 // GENERAL
-const std::vector<std::pair<int, int> > D1_PRE({{1, 11}});
-const std::vector<std::pair<int, int> > D1_FRAID({{16, 3}});
-const std::vector<std::pair<int, int> > D1_SOW({{19, 8}, {31, 12}});
-const std::vector<std::pair<int, int> > D1_PNUM({{44, 7}});
+const std::vector<std::pair<int32_t, int32_t> > D1_PRE({{1, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D1_FRAID({{16, 3}});
+const std::vector<std::pair<int32_t, int32_t> > D1_SOW({{19, 8}, {31, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D1_PNUM({{44, 7}});
 
 // DNAV SCALE FACTORS
 // EPH
@@ -164,183 +165,183 @@ const double D1_A0UTC_LSB = TWO_N30;
 const double D1_A1UTC_LSB = TWO_N50;
 
 // SUBFRAME 1
-const std::vector<std::pair<int, int> > D1_SAT_H1({{43, 1}});
-const std::vector<std::pair<int, int> > D1_AODC({{44, 5}});
-const std::vector<std::pair<int, int> > D1_URAI({{49, 4}});
-const std::vector<std::pair<int, int> > D1_WN({{61, 13}});
-const std::vector<std::pair<int, int> > D1_TOC({{74, 9}, {91, 8}});
-const std::vector<std::pair<int, int> > D1_TGD1({{99, 10}});
-const std::vector<std::pair<int, int> > D1_TGD2({{121, 6}});
-const std::vector<std::pair<int, int> > D1_ALPHA0({{127, 8}});
-const std::vector<std::pair<int, int> > D1_ALPHA1({{135, 8}});
-const std::vector<std::pair<int, int> > D1_ALPHA2({{151, 8}});
-const std::vector<std::pair<int, int> > D1_ALPHA3({{159, 8}});
-const std::vector<std::pair<int, int> > D1_BETA0({{167, 6}, {181, 2}});
-const std::vector<std::pair<int, int> > D1_BETA1({{183, 8}});
-const std::vector<std::pair<int, int> > D1_BETA2({{191, 8}});
-const std::vector<std::pair<int, int> > D1_BETA3({{199, 4}, {211, 4}});
-const std::vector<std::pair<int, int> > D1_A2({{215, 11}});
-const std::vector<std::pair<int, int> > D1_A0({{226, 7}, {241, 17}});
-const std::vector<std::pair<int, int> > D1_A1({{258, 5}, {271, 17}});
-const std::vector<std::pair<int, int> > D1_AODE({{288, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D1_SAT_H1({{43, 1}});
+const std::vector<std::pair<int32_t, int32_t> > D1_AODC({{44, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D1_URAI({{49, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D1_WN({{61, 13}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TOC({{74, 9}, {91, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TGD1({{99, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TGD2({{121, 6}});
+const std::vector<std::pair<int32_t, int32_t> > D1_ALPHA0({{127, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_ALPHA1({{135, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_ALPHA2({{151, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_ALPHA3({{159, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_BETA0({{167, 6}, {181, 2}});
+const std::vector<std::pair<int32_t, int32_t> > D1_BETA1({{183, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_BETA2({{191, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_BETA3({{199, 4}, {211, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A2({{215, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A0({{226, 7}, {241, 17}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A1({{258, 5}, {271, 17}});
+const std::vector<std::pair<int32_t, int32_t> > D1_AODE({{288, 5}});
 
 //SUBFRAME 2
-const std::vector<std::pair<int, int> > D1_DELTA_N({{43, 10}, {61, 6}});
-const std::vector<std::pair<int, int> > D1_CUC({{67, 16}, {91, 2}});
-const std::vector<std::pair<int, int> > D1_M0({{93, 20}, {121, 12}});
-const std::vector<std::pair<int, int> > D1_E({{133, 10}, {151, 22}});
-const std::vector<std::pair<int, int> > D1_CUS({{181, 18}});
-const std::vector<std::pair<int, int> > D1_CRC({{199, 4}, {211, 14}});
-const std::vector<std::pair<int, int> > D1_CRS({{225, 8}, {241, 10}});
-const std::vector<std::pair<int, int> > D1_SQRT_A({{251, 12}, {271, 20}});
-const std::vector<std::pair<int, int> > D1_TOE_SF2({{291, 2}});
+const std::vector<std::pair<int32_t, int32_t> > D1_DELTA_N({{43, 10}, {61, 6}});
+const std::vector<std::pair<int32_t, int32_t> > D1_CUC({{67, 16}, {91, 2}});
+const std::vector<std::pair<int32_t, int32_t> > D1_M0({{93, 20}, {121, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D1_E({{133, 10}, {151, 22}});
+const std::vector<std::pair<int32_t, int32_t> > D1_CUS({{181, 18}});
+const std::vector<std::pair<int32_t, int32_t> > D1_CRC({{199, 4}, {211, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D1_CRS({{225, 8}, {241, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D1_SQRT_A({{251, 12}, {271, 20}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TOE_SF2({{291, 2}});
 
 //SUBFRAME 3
-const std::vector<std::pair<int, int> > D1_TOE_SF3({{43, 10}, {61, 5}});
-const std::vector<std::pair<int, int> > D1_I0({{66, 17}, {91, 15}});
-const std::vector<std::pair<int, int> > D1_CIC({{106, 7}, {121, 11}});
-const std::vector<std::pair<int, int> > D1_OMEGA_DOT({{132, 11}, {151, 13}});
-const std::vector<std::pair<int, int> > D1_CIS({{164, 9}, {181, 9}});
-const std::vector<std::pair<int, int> > D1_IDOT({{190, 13}, {211, 1}});
-const std::vector<std::pair<int, int> > D1_OMEGA0({{212, 21}, {241, 11}});
-const std::vector<std::pair<int, int> > D1_OMEGA({{252, 11}, {271, 21}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TOE_SF3({{43, 10}, {61, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D1_I0({{66, 17}, {91, 15}});
+const std::vector<std::pair<int32_t, int32_t> > D1_CIC({{106, 7}, {121, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D1_OMEGA_DOT({{132, 11}, {151, 13}});
+const std::vector<std::pair<int32_t, int32_t> > D1_CIS({{164, 9}, {181, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_IDOT({{190, 13}, {211, 1}});
+const std::vector<std::pair<int32_t, int32_t> > D1_OMEGA0({{212, 21}, {241, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D1_OMEGA({{252, 11}, {271, 21}});
 
 //SUBFRAME 4 AND PAGES 1 THROUGH 6 IN SUBFRAME 5
-const std::vector<std::pair<int, int> > D1_SQRT_A_ALMANAC({{51, 2}, {61, 22}});
-const std::vector<std::pair<int, int> > D1_A1_ALMANAC({{91, 11}});
-const std::vector<std::pair<int, int> > D1_A0_ALMANAC({{102, 11}});
-const std::vector<std::pair<int, int> > D1_OMEGA0_ALMANAC({{121, 22}, {151, 2}});
-const std::vector<std::pair<int, int> > D1_E_ALMANAC({{153, 17}});
-const std::vector<std::pair<int, int> > D1_DELTA_I({{170, 3}, {181, 13}});
-const std::vector<std::pair<int, int> > D1_TOA({{194, 8}});
-const std::vector<std::pair<int, int> > D1_OMEGA_DOT_ALMANAC({{202, 1}, {211, 16}});
-const std::vector<std::pair<int, int> > D1_OMEGA_ALMANAC({{227, 6}, {241, 18}});
-const std::vector<std::pair<int, int> > D1_M0_ALMANAC({{259, 4}, {271, 20}});
+const std::vector<std::pair<int32_t, int32_t> > D1_SQRT_A_ALMANAC({{51, 2}, {61, 22}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A1_ALMANAC({{91, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A0_ALMANAC({{102, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D1_OMEGA0_ALMANAC({{121, 22}, {151, 2}});
+const std::vector<std::pair<int32_t, int32_t> > D1_E_ALMANAC({{153, 17}});
+const std::vector<std::pair<int32_t, int32_t> > D1_DELTA_I({{170, 3}, {181, 13}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TOA({{194, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_OMEGA_DOT_ALMANAC({{202, 1}, {211, 16}});
+const std::vector<std::pair<int32_t, int32_t> > D1_OMEGA_ALMANAC({{227, 6}, {241, 18}});
+const std::vector<std::pair<int32_t, int32_t> > D1_M0_ALMANAC({{259, 4}, {271, 20}});
 
 //SUBFRAME 5 PAGE 7
-const std::vector<std::pair<int, int> > D1_HEA1({{51, 2}, {61, 7}});
-const std::vector<std::pair<int, int> > D1_HEA2({{68, 9}});
-const std::vector<std::pair<int, int> > D1_HEA3({{77, 6}, {91, 3}});
-const std::vector<std::pair<int, int> > D1_HEA4({{94, 9}});
-const std::vector<std::pair<int, int> > D1_HEA5({{103, 9}});
-const std::vector<std::pair<int, int> > D1_HEA6({{112, 1}, {121, 8}});
-const std::vector<std::pair<int, int> > D1_HEA7({{129, 9}});
-const std::vector<std::pair<int, int> > D1_HEA8({{138, 5}, {151, 4}});
-const std::vector<std::pair<int, int> > D1_HEA9({{155, 9}});
-const std::vector<std::pair<int, int> > D1_HEA10({{164, 9}});
-const std::vector<std::pair<int, int> > D1_HEA11({{181, 9}});
-const std::vector<std::pair<int, int> > D1_HEA12({{190, 9}});
-const std::vector<std::pair<int, int> > D1_HEA13({{199, 4}, {211, 5}});
-const std::vector<std::pair<int, int> > D1_HEA14({{216, 9}});
-const std::vector<std::pair<int, int> > D1_HEA15({{225, 8}, {241, 1}});
-const std::vector<std::pair<int, int> > D1_HEA16({{242, 9}});
-const std::vector<std::pair<int, int> > D1_HEA17({{251, 9}});
-const std::vector<std::pair<int, int> > D1_HEA18({{260, 3}, {271, 6}});
-const std::vector<std::pair<int, int> > D1_HEA19({{277, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA1({{51, 2}, {61, 7}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA2({{68, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA3({{77, 6}, {91, 3}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA4({{94, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA5({{103, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA6({{112, 1}, {121, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA7({{129, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA8({{138, 5}, {151, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA9({{155, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA10({{164, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA11({{181, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA12({{190, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA13({{199, 4}, {211, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA14({{216, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA15({{225, 8}, {241, 1}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA16({{242, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA17({{251, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA18({{260, 3}, {271, 6}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA19({{277, 9}});
 
 //SUBFRAME 5 PAGE 8
-const std::vector<std::pair<int, int> > D1_HEA20({{51, 2}, {61, 7}});
-const std::vector<std::pair<int, int> > D1_HEA21({{68, 9}});
-const std::vector<std::pair<int, int> > D1_HEA22({{77, 6}, {91, 3}});
-const std::vector<std::pair<int, int> > D1_HEA23({{94, 9}});
-const std::vector<std::pair<int, int> > D1_HEA24({{103, 9}});
-const std::vector<std::pair<int, int> > D1_HEA25({{112, 1}, {121, 8}});
-const std::vector<std::pair<int, int> > D1_HEA26({{129, 9}});
-const std::vector<std::pair<int, int> > D1_HEA27({{138, 5}, {151, 4}});
-const std::vector<std::pair<int, int> > D1_HEA28({{155, 9}});
-const std::vector<std::pair<int, int> > D1_HEA29({{164, 9}});
-const std::vector<std::pair<int, int> > D1_HEA30({{181, 9}});
-const std::vector<std::pair<int, int> > D1_WNA({{190, 8}});
-const std::vector<std::pair<int, int> > D1_TOA2({{198, 5}, {211, 3}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA20({{51, 2}, {61, 7}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA21({{68, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA22({{77, 6}, {91, 3}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA23({{94, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA24({{103, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA25({{112, 1}, {121, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA26({{129, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA27({{138, 5}, {151, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA28({{155, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA29({{164, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_HEA30({{181, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D1_WNA({{190, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_TOA2({{198, 5}, {211, 3}});
 
 //SUBFRAME 5 PAGE 9
-const std::vector<std::pair<int, int> > D1_A0GPS({{97, 14}});
-const std::vector<std::pair<int, int> > D1_A1GPS({{111, 2}, {121, 14}});
-const std::vector<std::pair<int, int> > D1_A0GAL({{135, 8}, {151, 6}});
-const std::vector<std::pair<int, int> > D1_A1GAL({{157, 16}});
-const std::vector<std::pair<int, int> > D1_A0GLO({{181, 14}});
-const std::vector<std::pair<int, int> > D1_A1GLO({{195, 8}, {211, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A0GPS({{97, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A1GPS({{111, 2}, {121, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A0GAL({{135, 8}, {151, 6}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A1GAL({{157, 16}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A0GLO({{181, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A1GLO({{195, 8}, {211, 8}});
 
 //SUBFRAME 5 PAGE 10
-const std::vector<std::pair<int, int> > D1_DELTA_T_LS({{51, 2}, {61, 6}});
-const std::vector<std::pair<int, int> > D1_DELTA_T_LSF({{67, 8}});
-const std::vector<std::pair<int, int> > D1_WN_LSF({{75, 8}});
-const std::vector<std::pair<int, int> > D1_A0UTC({{91, 22}, {121, 10}});
-const std::vector<std::pair<int, int> > D1_A1UTC({{131, 12}, {151, 12}});
-const std::vector<std::pair<int, int> > D1_DN({{163, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_DELTA_T_LS({{51, 2}, {61, 6}});
+const std::vector<std::pair<int32_t, int32_t> > D1_DELTA_T_LSF({{67, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_WN_LSF({{75, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A0UTC({{91, 22}, {121, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D1_A1UTC({{131, 12}, {151, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D1_DN({{163, 8}});
 
 // D2 NAV Message Decoding Information
-const std::vector<std::pair<int, int> > D2_PRE({{1, 11}});
-const std::vector<std::pair<int, int> > D2_FRAID({{16, 3}});
-const std::vector<std::pair<int, int> > D2_SOW({{19, 8}, {31, 12}});
-const std::vector<std::pair<int, int> > D2_PNUM({{43, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_PRE({{1, 11}});
+const std::vector<std::pair<int32_t, int32_t> > D2_FRAID({{16, 3}});
+const std::vector<std::pair<int32_t, int32_t> > D2_SOW({{19, 8}, {31, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D2_PNUM({{43, 4}});
 
 // D2 NAV, SUBFRAME 1, PAGE 1
-const std::vector<std::pair<int, int> > D2_SAT_H1({{47, 1}});
-const std::vector<std::pair<int, int> > D2_AODC({{48, 5}});
-const std::vector<std::pair<int, int> > D2_URAI({{61, 4}});
-const std::vector<std::pair<int, int> > D2_WN({{65, 13}});
-const std::vector<std::pair<int, int> > D2_TOC({{78, 5}, {91, 12}});
-const std::vector<std::pair<int, int> > D2_TGD1({{103, 10}});
-const std::vector<std::pair<int, int> > D2_TGD2({{121, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D2_SAT_H1({{47, 1}});
+const std::vector<std::pair<int32_t, int32_t> > D2_AODC({{48, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D2_URAI({{61, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_WN({{65, 13}});
+const std::vector<std::pair<int32_t, int32_t> > D2_TOC({{78, 5}, {91, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D2_TGD1({{103, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D2_TGD2({{121, 10}});
 
 // D2 NAV, SUBFRAME 1, PAGE 2
-const std::vector<std::pair<int, int> > D2_ALPHA0({{47, 6}, {61, 2}});
-const std::vector<std::pair<int, int> > D2_ALPHA1({{63, 8}});
-const std::vector<std::pair<int, int> > D2_ALPHA2({{71, 8}});
-const std::vector<std::pair<int, int> > D2_ALPHA3({{79, 4}, {91, 4}});
-const std::vector<std::pair<int, int> > D2_BETA0({{95, 8}});
-const std::vector<std::pair<int, int> > D2_BETA1({{103, 8}});
-const std::vector<std::pair<int, int> > D2_BETA2({{111, 2}, {121, 6}});
-const std::vector<std::pair<int, int> > D2_BETA3({{127, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D2_ALPHA0({{47, 6}, {61, 2}});
+const std::vector<std::pair<int32_t, int32_t> > D2_ALPHA1({{63, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D2_ALPHA2({{71, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D2_ALPHA3({{79, 4}, {91, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_BETA0({{95, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D2_BETA1({{103, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D2_BETA2({{111, 2}, {121, 6}});
+const std::vector<std::pair<int32_t, int32_t> > D2_BETA3({{127, 8}});
 
 // D2 NAV, SUBFRAME 1, PAGE 3
-const std::vector<std::pair<int, int> > D2_A0({{101, 12}, {121, 12}});
-const std::vector<std::pair<int, int> > D2_A1_MSB({{133, 4}});
-const std::vector<std::pair<int, int> > D2_A1_LSB({{47, 6}, {61, 12}});
-const std::vector<std::pair<int, int> > D2_A1({{279, 22}});
+const std::vector<std::pair<int32_t, int32_t> > D2_A0({{101, 12}, {121, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D2_A1_MSB({{133, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_A1_LSB({{47, 6}, {61, 12}});
+const std::vector<std::pair<int32_t, int32_t> > D2_A1({{279, 22}});
 
 // D2 NAV, SUBFRAME 1, PAGE 4
-const std::vector<std::pair<int, int> > D2_A2({{73, 10}, {91, 1}});
-const std::vector<std::pair<int, int> > D2_AODE({{92, 5}});
-const std::vector<std::pair<int, int> > D2_DELTA_N({{97, 16}});
-const std::vector<std::pair<int, int> > D2_CUC_MSB({{121, 14}});
-const std::vector<std::pair<int, int> > D2_CUC_LSB({{47, 4}});
-const std::vector<std::pair<int, int> > D2_CUC({{283, 18}});
+const std::vector<std::pair<int32_t, int32_t> > D2_A2({{73, 10}, {91, 1}});
+const std::vector<std::pair<int32_t, int32_t> > D2_AODE({{92, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D2_DELTA_N({{97, 16}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CUC_MSB({{121, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CUC_LSB({{47, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CUC({{283, 18}});
 
 // D2 NAV, SUBFRAME 1, PAGE 5
-const std::vector<std::pair<int, int> > D2_M0({{51, 2}, {61, 22}, {91, 8}});
-const std::vector<std::pair<int, int> > D2_CUS({{99, 14}, {121, 4}});
-const std::vector<std::pair<int, int> > D2_E_MSB({{125, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D2_M0({{51, 2}, {61, 22}, {91, 8}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CUS({{99, 14}, {121, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_E_MSB({{125, 10}});
 
 // D2 NAV, SUBFRAME 1, PAGE 6
-const std::vector<std::pair<int, int> > D2_E_LSB({{47, 6}, {61, 16}});
-const std::vector<std::pair<int, int> > D2_SQRT_A({{77, 6}, {91, 22}, {121, 4}});
-const std::vector<std::pair<int, int> > D2_CIC_MSB({{125, 10}});
-const std::vector<std::pair<int, int> > D2_CIC_LSB({{47, 6}, {61, 2}});
-const std::vector<std::pair<int, int> > D2_CIC({{283, 18}});
+const std::vector<std::pair<int32_t, int32_t> > D2_E_LSB({{47, 6}, {61, 16}});
+const std::vector<std::pair<int32_t, int32_t> > D2_SQRT_A({{77, 6}, {91, 22}, {121, 4}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CIC_MSB({{125, 10}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CIC_LSB({{47, 6}, {61, 2}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CIC({{283, 18}});
 
 // D2 NAV, SUBFRAME 1, PAGE 7
-const std::vector<std::pair<int, int> > D2_CIS({{63, 18}});
-const std::vector<std::pair<int, int> > D2_TOE({{81, 2}, {91, 15}});
-const std::vector<std::pair<int, int> > D2_I0_MSB({{106, 7}, {121, 14}});
-const std::vector<std::pair<int, int> > D2_I0_LSB({{47, 6}, {61, 5}});
-const std::vector<std::pair<int, int> > D2_I0({{269, 32}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CIS({{63, 18}});
+const std::vector<std::pair<int32_t, int32_t> > D2_TOE({{81, 2}, {91, 15}});
+const std::vector<std::pair<int32_t, int32_t> > D2_I0_MSB({{106, 7}, {121, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D2_I0_LSB({{47, 6}, {61, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D2_I0({{269, 32}});
 
 // D2 NAV, SUBFRAME 1, PAGE 8
-const std::vector<std::pair<int, int> > D2_CRC({{66, 17}, {91, 1}});
-const std::vector<std::pair<int, int> > D2_CRS({{92, 18}});
-const std::vector<std::pair<int, int> > D2_OMEGA_DOT_MSB({{110, 3}, {121, 16}});
-const std::vector<std::pair<int, int> > D2_OMEGA_DOT_LSB({{47, 5}});
-const std::vector<std::pair<int, int> > D2_OMEGA_DOT({{277, 24}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CRC({{66, 17}, {91, 1}});
+const std::vector<std::pair<int32_t, int32_t> > D2_CRS({{92, 18}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA_DOT_MSB({{110, 3}, {121, 16}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA_DOT_LSB({{47, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA_DOT({{277, 24}});
 
 // D2 NAV, SUBFRAME 1, PAGE 9
-const std::vector<std::pair<int, int> > D2_OMEGA0({{52, 1}, {61, 22}, {91, 9}});
-const std::vector<std::pair<int, int> > D2_OMEGA_MSB({{100, 13}, {121, 14}});
-const std::vector<std::pair<int, int> > D2_OMEGA_LSB({{47, 5}});
-const std::vector<std::pair<int, int> > D2_OMEGA({{269, 32}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA0({{52, 1}, {61, 22}, {91, 9}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA_MSB({{100, 13}, {121, 14}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA_LSB({{47, 5}});
+const std::vector<std::pair<int32_t, int32_t> > D2_OMEGA({{269, 32}});
 
 // D2 NAV, SUBFRAME 1, PAGE 10
-const std::vector<std::pair<int, int> > D2_IDOT({{52, 1}, {61, 13}});
+const std::vector<std::pair<int32_t, int32_t> > D2_IDOT({{52, 1}, {61, 13}});
 
 #endif /* GNSS_SDR_BEIDOU_B1I_H_ */

From 21b5aeee9d7533273291ba7eba0377557f28f79b Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 12:45:23 +0100
Subject: [PATCH 029/123] Make use of cstdint type names

---
 .../libs/beidou_b1i_signal_processing.cc      | 48 +++++-----
 .../libs/beidou_b1i_signal_processing.h       | 23 ++---
 .../beidou_dnav_navigation_message.cc         | 94 ++++++++++++-------
 .../beidou_dnav_navigation_message.h          | 68 +++++++-------
 4 files changed, 128 insertions(+), 105 deletions(-)

diff --git a/src/algorithms/libs/beidou_b1i_signal_processing.cc b/src/algorithms/libs/beidou_b1i_signal_processing.cc
index 47230943a..b9618223e 100644
--- a/src/algorithms/libs/beidou_b1i_signal_processing.cc
+++ b/src/algorithms/libs/beidou_b1i_signal_processing.cc
@@ -7,7 +7,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -32,26 +32,26 @@
 
 #include "beidou_b1i_signal_processing.h"
 
-auto auxCeil = [](float x) { return static_cast<int>(static_cast<long>((x) + 1)); };
+auto auxCeil = [](float x) { return static_cast<int32_t>(static_cast<int64_t>((x) + 1)); };
 
-void beidou_b1i_code_gen_int(int* _dest, signed int _prn, unsigned int _chip_shift)
+void beidou_b1i_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift)
 {
-    const unsigned int _code_length = 2046;
+    const uint32_t _code_length = 2046;
     bool G1[_code_length];
     bool G2[_code_length];
     bool G1_register[11] = {false, true, false, true, false, true, false, true, false, true, false};
     bool G2_register[11] = {false, true, false, true, false, true, false, true, false, true, false};
     bool feedback1, feedback2;
     bool aux;
-    unsigned int lcv, lcv2;
-    unsigned int delay;
-    signed int prn_idx;
+    uint32_t lcv, lcv2;
+    uint32_t delay;
+    int32_t prn_idx;
     /* G2 Delays as defined in GPS-ISD-200D */
-    const signed int delays[33] = {712 /*PRN1*/, 1581, 1414, 1550, 581, 771, 1311, 1043, 1549, 359, 710, 1579, 1548, 1103, 579, 769, 358, 709, 1411, 1547,
+    const int32_t delays[33] = {712 /*PRN1*/, 1581, 1414, 1550, 581, 771, 1311, 1043, 1549, 359, 710, 1579, 1548, 1103, 579, 769, 358, 709, 1411, 1547,
         1102, 578, 357, 1577, 1410, 1546, 1101, 707, 1576, 1409, 1545, 354 /*PRN32*/,
         705};
-    const signed int phase1[37] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 8, 8, 8, 9, 9, 10};
-    const signed int phase2[37] = {3, 4, 5, 6, 8, 9, 10, 11, 7, 4, 5, 6, 8, 9, 10, 11, 5, 6, 8, 9, 10, 11, 6, 8, 9, 10, 11, 8, 9, 10, 11, 9, 10, 11, 10, 11, 11};
+    const int32_t phase1[37] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 8, 8, 8, 9, 9, 10};
+    const int32_t phase2[37] = {3, 4, 5, 6, 8, 9, 10, 11, 7, 4, 5, 6, 8, 9, 10, 11, 5, 6, 8, 9, 10, 11, 6, 8, 9, 10, 11, 8, 9, 10, 11, 9, 10, 11, 10, 11, 11};
 
     // compute delay array index for given PRN number
     prn_idx = _prn - 1;
@@ -110,28 +110,28 @@ void beidou_b1i_code_gen_int(int* _dest, signed int _prn, unsigned int _chip_shi
 }
 
 
-void beidou_b1i_code_gen_float(float* _dest, signed int _prn, unsigned int _chip_shift)
+void beidou_b1i_code_gen_float(float* _dest, int32_t _prn, uint32_t _chip_shift)
 {
-    unsigned int _code_length = 2046;
-    int b1i_code_int[_code_length];
+    uint32_t _code_length = 2046;
+    int32_t b1i_code_int[_code_length];
 
     beidou_b1i_code_gen_int(b1i_code_int, _prn, _chip_shift);
 
-    for (unsigned int ii = 0; ii < _code_length; ++ii)
+    for (uint32_t ii = 0; ii < _code_length; ++ii)
         {
             _dest[ii] = static_cast<float>(b1i_code_int[ii]);
         }
 }
 
 
-void beidou_b1i_code_gen_complex(std::complex<float>* _dest, signed int _prn, unsigned int _chip_shift)
+void beidou_b1i_code_gen_complex(std::complex<float>* _dest, int32_t _prn, uint32_t _chip_shift)
 {
-    unsigned int _code_length = 2046;
-    int b1i_code_int[_code_length];
+    uint32_t _code_length = 2046;
+    int32_t b1i_code_int[_code_length];
 
     beidou_b1i_code_gen_int(b1i_code_int, _prn, _chip_shift);
 
-    for (unsigned int ii = 0; ii < _code_length; ++ii)
+    for (uint32_t ii = 0; ii < _code_length; ++ii)
         {
             _dest[ii] = std::complex<float>(static_cast<float>(b1i_code_int[ii]), 0.0f);
         }
@@ -141,26 +141,26 @@ void beidou_b1i_code_gen_complex(std::complex<float>* _dest, signed int _prn, un
 /*
  *  Generates complex GPS L1 C/A code for the desired SV ID and sampled to specific sampling frequency
  */
-void beidou_b1i_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int _prn, int _fs, unsigned int _chip_shift)
+void beidou_b1i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift)
 {
     // This function is based on the GNU software GPS for MATLAB in the Kay Borre book
     std::complex<float> _code[2046];
-    signed int _samplesPerCode, _codeValueIndex;
+    int32_t _samplesPerCode, _codeValueIndex;
     float _ts;
     float _tc;
     float aux;
-    const signed int _codeFreqBasis = 2046000;  //Hz
-    const signed int _codeLength = 2046;
+    const int32_t _codeFreqBasis = 2046000;  //Hz
+    const int32_t _codeLength = 2046;
 
     //--- Find number of samples per spreading code ----------------------------
-    _samplesPerCode = static_cast<signed int>(static_cast<double>(_fs) / static_cast<double>(_codeFreqBasis / _codeLength));
+    _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / static_cast<double>(_codeFreqBasis / _codeLength));
 
     //--- Find time constants --------------------------------------------------
     _ts = 1.0 / static_cast<float>(_fs);                    // Sampling period in sec
     _tc = 1.0 / static_cast<float>(_codeFreqBasis);         // C/A chip period in sec
     beidou_b1i_code_gen_complex(_code, _prn, _chip_shift);  //generate C/A code 1 sample per chip
 
-    for (signed int i = 0; i < _samplesPerCode; i++)
+    for (int32_t i = 0; i < _samplesPerCode; i++)
         {
             //=== Digitizing =======================================================
 
diff --git a/src/algorithms/libs/beidou_b1i_signal_processing.h b/src/algorithms/libs/beidou_b1i_signal_processing.h
index 4c03328f0..16c842523 100644
--- a/src/algorithms/libs/beidou_b1i_signal_processing.h
+++ b/src/algorithms/libs/beidou_b1i_signal_processing.h
@@ -7,7 +7,7 @@
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -30,25 +30,26 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_
-#define BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_
+#ifndef GNSS_SDR_BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_
+#define GNSS_SDR_BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_
 
 #include <complex>
 #include <iostream>
+#include <cstdint>
 
-//!Generates int GPS L1 C/A code for the desired SV ID and code shift
-void beidou_b1i_code_gen_int(int* _dest, signed int _prn, unsigned int _chip_shift);
+//! Generates int32_t GPS L1 C/A code for the desired SV ID and code shift
+void beidou_b1i_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift);
 
-//!Generates float GPS L1 C/A code for the desired SV ID and code shift
-void beidou_b1i_code_gen_float(float* _dest, signed int _prn, unsigned int _chip_shift);
+//! Generates float GPS L1 C/A code for the desired SV ID and code shift
+void beidou_b1i_code_gen_float(float* _dest, int32_t _prn, uint32_t _chip_shift);
 
-//!Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency
-void beidou_b1i_code_gen_complex(std::complex<float>* _dest, signed int _prn, unsigned int _chip_shift);
+//! Generates complex GPS L1 C/A code for the desired SV ID and code shift, and sampled to specific sampling frequency
+void beidou_b1i_code_gen_complex(std::complex<float>* _dest, int32_t _prn, uint32_t _chip_shift);
 
 //! Generates N complex GPS L1 C/A codes for the desired SV ID and code shift
-void beidou_b1i_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int _prn, int _fs, unsigned int _chip_shift, unsigned int _ncodes);
+void beidou_b1i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift, uint32_t _ncodes);
 
 //! Generates complex GPS L1 C/A code for the desired SV ID and code shift
-void beidou_b1i_code_gen_complex_sampled(std::complex<float>* _dest, unsigned int _prn, int _fs, unsigned int _chip_shift);
+void beidou_b1i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs, uint32_t _chip_shift);
 
 #endif /* BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_ */
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc
index 7cebd5b6c..9a83d1598 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.cc
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc
@@ -175,7 +175,7 @@ void Beidou_Dnav_Navigation_Message::reset()
     //Almanac
     d_Toa = 0;
     i_WN_A = 0;
-    for (int i = 1; i < 36; i++)
+    for (int32_t i = 1; i < 36; i++)
         {
             almanacHealth[i] = 0;
         }
@@ -208,25 +208,30 @@ void Beidou_Dnav_Navigation_Message::reset()
 
     auto gnss_sat = Gnss_Satellite();
     std::string _system("Beidou");
-    for (unsigned int i = 1; i < 36; i++)
+    for (uint32_t i = 1; i < 36; i++)
         {
             satelliteBlock[i] = gnss_sat.what_block(_system, i);
         }
 }
 
+
 Beidou_Dnav_Navigation_Message::Beidou_Dnav_Navigation_Message()
 {
     reset();
 }
 
-void Beidou_Dnav_Navigation_Message::print_beidou_word_bytes(unsigned int BEIDOU_word)
+
+void Beidou_Dnav_Navigation_Message::print_beidou_word_bytes(uint32_t BEIDOU_word)
 {
     std::cout << " Word =";
     std::cout << std::bitset<32>(BEIDOU_word);
     std::cout << std::endl;
 }
 
-bool Beidou_Dnav_Navigation_Message::read_navigation_bool(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int, int>>& parameter)
+
+bool Beidou_Dnav_Navigation_Message::read_navigation_bool(
+    std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits,
+    const std::vector<std::pair<int32_t, int32_t>>& parameter)
 {
     bool value;
 
@@ -241,15 +246,18 @@ bool Beidou_Dnav_Navigation_Message::read_navigation_bool(std::bitset<BEIDOU_DNA
     return value;
 }
 
-unsigned long int Beidou_Dnav_Navigation_Message::read_navigation_unsigned(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int, int>>& parameter)
+
+uint64_t Beidou_Dnav_Navigation_Message::read_navigation_unsigned(
+    std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits,
+    const std::vector<std::pair<int32_t, int32_t>>& parameter)
 {
-    unsigned long int value = 0;
-    int num_of_slices = parameter.size();
-    for (int i = 0; i < num_of_slices; i++)
+    uint64_t value = 0ULL;
+    int32_t num_of_slices = parameter.size();
+    for (int32_t i = 0; i < num_of_slices; i++)
         {
-            for (int j = 0; j < parameter[i].second; j++)
+            for (int32_t j = 0; j < parameter[i].second; j++)
                 {
-                    value <<= 1;  //shift left
+                    value <<= 1;  // shift left
                     if (bits[BEIDOU_DNAV_SUBFRAME_DATA_BITS - parameter[i].first - j] == 1)
                         {
                             value += 1;  // insert the bit
@@ -259,30 +267,33 @@ unsigned long int Beidou_Dnav_Navigation_Message::read_navigation_unsigned(std::
     return value;
 }
 
-signed long int Beidou_Dnav_Navigation_Message::read_navigation_signed(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int, int>>& parameter)
+
+int64_t Beidou_Dnav_Navigation_Message::read_navigation_signed(
+    std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits,
+    const std::vector<std::pair<int32_t, int32_t>>& parameter)
 {
-    signed long int value = 0;
-    int num_of_slices = parameter.size();
+    int64_t value = 0;
+    int32_t num_of_slices = parameter.size();
     // Discriminate between 64 bits and 32 bits compiler
-    int long_int_size_bytes = sizeof(signed long int);
+    int32_t long_int_size_bytes = sizeof(int64_t);
     if (long_int_size_bytes == 8)  // if a long int takes 8 bytes, we are in a 64 bits system
         {
             // read the MSB and perform the sign extension
             if (bits[BEIDOU_DNAV_SUBFRAME_DATA_BITS - parameter[0].first] == 1)
                 {
-                    value ^= 0xFFFFFFFFFFFFFFFF;  //64 bits variable
+                    value ^= 0xFFFFFFFFFFFFFFFF;  // 64 bits variable
                 }
             else
                 {
                     value &= 0;
                 }
 
-            for (int i = 0; i < num_of_slices; i++)
+            for (int32_t i = 0; i < num_of_slices; i++)
                 {
-                    for (int j = 0; j < parameter[i].second; j++)
+                    for (int32_t j = 0; j < parameter[i].second; j++)
                         {
-                            value <<= 1;                  //shift left
-                            value &= 0xFFFFFFFFFFFFFFFE;  //reset the corresponding bit (for the 64 bits variable)
+                            value <<= 1;                  // shift left
+                            value &= 0xFFFFFFFFFFFFFFFE;  // reset the corresponding bit (for the 64 bits variable)
                             if (bits[BEIDOU_DNAV_SUBFRAME_DATA_BITS - parameter[i].first - j] == 1)
                                 {
                                     value += 1;  // insert the bit
@@ -302,12 +313,12 @@ signed long int Beidou_Dnav_Navigation_Message::read_navigation_signed(std::bits
                     value &= 0;
                 }
 
-            for (int i = 0; i < num_of_slices; i++)
+            for (int32_t i = 0; i < num_of_slices; i++)
                 {
-                    for (int j = 0; j < parameter[i].second; j++)
+                    for (int32_t j = 0; j < parameter[i].second; j++)
                         {
-                            value <<= 1;          //shift left
-                            value &= 0xFFFFFFFE;  //reset the corresponding bit
+                            value <<= 1;          // shift left
+                            value &= 0xFFFFFFFE;  // reset the corresponding bit
                             if (bits[BEIDOU_DNAV_SUBFRAME_DATA_BITS - parameter[i].first - j] == 1)
                                 {
                                     value += 1;  // insert the bit
@@ -318,6 +329,7 @@ signed long int Beidou_Dnav_Navigation_Message::read_navigation_signed(std::bits
     return value;
 }
 
+
 double Beidou_Dnav_Navigation_Message::check_t(double time)
 {
     double corrTime;
@@ -334,6 +346,7 @@ double Beidou_Dnav_Navigation_Message::check_t(double time)
     return corrTime;
 }
 
+
 double Beidou_Dnav_Navigation_Message::sv_clock_correction(double transmitTime)
 {
     double dt;
@@ -343,6 +356,7 @@ double Beidou_Dnav_Navigation_Message::sv_clock_correction(double transmitTime)
     return correctedTime;
 }
 
+
 void Beidou_Dnav_Navigation_Message::satellitePosition(double transmitTime)
 {
     double tk;
@@ -384,7 +398,7 @@ void Beidou_Dnav_Navigation_Message::satellitePosition(double transmitTime)
     E = M;
 
     // --- Iteratively compute eccentric anomaly ----------------------------
-    for (int ii = 1; ii < 20; ii++)
+    for (int32_t ii = 1; ii < 20; ii++)
         {
             E_old = E;
             E = M + d_eccentricity * sin(E);
@@ -437,9 +451,10 @@ void Beidou_Dnav_Navigation_Message::satellitePosition(double transmitTime)
     d_satvel_Z = d_satpos_Y * sin(i);
 }
 
-int Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& subframe)
+
+int32_t Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& subframe)
 {
-    int subframe_ID = 0;
+    int32_t subframe_ID = 0;
     std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> subframe_bits(subframe);
 
     subframe_ID = static_cast<int>(read_navigation_unsigned(subframe_bits, D1_FRAID));
@@ -505,8 +520,6 @@ int Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& subfr
             break;
 
         case 2:  // --- It is subframe 2 ---
-
-
             d_SOW_SF2 = static_cast<double>(read_navigation_unsigned(subframe_bits, D1_SOW));
             d_SOW = d_SOW_SF2;  // Set transmission time
 
@@ -541,7 +554,6 @@ int Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& subfr
             break;
 
         case 3:  // --- It is subframe 3 ---
-
             d_SOW_SF3 = static_cast<double>(read_navigation_unsigned(subframe_bits, D1_SOW));
             d_SOW = d_SOW_SF3;  // Set transmission time
 
@@ -615,7 +627,7 @@ int Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& subfr
             break;
 
         case 5:  // --- It is subframe 5 ---
-            int SV_page_5;
+            int32_t SV_page_5;
             d_SOW_SF5 = static_cast<double>(read_navigation_unsigned(subframe_bits, D1_SOW));
             d_SOW = d_SOW_SF5;  // Set transmission time
 
@@ -731,10 +743,11 @@ int Beidou_Dnav_Navigation_Message::d1_subframe_decoder(std::string const& subfr
     return subframe_ID;
 }
 
-int Beidou_Dnav_Navigation_Message::d2_subframe_decoder(std::string const& subframe)
+
+int32_t Beidou_Dnav_Navigation_Message::d2_subframe_decoder(std::string const& subframe)
 {
-    int subframe_ID = 0;
-    int page_ID = 0;
+    int32_t subframe_ID = 0;
+    int32_t page_ID = 0;
 
     std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> subframe_bits(subframe);
 
@@ -920,6 +933,7 @@ int Beidou_Dnav_Navigation_Message::d2_subframe_decoder(std::string const& subfr
     return subframe_ID;
 }
 
+
 double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_corrected) const
 {
     double t_utc;
@@ -927,12 +941,12 @@ double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_correcte
     double Delta_t_UTC = d_DeltaT_LS + d_A0UTC + d_A1UTC * (beidoutime_corrected);
 
     // Determine if the effectivity time of the leap second event is in the past
-    int weeksToLeapSecondEvent = i_WN_LSF - i_BEIDOU_week;
+    int32_t weeksToLeapSecondEvent = i_WN_LSF - i_BEIDOU_week;
 
     if ((weeksToLeapSecondEvent) >= 0)  // is not in the past
         {
             //Detect if the effectivity time and user's time is within six hours  = 6 * 60 *60 = 21600 s
-            int secondOfLeapSecondEvent = i_DN * 24 * 60 * 60;
+            int32_t secondOfLeapSecondEvent = i_DN * 24 * 60 * 60;
             if (weeksToLeapSecondEvent > 0)
                 {
                     t_utc_daytime = fmod(beidoutime_corrected - Delta_t_UTC, 86400);
@@ -947,7 +961,7 @@ double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_correcte
                         {
                             if ((beidoutime_corrected - secondOfLeapSecondEvent) < (5 / 4) * 24 * 60 * 60)
                                 {
-                                    int W = fmod(beidoutime_corrected - Delta_t_UTC - 43200, 86400) + 43200;
+                                    int32_t W = fmod(beidoutime_corrected - Delta_t_UTC - 43200, 86400) + 43200;
                                     t_utc_daytime = fmod(W, 86400 + d_DeltaT_LSF - d_DeltaT_LS);
                                 }
                             else
@@ -967,6 +981,7 @@ double Beidou_Dnav_Navigation_Message::utc_time(const double beidoutime_correcte
     return t_utc;
 }
 
+
 Beidou_Dnav_Ephemeris Beidou_Dnav_Navigation_Message::get_ephemeris()
 {
     Beidou_Dnav_Ephemeris eph;
@@ -1064,6 +1079,7 @@ Beidou_Dnav_Ephemeris Beidou_Dnav_Navigation_Message::get_ephemeris()
     return eph;
 }
 
+
 Beidou_Dnav_Iono Beidou_Dnav_Navigation_Message::get_iono()
 {
     Beidou_Dnav_Iono iono;
@@ -1081,6 +1097,7 @@ Beidou_Dnav_Iono Beidou_Dnav_Navigation_Message::get_iono()
     return iono;
 }
 
+
 Beidou_Dnav_Utc_Model Beidou_Dnav_Navigation_Message::get_utc_model()
 {
     Beidou_Dnav_Utc_Model utc_model;
@@ -1105,6 +1122,7 @@ Beidou_Dnav_Utc_Model Beidou_Dnav_Navigation_Message::get_utc_model()
     return utc_model;
 }
 
+
 bool Beidou_Dnav_Navigation_Message::have_new_ephemeris()  // Check if we have a new ephemeris stored in the galileo navigation class
 {
     if (i_satellite_PRN > 0 and i_satellite_PRN < 6)
@@ -1160,6 +1178,7 @@ bool Beidou_Dnav_Navigation_Message::have_new_ephemeris()  // Check if we have a
     return false;
 }
 
+
 bool Beidou_Dnav_Navigation_Message::have_new_iono()
 {
     // the condition on flag_utc_model is added to have a time stamp for iono
@@ -1171,6 +1190,7 @@ bool Beidou_Dnav_Navigation_Message::have_new_iono()
     return false;
 }
 
+
 bool Beidou_Dnav_Navigation_Message::have_new_utc_model()
 {
     if (flag_d1_sf5_p9 == true and flag_d1_sf5_p10 == true)
@@ -1185,6 +1205,7 @@ bool Beidou_Dnav_Navigation_Message::have_new_utc_model()
     return false;
 }
 
+
 bool Beidou_Dnav_Navigation_Message::have_new_almanac()
 {
     if ((flag_d1_sf4 == true) and (flag_d1_sf5 == true))
@@ -1199,6 +1220,7 @@ bool Beidou_Dnav_Navigation_Message::have_new_almanac()
     return false;
 }
 
+
 bool Beidou_Dnav_Navigation_Message::satellite_validation()
 {
     bool flag_data_valid = false;
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h
index 1525c7b4b..7212447cd 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.h
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.h
@@ -54,10 +54,10 @@
 class Beidou_Dnav_Navigation_Message
 {
 private:
-    unsigned long int read_navigation_unsigned(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int, int>>& parameter);
-    signed long int read_navigation_signed(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int, int>>& parameter);
-    bool read_navigation_bool(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int, int>>& parameter);
-    void print_beidou_word_bytes(unsigned int BEIDOU_word);
+    uint64_t read_navigation_unsigned(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int32_t, int32_t>>& parameter);
+    int64_t read_navigation_signed(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int32_t, int32_t>>& parameter);
+    bool read_navigation_bool(std::bitset<BEIDOU_DNAV_SUBFRAME_DATA_BITS> bits, const std::vector<std::pair<int32_t, int32_t>>& parameter);
+    void print_beidou_word_bytes(uint32_t BEIDOU_word);
     /*
      * Accounts for the beginning or end of week crossover
      *
@@ -130,15 +130,15 @@ public:
     double d_OMEGA_DOT;  //!< Rate of Right Ascension [semi-circles/s]
     //broadcast orbit 5
     double d_IDOT;      //!< Rate of Inclination Angle [semi-circles/s]
-    int i_BEIDOU_week;  //!< BeiDou week number, aka WN [week]
+    int32_t i_BEIDOU_week;  //!< BeiDou week number, aka WN [week]
     //broadcast orbit 6
-    int i_SV_accuracy;  //!< User Range Accuracy (URA) index of the SV
-    int i_SV_health;
+    int32_t i_SV_accuracy;  //!< User Range Accuracy (URA) index of the SV
+    int32_t i_SV_health;
     double d_TGD1;  //!< Estimated Group Delay Differential in B1 [s]
     double d_TGD2;  //!< Estimated Group Delay Differential in B2 [s]
     double d_AODC;  //!< Age of Data, Clock
     //broadcast orbit 7
-    //    int i_AODO;              //!< Age of Data Offset (AODO) term for the navigation message correction table (NMCT) contained in subframe 4 (reference paragraph 20.3.3.5.1.9) [s]
+    //    int32_t i_AODO;              //!< Age of Data Offset (AODO) term for the navigation message correction table (NMCT) contained in subframe 4 (reference paragraph 20.3.3.5.1.9) [s]
 
     bool b_fit_interval_flag;  //!< indicates the curve-fit interval used by the CS (Block II/IIA/IIR/IIR-M/IIF) and SS (Block IIIA) in determining the ephemeris parameters, as follows: 0 = 4 hours, 1 = greater than 4 hours.
     double d_spare1;
@@ -149,29 +149,29 @@ public:
     double d_A_f2;  //!< Clock correction parameters. Coefficient 2 of code phase offset model [s/s^2]
 
     // D2 NAV Message Decoding
-    unsigned long int d_A_f1_msb_bits;          //!< Clock correction parameters, D2 NAV MSB
-    unsigned long int d_A_f1_lsb_bits;          //!< Clock correction parameters, D2 NAV LSB
-    unsigned long int d_Cuc_msb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
-    unsigned long int d_Cuc_lsb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
-    unsigned long int d_eccentricity_msb;       //!< Eccentricity [dimensionless]
-    unsigned long int d_eccentricity_lsb;       //!< Eccentricity [dimensionless]
-    unsigned long int d_Cic_msb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
-    unsigned long int d_Cic_lsb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
-    unsigned long int d_eccentricity_msb_bits;  //!< Eccentricity [dimensionless]
-    unsigned long int d_eccentricity_lsb_bits;
-    unsigned long int d_i_0_msb_bits;        //!< Inclination Angle at Reference Time [semi-circles]
-    unsigned long int d_i_0_lsb_bits;        //!< Inclination Angle at Reference Time [semi-circles]
-    unsigned long int d_OMEGA_msb_bits;      //!< Argument of Perigee [semi-cicles]
-    unsigned long int d_OMEGA_lsb_bits;      //!< Argument of Perigee [semi-cicles]
-    unsigned long int d_OMEGA_DOT_msb_bits;  //!< Rate of Right Ascension [semi-circles/s]
-    unsigned long int d_OMEGA_DOT_lsb_bits;  //!< Rate of Right Ascension [semi-circles/s]
+    uint64_t d_A_f1_msb_bits;          //!< Clock correction parameters, D2 NAV MSB
+    uint64_t d_A_f1_lsb_bits;          //!< Clock correction parameters, D2 NAV LSB
+    uint64_t d_Cuc_msb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
+    uint64_t d_Cuc_lsb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
+    uint64_t d_eccentricity_msb;       //!< Eccentricity [dimensionless]
+    uint64_t d_eccentricity_lsb;       //!< Eccentricity [dimensionless]
+    uint64_t d_Cic_msb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
+    uint64_t d_Cic_lsb_bits;           //!< Amplitude of the Cosine Harmonic Correction Term to the Argument of Latitude [rad]
+    uint64_t d_eccentricity_msb_bits;  //!< Eccentricity [dimensionless]
+    uint64_t d_eccentricity_lsb_bits;
+    uint64_t d_i_0_msb_bits;        //!< Inclination Angle at Reference Time [semi-circles]
+    uint64_t d_i_0_lsb_bits;        //!< Inclination Angle at Reference Time [semi-circles]
+    uint64_t d_OMEGA_msb_bits;      //!< Argument of Perigee [semi-cicles]
+    uint64_t d_OMEGA_lsb_bits;      //!< Argument of Perigee [semi-cicles]
+    uint64_t d_OMEGA_DOT_msb_bits;  //!< Rate of Right Ascension [semi-circles/s]
+    uint64_t d_OMEGA_DOT_lsb_bits;  //!< Rate of Right Ascension [semi-circles/s]
 
     // Almanac
     double d_Toa;                      //!< Almanac reference time [s]
-    int i_WN_A;                        //!< Modulo 256 of the GPS week number to which the almanac reference time (d_Toa) is referenced
-    std::map<int, int> almanacHealth;  //!< Map that stores the health information stored in the almanac
+    int32_t i_WN_A;                        //!< Modulo 256 of the GPS week number to which the almanac reference time (d_Toa) is referenced
+    std::map<int32_t, int32_t> almanacHealth;  //!< Map that stores the health information stored in the almanac
 
-    std::map<int, std::string> satelliteBlock;  //!< Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus
+    std::map<int32_t, std::string> satelliteBlock;  //!< Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus
 
     // Flags
 
@@ -201,8 +201,8 @@ public:
     double d_satpos_Z;  //!< Earth-fixed coordinate z of the satellite [m]. The direction of the IERS (International Earth Rotation and Reference Systems Service) Reference Pole (IRP).
 
     // satellite identification info
-    int i_channel_ID;
-    unsigned int i_satellite_PRN;
+    int32_t i_channel_ID;
+    uint32_t i_satellite_PRN;
 
     // time synchro
     double d_subframe_timestamp_ms;  //[ms]
@@ -221,8 +221,8 @@ public:
     double d_A1UTC;       //!< 1st order term of a model that relates GPS and UTC time (ref. 20.3.3.5.2.4 IS-GPS-200E) [s/s]
     double d_A0UTC;       //!< Constant of a model that relates GPS and UTC time (ref. 20.3.3.5.2.4 IS-GPS-200E) [s]
     double d_DeltaT_LS;   //!< delta time due to leap seconds [s]. Number of leap seconds since 6-Jan-1980 as transmitted by the GPS almanac.
-    int i_WN_LSF;         //!< Week number at the end of which the leap second becomes effective [weeks]
-    int i_DN;             //!< Day number (DN) at the end of which the leap second becomes effective [days]
+    int32_t i_WN_LSF;         //!< Week number at the end of which the leap second becomes effective [weeks]
+    int32_t i_DN;             //!< Day number (DN) at the end of which the leap second becomes effective [days]
     double d_DeltaT_LSF;  //!< Scheduled future or recent past (relative to NAV message upload) value of the delta time due to leap seconds [s]
     double d_A1GPS;
     double d_A0GPS;
@@ -241,7 +241,7 @@ public:
     double d_OMEGA_DOT_ALMANAC;
     double d_OMEGA_ALMANAC;
     double d_M0_ALMANAC;
-    int almanac_WN;
+    int32_t almanac_WN;
     double d_toa2;
 
     // Satellite velocity
@@ -272,12 +272,12 @@ public:
     /*!
      * \brief Decodes the BDS D1 NAV message
      */
-    int d1_subframe_decoder(std::string const& subframe);
+    int32_t d1_subframe_decoder(std::string const& subframe);
 
     /*!
      * \brief Decodes the BDS D2 NAV message
      */
-    int d2_subframe_decoder(std::string const& subframe);
+    int32_t d2_subframe_decoder(std::string const& subframe);
 
     /*!
      * \brief Computes the position of the satellite

From 96338be94edc283f7896bf5a1b1c87473bfb67a9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 12:53:22 +0100
Subject: [PATCH 030/123] Fix by clang-tidy

---
 src/core/receiver/gnss_block_factory.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 8088e459c..fd8d0f09f 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -199,7 +199,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalSource(
         }
     std::string implementation = configuration->property(role + ".implementation", default_implementation);
     LOG(INFO) << "Getting SignalSource with implementation " << implementation;
-    return GetBlock(configuration, role, implementation, 0, 1, std::move(queue));
+    return GetBlock(configuration, role, implementation, 0, 1, queue);
 }
 
 

From 35a6ecb4042083ef82827e1d3d8cfed798dfb16c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 13:22:49 +0100
Subject: [PATCH 031/123] Fix bug, better string comparison

---
 src/algorithms/libs/rtcm.cc | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/algorithms/libs/rtcm.cc b/src/algorithms/libs/rtcm.cc
index a5c02d4d4..9adda308a 100644
--- a/src/algorithms/libs/rtcm.cc
+++ b/src/algorithms/libs/rtcm.cc
@@ -3309,7 +3309,7 @@ std::map<std::string, int> Rtcm::galileo_signal_map = [] {
 boost::posix_time::ptime Rtcm::compute_GPS_time(const Gps_Ephemeris& eph, double obs_time) const
 {
     const double gps_t = obs_time;
-    boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));
+    boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));  // NOLINT(google-runtime-int)
     boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
     return p_time;
 }
@@ -3318,7 +3318,7 @@ boost::posix_time::ptime Rtcm::compute_GPS_time(const Gps_Ephemeris& eph, double
 boost::posix_time::ptime Rtcm::compute_GPS_time(const Gps_CNAV_Ephemeris& eph, double obs_time) const
 {
     const double gps_t = obs_time;
-    boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));
+    boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((gps_t + 604800 * static_cast<double>(eph.i_GPS_week % 1024)) * 1000));  // NOLINT(google-runtime-int)
     boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
     return p_time;
 }
@@ -3327,7 +3327,7 @@ boost::posix_time::ptime Rtcm::compute_GPS_time(const Gps_CNAV_Ephemeris& eph, d
 boost::posix_time::ptime Rtcm::compute_Galileo_time(const Galileo_Ephemeris& eph, double obs_time) const
 {
     double galileo_t = obs_time;
-    boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((galileo_t + 604800 * static_cast<double>(eph.WN_5)) * 1000));
+    boost::posix_time::time_duration t = boost::posix_time::milliseconds(static_cast<long>((galileo_t + 604800 * static_cast<double>(eph.WN_5)) * 1000));  // NOLINT(google-runtime-int)
     boost::posix_time::ptime p_time(boost::gregorian::date(1999, 8, 22), t);
     return p_time;
 }
@@ -5233,19 +5233,19 @@ int32_t Rtcm::set_DF401(const Gnss_Synchro& gnss_synchro)
         {
             lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
         }
-    if ((sig.compare("2S")) == 0 && (sys == "G"))
+    if ((sig == "2S") && (sys == "G"))
         {
             lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
         }
-    if ((sig.compare("5X")) == 0 && (sys == "E"))
+    if ((sig == "5X") && (sys == "E"))
         {
             lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
         }
-    if ((sig.compare("1B")) == 0 && (sys == "E"))
+    if ((sig == "1B") && (sys == "E"))
         {
             lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
         }
-    if ((sig.compare("7X")) == 0 && (sys == "E"))
+    if ((sig == "7X") && (sys == "E"))
         {
             lambda = GPS_C_m_s / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
         }
@@ -5303,7 +5303,7 @@ int32_t Rtcm::set_DF402(const Gps_Ephemeris& ephNAV, const Gps_CNAV_Ephemeris& e
             lock_time_period_s = Rtcm::lock_time(ephCNAV, obs_time, gnss_synchro);
         }
     // TODO Should add system for galileo satellites
-    if (sig_.compare("1B") || sig_.compare("5X") || sig_.compare("7X") || sig_.compare("8X"))
+    if ((sig_ == "1B") || (sig_ == "5X") || (sig_ == "7X") || (sig_ == "8X"))
         {
             lock_time_period_s = Rtcm::lock_time(ephFNAV, obs_time, gnss_synchro);
         }
@@ -5490,15 +5490,15 @@ int32_t Rtcm::set_DF407(const Gps_Ephemeris& ephNAV, const Gps_CNAV_Ephemeris& e
 
     std::string sig_(gnss_synchro.Signal);
     std::string sys_(&gnss_synchro.System, 1);
-    if ((sig_.compare("1C")) && (sys_ == "G"))
+    if ((sig_ == "1C") && (sys_ == "G"))
         {
             lock_time_period_s = Rtcm::lock_time(ephNAV, obs_time, gnss_synchro);
         }
-    if ((sig_.compare("2S")) && (sys_ == "G"))
+    if ((sig_ == "2S") && (sys_ == "G"))
         {
             lock_time_period_s = Rtcm::lock_time(ephCNAV, obs_time, gnss_synchro);
         }
-    if ((sig_.compare("1B") || sig_.compare("5X") || sig_.compare("7X") || sig_.compare("8X")) && (sys_ == "E"))
+    if (((sig_ == "1B") || (sig_ == "5X") || (sig_ == "7X") || (sig_ == "8X")) && (sys_ == "E"))
         {
             lock_time_period_s = Rtcm::lock_time(ephFNAV, obs_time, gnss_synchro);
         }

From bf65447cdf7eff431bc150fcbe1b4e0d0302ba03 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 13:23:36 +0100
Subject: [PATCH 032/123] Remove unused includes

---
 .../gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc     | 2 --
 .../gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc      | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index bf97d8eb3..6d410efe1 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -45,8 +45,6 @@
 #include "tcp_communication.h"
 #include "tcp_packet_data.h"
 #include "tracking_discriminators.h"
-#include <boost/asio.hpp>
-#include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 451689741..020402421 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -43,8 +43,6 @@
 #include "tcp_communication.h"
 #include "tcp_packet_data.h"
 #include "tracking_discriminators.h"
-#include <boost/asio.hpp>
-#include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>

From 6d9563ef0071a2823306371b6b8b378685f5a264 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 13:24:25 +0100
Subject: [PATCH 033/123] Improvement by clang-tidy

---
 src/core/receiver/gnss_block_factory.cc | 2 +-
 src/core/receiver/gnss_block_factory.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index fd8d0f09f..ac0bb8aad 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -182,7 +182,7 @@ GNSSBlockFactory::~GNSSBlockFactory() = default;
 
 
 std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalSource(
-    const std::shared_ptr<ConfigurationInterface>& configuration, gr::msg_queue::sptr queue, int ID)
+    const std::shared_ptr<ConfigurationInterface>& configuration, const gr::msg_queue::sptr& queue, int ID)
 {
     std::string default_implementation = "File_Signal_Source";
     std::string role = "SignalSource";  //backwards compatibility for old conf files
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index 8ead87090..e3eb02226 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -58,7 +58,7 @@ public:
     GNSSBlockFactory();
     virtual ~GNSSBlockFactory();
     std::unique_ptr<GNSSBlockInterface> GetSignalSource(const std::shared_ptr<ConfigurationInterface>& configuration,
-        gr::msg_queue::sptr queue, int ID = -1);
+        const gr::msg_queue::sptr& queue, int ID = -1);
 
     std::unique_ptr<GNSSBlockInterface> GetSignalConditioner(const std::shared_ptr<ConfigurationInterface>& configuration, int ID = -1);
 

From f0e2c7c48ddfbc4f293be09171b985a3b0a0e2f7 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 13:52:37 +0100
Subject: [PATCH 034/123] Small fixes

---
 src/tests/CMakeLists.txt               | 4 ++++
 src/utils/front-end-cal/CMakeLists.txt | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 8427d40cb..540d295da 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -615,6 +615,10 @@ if(NOT ENABLE_PACKAGING)
 
     target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
 
+    if(ENABLE_FPGA)
+        target_compile_definitions(gnss_block_test PUBLIC -DENABLE_FPGA=1)
+    endif()
+
     add_test(gnss_block_test gnss_block_test)
 
     set_property(TEST gnss_block_test PROPERTY TIMEOUT 60)
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 2b39b6837..f5f6671af 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -29,6 +29,9 @@ target_link_libraries(front_end_cal_lib
         Threads::Threads
         acq_adapters
         Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
+        signal_source_adapters
+        signal_source_gr_blocks
+        signal_source_lib
         rx_core_lib
         gnss_sdr_flags
         gnss_rx

From c46cdcb188304496ea9ed64bece987215f68558a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 14:07:27 +0100
Subject: [PATCH 035/123] Better string comparison

---
 src/core/receiver/control_thread.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 455ba341f..57907e079 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -78,7 +78,7 @@ using google::LogMessage;
 
 ControlThread::ControlThread()
 {
-    if (!FLAGS_c.compare("-"))
+    if (FLAGS_c == "-")
         {
             configuration_ = std::make_shared<FileConfiguration>(FLAGS_config_file);
         }
@@ -776,7 +776,7 @@ void ControlThread::read_control_messages()
 // Apply the corresponding control actions
 void ControlThread::process_control_messages()
 {
-    for (auto & i : *control_messages_)
+    for (auto &i : *control_messages_)
         {
             if (stop_) break;
             if (i->who == 200)
@@ -881,7 +881,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
               << "UTC, assuming RX position " << LLH(0) << " [deg], " << LLH(1) << " [deg], " << LLH(2) << " [m]" << std::endl;
 
     std::map<int, Gps_Ephemeris> gps_eph_map = pvt_ptr->get_gps_ephemeris();
-    for (auto & it : gps_eph_map)
+    for (auto &it : gps_eph_map)
         {
             eph_t rtklib_eph = eph_to_rtklib(it.second);
             double r_sat[3];
@@ -904,7 +904,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
         }
 
     std::map<int, Galileo_Ephemeris> gal_eph_map = pvt_ptr->get_galileo_ephemeris();
-    for (auto & it : gal_eph_map)
+    for (auto &it : gal_eph_map)
         {
             eph_t rtklib_eph = eph_to_rtklib(it.second);
             double r_sat[3];
@@ -927,7 +927,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
         }
 
     std::map<int, Gps_Almanac> gps_alm_map = pvt_ptr->get_gps_almanac();
-    for (auto & it : gps_alm_map)
+    for (auto &it : gps_alm_map)
         {
             alm_t rtklib_alm = alm_to_rtklib(it.second);
             double r_sat[3];
@@ -954,7 +954,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
         }
 
     std::map<int, Galileo_Almanac> gal_alm_map = pvt_ptr->get_galileo_almanac();
-    for (auto & it : gal_alm_map)
+    for (auto &it : gal_alm_map)
         {
             alm_t rtklib_alm = alm_to_rtklib(it.second);
             double r_sat[3];

From 75bd492d960e9438d2190dfc582381dde53050d6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 18:34:28 +0100
Subject: [PATCH 036/123] Change CMake target names to more meaningful ones,
 reflecting the code tree

---
 src/algorithms/PVT/adapters/CMakeLists.txt    |  4 +-
 .../PVT/gnuradio_blocks/CMakeLists.txt        |  4 +-
 src/algorithms/PVT/libs/CMakeLists.txt        | 16 ++--
 .../acquisition/adapters/CMakeLists.txt       | 16 ++--
 .../gnuradio_blocks/CMakeLists.txt            | 16 ++--
 .../acquisition/libs/CMakeLists.txt           | 10 +-
 .../channel/adapters/CMakeLists.txt           |  2 +-
 src/algorithms/channel/libs/CMakeLists.txt    | 10 +-
 .../data_type_adapter/adapters/CMakeLists.txt | 12 +--
 .../gnuradio_blocks/CMakeLists.txt            |  2 +-
 .../input_filter/adapters/CMakeLists.txt      |  2 +-
 src/algorithms/libs/CMakeLists.txt            | 12 +--
 src/algorithms/libs/rtklib/CMakeLists.txt     |  8 +-
 .../volk_gnsssdr_modtool/CMakeLists.txt       |  2 +-
 .../observables/adapters/CMakeLists.txt       |  2 +-
 .../gnuradio_blocks/CMakeLists.txt            |  4 +-
 .../signal_generator/adapters/CMakeLists.txt  |  2 +-
 .../gnuradio_blocks/CMakeLists.txt            |  4 +-
 .../signal_source/adapters/CMakeLists.txt     |  4 +-
 .../gnuradio_blocks/CMakeLists.txt            |  2 +-
 .../signal_source/libs/CMakeLists.txt         | 12 +--
 .../telemetry_decoder/adapters/CMakeLists.txt |  4 +-
 .../gnuradio_blocks/CMakeLists.txt            |  4 +-
 .../telemetry_decoder/libs/CMakeLists.txt     |  6 +-
 src/algorithms/tracking/CMakeLists.txt        |  2 +-
 .../tracking/adapters/CMakeLists.txt          |  2 +-
 .../tracking/gnuradio_blocks/CMakeLists.txt   |  4 +-
 src/algorithms/tracking/libs/CMakeLists.txt   | 10 +-
 src/core/libs/CMakeLists.txt                  | 10 +-
 src/core/libs/supl/CMakeLists.txt             | 10 +-
 src/core/monitor/CMakeLists.txt               |  8 +-
 src/core/receiver/CMakeLists.txt              | 44 ++++-----
 src/core/system_parameters/CMakeLists.txt     |  6 +-
 src/main/CMakeLists.txt                       |  2 +-
 src/tests/CMakeLists.txt                      | 94 +++++++++----------
 src/utils/front-end-cal/CMakeLists.txt        | 16 ++--
 src/utils/rinex2assist/CMakeLists.txt         |  6 +-
 37 files changed, 187 insertions(+), 187 deletions(-)

diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index d7d3423ba..60dba0590 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -34,8 +34,8 @@ target_link_libraries(pvt_adapters
         Armadillo::armadillo
         Gnuradio::runtime
         pvt_gr_blocks
-        pvt_lib
-        gnss_system_parameters
+        pvt_libs
+        core_system_parameters
     PRIVATE
         Boost::serialization
 )
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 6341a80af..9a426daf6 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -32,13 +32,13 @@ target_link_libraries(pvt_gr_blocks
     PUBLIC
         Boost::date_time
         Gnuradio::runtime
-        pvt_lib
+        pvt_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Boost::system
-        gnss_system_parameters
+        core_system_parameters
 )
 
 target_include_directories(pvt_gr_blocks
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index 5eb9e4f88..a19859234 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -53,15 +53,15 @@ list(SORT PVT_LIB_SOURCES)
 
 source_group(Headers FILES ${PVT_LIB_HEADERS})
 
-add_library(pvt_lib ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
+add_library(pvt_libs ${PVT_LIB_SOURCES} ${PVT_LIB_HEADERS})
 
-target_link_libraries(pvt_lib
+target_link_libraries(pvt_libs
     PUBLIC
         Armadillo::armadillo
         Boost::date_time
-        gnss_sp_libs
-        rtklib_lib
-        gnss_system_parameters
+        algorithms_libs
+        algorithms_libs_rtklib
+        core_system_parameters
     PRIVATE
         Boost::filesystem
         Boost::system
@@ -70,16 +70,16 @@ target_link_libraries(pvt_lib
         Matio::matio
 )
 
-target_include_directories(pvt_lib
+target_include_directories(pvt_libs
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib
         ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
-target_compile_definitions(pvt_lib PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
+target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
-set_property(TARGET pvt_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET pvt_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs/rtklib>
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index 161824ab3..c6285d699 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -88,29 +88,29 @@ list(SORT ACQ_ADAPTER_SOURCES)
 
 source_group(Headers FILES ${ACQ_ADAPTER_HEADERS})
 
-add_library(acq_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
+add_library(acquisition_adapters ${ACQ_ADAPTER_SOURCES} ${ACQ_ADAPTER_HEADERS})
 
-target_link_libraries(acq_adapters
+target_link_libraries(acquisition_adapters
     PUBLIC
         Gnuradio::blocks
-        gnss_sp_libs
+        algorithms_libs
         gnss_sdr_flags
-        acq_gr_blocks
-        gnss_system_parameters
+        acquisition_gr_blocks
+        core_system_parameters
     PRIVATE
         Boost::boost
         Gflags::gflags
         Glog::glog
         Volkgnsssdr::volkgnsssdr
-        acquisition_lib
+        acquisition_libs
 )
 
-target_include_directories(acq_adapters
+target_include_directories(acquisition_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
-set_property(TARGET acq_adapters
+set_property(TARGET acquisition_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index 94bea3705..e0db64422 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -64,15 +64,15 @@ list(SORT ACQ_GR_BLOCKS_SOURCES)
 
 source_group(Headers FILES ${ACQ_GR_BLOCKS_HEADERS})
 
-add_library(acq_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
+add_library(acquisition_gr_blocks ${ACQ_GR_BLOCKS_SOURCES} ${ACQ_GR_BLOCKS_HEADERS})
 
-target_link_libraries(acq_gr_blocks
+target_link_libraries(acquisition_gr_blocks
     PUBLIC
         Gnuradio::runtime
         Gnuradio::fft
         Volk::volk
-        acquisition_lib
-        gnss_system_parameters
+        acquisition_libs
+        core_system_parameters
         ${OPT_LIBRARIES}
     PRIVATE
         Boost::filesystem
@@ -80,10 +80,10 @@ target_link_libraries(acq_gr_blocks
         Glog::glog
         Matio::matio
         Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
+        algorithms_libs
 )
 
-target_include_directories(acq_gr_blocks
+target_include_directories(acquisition_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
     PRIVATE
@@ -91,10 +91,10 @@ target_include_directories(acq_gr_blocks
 )
 
 if(OPENCL_FOUND)
-    target_include_directories(acq_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
+    target_include_directories(acquisition_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()
 
-set_property(TARGET acq_gr_blocks
+set_property(TARGET acquisition_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index a58bd0f3b..678cb5f2d 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -29,23 +29,23 @@ list(SORT ACQUISITION_LIB_SOURCES)
 
 source_group(Headers FILES ${ACQUISITION_LIB_HEADERS})
 
-add_library(acquisition_lib
+add_library(acquisition_libs
     ${ACQUISITION_LIB_SOURCES}
     ${ACQUISITION_LIB_HEADERS}
 )
 
-target_link_libraries(acquisition_lib
+target_link_libraries(acquisition_libs
     PUBLIC
         Volk::volk
         Gnuradio::fft
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_sp_libs
-        gnss_system_parameters
+        algorithms_libs
+        core_system_parameters
 )
 
-set_property(TARGET acquisition_lib
+set_property(TARGET acquisition_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt
index 4b9cc6564..14bc0f16b 100644
--- a/src/algorithms/channel/adapters/CMakeLists.txt
+++ b/src/algorithms/channel/adapters/CMakeLists.txt
@@ -29,7 +29,7 @@ source_group(Headers FILES ${CHANNEL_ADAPTER_HEADERS})
 target_link_libraries(channel_adapters
     PUBLIC
         Gnuradio::runtime
-        channel_fsm
+        channel_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index 570de7dc7..7a6582046 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -31,19 +31,19 @@ list(SORT CHANNEL_FSM_SOURCES)
 
 source_group(Headers FILES ${CHANNEL_FSM_HEADERS})
 
-add_library(channel_fsm ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
+add_library(channel_libs ${CHANNEL_FSM_SOURCES} ${CHANNEL_FSM_HEADERS})
 
-target_link_libraries(channel_fsm
+target_link_libraries(channel_libs
     PUBLIC
         Gnuradio::runtime
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_rx
+        core_receiver
 )
 
-set_property(TARGET channel_fsm
+set_property(TARGET channel_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index a43c8d37a..39a4c7216 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -40,30 +40,30 @@ list(SORT DATATYPE_ADAPTER_SOURCES)
 
 source_group(Headers FILES ${DATATYPE_ADAPTER_HEADERS})
 
-add_library(datatype_adapters
+add_library(data_type_adapters
     ${DATATYPE_ADAPTER_SOURCES}
     ${DATATYPE_ADAPTER_HEADERS}
 )
 
-target_link_libraries(datatype_adapters
+target_link_libraries(data_type_adapters
     PUBLIC
         Gnuradio::blocks
         data_type_gr_blocks
-        gnss_sp_libs
-        gnss_system_parameters
+        algorithms_libs
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Volk::volk
 )
 
-target_include_directories(datatype_adapters
+target_include_directories(data_type_adapters
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
-set_property(TARGET datatype_adapters
+set_property(TARGET data_type_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
index 252f4490d..9090d9c43 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/CMakeLists.txt
@@ -43,7 +43,7 @@ target_link_libraries(data_type_gr_blocks
     PUBLIC
         Gnuradio::runtime
         Boost::boost
-        gnss_sp_libs
+        algorithms_libs
     PRIVATE
         Volk::volk
 )
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index dc7d46bc6..9201bcc79 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -49,7 +49,7 @@ target_link_libraries(input_filter_adapters
         Gnuradio::blocks
         Gnuradio::filter
         input_filter_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
     PRIVATE
         Volk::volk
 )
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index e9ab0f43d..64ac7c64b 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -105,9 +105,9 @@ list(SORT GNSS_SPLIBS_SOURCES)
 
 source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
 
-add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
+add_library(algorithms_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
 
-target_link_libraries(gnss_sp_libs
+target_link_libraries(algorithms_libs
     PUBLIC
         Armadillo::armadillo
         Boost::boost
@@ -116,7 +116,7 @@ target_link_libraries(gnss_sp_libs
         Gnuradio::blocks
         Volk::volk ${ORC_LIBRARIES}
         Volkgnsssdr::volkgnsssdr
-        gnss_system_parameters
+        core_system_parameters
         ${OPT_LIBRARIES}
     PRIVATE
         Boost::filesystem
@@ -124,17 +124,17 @@ target_link_libraries(gnss_sp_libs
         Glog::glog
 )
 
-target_include_directories(gnss_sp_libs
+target_include_directories(algorithms_libs
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
         ${CMAKE_SOURCE_DIR}/src/core/receiver
 )
 
-target_compile_definitions(gnss_sp_libs
+target_compile_definitions(algorithms_libs
     PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
 )
 
-set_property(TARGET gnss_sp_libs
+set_property(TARGET algorithms_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt
index fcfaafa8b..f049333be 100644
--- a/src/algorithms/libs/rtklib/CMakeLists.txt
+++ b/src/algorithms/libs/rtklib/CMakeLists.txt
@@ -63,11 +63,11 @@ list(SORT RTKLIB_LIB_SOURCES)
 
 source_group(Headers FILES ${RTKLIB_LIB_HEADERS})
 
-add_library(rtklib_lib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
+add_library(algorithms_libs_rtklib ${RTKLIB_LIB_SOURCES} ${RTKLIB_LIB_HEADERS})
 
-target_link_libraries(rtklib_lib
+target_link_libraries(algorithms_libs_rtklib
     PUBLIC
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -75,7 +75,7 @@ target_link_libraries(rtklib_lib
         ${LAPACK}
 )
 
-set_property(TARGET rtklib_lib
+set_property(TARGET algorithms_libs_rtklib
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt
index 3309080ba..4c35e9c60 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/python/volk_gnsssdr_modtool/CMakeLists.txt
@@ -35,4 +35,4 @@ VOLK_PYTHON_INSTALL(
     volk_gnsssdr_modtool
     DESTINATION ${VOLK_RUNTIME_DIR}
     COMPONENT "volk_gnsssdr"
-)
\ No newline at end of file
+)
diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index 943b74717..78d5c0b98 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -37,7 +37,7 @@ target_include_directories(obs_adapters
 target_link_libraries(obs_adapters
     PUBLIC
         obs_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index c937ec741..d1fb176eb 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -37,13 +37,13 @@ target_link_libraries(obs_gr_blocks
     PUBLIC
         Boost::boost
         Gnuradio::blocks
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Matio::matio
-        gnss_sp_libs
+        algorithms_libs
 )
 
 set_property(TARGET obs_gr_blocks
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index 5be8348e8..8797cb514 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(signal_generator_adapters
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_sp_libs
+        algorithms_libs
 )
 
 target_include_directories(signal_generator_adapters
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 2325d0acb..87990a094 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -30,10 +30,10 @@ target_link_libraries(signal_generator_blocks
     PUBLIC
         Boost::boost
         Gnuradio::runtime
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Volkgnsssdr::volkgnsssdr
-        gnss_sp_libs
+        algorithms_libs
 )
 
 target_include_directories(signal_generator_blocks
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index 1547605b6..e0233ad6f 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -189,10 +189,10 @@ target_link_libraries(signal_source_adapters
         Gnuradio::runtime
         Gnuradio::blocks
         signal_source_gr_blocks
-        signal_source_lib
+        signal_source_libs
     PRIVATE
         gnss_sdr_flags
-        gnss_system_parameters
+        core_system_parameters
         Gflags::gflags
         Glog::glog
         Volk::volk
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index f4fabd5fa..5ad9ffe2e 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -62,7 +62,7 @@ target_link_libraries(signal_source_gr_blocks
     PUBLIC
         Boost::thread
         Gnuradio::runtime
-        signal_source_lib
+        signal_source_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 7741b5b0c..7f07471ea 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -65,20 +65,20 @@ list(SORT SIGNAL_SOURCE_LIB_SOURCES)
 
 source_group(Headers FILES ${SIGNAL_SOURCE_LIB_HEADERS})
 
-add_library(signal_source_lib ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
+add_library(signal_source_libs ${SIGNAL_SOURCE_LIB_SOURCES} ${SIGNAL_SOURCE_LIB_HEADERS})
 
-target_link_libraries(signal_source_lib
+target_link_libraries(signal_source_libs
     PUBLIC
         Boost::boost
         Gnuradio::runtime
     PRIVATE
         Gflags::gflags
         Glog::glog
-        gnss_rx
+        core_receiver
 )
 
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
-    target_link_libraries(signal_source_lib
+    target_link_libraries(signal_source_libs
         PUBLIC
             Gnuradio::iio
         PRIVATE
@@ -87,12 +87,12 @@ if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
 endif()
 
 if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
-    target_link_libraries(signal_source_lib
+    target_link_libraries(signal_source_libs
         PUBLIC
             Iio::iio
     )
 endif()
 
-set_property(TARGET signal_source_lib APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET signal_source_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index 52175e1b7..cf8ca684d 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -54,12 +54,12 @@ add_library(telemetry_decoder_adapters
 target_link_libraries(telemetry_decoder_adapters
     PUBLIC
         telemetry_decoder_gr_blocks
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Gnuradio::runtime
-        telemetry_decoder_lib
+        telemetry_decoder_libs
 )
 
 target_include_directories(telemetry_decoder_adapters
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index dd605a575..6c76801de 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -53,8 +53,8 @@ target_link_libraries(telemetry_decoder_gr_blocks
         Gnuradio::runtime
         Volkgnsssdr::volkgnsssdr
         telemetry_decoder_libswiftcnav
-        telemetry_decoder_lib
-        gnss_system_parameters
+        telemetry_decoder_libs
+        core_system_parameters
     PRIVATE
         Boost::boost
         Gflags::gflags
diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
index 5bab58017..866c8957b 100644
--- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
@@ -33,18 +33,18 @@ list(SORT TELEMETRY_DECODER_LIB_SOURCES)
 
 source_group(Headers FILES ${TELEMETRY_DECODER_LIB_HEADERS})
 
-add_library(telemetry_decoder_lib
+add_library(telemetry_decoder_libs
     ${TELEMETRY_DECODER_LIB_SOURCES}
     ${TELEMETRY_DECODER_LIB_HEADERS}
 )
 
-target_link_libraries(telemetry_decoder_lib
+target_link_libraries(telemetry_decoder_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
 )
 
-set_property(TARGET telemetry_decoder_lib
+set_property(TARGET telemetry_decoder_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/tracking/CMakeLists.txt b/src/algorithms/tracking/CMakeLists.txt
index ea74d8ec3..96259341c 100644
--- a/src/algorithms/tracking/CMakeLists.txt
+++ b/src/algorithms/tracking/CMakeLists.txt
@@ -18,4 +18,4 @@
 
 add_subdirectory(adapters)
 add_subdirectory(gnuradio_blocks)
-add_subdirectory(libs)
\ No newline at end of file
+add_subdirectory(libs)
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index a0c878a57..34c62dfb2 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -96,7 +96,7 @@ add_library(tracking_adapters
 target_link_libraries(tracking_adapters
     PUBLIC
         tracking_gr_blocks
-        gnss_sp_libs
+        algorithms_libs
         gnss_sdr_flags
 )
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 082e2b677..3341d142a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -87,8 +87,8 @@ target_link_libraries(tracking_gr_blocks
         Matio::matio
         Volkgnsssdr::volkgnsssdr
         gnss_sdr_flags
-        gnss_sp_libs
-        tracking_lib
+        algorithms_libs
+        tracking_libs
 )
 
 if(ENABLE_CUDA)
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 3e66cd4e4..4607478ee 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -71,27 +71,27 @@ list(SORT TRACKING_LIB_SOURCES)
 
 source_group(Headers FILES ${TRACKING_LIB_HEADERS})
 
-add_library(tracking_lib ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
+add_library(tracking_libs ${TRACKING_LIB_SOURCES} ${TRACKING_LIB_HEADERS})
 
-target_link_libraries(tracking_lib
+target_link_libraries(tracking_libs
     PUBLIC
         Armadillo::armadillo
         Boost::boost
         Gnuradio::runtime
         Volkgnsssdr::volkgnsssdr
-        gnss_system_parameters
+        core_system_parameters
         ${OPT_TRACKING_LIBRARIES}
     PRIVATE
         Gflags::gflags
         Glog::glog
 )
 
-target_include_directories(tracking_lib
+target_include_directories(tracking_libs
     PUBLIC
         ${OPT_TRACKING_INCLUDES}
 )
 
-set_property(TARGET tracking_lib
+set_property(TARGET tracking_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index 30e172792..d99d6f494 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -37,13 +37,13 @@ list(SORT CORE_LIBS_SOURCES)
 
 source_group(Headers FILES ${CORE_LIBS_HEADERS})
 
-add_library(rx_core_lib ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
+add_library(core_libs ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
 
-target_link_libraries(rx_core_lib
+target_link_libraries(core_libs
     PUBLIC
         Boost::boost
-        supl_library
-        gnss_system_parameters
+        core_libs_supl
+        core_system_parameters
     PRIVATE
         Boost::serialization
         Gflags::gflags
@@ -51,7 +51,7 @@ target_link_libraries(rx_core_lib
         Pugixml::pugixml
 )
 
-set_property(TARGET rx_core_lib
+set_property(TARGET core_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
         $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>
diff --git a/src/core/libs/supl/CMakeLists.txt b/src/core/libs/supl/CMakeLists.txt
index ed2b2b827..449c49b48 100644
--- a/src/core/libs/supl/CMakeLists.txt
+++ b/src/core/libs/supl/CMakeLists.txt
@@ -33,19 +33,19 @@ endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_FLAGS}")
 
-add_library(supl_library STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
+add_library(core_libs_supl STATIC ${ASN_RRLP_SOURCES} ${ASN_SUPL_SOURCES} ${SUPL_SOURCES})
 
 if(OPENSSL_FOUND)
-    target_compile_definitions(supl_library PUBLIC -DUSE_OPENSSL_FALLBACK=1)
+    target_compile_definitions(core_libs_supl PUBLIC -DUSE_OPENSSL_FALLBACK=1)
 endif()
 
-target_link_libraries(supl_library
+target_link_libraries(core_libs_supl
     PUBLIC
         ${GNUTLS_LIBRARIES}
         ${GNUTLS_OPENSSL_LIBRARY}
 )
 
-target_include_directories(supl_library
+target_include_directories(core_libs_supl
     PUBLIC
         ${GNUTLS_INCLUDE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}
@@ -53,7 +53,7 @@ target_include_directories(supl_library
         ${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
 )
 
-set_target_properties(supl_library PROPERTIES
+set_target_properties(core_libs_supl PROPERTIES
     LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR};${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl;${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp;${GNUTLS_INCLUDE_DIR}"
 )
diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt
index a245b7a61..73ddc1d9d 100644
--- a/src/core/monitor/CMakeLists.txt
+++ b/src/core/monitor/CMakeLists.txt
@@ -32,24 +32,24 @@ list(SORT CORE_MONITOR_LIBS_SOURCES)
 
 source_group(Headers FILES ${CORE_MONITOR_LIBS_HEADERS})
 
-add_library(core_monitor_lib
+add_library(core_monitor
     ${CORE_MONITOR_LIBS_SOURCES}
     ${CORE_MONITOR_LIBS_HEADERS}
 )
 
-target_link_libraries(core_monitor_lib
+target_link_libraries(core_monitor
     PUBLIC
         Boost::serialization
         Boost::system
         Gnuradio::runtime
-        gnss_system_parameters
+        core_system_parameters
     PRIVATE
         Gflags::gflags
         Glog::glog
         Gnuradio::pmt
 )
 
-set_property(TARGET core_monitor_lib
+set_property(TARGET core_monitor
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 915e7f545..065cca98c 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -66,92 +66,92 @@ source_group(Headers FILES ${GNSS_RECEIVER_HEADERS}
     ${GNSS_RECEIVER_INTERFACE_HEADERS}
 )
 
-add_library(gnss_rx
+add_library(core_receiver
     ${GNSS_RECEIVER_SOURCES}
     ${GNSS_RECEIVER_HEADERS}
     ${GNSS_RECEIVER_INTERFACE_HEADERS}
 )
 
 if(ENABLE_FPGA)
-    target_compile_definitions(gnss_rx PUBLIC -DENABLE_FPGA=1)
+    target_compile_definitions(core_receiver PUBLIC -DENABLE_FPGA=1)
 endif()
 
 if(ENABLE_RAW_UDP)
-    target_compile_definitions(gnss_rx PRIVATE -DRAW_UDP=1)
+    target_compile_definitions(core_receiver PRIVATE -DRAW_UDP=1)
 endif()
 
 if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.3)
-    target_compile_definitions(gnss_rx PRIVATE -DMODERN_GNURADIO=1)
+    target_compile_definitions(core_receiver PRIVATE -DMODERN_GNURADIO=1)
 endif()
 
 if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
-    target_compile_definitions(gnss_rx PRIVATE -DGR_GREATER_38=1)
+    target_compile_definitions(core_receiver PRIVATE -DGR_GREATER_38=1)
 endif()
 
 if(ENABLE_UHD AND GNURADIO_UHD_LIBRARIES_gnuradio-uhd)
-    target_compile_definitions(gnss_rx PRIVATE -DUHD_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DUHD_DRIVER=1)
 endif()
 
 if(ENABLE_PLUTOSDR)
-    target_compile_definitions(gnss_rx PRIVATE -DPLUTOSDR_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DPLUTOSDR_DRIVER=1)
 endif()
 
 if(ENABLE_FMCOMMS2)
-    target_compile_definitions(gnss_rx PRIVATE -DFMCOMMS2_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DFMCOMMS2_DRIVER=1)
 endif()
 
 if(ENABLE_AD9361)
-    target_compile_definitions(gnss_rx PRIVATE -DAD9361_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DAD9361_DRIVER=1)
 endif()
 
 if(ENABLE_OSMOSDR)
     if(GROSMOSDR_FOUND)
-        target_compile_definitions(gnss_rx PRIVATE -DOSMOSDR_DRIVER=1)
+        target_compile_definitions(core_receiver PRIVATE -DOSMOSDR_DRIVER=1)
     endif()
 endif()
 
 if(ENABLE_GN3S)
-    target_compile_definitions(gnss_rx PRIVATE -DGN3S_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DGN3S_DRIVER=1)
 endif()
 
 if(ENABLE_ARRAY)
-    target_compile_definitions(gnss_rx PRIVATE -DRAW_ARRAY_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DRAW_ARRAY_DRIVER=1)
 endif()
 
 if(ENABLE_FLEXIBAND)
-    target_compile_definitions(gnss_rx PRIVATE -DFLEXIBAND_DRIVER=1)
+    target_compile_definitions(core_receiver PRIVATE -DFLEXIBAND_DRIVER=1)
 endif()
 
 if(OPENCL_FOUND)
     message(STATUS "Adding processing blocks implemented using OpenCL")
-    target_compile_definitions(gnss_rx PRIVATE -DOPENCL_BLOCKS=1)
+    target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=1)
 else()
-    target_compile_definitions(gnss_rx PRIVATE -DOPENCL_BLOCKS=0)
+    target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=0)
 endif()
 
 if(ENABLE_CUDA)
-    target_compile_definitions(gnss_rx PRIVATE -DCUDA_GPU_ACCEL=1)
+    target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1)
 endif()
 
 
-target_link_libraries(gnss_rx
+target_link_libraries(core_receiver
     PUBLIC
         Armadillo::armadillo
         Boost::boost
         Boost::thread
         Gnuradio::runtime
-        rx_core_lib
-        core_monitor_lib
+        core_libs
+        core_monitor
     PRIVATE
         Boost::chrono
         Gflags::gflags
         Glog::glog
         signal_source_adapters
-        datatype_adapters
+        data_type_adapters
         input_filter_adapters
         conditioner_adapters
         resampler_adapters
-        acq_adapters
+        acquisition_adapters
         tracking_adapters
         channel_adapters
         telemetry_decoder_adapters
@@ -159,7 +159,7 @@ target_link_libraries(gnss_rx
         pvt_adapters
 )
 
-set_property(TARGET gnss_rx APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/receiver>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>
     $<BUILD_INTERFACE:${OPT_RECEIVER_INCLUDE_DIRS}>
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index 389af1bb0..bc1e89cc4 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -103,12 +103,12 @@ list(SORT SYSTEM_PARAMETERS_SOURCES)
 
 source_group(Headers FILES ${SYSTEM_PARAMETERS_HEADERS})
 
-add_library(gnss_system_parameters
+add_library(core_system_parameters
     ${SYSTEM_PARAMETERS_SOURCES}
     ${SYSTEM_PARAMETERS_HEADERS}
 )
 
-target_link_libraries(gnss_system_parameters
+target_link_libraries(core_system_parameters
     PUBLIC
         Boost::date_time
         Boost::serialization
@@ -117,7 +117,7 @@ target_link_libraries(gnss_system_parameters
         Gflags::gflags
 )
 
-set_property(TARGET gnss_system_parameters
+set_property(TARGET core_system_parameters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 2cf04932a..40f0c3ff9 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -26,7 +26,7 @@ target_link_libraries(gnss-sdr
         Gflags::gflags
         Glog::glog
         Threads::Threads
-        gnss_rx
+        core_receiver
         gnss_sdr_flags
 )
 
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 540d295da..98b782fd2 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -364,25 +364,25 @@ if(ENABLE_UNIT_TESTING)
             Volkgnsssdr::volkgnsssdr
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
-            datatype_adapters
+            signal_source_libs
+            data_type_adapters
             input_filter_adapters
             resampler_adapters
             channel_adapters
-            acq_adapters
+            acquisition_adapters
             tracking_adapters
-            tracking_lib
+            tracking_libs
             telemetry_decoder_adapters
             obs_adapters
             signal_generator_adapters
             pvt_adapters
-            pvt_lib
-            gnss_sp_libs
-            core_monitor_lib
+            pvt_libs
+            algorithms_libs
+            core_monitor
             signal_processing_testing_lib
             system_testing_lib
-            gnss_rx
-            gnss_system_parameters
+            core_receiver
+            core_system_parameters
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)
@@ -436,13 +436,13 @@ if(ENABLE_FPGA)
             GTest::Main
             Matio::matio
             Volk::volk
-            channel_fsm
-            datatype_adapters
+            channel_libs
+            data_type_adapters
             tracking_adapters
             signal_processing_testing_lib
-            gnss_sp_libs
-            gnss_rx
-            gnss_system_parameters
+            algorithms_libs
+            core_receiver
+            core_system_parameters
     )
     install(TARGETS gps_l1_ca_dll_pll_tracking_test_fpga
         RUNTIME DESTINATION bin
@@ -465,7 +465,7 @@ function(add_system_test executable)
     add_executable(${executable} ${SYSTEM_TEST_SOURCES})
 
     target_include_directories(${executable} PUBLIC ${OPT_INCLUDES_} ${CMAKE_SOURCES_DIR}/src/algorithms/libs)
-    target_link_libraries(${executable} PUBLIC ${OPT_LIBS_} gnss_sp_libs)
+    target_link_libraries(${executable} PUBLIC ${OPT_LIBS_} algorithms_libs)
 
     if(ENABLE_INSTALL_TESTS)
         if(EXISTS ${CMAKE_SOURCE_DIR}/install/${executable})
@@ -497,8 +497,8 @@ if(ENABLE_SYSTEM_TESTING)
         Threads::Threads Gflags::gflags Glog::glog
         Gnuradio::runtime GTest::GTest GTest::Main
         Gnuradio::blocks Gnuradio::filter
-        Gnuradio::analog gnss_sp_libs
-        gnss_rx gnss_system_parameters
+        Gnuradio::analog algorithms_libs
+        core_receiver core_system_parameters
     )
     add_system_test(ttff)
 
@@ -509,7 +509,7 @@ if(ENABLE_SYSTEM_TESTING)
             GTest::GTest GTest::Main Gnuradio::runtime
             Gnuradio::blocks Gnuradio::filter
             Gnuradio::analog Matio::matio Volkgnsssdr::volkgnsssdr
-            gnss_sp_libs gnss_rx gnss_system_parameters
+            algorithms_libs core_receiver core_system_parameters
             system_testing_lib signal_processing_testing_lib
         )
         add_system_test(position_test)
@@ -555,12 +555,12 @@ if(NOT ENABLE_PACKAGING)
             Volkgnsssdr::volkgnsssdr
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
+            signal_source_libs
             input_filter_adapters
             channel_adapters
-            gnss_rx
-            gnss_sp_libs
-            gnss_system_parameters
+            core_receiver
+            algorithms_libs
+            core_system_parameters
     )
 
     target_include_directories(flowgraph_test
@@ -604,13 +604,13 @@ if(NOT ENABLE_PACKAGING)
             Volkgnsssdr::volkgnsssdr
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
-            datatype_adapters
+            signal_source_libs
+            data_type_adapters
             input_filter_adapters
             channel_adapters
-            gnss_rx
-            gnss_sp_libs
-            gnss_system_parameters
+            core_receiver
+            algorithms_libs
+            core_system_parameters
     )
 
     target_include_directories(gnss_block_test PUBLIC ${CMAKE_SOURCE_DIR}/src/algorithms/libs)
@@ -647,10 +647,10 @@ if(NOT ENABLE_PACKAGING)
             GTest::Main
             Volkgnsssdr::volkgnsssdr
             signal_source_gr_blocks
-            signal_source_lib
-            gnss_rx
-            gnss_sp_libs
-            gnss_system_parameters
+            signal_source_libs
+            core_receiver
+            algorithms_libs
+            core_system_parameters
     )
 
     add_test(gnuradio_block_test gnuradio_block_test)
@@ -672,8 +672,8 @@ target_link_libraries(matio_test
         GTest::GTest
         GTest::Main
         Matio::matio
-        gnss_rx
-        gnss_system_parameters
+        core_receiver
+        core_system_parameters
 )
 
 add_test(matio_test matio_test)
@@ -704,13 +704,13 @@ if(NOT ENABLE_PACKAGING)
             Volkgnsssdr::volkgnsssdr
             signal_generator_blocks
             signal_source_gr_blocks
-            signal_source_lib
-            acq_adapters
-            acq_gr_blocks
-            gnss_sp_libs
+            signal_source_libs
+            acquisition_adapters
+            acquisition_gr_blocks
+            algorithms_libs
             signal_processing_testing_lib
-            gnss_rx
-            gnss_system_parameters
+            core_receiver
+            core_system_parameters
     )
 
     add_test(acq_test acq_test)
@@ -744,12 +744,12 @@ if(NOT ENABLE_PACKAGING)
             GTest::Main
             Volkgnsssdr::volkgnsssdr
             signal_source_gr_blocks
-            signal_source_lib
-            gnss_sp_libs
+            signal_source_libs
+            algorithms_libs
             tracking_adapters
             signal_generator_blocks
-            gnss_rx
-            gnss_system_parameters
+            core_receiver
+            core_system_parameters
     )
 
     add_test(trk_test trk_test)
@@ -777,10 +777,10 @@ if(NOT ENABLE_PACKAGING)
             GTest::Main
             signal_source_adapters
             signal_source_gr_blocks
-            signal_source_lib
-            gnss_sp_libs
-            gnss_rx
-            gnss_system_parameters
+            signal_source_libs
+            algorithms_libs
+            core_receiver
+            core_system_parameters
     )
 
     add_test(control_thread_test control_thread_test)
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index f5f6671af..061ecbaee 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -27,16 +27,16 @@ target_link_libraries(front_end_cal_lib
     PUBLIC
         Armadillo::armadillo
         Threads::Threads
-        acq_adapters
         Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
         signal_source_adapters
         signal_source_gr_blocks
-        signal_source_lib
-        rx_core_lib
+        signal_source_libs
+        acquisition_adapters
         gnss_sdr_flags
-        gnss_rx
-        channel_fsm
-        gnss_sp_libs
+        channel_libs
+        algorithms_libs
+        core_receiver
+        core_libs
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -51,8 +51,8 @@ add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 target_link_libraries(front-end-cal
     PUBLIC
         Volkgnsssdr::volkgnsssdr ${ORC_LIBRARIES}
-        rx_core_lib
-        gnss_rx
+        core_libs
+        core_receiver
         front_end_cal_lib
         gnss_sdr_flags
     PRIVATE
diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index 4f859566d..c32cd3b1d 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -65,9 +65,9 @@ if(Boost_FOUND)
             Boost::serialization
             ${GPSTK_LIBRARY}
             Gflags::gflags
-            gnss_system_parameters
-            gnss_sp_libs
-            gnss_rx
+            algorithms_libs
+            core_receiver
+            core_system_parameters
     )
 
     target_include_directories(rinex2assist

From 4b2b205e21cfe898a9adafc404da76f3459aa07f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 21:55:51 +0100
Subject: [PATCH 037/123] Avoid throwing exceptions from destructors

Detected by clang-tidy check bugprone-exception-escape
---
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      | 754 +++++++++++-------
 src/algorithms/PVT/libs/geojson_printer.cc    |  10 +-
 src/algorithms/PVT/libs/gpx_printer.cc        |  10 +-
 src/algorithms/PVT/libs/kml_printer.cc        |  10 +-
 src/algorithms/PVT/libs/nmea_printer.cc       |  25 +-
 src/algorithms/PVT/libs/rinex_printer.cc      |  21 +-
 src/algorithms/PVT/libs/rtcm_printer.cc       |  19 +-
 src/algorithms/PVT/libs/rtklib_solver.cc      |  11 +-
 ...o_e5a_noncoherent_iq_acquisition_caf_cc.cc |  16 +-
 .../galileo_pcps_8ms_acquisition_cc.cc        |  17 +-
 .../pcps_assisted_acquisition_cc.cc           |  16 +-
 .../pcps_cccwsr_acquisition_cc.cc             |  19 +-
 .../pcps_opencl_acquisition_cc.cc             |  16 +-
 .../pcps_quicksync_acquisition_cc.cc          |  17 +-
 .../pcps_tong_acquisition_cc.cc               |  21 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc  |  10 +-
 .../gnuradio_blocks/labsat23_source.cc        |  16 +-
 .../gnuradio_blocks/dll_pll_veml_tracking.cc  |  10 +-
 .../dll_pll_veml_tracking_fpga.cc             |  10 +-
 ...glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc |  10 +-
 ...glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc |  11 +-
 .../glonass_l1_ca_dll_pll_tracking_cc.cc      |  11 +-
 ...glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc |  11 +-
 ...glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc |  11 +-
 .../glonass_l2_ca_dll_pll_tracking_cc.cc      |  11 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc    |  11 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc    |  11 +-
 .../gps_l1_ca_kf_tracking_cc.cc               |  11 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc    |   1 +
 .../libs/rtklib_solver_dump_reader.cc         |  18 +-
 .../libs/spirent_motion_csv_dump_reader.cc    |  33 +-
 .../libs/observables_dump_reader.cc           |  20 +-
 .../libs/tlm_dump_reader.cc                   |  18 +-
 .../libs/tracking_dump_reader.cc              |  18 +-
 .../libs/tracking_true_obs_reader.cc          |  18 +-
 .../libs/true_observables_reader.cc           |  18 +-
 36 files changed, 897 insertions(+), 373 deletions(-)

diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index f639d4ecd..2e0bec8d5 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -46,6 +46,7 @@
 #include <exception>
 #include <iostream>
 #include <map>
+#include <stdexcept>
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
@@ -588,403 +589,546 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
 rtklib_pvt_cc::~rtklib_pvt_cc()
 {
     msgctl(sysv_msqid, IPC_RMID, nullptr);
-    if (d_xml_storage)
+    try
         {
-            // save GPS L2CM ephemeris to XML file
-            std::string file_name = xml_base_path + "gps_cnav_ephemeris.xml";
-            if (d_pvt_solver->gps_cnav_ephemeris_map.empty() == false)
+            if (d_xml_storage)
                 {
-                    std::ofstream ofs;
-                    try
+                    // save GPS L2CM ephemeris to XML file
+                    std::string file_name = xml_base_path + "gps_cnav_ephemeris.xml";
+                    if (d_pvt_solver->gps_cnav_ephemeris_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_cnav_ephemeris_map", d_pvt_solver->gps_cnav_ephemeris_map);
-                            LOG(INFO) << "Saved GPS L2CM or L5 Ephemeris map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_cnav_ephemeris_map", d_pvt_solver->gps_cnav_ephemeris_map);
+                                    LOG(INFO) << "Saved GPS L2CM or L5 Ephemeris map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS L2CM or L5 Ephemeris, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS L2CM or L5 Ephemeris, map is empty";
-                }
 
-            // save GPS L1 CA ephemeris to XML file
-            file_name = xml_base_path + "gps_ephemeris.xml";
-            if (d_pvt_solver->gps_ephemeris_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save GPS L1 CA ephemeris to XML file
+                    file_name = xml_base_path + "gps_ephemeris.xml";
+                    if (d_pvt_solver->gps_ephemeris_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", d_pvt_solver->gps_ephemeris_map);
-                            LOG(INFO) << "Saved GPS L1 CA Ephemeris map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", d_pvt_solver->gps_ephemeris_map);
+                                    LOG(INFO) << "Saved GPS L1 CA Ephemeris map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (const std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS L1 CA Ephemeris, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS L1 CA Ephemeris, map is empty";
-                }
 
-            // save Galileo E1 ephemeris to XML file
-            file_name = xml_base_path + "gal_ephemeris.xml";
-            if (d_pvt_solver->galileo_ephemeris_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save Galileo E1 ephemeris to XML file
+                    file_name = xml_base_path + "gal_ephemeris.xml";
+                    if (d_pvt_solver->galileo_ephemeris_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gal_ephemeris_map", d_pvt_solver->galileo_ephemeris_map);
-                            LOG(INFO) << "Saved Galileo E1 Ephemeris map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gal_ephemeris_map", d_pvt_solver->galileo_ephemeris_map);
+                                    LOG(INFO) << "Saved Galileo E1 Ephemeris map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (const std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (const std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save Galileo E1 Ephemeris, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save Galileo E1 Ephemeris, map is empty";
-                }
 
-            // save GLONASS GNAV ephemeris to XML file
-            file_name = xml_base_path + "eph_GLONASS_GNAV.xml";
-            if (d_pvt_solver->glonass_gnav_ephemeris_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save GLONASS GNAV ephemeris to XML file
+                    file_name = xml_base_path + "eph_GLONASS_GNAV.xml";
+                    if (d_pvt_solver->glonass_gnav_ephemeris_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", d_pvt_solver->glonass_gnav_ephemeris_map);
-                            LOG(INFO) << "Saved GLONASS GNAV Ephemeris map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", d_pvt_solver->glonass_gnav_ephemeris_map);
+                                    LOG(INFO) << "Saved GLONASS GNAV Ephemeris map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GLONASS GNAV Ephemeris, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GLONASS GNAV Ephemeris, map is empty";
-                }
 
-            // Save GPS UTC model parameters
-            file_name = xml_base_path + "gps_utc_model.xml";
-            if (d_pvt_solver->gps_utc_model.valid)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save GPS UTC model parameters
+                    file_name = xml_base_path + "gps_utc_model.xml";
+                    if (d_pvt_solver->gps_utc_model.valid)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_utc_model", d_pvt_solver->gps_utc_model);
-                            LOG(INFO) << "Saved GPS UTC model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_utc_model", d_pvt_solver->gps_utc_model);
+                                    LOG(INFO) << "Saved GPS UTC model parameters";
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS UTC model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS UTC model parameters, not valid data";
-                }
 
-            // Save Galileo UTC model parameters
-            file_name = xml_base_path + "gal_utc_model.xml";
-            if (d_pvt_solver->galileo_utc_model.Delta_tLS_6 != 0.0)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save Galileo UTC model parameters
+                    file_name = xml_base_path + "gal_utc_model.xml";
+                    if (d_pvt_solver->galileo_utc_model.Delta_tLS_6 != 0.0)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gal_utc_model", d_pvt_solver->galileo_utc_model);
-                            LOG(INFO) << "Saved Galileo UTC model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gal_utc_model", d_pvt_solver->galileo_utc_model);
+                                    LOG(INFO) << "Saved Galileo UTC model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save Galileo UTC model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save Galileo UTC model parameters, not valid data";
-                }
 
-            // Save GPS iono parameters
-            file_name = xml_base_path + "gps_iono.xml";
-            if (d_pvt_solver->gps_iono.valid == true)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save GPS iono parameters
+                    file_name = xml_base_path + "gps_iono.xml";
+                    if (d_pvt_solver->gps_iono.valid == true)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_iono_model", d_pvt_solver->gps_iono);
-                            LOG(INFO) << "Saved GPS ionospheric model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_iono_model", d_pvt_solver->gps_iono);
+                                    LOG(INFO) << "Saved GPS ionospheric model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS ionospheric model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS ionospheric model parameters, not valid data";
-                }
 
-            // Save GPS CNAV iono parameters
-            file_name = xml_base_path + "gps_cnav_iono.xml";
-            if (d_pvt_solver->gps_cnav_iono.valid == true)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save GPS CNAV iono parameters
+                    file_name = xml_base_path + "gps_cnav_iono.xml";
+                    if (d_pvt_solver->gps_cnav_iono.valid == true)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_cnav_iono_model", d_pvt_solver->gps_cnav_iono);
-                            LOG(INFO) << "Saved GPS CNAV ionospheric model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_cnav_iono_model", d_pvt_solver->gps_cnav_iono);
+                                    LOG(INFO) << "Saved GPS CNAV ionospheric model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS CNAV ionospheric model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS CNAV ionospheric model parameters, not valid data";
-                }
 
-            // Save Galileo iono parameters
-            file_name = xml_base_path + "gal_iono.xml";
-            if (d_pvt_solver->galileo_iono.ai0_5 != 0.0)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save Galileo iono parameters
+                    file_name = xml_base_path + "gal_iono.xml";
+                    if (d_pvt_solver->galileo_iono.ai0_5 != 0.0)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gal_iono_model", d_pvt_solver->galileo_iono);
-                            LOG(INFO) << "Saved Galileo ionospheric model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gal_iono_model", d_pvt_solver->galileo_iono);
+                                    LOG(INFO) << "Saved Galileo ionospheric model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save Galileo ionospheric model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save Galileo ionospheric model parameters, not valid data";
-                }
 
-            // save GPS almanac to XML file
-            file_name = xml_base_path + "gps_almanac.xml";
-            if (d_pvt_solver->gps_almanac_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save GPS almanac to XML file
+                    file_name = xml_base_path + "gps_almanac.xml";
+                    if (d_pvt_solver->gps_almanac_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gps_almanac_map", d_pvt_solver->gps_almanac_map);
-                            LOG(INFO) << "Saved GPS almanac map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gps_almanac_map", d_pvt_solver->gps_almanac_map);
+                                    LOG(INFO) << "Saved GPS almanac map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (const std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (const std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS almanac, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS almanac, map is empty";
-                }
 
-            // Save Galileo almanac
-            file_name = xml_base_path + "gal_almanac.xml";
-            if (d_pvt_solver->galileo_almanac_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save Galileo almanac
+                    file_name = xml_base_path + "gal_almanac.xml";
+                    if (d_pvt_solver->galileo_almanac_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gal_almanac_map", d_pvt_solver->galileo_almanac_map);
-                            LOG(INFO) << "Saved Galileo almanac data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gal_almanac_map", d_pvt_solver->galileo_almanac_map);
+                                    LOG(INFO) << "Saved Galileo almanac data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save Galileo almanac, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save Galileo almanac, not valid data";
-                }
 
-            // Save GPS CNAV UTC model parameters
-            file_name = xml_base_path + "gps_cnav_utc_model.xml";
-            if (d_pvt_solver->gps_cnav_utc_model.valid)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save GPS CNAV UTC model parameters
+                    file_name = xml_base_path + "gps_cnav_utc_model.xml";
+                    if (d_pvt_solver->gps_cnav_utc_model.valid)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_cnav_utc_model", d_pvt_solver->gps_cnav_utc_model);
-                            LOG(INFO) << "Saved GPS CNAV UTC model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_cnav_utc_model", d_pvt_solver->gps_cnav_utc_model);
+                                    LOG(INFO) << "Saved GPS CNAV UTC model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GPS CNAV UTC model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GPS CNAV UTC model parameters, not valid data";
-                }
 
-            // save GLONASS GNAV ephemeris to XML file
-            file_name = xml_base_path + "glo_gnav_ephemeris.xml";
-            if (d_pvt_solver->glonass_gnav_ephemeris_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save GLONASS GNAV ephemeris to XML file
+                    file_name = xml_base_path + "glo_gnav_ephemeris.xml";
+                    if (d_pvt_solver->glonass_gnav_ephemeris_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", d_pvt_solver->glonass_gnav_ephemeris_map);
-                            LOG(INFO) << "Saved GLONASS GNAV ephemeris map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", d_pvt_solver->glonass_gnav_ephemeris_map);
+                                    LOG(INFO) << "Saved GLONASS GNAV ephemeris map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GLONASS GNAV ephemeris, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GLONASS GNAV ephemeris, map is empty";
-                }
 
-            // save GLONASS UTC model parameters to XML file
-            file_name = xml_base_path + "glo_utc_model.xml";
-            if (d_pvt_solver->glonass_gnav_utc_model.valid)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save GLONASS UTC model parameters to XML file
+                    file_name = xml_base_path + "glo_utc_model.xml";
+                    if (d_pvt_solver->glonass_gnav_utc_model.valid)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_gnav_utc_model", d_pvt_solver->glonass_gnav_utc_model);
-                            LOG(INFO) << "Saved GLONASS UTC model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_gnav_utc_model", d_pvt_solver->glonass_gnav_utc_model);
+                                    LOG(INFO) << "Saved GLONASS UTC model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save GLONASS GNAV ephemeris, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save GLONASS GNAV ephemeris, not valid data";
-                }
 
-            // save BeiDou DNAV ephemeris to XML file
-            file_name = xml_base_path + "bds_dnav_ephemeris.xml";
-            if (d_pvt_solver->beidou_dnav_ephemeris_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save BeiDou DNAV ephemeris to XML file
+                    file_name = xml_base_path + "bds_dnav_ephemeris.xml";
+                    if (d_pvt_solver->beidou_dnav_ephemeris_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_ephemeris_map", d_pvt_solver->beidou_dnav_ephemeris_map);
-                            LOG(INFO) << "Saved BeiDou DNAV Ephemeris map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_ephemeris_map", d_pvt_solver->beidou_dnav_ephemeris_map);
+                                    LOG(INFO) << "Saved BeiDou DNAV Ephemeris map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (const std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (const std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save BeiDou DNAV Ephemeris, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save BeiDou DNAV Ephemeris, map is empty";
-                }
 
-            // Save BeiDou DNAV iono parameters
-            file_name = xml_base_path + "bds_dnav_iono.xml";
-            if (d_pvt_solver->beidou_dnav_iono.valid)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save BeiDou DNAV iono parameters
+                    file_name = xml_base_path + "bds_dnav_iono.xml";
+                    if (d_pvt_solver->beidou_dnav_iono.valid)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_iono_model", d_pvt_solver->beidou_dnav_iono);
-                            LOG(INFO) << "Saved BeiDou DNAV ionospheric model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_iono_model", d_pvt_solver->beidou_dnav_iono);
+                                    LOG(INFO) << "Saved BeiDou DNAV ionospheric model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save BeiDou DNAV ionospheric model parameters, not valid data";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save BeiDou DNAV ionospheric model parameters, not valid data";
-                }
 
-            // save BeiDou DNAV almanac to XML file
-            file_name = xml_base_path + "bds_dnav_almanac.xml";
-            if (d_pvt_solver->beidou_dnav_almanac_map.empty() == false)
-                {
-                    std::ofstream ofs;
-                    try
+                    // save BeiDou DNAV almanac to XML file
+                    file_name = xml_base_path + "bds_dnav_almanac.xml";
+                    if (d_pvt_solver->beidou_dnav_almanac_map.empty() == false)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_almanac_map", d_pvt_solver->beidou_dnav_almanac_map);
-                            LOG(INFO) << "Saved BeiDou DNAV almanac map data";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_almanac_map", d_pvt_solver->beidou_dnav_almanac_map);
+                                    LOG(INFO) << "Saved BeiDou DNAV almanac map data";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (const std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (const std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save BeiDou DNAV almanac, map is empty";
                         }
-                }
-            else
-                {
-                    LOG(INFO) << "Failed to save BeiDou DNAV almanac, map is empty";
-                }
 
-            // Save BeiDou UTC model parameters
-            file_name = xml_base_path + "bds_dnav_utc_model.xml";
-            if (d_pvt_solver->beidou_dnav_utc_model.valid)
-                {
-                    std::ofstream ofs;
-                    try
+                    // Save BeiDou UTC model parameters
+                    file_name = xml_base_path + "bds_dnav_utc_model.xml";
+                    if (d_pvt_solver->beidou_dnav_utc_model.valid)
                         {
-                            ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
-                            boost::archive::xml_oarchive xml(ofs);
-                            xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_utc_model", d_pvt_solver->beidou_dnav_utc_model);
-                            LOG(INFO) << "Saved BeiDou DNAV UTC model parameters";
+                            std::ofstream ofs;
+                            try
+                                {
+                                    ofs.open(file_name.c_str(), std::ofstream::trunc | std::ofstream::out);
+                                    boost::archive::xml_oarchive xml(ofs);
+                                    xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_utc_model", d_pvt_solver->beidou_dnav_utc_model);
+                                    LOG(INFO) << "Saved BeiDou DNAV UTC model parameters";
+                                }
+                            catch (const boost::archive::archive_exception e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
+                            catch (const std::ofstream::failure& e)
+                                {
+                                    LOG(WARNING) << "Problem opening output XML file";
+                                }
+                            catch (std::exception& e)
+                                {
+                                    LOG(WARNING) << e.what();
+                                }
                         }
-                    catch (std::exception& e)
+                    else
                         {
-                            LOG(WARNING) << e.what();
+                            LOG(INFO) << "Failed to save BeiDou DNAV UTC model parameters, not valid data";
                         }
                 }
-            else
-                {
-                    LOG(INFO) << "Failed to save BeiDou DNAV UTC model parameters, not valid data";
-                }
+        }
+    catch (std::length_error& e)
+        {
+            LOG(WARNING) << e.what();
         }
 }
 
diff --git a/src/algorithms/PVT/libs/geojson_printer.cc b/src/algorithms/PVT/libs/geojson_printer.cc
index 7f4da17c1..22da08606 100644
--- a/src/algorithms/PVT/libs/geojson_printer.cc
+++ b/src/algorithms/PVT/libs/geojson_printer.cc
@@ -36,6 +36,7 @@
 #include <boost/filesystem/path.hpp>         // for path, operator<<
 #include <boost/filesystem/path_traits.hpp>  // for filesystem
 #include <glog/logging.h>
+#include <exception>
 #include <iomanip>
 #include <sstream>
 
@@ -79,7 +80,14 @@ GeoJSON_Printer::GeoJSON_Printer(const std::string& base_path)
 
 GeoJSON_Printer::~GeoJSON_Printer()
 {
-    GeoJSON_Printer::close_file();
+    try
+        {
+            GeoJSON_Printer::close_file();
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
+        }
 }
 
 
diff --git a/src/algorithms/PVT/libs/gpx_printer.cc b/src/algorithms/PVT/libs/gpx_printer.cc
index 7ca86052a..8075b21fa 100644
--- a/src/algorithms/PVT/libs/gpx_printer.cc
+++ b/src/algorithms/PVT/libs/gpx_printer.cc
@@ -36,6 +36,7 @@
 #include <boost/filesystem/path.hpp>         // for path, operator<<
 #include <boost/filesystem/path_traits.hpp>  // for filesystem
 #include <glog/logging.h>
+#include <exception>
 #include <sstream>
 
 using google::LogMessage;
@@ -218,7 +219,14 @@ bool Gpx_Printer::close_file()
 
 Gpx_Printer::~Gpx_Printer()
 {
-    close_file();
+    try
+        {
+            close_file();
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
+        }
     if (!positions_printed)
         {
             if (remove(gpx_filename.c_str()) != 0) LOG(INFO) << "Error deleting temporary GPX file";
diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc
index 76018ba35..627e26416 100644
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@@ -36,6 +36,7 @@
 #include <boost/filesystem/path.hpp>         // for path, operator<<
 #include <boost/filesystem/path_traits.hpp>  // for filesystem
 #include <glog/logging.h>
+#include <exception>
 #include <sstream>
 
 using google::LogMessage;
@@ -319,7 +320,14 @@ bool Kml_Printer::close_file()
 
 Kml_Printer::~Kml_Printer()
 {
-    close_file();
+    try
+        {
+            close_file();
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
+        }
     if (!positions_printed)
         {
             if (remove(kml_filename.c_str()) != 0) LOG(INFO) << "Error deleting temporary KML file";
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 2470b1819..39b374bc7 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -41,6 +41,7 @@
 #include <boost/filesystem/path_traits.hpp>  // for filesystem
 #include <glog/logging.h>
 #include <cstdint>
+#include <exception>
 #include <fcntl.h>
 #include <termios.h>
 
@@ -118,11 +119,29 @@ Nmea_Printer::Nmea_Printer(const std::string& filename, bool flag_nmea_output_fi
 
 Nmea_Printer::~Nmea_Printer()
 {
-    if (nmea_file_descriptor.is_open())
+    try
         {
-            nmea_file_descriptor.close();
+            if (nmea_file_descriptor.is_open())
+                {
+                    nmea_file_descriptor.close();
+                }
+        }
+    catch (const std::ofstream::failure& e)
+        {
+            std::cerr << "Problem closing NMEA dump file: " << nmea_filename << '\n';
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
+        }
+    try
+        {
+            close_serial();
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
         }
-    close_serial();
 }
 
 
diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index 0f686e460..2da35daa2 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -39,6 +39,7 @@
 #include <algorithm>  // for min and max
 #include <cmath>      // for floor
 #include <cstdlib>    // for getenv()
+#include <exception>
 #include <iterator>
 #include <ostream>
 #include <set>
@@ -213,13 +214,19 @@ Rinex_Printer::~Rinex_Printer()
     posmn = navMixFile.tellp();
     posnr = navGloFile.tellp();
     posnc = navBdsFile.tellp();
-
-    Rinex_Printer::navFile.close();
-    Rinex_Printer::obsFile.close();
-    Rinex_Printer::sbsFile.close();
-    Rinex_Printer::navGalFile.close();
-    Rinex_Printer::navGloFile.close();
-    Rinex_Printer::navBdsFile.close();
+    try
+        {
+            Rinex_Printer::navFile.close();
+            Rinex_Printer::obsFile.close();
+            Rinex_Printer::sbsFile.close();
+            Rinex_Printer::navGalFile.close();
+            Rinex_Printer::navGloFile.close();
+            Rinex_Printer::navBdsFile.close();
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
+        }
     // If nothing written, erase the files.
     if (posn == 0)
         {
diff --git a/src/algorithms/PVT/libs/rtcm_printer.cc b/src/algorithms/PVT/libs/rtcm_printer.cc
index b4892e2f8..39c7fe650 100644
--- a/src/algorithms/PVT/libs/rtcm_printer.cc
+++ b/src/algorithms/PVT/libs/rtcm_printer.cc
@@ -38,6 +38,7 @@
 #include <boost/filesystem/path_traits.hpp>  // for filesystem
 #include <glog/logging.h>
 #include <cstdint>
+#include <exception>
 #include <fcntl.h>  // for O_RDWR
 #include <iomanip>
 #include <termios.h>  // for tcgetattr
@@ -190,13 +191,27 @@ Rtcm_Printer::~Rtcm_Printer()
         {
             int64_t pos;
             pos = rtcm_file_descriptor.tellp();
-            rtcm_file_descriptor.close();
+            try
+                {
+                    rtcm_file_descriptor.close();
+                }
+            catch (const std::exception& e)
+                {
+                    std::cerr << e.what() << '\n';
+                }
             if (pos == 0)
                 {
                     if (remove(rtcm_filename.c_str()) != 0) LOG(INFO) << "Error deleting temporary RTCM file";
                 }
         }
-    close_serial();
+    try
+        {
+            close_serial();
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
+        }
 }
 
 
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index a6bb03c4a..6057276ab 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -60,6 +60,7 @@
 #include "rtklib_solution.h"
 #include <glog/logging.h>
 #include <matio.h>
+#include <exception>
 #include <utility>
 
 
@@ -397,6 +398,7 @@ bool rtklib_solver::save_matfile()
     return true;
 }
 
+
 rtklib_solver::~rtklib_solver()
 {
     if (d_dump_file.is_open() == true)
@@ -412,7 +414,14 @@ rtklib_solver::~rtklib_solver()
         }
     if (d_flag_dump_mat_enabled)
         {
-            save_matfile();
+            try
+                {
+                    save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Exception in destructor saving the PVT .mat dump file " << ex.what();
+                }
         }
 }
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index 7b127007d..c6f14d597 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -40,6 +40,7 @@
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <exception>
 #include <sstream>
 #include <utility>
 
@@ -213,9 +214,20 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::~galileo_e5a_noncoherentIQ_acquisi
     delete d_fft_if;
     delete d_ifft;
 
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ofstream::failure &e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index ef8fe300d..05ac683e0 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -34,6 +34,7 @@
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <exception>
 #include <sstream>
 #include <utility>
 
@@ -53,6 +54,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(
             samples_per_code, dump, std::move(dump_filename)));
 }
 
+
 galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc(
     uint32_t sampled_ms,
     uint32_t max_dwells,
@@ -125,9 +127,20 @@ galileo_pcps_8ms_acquisition_cc::~galileo_pcps_8ms_acquisition_cc()
     delete d_ifft;
     delete d_fft_if;
 
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 1037aabc7..1934ee5e8 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -38,6 +38,7 @@
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <exception>
 #include <sstream>
 #include <utility>
 
@@ -131,9 +132,20 @@ pcps_assisted_acquisition_cc::~pcps_assisted_acquisition_cc()
     volk_gnsssdr_free(d_fft_codes);
     delete d_ifft;
     delete d_fft_if;
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ofstream::failure &e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index 13af36da9..17082ae25 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -40,6 +40,7 @@
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <exception>
 #include <sstream>
 #include <utility>
 
@@ -117,6 +118,7 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc(
     d_channel = 0;
 }
 
+
 pcps_cccwsr_acquisition_cc::~pcps_cccwsr_acquisition_cc()
 {
     if (d_num_doppler_bins > 0)
@@ -139,12 +141,24 @@ pcps_cccwsr_acquisition_cc::~pcps_cccwsr_acquisition_cc()
     delete d_ifft;
     delete d_fft_if;
 
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ofstream::failure &e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
+
 void pcps_cccwsr_acquisition_cc::set_local_code(std::complex<float> *code_data,
     std::complex<float> *code_pilot)
 {
@@ -165,6 +179,7 @@ void pcps_cccwsr_acquisition_cc::set_local_code(std::complex<float> *code_data,
     volk_32fc_conjugate_32fc(d_fft_code_pilot, d_fft_if->get_outbuf(), d_fft_size);
 }
 
+
 void pcps_cccwsr_acquisition_cc::init()
 {
     d_gnss_synchro->Flag_valid_acquisition = false;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
index 0838fee7b..774022fb2 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc
@@ -57,6 +57,7 @@
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>
+#include <exception>
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -186,9 +187,20 @@ pcps_opencl_acquisition_cc::~pcps_opencl_acquisition_cc()
             delete d_fft_if;
         }
 
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ofstream::failure &e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index 7377aebae..48ae578e6 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -35,6 +35,7 @@
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <sstream>
 #include <utility>
 
@@ -158,11 +159,21 @@ pcps_quicksync_acquisition_cc::~pcps_quicksync_acquisition_cc()
     delete d_corr_output_f;
     delete[] d_code_folded;
 
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ofstream::failure& e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception& e)
+        {
+            std::cerr << e.what() << '\n';
         }
-    // DLOG(INFO) << "END DESTROYER";
 }
 
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index a6013fcaf..7fc685028 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -54,6 +54,7 @@
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
+#include <exception>
 #include <sstream>
 #include <utility>
 
@@ -75,6 +76,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(
             tong_init_val, tong_max_val, tong_max_dwells, dump, std::move(dump_filename)));
 }
 
+
 pcps_tong_acquisition_cc::pcps_tong_acquisition_cc(
     uint32_t sampled_ms,
     uint32_t doppler_max,
@@ -152,12 +154,24 @@ pcps_tong_acquisition_cc::~pcps_tong_acquisition_cc()
     delete d_ifft;
     delete d_fft_if;
 
-    if (d_dump)
+    try
         {
-            d_dump_file.close();
+            if (d_dump)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ofstream::failure &e)
+        {
+            std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
+
 void pcps_tong_acquisition_cc::set_local_code(std::complex<float> *code)
 {
     memcpy(d_fft_if->get_inbuf(), code, sizeof(gr_complex) * d_fft_size);
@@ -168,6 +182,7 @@ void pcps_tong_acquisition_cc::set_local_code(std::complex<float> *code)
     volk_32fc_conjugate_32fc(d_fft_codes, d_fft_if->get_outbuf(), d_fft_size);
 }
 
+
 void pcps_tong_acquisition_cc::init()
 {
     d_gnss_synchro->Flag_valid_acquisition = false;
@@ -212,6 +227,7 @@ void pcps_tong_acquisition_cc::init()
         }
 }
 
+
 void pcps_tong_acquisition_cc::set_state(int32_t state)
 {
     d_state = state;
@@ -244,6 +260,7 @@ void pcps_tong_acquisition_cc::set_state(int32_t state)
         }
 }
 
+
 int pcps_tong_acquisition_cc::general_work(int noutput_items,
     gr_vector_int &ninput_items, gr_vector_const_void_star &input_items,
     gr_vector_void_star &output_items __attribute__((unused)))
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index cf9807ece..d542235a9 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -40,6 +40,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstdlib>
+#include <exception>
 #include <iostream>
 #include <limits>
 #include <utility>
@@ -140,7 +141,14 @@ hybrid_observables_cc::~hybrid_observables_cc()
         }
     if (d_dump_mat)
         {
-            save_matfile();
+            try
+                {
+                    save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
         }
 }
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
index 2ae97cd1d..efc866de8 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
@@ -31,6 +31,7 @@
 
 #include "labsat23_source.h"
 #include <gnuradio/io_signature.h>
+#include <exception>
 #include <iostream>
 #include <sstream>
 
@@ -88,9 +89,20 @@ labsat23_source::labsat23_source(const char *signal_file_basename,
 
 labsat23_source::~labsat23_source()
 {
-    if (binary_input_file->is_open())
+    try
         {
-            binary_input_file->close();
+            if (binary_input_file->is_open())
+                {
+                    binary_input_file->close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing input file" << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
     delete binary_input_file;
 }
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index 8f7e5b44d..a42e85d15 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -58,6 +58,7 @@
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <numeric>
 #include <sstream>
@@ -672,7 +673,14 @@ dll_pll_veml_tracking::~dll_pll_veml_tracking()
         }
     if (d_dump_mat)
         {
-            save_matfile();
+            try
+                {
+                    save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
         }
     try
         {
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
index 24b5e4e77..94ff75e3e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -54,6 +54,7 @@
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <algorithm>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <sstream>
 
@@ -621,7 +622,14 @@ dll_pll_veml_tracking_fpga::~dll_pll_veml_tracking_fpga()
         }
     if (d_dump_mat)
         {
-            save_matfile();
+            try
+                {
+                    save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
         }
     try
         {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 7eefb338a..73a5f8604 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -49,6 +49,7 @@
 #include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -325,7 +326,14 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::~glonass_l1_ca_dll_pll_c_aid_tracking_c
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            glonass_l1_ca_dll_pll_c_aid_tracking_cc::save_matfile();
+            try
+                {
+                    glonass_l1_ca_dll_pll_c_aid_tracking_cc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
index ed0fecde8..a9f9402b8 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -48,6 +48,7 @@
 #include <matio.h>
 #include <pmt/pmt.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -528,7 +529,15 @@ glonass_l1_ca_dll_pll_c_aid_tracking_sc::~glonass_l1_ca_dll_pll_c_aid_tracking_s
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            glonass_l1_ca_dll_pll_c_aid_tracking_sc::save_matfile();
+            try
+                {
+                    glonass_l1_ca_dll_pll_c_aid_tracking_sc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 482ea0140..0bd9553c6 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -47,6 +47,7 @@
 #include <matio.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -278,7 +279,15 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::~Glonass_L1_Ca_Dll_Pll_Tracking_cc()
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            Glonass_L1_Ca_Dll_Pll_Tracking_cc::save_matfile();
+            try
+                {
+                    Glonass_L1_Ca_Dll_Pll_Tracking_cc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index 81fbe50db..ac85df763 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -47,6 +47,7 @@
 #include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -322,7 +323,15 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::~glonass_l2_ca_dll_pll_c_aid_tracking_c
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            glonass_l2_ca_dll_pll_c_aid_tracking_cc::save_matfile();
+            try
+                {
+                    glonass_l2_ca_dll_pll_c_aid_tracking_cc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
index 92d3e1bcc..b60aabb3a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -46,6 +46,7 @@
 #include <matio.h>
 #include <pmt/pmt.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -527,7 +528,15 @@ glonass_l2_ca_dll_pll_c_aid_tracking_sc::~glonass_l2_ca_dll_pll_c_aid_tracking_s
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            glonass_l2_ca_dll_pll_c_aid_tracking_sc::save_matfile();
+            try
+                {
+                    glonass_l2_ca_dll_pll_c_aid_tracking_sc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index 2549f85e0..8b3492978 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -47,6 +47,7 @@
 #include <matio.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -278,7 +279,15 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::~Glonass_L2_Ca_Dll_Pll_Tracking_cc()
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            Glonass_L2_Ca_Dll_Pll_Tracking_cc::save_matfile();
+            try
+                {
+                    Glonass_L2_Ca_Dll_Pll_Tracking_cc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 9701a6810..eea588de4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -40,6 +40,7 @@
 #include <matio.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -304,7 +305,15 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::~gps_l1_ca_dll_pll_c_aid_tracking_cc()
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            gps_l1_ca_dll_pll_c_aid_tracking_cc::save_matfile();
+            try
+                {
+                    gps_l1_ca_dll_pll_c_aid_tracking_cc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
index 847806647..6ba84d855 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -40,6 +40,7 @@
 #include <matio.h>
 #include <pmt/pmt.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -305,7 +306,15 @@ gps_l1_ca_dll_pll_c_aid_tracking_sc::~gps_l1_ca_dll_pll_c_aid_tracking_sc()
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            gps_l1_ca_dll_pll_c_aid_tracking_sc::save_matfile();
+            try
+                {
+                    gps_l1_ca_dll_pll_c_aid_tracking_sc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index 8c250036c..d5a6cb62f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -48,6 +48,7 @@
 #include <matio.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <memory>
 #include <sstream>
@@ -374,7 +375,15 @@ Gps_L1_Ca_Kf_Tracking_cc::~Gps_L1_Ca_Kf_Tracking_cc()
                 {
                     std::cout << "Writing .mat files ...";
                 }
-            Gps_L1_Ca_Kf_Tracking_cc::save_matfile();
+            try
+                {
+                    Gps_L1_Ca_Kf_Tracking_cc::save_matfile();
+                }
+            catch (const std::exception &ex)
+                {
+                    LOG(WARNING) << "Error saving the .mat file: " << ex.what();
+                }
+
             if (d_channel == 0)
                 {
                     std::cout << " done." << std::endl;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 020402421..cf5cb96a2 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -47,6 +47,7 @@
 #include <gnuradio/io_signature.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
+#include <exception>
 #include <iostream>
 #include <sstream>
 #include <utility>
diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
index a2c25debc..5de0d332a 100644
--- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
+++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
@@ -29,6 +29,7 @@
  */
 
 #include "rtklib_solver_dump_reader.h"
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -113,7 +114,7 @@ bool rtklib_solver_dump_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening rtklib_solver dump Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening rtklib_solver dump Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -126,8 +127,19 @@ bool rtklib_solver_dump_reader::open_obs_file(std::string out_file)
 
 rtklib_solver_dump_reader::~rtklib_solver_dump_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing rtklib_solver dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
index 1082fb233..631e8e782 100644
--- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
+++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
@@ -30,6 +30,7 @@
 
 #include "spirent_motion_csv_dump_reader.h"
 #include <boost/tokenizer.hpp>
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -80,9 +81,20 @@ spirent_motion_csv_dump_reader::spirent_motion_csv_dump_reader()
 
 spirent_motion_csv_dump_reader::~spirent_motion_csv_dump_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing Spirent CSV dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
 
@@ -225,7 +237,7 @@ bool spirent_motion_csv_dump_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening Spirent CSV dump Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening Spirent CSV dump Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -238,8 +250,19 @@ bool spirent_motion_csv_dump_reader::open_obs_file(std::string out_file)
 
 void spirent_motion_csv_dump_reader::close_obs_file()
 {
-    if (d_dump_file.is_open() == false)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing Spirent CSV dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
index 95c5ed22d..370b38d9b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
@@ -29,6 +29,7 @@
  */
 
 #include "observables_dump_reader.h"
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -96,7 +97,7 @@ bool observables_dump_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening TLM dump Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening Observables dump Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -106,6 +107,7 @@ bool observables_dump_reader::open_obs_file(std::string out_file)
         }
 }
 
+
 void observables_dump_reader::close_obs_file()
 {
     if (d_dump_file.is_open() == false)
@@ -114,6 +116,7 @@ void observables_dump_reader::close_obs_file()
         }
 }
 
+
 observables_dump_reader::observables_dump_reader(int n_channels_)
 {
     n_channels = n_channels_;
@@ -129,9 +132,20 @@ observables_dump_reader::observables_dump_reader(int n_channels_)
 
 observables_dump_reader::~observables_dump_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing Observables dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
     delete[] RX_time;
     delete[] TOW_at_current_symbol_s;
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
index c8c95afd4..e35304014 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
@@ -29,6 +29,7 @@
  */
 
 #include "tlm_dump_reader.h"
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -90,7 +91,7 @@ bool tlm_dump_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening TLM dump Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening TLM dump Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -103,8 +104,19 @@ bool tlm_dump_reader::open_obs_file(std::string out_file)
 
 tlm_dump_reader::~tlm_dump_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing TLM dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
index 233bd8acb..2e3fe04dc 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
@@ -29,6 +29,7 @@
  */
 
 #include "tracking_dump_reader.h"
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -112,7 +113,7 @@ bool tracking_dump_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening Tracking dump Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening Tracking dump Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -125,8 +126,19 @@ bool tracking_dump_reader::open_obs_file(std::string out_file)
 
 tracking_dump_reader::~tracking_dump_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing Tracking dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
index efa913404..41735824f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
@@ -29,6 +29,7 @@
  */
 
 #include "tracking_true_obs_reader.h"
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -92,7 +93,7 @@ bool tracking_true_obs_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening Tracking dump Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening Tracking dump Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -112,8 +113,19 @@ void tracking_true_obs_reader::close_obs_file()
 
 tracking_true_obs_reader::~tracking_true_obs_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing Tracking dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
index 14cd52562..e183bb9ef 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
@@ -29,6 +29,7 @@
  */
 
 #include "true_observables_reader.h"
+#include <exception>
 #include <iostream>
 #include <utility>
 
@@ -97,7 +98,7 @@ bool true_observables_reader::open_obs_file(std::string out_file)
                 }
             catch (const std::ifstream::failure &e)
                 {
-                    std::cout << "Problem opening True observables Log file: " << d_dump_filename.c_str() << std::endl;
+                    std::cout << "Problem opening true Observables Log file: " << d_dump_filename << std::endl;
                     return false;
                 }
         }
@@ -110,8 +111,19 @@ bool true_observables_reader::open_obs_file(std::string out_file)
 
 true_observables_reader::~true_observables_reader()
 {
-    if (d_dump_file.is_open() == true)
+    try
         {
-            d_dump_file.close();
+            if (d_dump_file.is_open() == true)
+                {
+                    d_dump_file.close();
+                }
+        }
+    catch (const std::ifstream::failure &e)
+        {
+            std::cerr << "Problem closing true Observables dump Log file: " << d_dump_filename << '\n';
+        }
+    catch (const std::exception &e)
+        {
+            std::cerr << e.what() << '\n';
         }
 }

From ef8ee921aad616856a70cd192e15d4f896697fd2 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 10 Feb 2019 21:56:40 +0100
Subject: [PATCH 038/123] Update copyright year

---
 src/main/main.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/main.cc b/src/main/main.cc
index 9b8354276..77620833f 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -8,7 +8,7 @@
 *
 * -------------------------------------------------------------------------
 *
-* Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)
+* Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)
 *
 * GNSS-SDR is a software defined Global Navigation
 * Satellite Systems receiver
@@ -79,7 +79,7 @@ int main(int argc, char** argv)
 {
     const std::string intro_help(
         std::string("\nGNSS-SDR is an Open Source GNSS Software Defined Receiver\n") +
-        "Copyright (C) 2010-2018 (see AUTHORS file for a list of contributors)\n" +
+        "Copyright (C) 2010-2019 (see AUTHORS file for a list of contributors)\n" +
         "This program comes with ABSOLUTELY NO WARRANTY;\n" +
         "See COPYING file to see a copy of the General Public License\n \n");
 

From ca2e22cd9f14a48e39bbf961d799c282bf751667 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 00:38:44 +0100
Subject: [PATCH 039/123] Replace boost::lexical_cast<std::string> by
 std::to_string

---
 src/algorithms/PVT/libs/rinex_printer.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index 2da35daa2..dfa3aaa08 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -1657,8 +1657,8 @@ void Rinex_Printer::rinex_nav_header(std::fstream& out, const Beidou_Dnav_Iono&
     // -------- Line 6 leap seconds
     // For leap second information, see http://www.endruntechnologies.com/leap.htm
     line.clear();
-    line += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(utc_model.d_DeltaT_LS), 6);
-    line += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(utc_model.d_DeltaT_LSF), 6);
+    line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6);
+    line += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6);
     line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
     line += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
     line += std::string(36, ' ');
@@ -2831,8 +2831,8 @@ void Rinex_Printer::update_nav_header(std::fstream& out, const Beidou_Dnav_Utc_M
                         }
                     else if (line_str.find("LEAP SECONDS", 59) != std::string::npos)
                         {
-                            line_aux += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(utc_model.d_DeltaT_LS), 6);
-                            line_aux += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(utc_model.d_DeltaT_LSF), 6);
+                            line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6);
+                            line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6);
                             line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
                             line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
                             line_aux += std::string(36, ' ');
@@ -7666,8 +7666,8 @@ void Rinex_Printer::update_obs_header(std::fstream& out, const Beidou_Dnav_Utc_M
                     if (line_str.find("TIME OF FIRST OBS", 59) != std::string::npos)
                         {
                             data.push_back(line_str);
-                            line_aux += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(utc_model.d_DeltaT_LS), 6);
-                            line_aux += Rinex_Printer::rightJustify(boost::lexical_cast<std::string>(utc_model.d_DeltaT_LSF), 6);
+                            line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LS), 6);
+                            line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.d_DeltaT_LSF), 6);
                             line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_WN_LSF), 6);
                             line_aux += Rinex_Printer::rightJustify(std::to_string(utc_model.i_DN), 6);
                             line_aux += std::string(36, ' ');

From 64f7a900c6dfe24d9d28c03a087605bf8a542aec Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 11:26:43 +0100
Subject: [PATCH 040/123] Remove llvm-header-guard filter

---
 .clang-tidy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index 50fa566d0..2e3964f82 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,3 +1,3 @@
 ---
-Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,llvm-header-guard,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
+Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
 HeaderFilterRegex: '.*'

From b9c115bdf8f952a5ca724b51f8c16295a00c53b4 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 13:02:18 +0100
Subject: [PATCH 041/123] clang-tidy: apply modernize-use-using check

---
 src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h           | 2 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h          | 2 +-
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h        | 2 +-
 .../acquisition/gnuradio_blocks/pcps_acquisition.h           | 2 +-
 .../gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h       | 3 +--
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.h           | 3 +--
 .../acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 2 +-
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.h          | 3 +--
 .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h   | 2 +-
 src/algorithms/channel/libs/channel_msg_receiver_cc.h        | 2 +-
 .../gnuradio_blocks/interleaved_byte_to_complex_byte.h       | 2 +-
 .../gnuradio_blocks/interleaved_byte_to_complex_short.h      | 2 +-
 .../gnuradio_blocks/interleaved_short_to_complex_short.h     | 2 +-
 src/algorithms/input_filter/gnuradio_blocks/beamformer.h     | 2 +-
 src/algorithms/input_filter/gnuradio_blocks/notch_cc.h       | 2 +-
 src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h  | 2 +-
 .../input_filter/gnuradio_blocks/pulse_blanking_cc.h         | 2 +-
 src/algorithms/libs/byte_x2_to_complex_byte.h                | 2 +-
 src/algorithms/libs/complex_byte_to_float_x2.h               | 2 +-
 src/algorithms/libs/complex_float_to_complex_byte.h          | 2 +-
 src/algorithms/libs/conjugate_cc.h                           | 2 +-
 src/algorithms/libs/conjugate_ic.h                           | 2 +-
 src/algorithms/libs/conjugate_sc.h                           | 2 +-
 src/algorithms/libs/cshort_to_float_x2.h                     | 2 +-
 src/algorithms/libs/gnss_sdr_sample_counter.h                | 2 +-
 src/algorithms/libs/rtklib/rtklib.h                          | 2 +-
 src/algorithms/libs/short_x2_to_cshort.h                     | 2 +-
 .../observables/gnuradio_blocks/hybrid_observables_cc.h      | 2 +-
 .../gnuradio_blocks/direct_resampler_conditioner_cb.h        | 3 +--
 .../gnuradio_blocks/direct_resampler_conditioner_cc.h        | 2 +-
 .../gnuradio_blocks/direct_resampler_conditioner_cs.h        | 3 +--
 .../signal_generator/gnuradio_blocks/signal_generator_c.h    | 2 +-
 .../signal_source/gnuradio_blocks/labsat23_source.h          | 2 +-
 .../signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h  | 5 ++---
 .../signal_source/gnuradio_blocks/unpack_2bit_samples.h      | 2 +-
 .../gnuradio_blocks/unpack_byte_2bit_cpx_samples.h           | 2 +-
 .../signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h | 2 +-
 .../signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h | 2 +-
 .../gnuradio_blocks/unpack_intspir_1bit_samples.h            | 2 +-
 .../gnuradio_blocks/unpack_spir_gss6450_samples.h            | 2 +-
 .../gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h        | 2 +-
 .../gnuradio_blocks/galileo_telemetry_decoder_cc.h           | 2 +-
 .../gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h     | 2 +-
 .../gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h     | 2 +-
 .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h         | 2 +-
 .../gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h           | 2 +-
 .../gnuradio_blocks/gps_l5_telemetry_decoder_cc.h            | 2 +-
 .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h           | 2 +-
 .../tracking/gnuradio_blocks/dll_pll_veml_tracking.h         | 2 +-
 .../gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h   | 2 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h                | 3 +--
 .../glonass_l1_ca_dll_pll_c_aid_tracking_sc.h                | 3 +--
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h      | 3 +--
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h                | 3 +--
 .../glonass_l2_ca_dll_pll_c_aid_tracking_sc.h                | 3 +--
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h      | 3 +--
 .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h    | 3 +--
 .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h    | 3 +--
 .../tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h      | 3 +--
 .../gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h    | 2 +-
 src/core/monitor/gnss_synchro_monitor.h                      | 2 +-
 ...alileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 2 +-
 .../galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc   | 2 +-
 .../galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc       | 2 +-
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc            | 2 +-
 ...leo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 2 +-
 ..._e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc | 2 +-
 ...lileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc | 2 +-
 .../galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc  | 2 +-
 .../glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc          | 2 +-
 .../acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc  | 2 +-
 .../gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc    | 2 +-
 .../gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc         | 2 +-
 .../signal-processing-blocks/libs/acquisition_msg_rx.h       | 2 +-
 .../tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc    | 2 +-
 .../tracking/glonass_l1_ca_dll_pll_tracking_test.cc          | 2 +-
 76 files changed, 77 insertions(+), 92 deletions(-)

diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index 4f84f8a27..f2174039e 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -56,7 +56,7 @@
 
 class rtklib_pvt_cc;
 
-typedef boost::shared_ptr<rtklib_pvt_cc> rtklib_pvt_cc_sptr;
+using rtklib_pvt_cc_sptr = boost::shared_ptr<rtklib_pvt_cc>;
 
 rtklib_pvt_cc_sptr rtklib_make_pvt_cc(uint32_t n_channels,
     const Pvt_Conf& conf_,
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
index 352dc938c..c95a74b82 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
@@ -47,7 +47,7 @@
 
 class galileo_e5a_noncoherentIQ_acquisition_caf_cc;
 
-typedef boost::shared_ptr<galileo_e5a_noncoherentIQ_acquisition_caf_cc> galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr;
+using galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr = boost::shared_ptr<galileo_e5a_noncoherentIQ_acquisition_caf_cc>;
 
 galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr
 galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(unsigned int sampled_ms,
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
index d9f794d1e..0c1b81e20 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
@@ -41,7 +41,7 @@
 
 class galileo_pcps_8ms_acquisition_cc;
 
-typedef boost::shared_ptr<galileo_pcps_8ms_acquisition_cc> galileo_pcps_8ms_acquisition_cc_sptr;
+using galileo_pcps_8ms_acquisition_cc_sptr = boost::shared_ptr<galileo_pcps_8ms_acquisition_cc>;
 
 galileo_pcps_8ms_acquisition_cc_sptr
 galileo_pcps_8ms_make_acquisition_cc(uint32_t sampled_ms,
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
index c403b7d50..0447dd308 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h
@@ -63,7 +63,7 @@
 
 class pcps_acquisition;
 
-typedef boost::shared_ptr<pcps_acquisition> pcps_acquisition_sptr;
+using pcps_acquisition_sptr = boost::shared_ptr<pcps_acquisition>;
 
 pcps_acquisition_sptr
 pcps_make_acquisition(const Acq_Conf& conf_);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
index d92ed1db7..544aefc18 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
@@ -60,8 +60,7 @@
 
 class pcps_acquisition_fine_doppler_cc;
 
-typedef boost::shared_ptr<pcps_acquisition_fine_doppler_cc>
-    pcps_acquisition_fine_doppler_cc_sptr;
+using pcps_acquisition_fine_doppler_cc_sptr = boost::shared_ptr<pcps_acquisition_fine_doppler_cc>;
 
 pcps_acquisition_fine_doppler_cc_sptr
 pcps_make_acquisition_fine_doppler_cc(const Acq_Conf& conf_);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
index d582821c6..b27f920df 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
@@ -57,8 +57,7 @@
 
 class pcps_assisted_acquisition_cc;
 
-typedef boost::shared_ptr<pcps_assisted_acquisition_cc>
-    pcps_assisted_acquisition_cc_sptr;
+using pcps_assisted_acquisition_cc_sptr = boost::shared_ptr<pcps_assisted_acquisition_cc>;
 
 pcps_assisted_acquisition_cc_sptr
 pcps_make_assisted_acquisition_cc(
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
index 85050cc21..b1edf0106 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
@@ -47,7 +47,7 @@
 
 class pcps_cccwsr_acquisition_cc;
 
-typedef boost::shared_ptr<pcps_cccwsr_acquisition_cc> pcps_cccwsr_acquisition_cc_sptr;
+using pcps_cccwsr_acquisition_cc_sptr = boost::shared_ptr<pcps_cccwsr_acquisition_cc>;
 
 pcps_cccwsr_acquisition_cc_sptr
 pcps_cccwsr_make_acquisition_cc(
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
index 1e8e07a05..cf24625a5 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -63,8 +63,7 @@
 
 class pcps_quicksync_acquisition_cc;
 
-typedef boost::shared_ptr<pcps_quicksync_acquisition_cc>
-    pcps_quicksync_acquisition_cc_sptr;
+using pcps_quicksync_acquisition_cc_sptr = boost::shared_ptr<pcps_quicksync_acquisition_cc>;
 
 pcps_quicksync_acquisition_cc_sptr
 pcps_quicksync_make_acquisition_cc(
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
index f4cb31068..e2443fa33 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -61,7 +61,7 @@
 
 class pcps_tong_acquisition_cc;
 
-typedef boost::shared_ptr<pcps_tong_acquisition_cc> pcps_tong_acquisition_cc_sptr;
+using pcps_tong_acquisition_cc_sptr = boost::shared_ptr<pcps_tong_acquisition_cc>;
 
 pcps_tong_acquisition_cc_sptr
 pcps_tong_make_acquisition_cc(
diff --git a/src/algorithms/channel/libs/channel_msg_receiver_cc.h b/src/algorithms/channel/libs/channel_msg_receiver_cc.h
index 7fc172923..cc05892d8 100644
--- a/src/algorithms/channel/libs/channel_msg_receiver_cc.h
+++ b/src/algorithms/channel/libs/channel_msg_receiver_cc.h
@@ -36,7 +36,7 @@
 
 class channel_msg_receiver_cc;
 
-typedef boost::shared_ptr<channel_msg_receiver_cc> channel_msg_receiver_cc_sptr;
+using channel_msg_receiver_cc_sptr = boost::shared_ptr<channel_msg_receiver_cc>;
 
 channel_msg_receiver_cc_sptr channel_msg_receiver_make_cc(std::shared_ptr<ChannelFsm> channel_fsm, bool repeat);
 
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h
index c9ce17b4a..437d60d4e 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_byte.h
@@ -37,7 +37,7 @@
 
 class interleaved_byte_to_complex_byte;
 
-typedef boost::shared_ptr<interleaved_byte_to_complex_byte> interleaved_byte_to_complex_byte_sptr;
+using interleaved_byte_to_complex_byte_sptr = boost::shared_ptr<interleaved_byte_to_complex_byte>;
 
 interleaved_byte_to_complex_byte_sptr make_interleaved_byte_to_complex_byte();
 
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h
index 5eab0f314..0b0fbdf1b 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_byte_to_complex_short.h
@@ -36,7 +36,7 @@
 
 class interleaved_byte_to_complex_short;
 
-typedef boost::shared_ptr<interleaved_byte_to_complex_short> interleaved_byte_to_complex_short_sptr;
+using interleaved_byte_to_complex_short_sptr = boost::shared_ptr<interleaved_byte_to_complex_short>;
 
 interleaved_byte_to_complex_short_sptr make_interleaved_byte_to_complex_short();
 
diff --git a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h
index 10287459a..e31b6ac98 100644
--- a/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h
+++ b/src/algorithms/data_type_adapter/gnuradio_blocks/interleaved_short_to_complex_short.h
@@ -36,7 +36,7 @@
 
 class interleaved_short_to_complex_short;
 
-typedef boost::shared_ptr<interleaved_short_to_complex_short> interleaved_short_to_complex_short_sptr;
+using interleaved_short_to_complex_short_sptr = boost::shared_ptr<interleaved_short_to_complex_short>;
 
 interleaved_short_to_complex_short_sptr make_interleaved_short_to_complex_short();
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/beamformer.h b/src/algorithms/input_filter/gnuradio_blocks/beamformer.h
index 8236b11d3..6fc126272 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/beamformer.h
+++ b/src/algorithms/input_filter/gnuradio_blocks/beamformer.h
@@ -34,7 +34,7 @@
 #include <gnuradio/sync_block.h>
 
 class beamformer;
-typedef boost::shared_ptr<beamformer> beamformer_sptr;
+using beamformer_sptr = boost::shared_ptr<beamformer>;
 
 beamformer_sptr make_beamformer();
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h
index ab8f3b693..186d1feb1 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.h
@@ -39,7 +39,7 @@
 
 class Notch;
 
-typedef boost::shared_ptr<Notch> notch_sptr;
+using notch_sptr = boost::shared_ptr<Notch>;
 
 notch_sptr make_notch_filter(float pfa, float p_c_factor,
     int32_t length_, int32_t n_segments_est, int32_t n_segments_reset);
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h
index c312c2b98..111dd65b0 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.h
@@ -39,7 +39,7 @@
 
 class NotchLite;
 
-typedef boost::shared_ptr<NotchLite> notch_lite_sptr;
+using notch_lite_sptr = boost::shared_ptr<NotchLite>;
 
 notch_lite_sptr make_notch_filter_lite(float p_c_factor, float pfa, int32_t length_, int32_t n_segments_est, int32_t n_segments_reset, int32_t n_segments_coeff);
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h
index 4d0f72f00..af5584463 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h
+++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.h
@@ -37,7 +37,7 @@
 
 class pulse_blanking_cc;
 
-typedef boost::shared_ptr<pulse_blanking_cc> pulse_blanking_cc_sptr;
+using pulse_blanking_cc_sptr = boost::shared_ptr<pulse_blanking_cc>;
 
 pulse_blanking_cc_sptr make_pulse_blanking_cc(float pfa, int32_t length_, int32_t n_segments_est, int32_t n_segments_reset);
 
diff --git a/src/algorithms/libs/byte_x2_to_complex_byte.h b/src/algorithms/libs/byte_x2_to_complex_byte.h
index c7e49bc98..05db6cb2d 100644
--- a/src/algorithms/libs/byte_x2_to_complex_byte.h
+++ b/src/algorithms/libs/byte_x2_to_complex_byte.h
@@ -37,7 +37,7 @@
 
 class byte_x2_to_complex_byte;
 
-typedef boost::shared_ptr<byte_x2_to_complex_byte> byte_x2_to_complex_byte_sptr;
+using byte_x2_to_complex_byte_sptr = boost::shared_ptr<byte_x2_to_complex_byte>;
 
 byte_x2_to_complex_byte_sptr make_byte_x2_to_complex_byte();
 
diff --git a/src/algorithms/libs/complex_byte_to_float_x2.h b/src/algorithms/libs/complex_byte_to_float_x2.h
index 74c2e9c55..170cd6033 100644
--- a/src/algorithms/libs/complex_byte_to_float_x2.h
+++ b/src/algorithms/libs/complex_byte_to_float_x2.h
@@ -37,7 +37,7 @@
 
 class complex_byte_to_float_x2;
 
-typedef boost::shared_ptr<complex_byte_to_float_x2> complex_byte_to_float_x2_sptr;
+using complex_byte_to_float_x2_sptr = boost::shared_ptr<complex_byte_to_float_x2>;
 
 complex_byte_to_float_x2_sptr make_complex_byte_to_float_x2();
 
diff --git a/src/algorithms/libs/complex_float_to_complex_byte.h b/src/algorithms/libs/complex_float_to_complex_byte.h
index 74eb0b5c3..f8368543e 100644
--- a/src/algorithms/libs/complex_float_to_complex_byte.h
+++ b/src/algorithms/libs/complex_float_to_complex_byte.h
@@ -36,7 +36,7 @@
 
 class complex_float_to_complex_byte;
 
-typedef boost::shared_ptr<complex_float_to_complex_byte> complex_float_to_complex_byte_sptr;
+using complex_float_to_complex_byte_sptr = boost::shared_ptr<complex_float_to_complex_byte>;
 
 complex_float_to_complex_byte_sptr make_complex_float_to_complex_byte();
 
diff --git a/src/algorithms/libs/conjugate_cc.h b/src/algorithms/libs/conjugate_cc.h
index a04cd2410..56a3ece78 100644
--- a/src/algorithms/libs/conjugate_cc.h
+++ b/src/algorithms/libs/conjugate_cc.h
@@ -36,7 +36,7 @@
 
 class conjugate_cc;
 
-typedef boost::shared_ptr<conjugate_cc> conjugate_cc_sptr;
+using conjugate_cc_sptr = boost::shared_ptr<conjugate_cc>;
 
 conjugate_cc_sptr make_conjugate_cc();
 
diff --git a/src/algorithms/libs/conjugate_ic.h b/src/algorithms/libs/conjugate_ic.h
index 4b51f86da..4acc7af3a 100644
--- a/src/algorithms/libs/conjugate_ic.h
+++ b/src/algorithms/libs/conjugate_ic.h
@@ -36,7 +36,7 @@
 
 class conjugate_ic;
 
-typedef boost::shared_ptr<conjugate_ic> conjugate_ic_sptr;
+using conjugate_ic_sptr = boost::shared_ptr<conjugate_ic>;
 
 conjugate_ic_sptr make_conjugate_ic();
 
diff --git a/src/algorithms/libs/conjugate_sc.h b/src/algorithms/libs/conjugate_sc.h
index 019d16dcb..a26b39ad7 100644
--- a/src/algorithms/libs/conjugate_sc.h
+++ b/src/algorithms/libs/conjugate_sc.h
@@ -36,7 +36,7 @@
 
 class conjugate_sc;
 
-typedef boost::shared_ptr<conjugate_sc> conjugate_sc_sptr;
+using conjugate_sc_sptr = boost::shared_ptr<conjugate_sc>;
 
 conjugate_sc_sptr make_conjugate_sc();
 
diff --git a/src/algorithms/libs/cshort_to_float_x2.h b/src/algorithms/libs/cshort_to_float_x2.h
index 7a235e68a..87a5d89a7 100644
--- a/src/algorithms/libs/cshort_to_float_x2.h
+++ b/src/algorithms/libs/cshort_to_float_x2.h
@@ -37,7 +37,7 @@
 
 class cshort_to_float_x2;
 
-typedef boost::shared_ptr<cshort_to_float_x2> cshort_to_float_x2_sptr;
+using cshort_to_float_x2_sptr = boost::shared_ptr<cshort_to_float_x2>;
 
 cshort_to_float_x2_sptr make_cshort_to_float_x2();
 
diff --git a/src/algorithms/libs/gnss_sdr_sample_counter.h b/src/algorithms/libs/gnss_sdr_sample_counter.h
index 8a645d9f3..ed065b193 100644
--- a/src/algorithms/libs/gnss_sdr_sample_counter.h
+++ b/src/algorithms/libs/gnss_sdr_sample_counter.h
@@ -38,7 +38,7 @@
 
 class gnss_sdr_sample_counter;
 
-typedef boost::shared_ptr<gnss_sdr_sample_counter> gnss_sdr_sample_counter_sptr;
+using gnss_sdr_sample_counter_sptr = boost::shared_ptr<gnss_sdr_sample_counter>;
 
 gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(
     double _fs,
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index da2644a3a..7edb5786b 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -343,7 +343,7 @@ const int POSOPT_RINEX = 3;   //!< pos option: rinex header pos
 const int MAXSTRPATH = 1024;  //!<  max length of stream path
 const int MAXSTRMSG = 1024;   //!<  max length of stream message
 
-typedef void fatalfunc_t(const char *);  //!<  fatal callback function type
+using fatalfunc_t = void (const char *);  //!<  fatal callback function type
 
 #define STR_MODE_R 0x1  /* stream mode: read */
 #define STR_MODE_W 0x2  /* stream mode: write */
diff --git a/src/algorithms/libs/short_x2_to_cshort.h b/src/algorithms/libs/short_x2_to_cshort.h
index a95ae1214..1591c5412 100644
--- a/src/algorithms/libs/short_x2_to_cshort.h
+++ b/src/algorithms/libs/short_x2_to_cshort.h
@@ -37,7 +37,7 @@
 
 class short_x2_to_cshort;
 
-typedef boost::shared_ptr<short_x2_to_cshort> short_x2_to_cshort_sptr;
+using short_x2_to_cshort_sptr = boost::shared_ptr<short_x2_to_cshort>;
 
 short_x2_to_cshort_sptr make_short_x2_to_cshort();
 
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index 9f6d31e47..8a4d4c56e 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
@@ -45,7 +45,7 @@
 
 class hybrid_observables_cc;
 
-typedef boost::shared_ptr<hybrid_observables_cc> hybrid_observables_cc_sptr;
+using hybrid_observables_cc_sptr = boost::shared_ptr<hybrid_observables_cc>;
 
 hybrid_observables_cc_sptr
 hybrid_make_observables_cc(unsigned int nchannels_in, unsigned int nchannels_out, bool dump, bool dump_mat, std::string dump_filename);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
index 1db7f374d..ac93ab82b 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.h
@@ -36,8 +36,7 @@
 #include <volk/volk.h>
 
 class direct_resampler_conditioner_cb;
-typedef boost::shared_ptr<direct_resampler_conditioner_cb>
-    direct_resampler_conditioner_cb_sptr;
+using direct_resampler_conditioner_cb_sptr = boost::shared_ptr<direct_resampler_conditioner_cb>;
 
 direct_resampler_conditioner_cb_sptr
 direct_resampler_make_conditioner_cb(double sample_freq_in,
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
index 0c477c571..945f797ce 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.h
@@ -43,7 +43,7 @@
 #include <volk/volk.h>
 
 class direct_resampler_conditioner_cc;
-typedef boost::shared_ptr<direct_resampler_conditioner_cc> direct_resampler_conditioner_cc_sptr;
+using direct_resampler_conditioner_cc_sptr = boost::shared_ptr<direct_resampler_conditioner_cc>;
 direct_resampler_conditioner_cc_sptr
 direct_resampler_make_conditioner_cc(double sample_freq_in,
     double sample_freq_out);
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
index 40602a68d..9d904abfb 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.h
@@ -36,8 +36,7 @@
 #include <volk/volk.h>
 
 class direct_resampler_conditioner_cs;
-typedef boost::shared_ptr<direct_resampler_conditioner_cs>
-    direct_resampler_conditioner_cs_sptr;
+using direct_resampler_conditioner_cs_sptr = boost::shared_ptr<direct_resampler_conditioner_cs>;
 
 direct_resampler_conditioner_cs_sptr
 direct_resampler_make_conditioner_cs(double sample_freq_in,
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
index 0c412432d..2201a849c 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
@@ -51,7 +51,7 @@ class signal_generator_c;
 *
 * As a convention, the _sptr suffix indicates a boost::shared_ptr
 */
-typedef boost::shared_ptr<signal_generator_c> signal_generator_c_sptr;
+using signal_generator_c_sptr = boost::shared_ptr<signal_generator_c>;
 
 /*!
 * \brief Return a shared_ptr to a new instance of gen_source.
diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
index e7776efd9..6f4435c24 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.h
@@ -39,7 +39,7 @@
 
 class labsat23_source;
 
-typedef boost::shared_ptr<labsat23_source> labsat23_source_sptr;
+using labsat23_source_sptr = boost::shared_ptr<labsat23_source>;
 
 labsat23_source_sptr labsat23_make_source(const char *signal_file_basename, int channel_selector);
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
index 62e7f2c07..d685b26a1 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
@@ -50,8 +50,7 @@
 
 class rtl_tcp_signal_source_c;
 
-typedef boost::shared_ptr<rtl_tcp_signal_source_c>
-    rtl_tcp_signal_source_c_sptr;
+using rtl_tcp_signal_source_c_sptr = boost::shared_ptr<rtl_tcp_signal_source_c>;
 
 rtl_tcp_signal_source_c_sptr
 rtl_tcp_make_signal_source_c(const std::string &address,
@@ -78,7 +77,7 @@ public:
     void set_if_gain(int gain);
 
 private:
-    typedef boost::circular_buffer_space_optimized<float> buffer_type;
+    using buffer_type = boost::circular_buffer_space_optimized<float>;
 
     friend rtl_tcp_signal_source_c_sptr
     rtl_tcp_make_signal_source_c(const std::string &address,
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
index e91fefd2d..33f3cb73e 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -73,7 +73,7 @@
 
 class unpack_2bit_samples;
 
-typedef boost::shared_ptr<unpack_2bit_samples> unpack_2bit_samples_sptr;
+using unpack_2bit_samples_sptr = boost::shared_ptr<unpack_2bit_samples>;
 
 unpack_2bit_samples_sptr make_unpack_2bit_samples(bool big_endian_bytes,
     size_t item_size,
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
index 090568aa7..66ff922df 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_cpx_samples.h
@@ -39,7 +39,7 @@
 
 class unpack_byte_2bit_cpx_samples;
 
-typedef boost::shared_ptr<unpack_byte_2bit_cpx_samples> unpack_byte_2bit_cpx_samples_sptr;
+using unpack_byte_2bit_cpx_samples_sptr = boost::shared_ptr<unpack_byte_2bit_cpx_samples>;
 
 unpack_byte_2bit_cpx_samples_sptr make_unpack_byte_2bit_cpx_samples();
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
index 90ed74e60..92a115adf 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_2bit_samples.h
@@ -35,7 +35,7 @@
 
 class unpack_byte_2bit_samples;
 
-typedef boost::shared_ptr<unpack_byte_2bit_samples> unpack_byte_2bit_samples_sptr;
+using unpack_byte_2bit_samples_sptr = boost::shared_ptr<unpack_byte_2bit_samples>;
 
 unpack_byte_2bit_samples_sptr make_unpack_byte_2bit_samples();
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
index 0a48bcb5f..2ee08145e 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
@@ -37,7 +37,7 @@
 
 class unpack_byte_4bit_samples;
 
-typedef boost::shared_ptr<unpack_byte_4bit_samples> unpack_byte_4bit_samples_sptr;
+using unpack_byte_4bit_samples_sptr = boost::shared_ptr<unpack_byte_4bit_samples>;
 
 unpack_byte_4bit_samples_sptr make_unpack_byte_4bit_samples();
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
index 536816f0c..7b8e7d7dc 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_intspir_1bit_samples.h
@@ -35,7 +35,7 @@
 
 class unpack_intspir_1bit_samples;
 
-typedef boost::shared_ptr<unpack_intspir_1bit_samples> unpack_intspir_1bit_samples_sptr;
+using unpack_intspir_1bit_samples_sptr = boost::shared_ptr<unpack_intspir_1bit_samples>;
 
 unpack_intspir_1bit_samples_sptr make_unpack_intspir_1bit_samples();
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
index a8f4b47f9..28ef0b073 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
@@ -36,7 +36,7 @@
 
 class unpack_spir_gss6450_samples;
 
-typedef boost::shared_ptr<unpack_spir_gss6450_samples> unpack_spir_gss6450_samples_sptr;
+using unpack_spir_gss6450_samples_sptr = boost::shared_ptr<unpack_spir_gss6450_samples>;
 
 unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples(unsigned int adc_nbit);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h
index bd5eafb5a..e1b0b02ec 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.h
@@ -49,7 +49,7 @@
 
 class beidou_b1i_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<beidou_b1i_telemetry_decoder_cc> beidou_b1i_telemetry_decoder_cc_sptr;
+using beidou_b1i_telemetry_decoder_cc_sptr = boost::shared_ptr<beidou_b1i_telemetry_decoder_cc>;
 
 beidou_b1i_telemetry_decoder_cc_sptr beidou_b1i_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h
index c06df6010..96bd0081b 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.h
@@ -50,7 +50,7 @@
 
 class galileo_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<galileo_telemetry_decoder_cc> galileo_telemetry_decoder_cc_sptr;
+using galileo_telemetry_decoder_cc_sptr = boost::shared_ptr<galileo_telemetry_decoder_cc>;
 
 galileo_telemetry_decoder_cc_sptr galileo_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, int frame_type, bool dump);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h
index 1bdde14da..01b8dcd5a 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_cc.h
@@ -48,7 +48,7 @@
 
 class glonass_l1_ca_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<glonass_l1_ca_telemetry_decoder_cc> glonass_l1_ca_telemetry_decoder_cc_sptr;
+using glonass_l1_ca_telemetry_decoder_cc_sptr = boost::shared_ptr<glonass_l1_ca_telemetry_decoder_cc>;
 
 glonass_l1_ca_telemetry_decoder_cc_sptr glonass_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h
index 8b1a25ee9..0ee799a34 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_cc.h
@@ -47,7 +47,7 @@
 
 class glonass_l2_ca_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<glonass_l2_ca_telemetry_decoder_cc> glonass_l2_ca_telemetry_decoder_cc_sptr;
+using glonass_l2_ca_telemetry_decoder_cc_sptr = boost::shared_ptr<glonass_l2_ca_telemetry_decoder_cc>;
 
 glonass_l2_ca_telemetry_decoder_cc_sptr glonass_l2_ca_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
index c1b55cd9f..f77a98153 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.h
@@ -42,7 +42,7 @@
 
 class gps_l1_ca_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<gps_l1_ca_telemetry_decoder_cc> gps_l1_ca_telemetry_decoder_cc_sptr;
+using gps_l1_ca_telemetry_decoder_cc_sptr = boost::shared_ptr<gps_l1_ca_telemetry_decoder_cc>;
 
 gps_l1_ca_telemetry_decoder_cc_sptr
 gps_l1_ca_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h
index 8b5922575..3c7747f1b 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l2c_telemetry_decoder_cc.h
@@ -57,7 +57,7 @@ extern "C"
 
 class gps_l2c_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<gps_l2c_telemetry_decoder_cc> gps_l2c_telemetry_decoder_cc_sptr;
+using gps_l2c_telemetry_decoder_cc_sptr = boost::shared_ptr<gps_l2c_telemetry_decoder_cc>;
 
 gps_l2c_telemetry_decoder_cc_sptr
 gps_l2c_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
index eb57696bc..2414343ee 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
@@ -53,7 +53,7 @@ extern "C"
 
 class gps_l5_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<gps_l5_telemetry_decoder_cc> gps_l5_telemetry_decoder_cc_sptr;
+using gps_l5_telemetry_decoder_cc_sptr = boost::shared_ptr<gps_l5_telemetry_decoder_cc>;
 
 gps_l5_telemetry_decoder_cc_sptr
 gps_l5_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
index 5dcf4f27b..c1956d5e4 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
@@ -46,7 +46,7 @@
 
 class sbas_l1_telemetry_decoder_cc;
 
-typedef boost::shared_ptr<sbas_l1_telemetry_decoder_cc> sbas_l1_telemetry_decoder_cc_sptr;
+using sbas_l1_telemetry_decoder_cc_sptr = boost::shared_ptr<sbas_l1_telemetry_decoder_cc>;
 
 sbas_l1_telemetry_decoder_cc_sptr
 sbas_l1_make_telemetry_decoder_cc(const Gnss_Satellite &satellite, bool dump);
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
index bce6e9048..484f0b63c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
@@ -47,7 +47,7 @@
 
 class dll_pll_veml_tracking;
 
-typedef boost::shared_ptr<dll_pll_veml_tracking> dll_pll_veml_tracking_sptr;
+using dll_pll_veml_tracking_sptr = boost::shared_ptr<dll_pll_veml_tracking>;
 
 dll_pll_veml_tracking_sptr dll_pll_veml_make_tracking(const Dll_Pll_Conf &conf_);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
index acce9db54..ff14ab9cb 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
@@ -51,7 +51,7 @@
 
 class Galileo_E1_Tcp_Connector_Tracking_cc;
 
-typedef boost::shared_ptr<Galileo_E1_Tcp_Connector_Tracking_cc> galileo_e1_tcp_connector_tracking_cc_sptr;
+using galileo_e1_tcp_connector_tracking_cc_sptr = boost::shared_ptr<Galileo_E1_Tcp_Connector_Tracking_cc>;
 
 galileo_e1_tcp_connector_tracking_cc_sptr
 galileo_e1_tcp_connector_make_tracking_cc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index 10f1064f5..2a5102942 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -53,8 +53,7 @@
 
 class glonass_l1_ca_dll_pll_c_aid_tracking_cc;
 
-typedef boost::shared_ptr<glonass_l1_ca_dll_pll_c_aid_tracking_cc>
-    glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr;
+using glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr = boost::shared_ptr<glonass_l1_ca_dll_pll_c_aid_tracking_cc>;
 
 glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr
 glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
index b0717532e..54c30e270 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -54,8 +54,7 @@
 
 class glonass_l1_ca_dll_pll_c_aid_tracking_sc;
 
-typedef boost::shared_ptr<glonass_l1_ca_dll_pll_c_aid_tracking_sc>
-    glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr;
+using glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr = boost::shared_ptr<glonass_l1_ca_dll_pll_c_aid_tracking_sc>;
 
 glonass_l1_ca_dll_pll_c_aid_tracking_sc_sptr
 glonass_l1_ca_dll_pll_c_aid_make_tracking_sc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
index d8716f5ee..15bc1c90f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
@@ -50,8 +50,7 @@
 
 class Glonass_L1_Ca_Dll_Pll_Tracking_cc;
 
-typedef boost::shared_ptr<Glonass_L1_Ca_Dll_Pll_Tracking_cc>
-    glonass_l1_ca_dll_pll_tracking_cc_sptr;
+using glonass_l1_ca_dll_pll_tracking_cc_sptr = boost::shared_ptr<Glonass_L1_Ca_Dll_Pll_Tracking_cc>;
 
 glonass_l1_ca_dll_pll_tracking_cc_sptr
 glonass_l1_ca_dll_pll_make_tracking_cc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
index 129e4609e..1be8d3c7f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
@@ -51,8 +51,7 @@
 
 class glonass_l2_ca_dll_pll_c_aid_tracking_cc;
 
-typedef boost::shared_ptr<glonass_l2_ca_dll_pll_c_aid_tracking_cc>
-    glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr;
+using glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr = boost::shared_ptr<glonass_l2_ca_dll_pll_c_aid_tracking_cc>;
 
 glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr
 glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
index 5745d8ff9..3b2618eb9 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
@@ -52,8 +52,7 @@
 
 class glonass_l2_ca_dll_pll_c_aid_tracking_sc;
 
-typedef boost::shared_ptr<glonass_l2_ca_dll_pll_c_aid_tracking_sc>
-    glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr;
+using glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr = boost::shared_ptr<glonass_l2_ca_dll_pll_c_aid_tracking_sc>;
 
 glonass_l2_ca_dll_pll_c_aid_tracking_sc_sptr
 glonass_l2_ca_dll_pll_c_aid_make_tracking_sc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
index f2f4ebab5..29f6bb077 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
@@ -48,8 +48,7 @@
 
 class Glonass_L2_Ca_Dll_Pll_Tracking_cc;
 
-typedef boost::shared_ptr<Glonass_L2_Ca_Dll_Pll_Tracking_cc>
-    glonass_l2_ca_dll_pll_tracking_cc_sptr;
+using glonass_l2_ca_dll_pll_tracking_cc_sptr = boost::shared_ptr<Glonass_L2_Ca_Dll_Pll_Tracking_cc>;
 
 glonass_l2_ca_dll_pll_tracking_cc_sptr
 glonass_l2_ca_dll_pll_make_tracking_cc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index 43db468ae..ecbe2c15f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -51,8 +51,7 @@
 
 class gps_l1_ca_dll_pll_c_aid_tracking_cc;
 
-typedef boost::shared_ptr<gps_l1_ca_dll_pll_c_aid_tracking_cc>
-    gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr;
+using gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr = boost::shared_ptr<gps_l1_ca_dll_pll_c_aid_tracking_cc>;
 
 gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr
 gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
index f7624e944..6b67fa09b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -52,8 +52,7 @@
 
 class gps_l1_ca_dll_pll_c_aid_tracking_sc;
 
-typedef boost::shared_ptr<gps_l1_ca_dll_pll_c_aid_tracking_sc>
-    gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr;
+using gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr = boost::shared_ptr<gps_l1_ca_dll_pll_c_aid_tracking_sc>;
 
 gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr
 gps_l1_ca_dll_pll_c_aid_make_tracking_sc(
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
index a40e257b9..e4acf778b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
@@ -53,8 +53,7 @@
 
 class Gps_L1_Ca_Kf_Tracking_cc;
 
-typedef boost::shared_ptr<Gps_L1_Ca_Kf_Tracking_cc>
-    gps_l1_ca_kf_tracking_cc_sptr;
+using gps_l1_ca_kf_tracking_cc_sptr = boost::shared_ptr<Gps_L1_Ca_Kf_Tracking_cc>;
 
 gps_l1_ca_kf_tracking_cc_sptr
 gps_l1_ca_kf_make_tracking_cc(uint32_t order,
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
index 636a9fe28..a4a1c82e7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
@@ -48,7 +48,7 @@
 
 class Gps_L1_Ca_Tcp_Connector_Tracking_cc;
 
-typedef boost::shared_ptr<Gps_L1_Ca_Tcp_Connector_Tracking_cc> gps_l1_ca_tcp_connector_tracking_cc_sptr;
+using gps_l1_ca_tcp_connector_tracking_cc_sptr = boost::shared_ptr<Gps_L1_Ca_Tcp_Connector_Tracking_cc>;
 
 gps_l1_ca_tcp_connector_tracking_cc_sptr
 gps_l1_ca_tcp_connector_make_tracking_cc(
diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index 4346c9fb5..7c22a1290 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -43,7 +43,7 @@
 
 class gnss_synchro_monitor;
 
-typedef boost::shared_ptr<gnss_synchro_monitor> gnss_synchro_monitor_sptr;
+using gnss_synchro_monitor_sptr = boost::shared_ptr<gnss_synchro_monitor>;
 
 gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
     int output_rate_ms,
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index 7e3be06c6..21967ff9e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -55,7 +55,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx> GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr;
+using GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx>;
 
 GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 7f15ac400..300f90f63 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -56,7 +56,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx> GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr;
+using GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx>;
 
 GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index 73b67416b..3657fa0f1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -64,7 +64,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx> GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr;
+using GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx>;
 
 GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index 786bfbff7..c76cc762e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -60,7 +60,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx> GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr;
+using GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx>;
 
 GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx_make();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index df2d68e1f..a8d818ff6 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -56,7 +56,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx> GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr;
+using GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx>;
 
 GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index b4a7b4410..fa331c6dd 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -64,7 +64,7 @@ using google::LogMessage;
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx> GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr;
+using GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx>;
 
 GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 8fe2305a3..7b3f8daf7 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -58,7 +58,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx;
 
-typedef boost::shared_ptr<GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx> GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr;
+using GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx>;
 
 GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index df67c7756..7b1a6b975 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -55,7 +55,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx;
 
-typedef boost::shared_ptr<GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx> GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr;
+using GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr = boost::shared_ptr<GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx>;
 
 GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index cf515debb..3e16bd39e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -60,7 +60,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx;
 
-typedef boost::shared_ptr<GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx> GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr;
+using GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr = boost::shared_ptr<GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx>;
 
 GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 641672a9a..5ad20f059 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -60,7 +60,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx;
 
-typedef boost::shared_ptr<GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx> GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr;
+using GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx>;
 
 GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 966b33473..6e5392296 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -62,7 +62,7 @@ using google::LogMessage;
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx;
 
-typedef boost::shared_ptr<GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx> GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr;
+using GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx>;
 
 GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index d24b4b0f7..efdc554e4 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -58,7 +58,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx;
 
-typedef boost::shared_ptr<GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx> GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr;
+using GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx>;
 
 GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h
index 90a61a482..4dca5bcb8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_msg_rx.h
@@ -40,7 +40,7 @@
 // ######## GNURADIO ACQUISITION BLOCK MESSAGE RECEVER #########
 class Acquisition_msg_rx;
 
-typedef boost::shared_ptr<Acquisition_msg_rx> Acquisition_msg_rx_sptr;
+using Acquisition_msg_rx_sptr = boost::shared_ptr<Acquisition_msg_rx>;
 
 Acquisition_msg_rx_sptr Acquisition_msg_rx_make();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
index 64c6df3b5..6fbda7a6e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
@@ -55,7 +55,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL1CaDllPllCAidTrackingTest_msg_rx;
 
-typedef boost::shared_ptr<GlonassL1CaDllPllCAidTrackingTest_msg_rx> GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr;
+using GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr = boost::shared_ptr<GlonassL1CaDllPllCAidTrackingTest_msg_rx>;
 
 GlonassL1CaDllPllCAidTrackingTest_msg_rx_sptr GlonassL1CaDllPllCAidTrackingTest_msg_rx_make();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
index 2bf4f8938..c18809d5a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
@@ -56,7 +56,7 @@
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL1CaDllPllTrackingTest_msg_rx;
 
-typedef boost::shared_ptr<GlonassL1CaDllPllTrackingTest_msg_rx> GlonassL1CaDllPllTrackingTest_msg_rx_sptr;
+using GlonassL1CaDllPllTrackingTest_msg_rx_sptr = boost::shared_ptr<GlonassL1CaDllPllTrackingTest_msg_rx>;
 
 GlonassL1CaDllPllTrackingTest_msg_rx_sptr GlonassL1CaDllPllTrackingTest_msg_rx_make();
 

From 16bd8aa983e57998bb92e7e51b6ccbf84c4c78f1 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 13:13:54 +0100
Subject: [PATCH 042/123] clang-tidy: apply modernize-use-bool-literals check

---
 .../unit-tests/signal-processing-blocks/pvt/rtcm_test.cc  | 2 +-
 .../system-parameters/glonass_gnav_nav_message_test.cc    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
index cd8771880..ae0a89039 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
@@ -295,7 +295,7 @@ TEST(RtcmTest, MT1020)
     // Bit distribution per fields dependent on other factors
     gnav_ephemeris.d_t_b = 8100;
     // Binary flag representation
-    gnav_ephemeris.d_P_3 = 1;
+    gnav_ephemeris.d_P_3 = true;
 
     std::string tx_msg = rtcm->print_MT1020(gnav_ephemeris, gnav_utc_model);
 
diff --git a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc b/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc
index 3b91be0e6..0f570fe2a 100644
--- a/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc
+++ b/src/tests/unit-tests/system-parameters/glonass_gnav_nav_message_test.cc
@@ -126,7 +126,7 @@ TEST(GlonassGnavNavigationMessageTest, String2Decoder)
 
     // Fill out ephemeris values for truth
     gnav_ephemeris.d_B_n = 0;
-    gnav_ephemeris.d_P_2 = 1;
+    gnav_ephemeris.d_P_2 = true;
     gnav_ephemeris.d_t_b = 8100;
     gnav_ephemeris.d_VYn = -2.69022750854492;
     gnav_ephemeris.d_AYn = 0;
@@ -162,10 +162,10 @@ TEST(GlonassGnavNavigationMessageTest, String3Decoder)
     Glonass_Gnav_Ephemeris gnav_ephemeris;
 
     // Fill out ephemeris values for truth
-    gnav_ephemeris.d_P_3 = 1;
+    gnav_ephemeris.d_P_3 = true;
     gnav_ephemeris.d_gamma_n = 1.81898940354586e-12;
     gnav_ephemeris.d_P = 3;
-    gnav_ephemeris.d_l3rd_n = 0;
+    gnav_ephemeris.d_l3rd_n = false;
     gnav_ephemeris.d_VZn = -1.82016849517822;
     gnav_ephemeris.d_AZn = -2.79396772384644e-09;
     gnav_ephemeris.d_Zn = 19929.2377929688;
@@ -203,7 +203,7 @@ TEST(GlonassGnavNavigationMessageTest, String4Decoder)
     gnav_ephemeris.d_tau_n = -8.30907374620438e-05;
     gnav_ephemeris.d_Delta_tau_n = 9.31322574615479e-10;
     gnav_ephemeris.d_E_n = 0;
-    gnav_ephemeris.d_P_4 = 0;
+    gnav_ephemeris.d_P_4 = false;
     gnav_ephemeris.d_F_T = 6;
     gnav_ephemeris.d_N_T = 268;
     gnav_ephemeris.d_n = 21;

From 298a9c2391bb1c8e854c4f35c8aa04b3ffe287ce Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 14:47:18 +0100
Subject: [PATCH 043/123] clang-tidy: apply readability-container-size-empty
 check

---
 src/tests/common-files/gnuplot_i.h | 46 +++++++++++++++---------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 7a971f02e..7ef3acad8 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -786,7 +786,7 @@ inline Gnuplot::Gnuplot(const std::vector<double> &x,
 template <typename X>
 Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title)
 {
-    if (x.size() == 0)
+    if (x.empty())
         {
             throw GnuplotException("std::vector too small");
             return *this;
@@ -794,7 +794,7 @@ Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title)
 
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
-    if (name == "")
+    if (name.empty())
         return *this;
 
     //
@@ -819,7 +819,7 @@ Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title)
 template <typename X, typename Y>
 Gnuplot &Gnuplot::plot_xy(const X &x, const Y &y, const std::string &title, const unsigned int decimate)
 {
-    if (x.size() == 0 || y.size() == 0)
+    if (x.empty() || y.empty())
         {
             throw GnuplotException("std::vectors too small");
             return *this;
@@ -833,7 +833,7 @@ Gnuplot &Gnuplot::plot_xy(const X &x, const Y &y, const std::string &title, cons
 
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
-    if (name == "")
+    if (name.empty())
         return *this;
 
     //
@@ -875,7 +875,7 @@ Gnuplot &Gnuplot::plot_xy_err(const X &x,
 
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
-    if (name == "")
+    if (name.empty())
         return *this;
 
     //
@@ -904,14 +904,14 @@ Gnuplot &Gnuplot::plot_grid3d(const X &x,
     const E &mag,
     const std::string &title)
 {
-    if (x.size() == 0 || y.size() == 0)
+    if (x.empty() || y.empty())
         {
             throw GnuplotException("std::vectors too small");
             return *this;
         }
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
-    if (name == "")
+    if (name.empty())
         return *this;
 
     //
@@ -937,7 +937,7 @@ Gnuplot &Gnuplot::plot_grid3d(const X &x,
 
     cmdstr << " splot \"" << name << "\" u 1:2:3";
 
-    if (title == "")
+    if (title.empty())
         cmdstr << " notitle with " << pstyle << " palette";
     else
         cmdstr << " title \"" << title << "\" with " << pstyle << " palette";
@@ -961,7 +961,7 @@ Gnuplot &Gnuplot::plot_xyz(const X &x,
     const Z &z,
     const std::string &title)
 {
-    if (x.size() == 0 || y.size() == 0 || z.size() == 0)
+    if (x.empty() || y.empty() || z.empty())
         {
             throw GnuplotException("std::vectors too small");
             return *this;
@@ -975,7 +975,7 @@ Gnuplot &Gnuplot::plot_xyz(const X &x,
 
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
-    if (name == "")
+    if (name.empty())
         return *this;
 
     //
@@ -1507,7 +1507,7 @@ Gnuplot &Gnuplot::plot_slope(const double a,
 
     cmdstr << a << " * x + " << b << " title \"";
 
-    if (title == "")
+    if (title.empty())
         cmdstr << "f(x) = " << a << " * x + " << b;
     else
         cmdstr << title;
@@ -1541,7 +1541,7 @@ Gnuplot &Gnuplot::plot_equation(const std::string &equation,
 
     cmdstr << equation << " title \"";
 
-    if (title == "")
+    if (title.empty())
         cmdstr << "f(x) = " << equation;
     else
         cmdstr << title;
@@ -1575,7 +1575,7 @@ Gnuplot &Gnuplot::plot_equation3d(const std::string &equation,
 
     cmdstr << equation << " title \"";
 
-    if (title == "")
+    if (title.empty())
         cmdstr << "f(x,y) = " << equation;
     else
         cmdstr << title;
@@ -1615,12 +1615,12 @@ Gnuplot &Gnuplot::plotfile_x(const std::string &filename,
 
     cmdstr << "\"" << filename << "\" using " << column;
 
-    if (title == "")
+    if (title.empty())
         cmdstr << " notitle ";
     else
         cmdstr << " title \"" << title << "\" ";
 
-    if (smooth == "")
+    if (smooth.empty())
         cmdstr << "with " << pstyle;
     else
         cmdstr << "smooth " << smooth;
@@ -1660,12 +1660,12 @@ Gnuplot &Gnuplot::plotfile_xy(const std::string &filename,
 
     cmdstr << "\"" << filename << "\" using " << column_x << ":" << column_y << " every " << std::to_string(decimate);
 
-    if (title == "")
+    if (title.empty())
         cmdstr << " notitle ";
     else
         cmdstr << " title \"" << title << "\" ";
 
-    if (smooth == "")
+    if (smooth.empty())
         cmdstr << "with " << pstyle;
     else
         cmdstr << "smooth " << smooth;
@@ -1707,7 +1707,7 @@ Gnuplot &Gnuplot::plotfile_xy_err(const std::string &filename,
            << column_x << ":" << column_y << ":" << column_dy
            << " with errorbars ";
 
-    if (title == "")
+    if (title.empty())
         cmdstr << " notitle ";
     else
         cmdstr << " title \"" << title << "\" ";
@@ -1748,7 +1748,7 @@ Gnuplot &Gnuplot::plotfile_xyz(const std::string &filename,
     cmdstr << "\"" << filename << "\" using " << column_x << ":" << column_y
            << ":" << column_z;
 
-    if (title == "")
+    if (title.empty())
         cmdstr << " notitle with " << pstyle;
     else
         cmdstr << " title \"" << title << "\" with " << pstyle;
@@ -1773,7 +1773,7 @@ Gnuplot &Gnuplot::plot_image(const unsigned char *ucPicBuf,
 {
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
-    if (name == "")
+    if (name.empty())
         return *this;
 
     //
@@ -1801,7 +1801,7 @@ Gnuplot &Gnuplot::plot_image(const unsigned char *ucPicBuf,
     else
         cmdstr << "plot ";
 
-    if (title == "")
+    if (title.empty())
         cmdstr << "\"" << name << "\" with image";
     else
         cmdstr << "\"" << name << "\" title \"" << title << "\" with image";
@@ -1824,7 +1824,7 @@ Gnuplot &Gnuplot::plot_circle(double east, double north, double radius, const st
     cmdstr << "set object circle at " + std::to_string(east) + "," + std::to_string(north) + " size " +
                   std::to_string(radius) + " back\n";
 
-    if (label != "")
+    if (!label.empty())
         {
             double east_label = (std::cos(M_PI / 3.0) * radius) * 1.1 + east;
             double north_label = (std::sin(M_PI / 3.0) * radius) * 1.1 + north;
@@ -2151,7 +2151,7 @@ std::string Gnuplot::create_tmpfile(std::ofstream &tmp)
 
 void Gnuplot::remove_tmpfiles()
 {
-    if ((tmpfile_list).size() > 0)
+    if (!(tmpfile_list).empty())
         {
             for (auto &i : tmpfile_list)
                 if (remove(i.c_str()) != 0)

From b257c6433fa1e1acfb4e6cba8a12a73e9b04a516 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 15:31:01 +0100
Subject: [PATCH 044/123] clang-tidy: apply readability-named-parameter check

See https://google.github.io/styleguide/cppguide.html#Function_Declarations_and_Definitions
---
 src/core/system_parameters/gnss_satellite.h | 25 +++++++++++----------
 src/core/system_parameters/gnss_signal.h    |  9 ++++----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/core/system_parameters/gnss_satellite.h b/src/core/system_parameters/gnss_satellite.h
index 519deb671..064b34b2e 100644
--- a/src/core/system_parameters/gnss_satellite.h
+++ b/src/core/system_parameters/gnss_satellite.h
@@ -47,18 +47,19 @@
 class Gnss_Satellite
 {
 public:
-    Gnss_Satellite();                                                       //!< Default Constructor.
-    Gnss_Satellite(const std::string& system_, uint32_t PRN_);              //!< Concrete GNSS satellite Constructor.
-    ~Gnss_Satellite();                                                      //!< Default Destructor.
-    void update_PRN(uint32_t PRN);                                          //!< Updates the PRN Number when information is decoded, only applies to GLONASS GNAV messages
-    uint32_t get_PRN() const;                                               //!< Gets satellite's PRN
-    int32_t get_rf_link() const;                                            //!< Gets the satellite's rf link
-    std::string get_system() const;                                         //!< Gets the satellite system {"GPS", "GLONASS", "SBAS", "Galileo", "Beidou"}
-    std::string get_system_short() const;                                   //!< Gets the satellite system {"G", "R", "SBAS", "E", "C"}
-    std::string get_block() const;                                          //!< Gets the satellite block. If GPS, returns {"IIA", "IIR", "IIR-M", "IIF"}
-    std::string what_block(const std::string& system_, uint32_t PRN_);      //!< Gets the block of a given satellite
-    friend bool operator==(const Gnss_Satellite&, const Gnss_Satellite&);   //!< operator== for comparison
-    friend std::ostream& operator<<(std::ostream&, const Gnss_Satellite&);  //!< operator<< for pretty printing
+    Gnss_Satellite();                                                   //!< Default Constructor.
+    Gnss_Satellite(const std::string& system_, uint32_t PRN_);          //!< Concrete GNSS satellite Constructor.
+    ~Gnss_Satellite();                                                  //!< Default Destructor.
+    void update_PRN(uint32_t PRN);                                      //!< Updates the PRN Number when information is decoded, only applies to GLONASS GNAV messages
+    uint32_t get_PRN() const;                                           //!< Gets satellite's PRN
+    int32_t get_rf_link() const;                                        //!< Gets the satellite's rf link
+    std::string get_system() const;                                     //!< Gets the satellite system {"GPS", "GLONASS", "SBAS", "Galileo", "Beidou"}
+    std::string get_system_short() const;                               //!< Gets the satellite system {"G", "R", "SBAS", "E", "C"}
+    std::string get_block() const;                                      //!< Gets the satellite block. If GPS, returns {"IIA", "IIR", "IIR-M", "IIF"}
+    std::string what_block(const std::string& system_, uint32_t PRN_);  //!< Gets the block of a given satellite
+
+    friend bool operator==(const Gnss_Satellite& /*sat1*/, const Gnss_Satellite& /*sat2*/);  //!< operator== for comparison
+    friend std::ostream& operator<<(std::ostream& /*out*/, const Gnss_Satellite& /*sat*/);   //!< operator<< for pretty printing
     //Gnss_Satellite& operator=(const Gnss_Satellite &);
 private:
     uint32_t PRN;
diff --git a/src/core/system_parameters/gnss_signal.h b/src/core/system_parameters/gnss_signal.h
index 2b739c633..a2abc773f 100644
--- a/src/core/system_parameters/gnss_signal.h
+++ b/src/core/system_parameters/gnss_signal.h
@@ -52,10 +52,11 @@ public:
     Gnss_Signal(const std::string& signal_);
     Gnss_Signal(const Gnss_Satellite& satellite_, const std::string& signal_);
     ~Gnss_Signal();
-    std::string get_signal_str() const;                                  //!< Get the satellite signal {"1C" for GPS L1 C/A, "2S" for GPS L2C (M), "L5" for GPS L5, "1G" for GLONASS L1 C/A, "1B" for Galileo E1B, "5X" for Galileo E5a.
-    Gnss_Satellite get_satellite() const;                                //!< Get the Gnss_Satellite associated to the signal
-    friend bool operator==(const Gnss_Signal&, const Gnss_Signal&);      //!< operator== for comparison
-    friend std::ostream& operator<<(std::ostream&, const Gnss_Signal&);  //!< operator<< for pretty printing
+    std::string get_signal_str() const;    //!< Get the satellite signal {"1C" for GPS L1 C/A, "2S" for GPS L2C (M), "L5" for GPS L5, "1G" for GLONASS L1 C/A, "1B" for Galileo E1B, "5X" for Galileo E5a.
+    Gnss_Satellite get_satellite() const;  //!< Get the Gnss_Satellite associated to the signal
+
+    friend bool operator==(const Gnss_Signal& /*sig1*/, const Gnss_Signal& /*sig2*/);    //!< operator== for comparison
+    friend std::ostream& operator<<(std::ostream& /*out*/, const Gnss_Signal& /*sig*/);  //!< operator<< for pretty printing
 };
 
 #endif

From 18fda22221d928b9c0915bdb8e93cdd0caf9f89e Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 15:32:06 +0100
Subject: [PATCH 045/123] Improve const usage

---
 .../telemetry_decoder/libs/convolutional.h         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/algorithms/telemetry_decoder/libs/convolutional.h b/src/algorithms/telemetry_decoder/libs/convolutional.h
index 4195154df..23b9976b9 100644
--- a/src/algorithms/telemetry_decoder/libs/convolutional.h
+++ b/src/algorithms/telemetry_decoder/libs/convolutional.h
@@ -88,7 +88,7 @@ inline static int parity_counter(int symbol, int length)
 inline static int nsc_enc_bit(int state_out_p[],
     int input,
     int state_in,
-    int g[],
+    const int g[],
     int KK,
     int nn)
 {
@@ -144,7 +144,7 @@ inline static void nsc_transit(int output_p[],
  *  \param[in] nn            The length of the received vector
  *
  */
-inline static float Gamma(float rec_array[],
+inline static float Gamma(const float rec_array[],
     int symbol,
     int nn)
 {
@@ -175,11 +175,11 @@ inline static float Gamma(float rec_array[],
  *
  */
 inline static void Viterbi(int output_u_int[],
-    int out0[],
-    int state0[],
-    int out1[],
-    int state1[],
-    double input_c[],
+    const int out0[],
+    const int state0[],
+    const int out1[],
+    const int state1[],
+    const double input_c[],
     int KK,
     int nn,
     int LL)

From f1871a84e253233209ce78d0300c679695eb0d3a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 15:33:24 +0100
Subject: [PATCH 046/123] clang-tidy: apply checks

---
 .../arithmetic/code_generation_test.cc          |  6 +++---
 .../arithmetic/complex_carrier_test.cc          |  8 ++++----
 .../unit-tests/arithmetic/conjugate_test.cc     |  8 ++++----
 .../unit-tests/arithmetic/fft_length_test.cc    |  2 +-
 .../unit-tests/arithmetic/fft_speed_test.cc     |  5 +++--
 .../arithmetic/magnitude_squared_test.cc        |  8 ++++----
 .../unit-tests/arithmetic/multiply_test.cc      | 16 ++++++++--------
 ...s_8ms_ambiguous_acquisition_gsoc2013_test.cc |  9 ++++-----
 ..._pcps_ambiguous_acquisition_gsoc2013_test.cc |  9 ++++-----
 ...o_e1_pcps_ambiguous_acquisition_gsoc_test.cc |  9 ++++-----
 ...alileo_e1_pcps_ambiguous_acquisition_test.cc | 17 ++++++++---------
 ...ccwsr_ambiguous_acquisition_gsoc2013_test.cc |  9 ++++-----
 ...ksync_ambiguous_acquisition_gsoc2014_test.cc |  9 ++++-----
 ..._tong_ambiguous_acquisition_gsoc2013_test.cc |  9 ++++-----
 ..._pcps_acquisition_gsoc2014_gensource_test.cc |  9 ++++-----
 ...nass_l1_ca_pcps_acquisition_gsoc2017_test.cc | 15 +++++++--------
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 11 +++++------
 ..._pcps_quicksync_acquisition_gsoc2014_test.cc |  9 ++++-----
 ...l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |  9 ++++-----
 .../pvt/nmea_printer_test.cc                    |  3 +--
 .../galileo_fnav_inav_decoder_test.cc           | 10 +++++-----
 .../tracking/galileo_e5a_tracking_test.cc       |  3 +--
 ...glonass_l1_ca_dll_pll_c_aid_tracking_test.cc |  9 ++++-----
 .../glonass_l1_ca_dll_pll_tracking_test.cc      |  9 ++++-----
 24 files changed, 98 insertions(+), 113 deletions(-)

diff --git a/src/tests/unit-tests/arithmetic/code_generation_test.cc b/src/tests/unit-tests/arithmetic/code_generation_test.cc
index d89b03365..e252771af 100644
--- a/src/tests/unit-tests/arithmetic/code_generation_test.cc
+++ b/src/tests/unit-tests/arithmetic/code_generation_test.cc
@@ -37,7 +37,7 @@
 
 TEST(CodeGenerationTest, CodeGenGPSL1Test)
 {
-    std::complex<float>* _dest = new std::complex<float>[1023];
+    auto* _dest = new std::complex<float>[1023];
     signed int _prn = 1;
     unsigned int _chip_shift = 4;
 
@@ -68,7 +68,7 @@ TEST(CodeGenerationTest, CodeGenGPSL1SampledTest)
     const signed int _codeFreqBasis = 1023000;  //Hz
     const signed int _codeLength = 1023;
     int _samplesPerCode = round(_fs / static_cast<double>(_codeFreqBasis / _codeLength));
-    std::complex<float>* _dest = new std::complex<float>[_samplesPerCode];
+    auto* _dest = new std::complex<float>[_samplesPerCode];
 
     int iterations = 1000;
 
@@ -96,7 +96,7 @@ TEST(CodeGenerationTest, ComplexConjugateTest)
     const signed int _codeFreqBasis = 1023000;  //Hz
     const signed int _codeLength = 1023;
     int _samplesPerCode = round(_fs / static_cast<double>(_codeFreqBasis / _codeLength));
-    std::complex<float>* _dest = new std::complex<float>[_samplesPerCode];
+    auto* _dest = new std::complex<float>[_samplesPerCode];
 
     int iterations = 1000;
 
diff --git a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
index 3cac38fbe..72e12bcc0 100644
--- a/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
+++ b/src/tests/unit-tests/arithmetic/complex_carrier_test.cc
@@ -41,10 +41,10 @@ TEST(ComplexCarrierTest, StandardComplexImplementation)
 {
     // Dynamic allocation creates new usable space on the program STACK
     // (an area of RAM specifically allocated to the program)
-    std::complex<float>* output = new std::complex<float>[FLAGS_size_carrier_test];
+    auto* output = new std::complex<float>[FLAGS_size_carrier_test];
     const double _f = 2000.0;
     const double _fs = 2000000.0;
-    const double phase_step = static_cast<double>((GPS_TWO_PI * _f) / _fs);
+    const auto phase_step = static_cast<double>((GPS_TWO_PI * _f) / _fs);
     double phase = 0.0;
 
     std::chrono::time_point<std::chrono::system_clock> start, end;
@@ -84,7 +84,7 @@ TEST(ComplexCarrierTest, C11ComplexImplementation)
     std::vector<std::complex<float>> output(FLAGS_size_carrier_test);
     const double _f = 2000.0;
     const double _fs = 2000000.0;
-    const double phase_step = static_cast<double>((GPS_TWO_PI * _f) / _fs);
+    const auto phase_step = static_cast<double>((GPS_TWO_PI * _f) / _fs);
     double phase = 0.0;
 
     std::chrono::time_point<std::chrono::system_clock> start, end;
@@ -113,7 +113,7 @@ TEST(ComplexCarrierTest, C11ComplexImplementation)
 
 TEST(ComplexCarrierTest, OwnComplexImplementation)
 {
-    std::complex<float>* output = new std::complex<float>[FLAGS_size_carrier_test];
+    auto* output = new std::complex<float>[FLAGS_size_carrier_test];
     double _f = 2000.0;
     double _fs = 2000000.0;
     std::chrono::time_point<std::chrono::system_clock> start, end;
diff --git a/src/tests/unit-tests/arithmetic/conjugate_test.cc b/src/tests/unit-tests/arithmetic/conjugate_test.cc
index 1eaa4cc09..a32b12ebf 100644
--- a/src/tests/unit-tests/arithmetic/conjugate_test.cc
+++ b/src/tests/unit-tests/arithmetic/conjugate_test.cc
@@ -41,8 +41,8 @@ DEFINE_int32(size_conjugate_test, 100000, "Size of the arrays used for conjugate
 
 TEST(ConjugateTest, StandardCComplexImplementation)
 {
-    std::complex<float>* input = new std::complex<float>[FLAGS_size_conjugate_test];
-    std::complex<float>* output = new std::complex<float>[FLAGS_size_conjugate_test];
+    auto* input = new std::complex<float>[FLAGS_size_conjugate_test];
+    auto* output = new std::complex<float>[FLAGS_size_conjugate_test];
     std::fill_n(input, FLAGS_size_conjugate_test, std::complex<float>(0.0, 0.0));
 
     std::chrono::time_point<std::chrono::system_clock> start, end;
@@ -114,8 +114,8 @@ TEST(ConjugateTest, ArmadilloComplexImplementation)
 
 TEST(ConjugateTest, VolkComplexImplementation)
 {
-    std::complex<float>* input = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
-    std::complex<float>* output = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
+    auto* input = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
+    auto* output = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_conjugate_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
     std::fill_n(input, FLAGS_size_conjugate_test, std::complex<float>(0.0, 0.0));
 
     std::chrono::time_point<std::chrono::system_clock> start, end;
diff --git a/src/tests/unit-tests/arithmetic/fft_length_test.cc b/src/tests/unit-tests/arithmetic/fft_length_test.cc
index 3e75c4285..ff5d2fdb6 100644
--- a/src/tests/unit-tests/arithmetic/fft_length_test.cc
+++ b/src/tests/unit-tests/arithmetic/fft_length_test.cc
@@ -112,7 +112,7 @@ TEST(FFTLengthTest, MeasureExecutionTime)
                         {
                             boost::filesystem::path p(gnuplot_executable);
                             boost::filesystem::path dir = p.parent_path();
-                            std::string gnuplot_path = dir.native();
+                            const std::string& gnuplot_path = dir.native();
                             Gnuplot::set_GNUPlotPath(gnuplot_path);
 
                             Gnuplot g1("linespoints");
diff --git a/src/tests/unit-tests/arithmetic/fft_speed_test.cc b/src/tests/unit-tests/arithmetic/fft_speed_test.cc
index 009b40838..8d5486e62 100644
--- a/src/tests/unit-tests/arithmetic/fft_speed_test.cc
+++ b/src/tests/unit-tests/arithmetic/fft_speed_test.cc
@@ -46,8 +46,9 @@ TEST(FFTSpeedTest, ArmadilloVSGNURadioExecutionTime)
     unsigned int fft_sizes[19] = {16, 25, 32, 45, 64, 95, 128, 195, 256, 325, 512, 785, 1024, 1503, 2048, 3127, 4096, 6349, 8192};
     double d_execution_time;
     EXPECT_NO_THROW(
-        for (int i = 0; i < 19; i++) {
-            d_fft_size = fft_sizes[i];
+        for (unsigned int fft_size
+             : fft_sizes) {
+            d_fft_size = fft_size;
             gr::fft::fft_complex* d_gr_fft;
             d_gr_fft = new gr::fft::fft_complex(d_fft_size, true);
             arma::arma_rng::set_seed_random();
diff --git a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc
index 5a51b32be..d8bd2bd1e 100644
--- a/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc
+++ b/src/tests/unit-tests/arithmetic/magnitude_squared_test.cc
@@ -42,8 +42,8 @@ DEFINE_int32(size_magnitude_test, 100000, "Size of the arrays used for magnitude
 
 TEST(MagnitudeSquaredTest, StandardCComplexImplementation)
 {
-    std::complex<float>* input = new std::complex<float>[FLAGS_size_magnitude_test];
-    float* output = new float[FLAGS_size_magnitude_test];
+    auto* input = new std::complex<float>[FLAGS_size_magnitude_test];
+    auto* output = new float[FLAGS_size_magnitude_test];
     unsigned int number = 0;
     std::chrono::time_point<std::chrono::system_clock> start, end;
     start = std::chrono::system_clock::now();
@@ -114,9 +114,9 @@ TEST(MagnitudeSquaredTest, ArmadilloComplexImplementation)
 
 TEST(MagnitudeSquaredTest, VolkComplexImplementation)
 {
-    std::complex<float>* input = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
+    auto* input = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
     std::fill_n(input, FLAGS_size_magnitude_test, std::complex<float>(0.0, 0.0));
-    float* output = static_cast<float*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(float), volk_gnsssdr_get_alignment()));
+    auto* output = static_cast<float*>(volk_gnsssdr_malloc(FLAGS_size_magnitude_test * sizeof(float), volk_gnsssdr_get_alignment()));
     std::chrono::time_point<std::chrono::system_clock> start, end;
     start = std::chrono::system_clock::now();
 
diff --git a/src/tests/unit-tests/arithmetic/multiply_test.cc b/src/tests/unit-tests/arithmetic/multiply_test.cc
index f4747431f..43a7e21ff 100644
--- a/src/tests/unit-tests/arithmetic/multiply_test.cc
+++ b/src/tests/unit-tests/arithmetic/multiply_test.cc
@@ -43,8 +43,8 @@ DEFINE_int32(size_multiply_test, 100000, "Size of the arrays used for multiply t
 
 TEST(MultiplyTest, StandardCDoubleImplementation)
 {
-    double* input = new double[FLAGS_size_multiply_test];
-    double* output = new double[FLAGS_size_multiply_test];
+    auto* input = new double[FLAGS_size_multiply_test];
+    auto* output = new double[FLAGS_size_multiply_test];
     std::fill_n(input, FLAGS_size_multiply_test, 0.0);
     std::chrono::time_point<std::chrono::system_clock> start, end;
     start = std::chrono::system_clock::now();
@@ -95,8 +95,8 @@ TEST(MultiplyTest, ArmadilloImplementation)
 
 TEST(MultiplyTest, StandardCComplexImplementation)
 {
-    std::complex<float>* input = new std::complex<float>[FLAGS_size_multiply_test];
-    std::complex<float>* output = new std::complex<float>[FLAGS_size_multiply_test];
+    auto* input = new std::complex<float>[FLAGS_size_multiply_test];
+    auto* output = new std::complex<float>[FLAGS_size_multiply_test];
     std::fill_n(input, FLAGS_size_multiply_test, std::complex<float>(0.0, 0.0));
     std::chrono::time_point<std::chrono::system_clock> start, end;
     start = std::chrono::system_clock::now();
@@ -174,8 +174,8 @@ TEST(MultiplyTest, ArmadilloComplexImplementation)
 
 TEST(MultiplyTest, VolkComplexImplementation)
 {
-    std::complex<float>* input = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
-    std::complex<float>* output = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
+    auto* input = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
+    auto* output = static_cast<std::complex<float>*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(std::complex<float>), volk_gnsssdr_get_alignment()));
     std::fill_n(input, FLAGS_size_multiply_test, std::complex<float>(0.0, 0.0));
 
     std::chrono::time_point<std::chrono::system_clock> start, end;
@@ -190,10 +190,10 @@ TEST(MultiplyTest, VolkComplexImplementation)
               << " microseconds" << std::endl;
     ASSERT_LE(0, elapsed_seconds.count() * 1e6);
 
-    float* mag = static_cast<float*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(float), volk_gnsssdr_get_alignment()));
+    auto* mag = static_cast<float*>(volk_gnsssdr_malloc(FLAGS_size_multiply_test * sizeof(float), volk_gnsssdr_get_alignment()));
     volk_32fc_magnitude_32f(mag, output, FLAGS_size_multiply_test);
 
-    float* result = new float(0);
+    auto* result = new float(0);
     volk_32f_accumulator_s32f(result, mag, FLAGS_size_multiply_test);
     // Comparing floating-point numbers is tricky.
     // Due to round-off errors, it is very unlikely that two floating-points will match exactly.
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index 21967ff9e..8c1b365e9 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -35,6 +35,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -84,7 +85,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -104,8 +105,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo
 }
 
 GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -124,8 +124,7 @@ protected:
     }
 
     ~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 300f90f63..493e8f56f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -35,6 +35,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -85,7 +86,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pm
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -105,8 +106,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu
 }
 
 GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -125,8 +125,7 @@ protected:
     }
 
     ~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index 3657fa0f1..ad9332cc3 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -45,6 +45,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -93,7 +94,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events(pmt::p
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -113,8 +114,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit
 }
 
 GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -134,8 +134,7 @@ protected:
     }
 
     ~GalileoE1PcpsAmbiguousAcquisitionGSoCTest()
-    {
-    }
+    = default;
 
     void init();
     void start_queue();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index c76cc762e..ac68a9229 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -37,6 +37,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -87,7 +88,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -107,8 +108,7 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT
 
 
 GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -127,8 +127,7 @@ protected:
     }
 
     ~GalileoE1PcpsAmbiguousAcquisitionTest()
-    {
-    }
+    = default;
 
     void init();
     void plot_grid();
@@ -176,9 +175,9 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid()
 {
     //load the measured values
     std::string basename = "./tmp-acq-gal1/acquisition_E_1B";
-    unsigned int sat = static_cast<unsigned int>(gnss_synchro.PRN);
+    auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
 
-    unsigned int samples_per_code = static_cast<unsigned int>(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));  // !!
+    auto samples_per_code = static_cast<unsigned int>(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));  // !!
     acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code);
 
     if (!acq_dump.read_binary_acq()) std::cout << "Error reading files" << std::endl;
@@ -201,7 +200,7 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid()
                 {
                     boost::filesystem::path p(gnuplot_executable);
                     boost::filesystem::path dir = p.parent_path();
-                    std::string gnuplot_path = dir.native();
+                    const std::string& gnuplot_path = dir.native();
                     Gnuplot::set_GNUPlotPath(gnuplot_path);
 
                     Gnuplot g1("lines");
@@ -351,7 +350,7 @@ TEST_F(GalileoE1PcpsAmbiguousAcquisitionTest, ValidationOfResults)
     std::cout << "Doppler: " << gnss_synchro.Acq_doppler_hz << std::endl;
 
     double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples);
-    float delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000000);
+    auto delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000000);
     double doppler_error_hz = std::abs(expected_doppler_hz - gnss_synchro.Acq_doppler_hz);
 
     EXPECT_LE(doppler_error_hz, 166) << "Doppler error exceeds the expected value: 166 Hz = 2/(3*integration period)";
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index a8d818ff6..c87ebc536 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -36,6 +36,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -85,7 +86,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt:
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -105,8 +106,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous
 }
 
 GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -125,8 +125,7 @@ protected:
     }
 
     ~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index fa331c6dd..bc94b1f04 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -39,6 +39,7 @@
 #include <chrono>
 #include <fstream>
 #include <stdexcept>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -93,7 +94,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -114,8 +115,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic
 
 
 GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -133,8 +133,7 @@ protected:
         init();
     }
     ~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 7b3f8daf7..578cccf6a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -36,6 +36,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -87,7 +88,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_event
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -108,8 +109,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig
 
 
 GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx()
-{
-}
+= default;
 
 
 class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test : public ::testing::Test
@@ -126,8 +126,7 @@ protected:
     }
 
     ~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 7b1a6b975..76f5b5d29 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -33,6 +33,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -84,7 +85,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events(p
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -105,8 +106,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition
 
 
 GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx()
-{
-}
+= default;
 
 
 class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest : public ::testing::Test
@@ -122,8 +122,7 @@ protected:
     }
 
     ~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index 3e16bd39e..29cfd0068 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -35,6 +35,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -89,7 +90,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events(pmt::pmt_
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -110,8 +111,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201
 
 
 GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::~GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -125,13 +125,12 @@ protected:
         stop = false;
         message = 0;
         gnss_synchro = Gnss_Synchro();
-        acquisition = 0;
+        acquisition = nullptr;
         init();
     }
 
     ~GlonassL1CaPcpsAcquisitionGSoC2017Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
@@ -370,12 +369,12 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::wait_message()
         {
             acquisition->reset();
 
-            gettimeofday(&tv, NULL);
+            gettimeofday(&tv, nullptr);
             begin = tv.tv_sec * 1e6 + tv.tv_usec;
 
             channel_internal_queue.wait_and_pop(message);
 
-            gettimeofday(&tv, NULL);
+            gettimeofday(&tv, nullptr);
             end = tv.tv_sec * 1e6 + tv.tv_usec;
 
             mean_acq_time_us += (end - begin);
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 5ad20f059..0e82f6f03 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -35,6 +35,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -89,7 +90,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t ms
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -109,8 +110,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms
 }
 
 GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -124,13 +124,12 @@ protected:
         stop = false;
         message = 0;
         gnss_synchro = Gnss_Synchro();
-        acquisition = 0;
+        acquisition = nullptr;
         init();
     }
 
     ~GpsL1CaPcpsAcquisitionGSoC2013Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 6e5392296..48e1bda56 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -37,6 +37,7 @@
 #include <gnuradio/top_block.h>
 #include <chrono>
 #include <stdexcept>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -91,7 +92,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt:
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -112,8 +113,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit
 
 
 GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -131,8 +131,7 @@ protected:
     }
 
     ~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index efdc554e4..526bd3476 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -36,6 +36,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -87,7 +88,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -107,8 +108,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201
 }
 
 GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -125,8 +125,7 @@ protected:
     }
 
     ~GpsL1CaPcpsTongAcquisitionGSoC2013Test()
-    {
-    }
+    = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
index 074deea05..72522a769 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
@@ -43,8 +43,7 @@ protected:
         this->conf();
     }
     ~NmeaPrinterTest()
-    {
-    }
+    = default;
     void conf();
     rtk_t rtk;
 };
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc
index 748811a20..3da6e861f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc
@@ -61,7 +61,7 @@ public:
     }
 
 
-    void deinterleaver(int32_t rows, int32_t cols, double *in, double *out)
+    void deinterleaver(int32_t rows, int32_t cols, const double *in, double *out)
     {
         for (int32_t r = 0; r < rows; r++)
             {
@@ -76,7 +76,7 @@ public:
     bool decode_INAV_word(double *page_part_symbols, int32_t frame_length)
     {
         // 1. De-interleave
-        double *page_part_symbols_deint = static_cast<double *>(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment()));
+        auto *page_part_symbols_deint = static_cast<double *>(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment()));
         deinterleaver(GALILEO_INAV_INTERLEAVER_ROWS, GALILEO_INAV_INTERLEAVER_COLS, page_part_symbols, page_part_symbols_deint);
 
         // 2. Viterbi decoder
@@ -90,7 +90,7 @@ public:
                     }
             }
 
-        int32_t *page_part_bits = static_cast<int32_t *>(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+        auto *page_part_bits = static_cast<int32_t *>(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
 
         const int32_t CodeLength = 240;
         int32_t DataLength = (CodeLength / nn) - mm;
@@ -137,7 +137,7 @@ public:
     bool decode_FNAV_word(double *page_symbols, int32_t frame_length)
     {
         // 1. De-interleave
-        double *page_symbols_deint = static_cast<double *>(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment()));
+        auto *page_symbols_deint = static_cast<double *>(volk_gnsssdr_malloc(frame_length * sizeof(double), volk_gnsssdr_get_alignment()));
         deinterleaver(GALILEO_FNAV_INTERLEAVER_ROWS, GALILEO_FNAV_INTERLEAVER_COLS, page_symbols, page_symbols_deint);
 
         // 2. Viterbi decoder
@@ -150,7 +150,7 @@ public:
                         page_symbols_deint[i] = -page_symbols_deint[i];
                     }
             }
-        int32_t *page_bits = static_cast<int32_t *>(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+        auto *page_bits = static_cast<int32_t *>(volk_gnsssdr_malloc((frame_length / 2) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
 
         const int32_t CodeLength = 488;
         int32_t DataLength = (CodeLength / nn) - mm;
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc
index 29ffe6edd..1094fbd7f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc
@@ -66,8 +66,7 @@ protected:
     }
 
     ~GalileoE5aTrackingTest()
-    {
-    }
+    = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
index 6fbda7a6e..c8a6f94d0 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
@@ -46,6 +46,7 @@
 #include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -80,7 +81,7 @@ void GlonassL1CaDllPllCAidTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -98,8 +99,7 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_
 }
 
 GlonassL1CaDllPllCAidTrackingTest_msg_rx::~GlonassL1CaDllPllCAidTrackingTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -117,8 +117,7 @@ protected:
     }
 
     ~GlonassL1CaDllPllCAidTrackingTest()
-    {
-    }
+    = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
index c18809d5a..d83116a49 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
@@ -46,6 +46,7 @@
 #include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -81,7 +82,7 @@ void GlonassL1CaDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -99,8 +100,7 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g
 }
 
 GlonassL1CaDllPllTrackingTest_msg_rx::~GlonassL1CaDllPllTrackingTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -118,8 +118,7 @@ protected:
     }
 
     ~GlonassL1CaDllPllTrackingTest()
-    {
-    }
+    = default;
 
     void init();
 

From dfc963ad86bad5954a0ae4eebfe3f69cb39325ce Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 15:53:50 +0100
Subject: [PATCH 047/123] clang-tidy: apply readability-else-after-return check

See https://clang.llvm.org/extra/clang-tidy/checks/readability-else-after-return.html
---
 .../adapters/beidou_b1i_pcps_acquisition.cc   |  2 +-
 .../input_filter/adapters/fir_filter.cc       | 14 ++-----
 .../adapters/freq_xlating_fir_filter.cc       |  4 +-
 src/algorithms/libs/rtklib/rtklib_rtkcmn.cc   |  2 +-
 .../adapters/rtl_tcp_signal_source.cc         |  5 +--
 .../signal_source/libs/rtl_tcp_dongle_info.cc |  5 +--
 src/core/receiver/gnss_block_factory.cc       | 42 +++++++++----------
 .../galileo_fnav_inav_decoder_test.cc         |  5 +--
 8 files changed, 31 insertions(+), 48 deletions(-)

diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
index d2c8a99e2..733146e4a 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
@@ -315,7 +315,7 @@ gr::basic_block_sptr BeidouB1iPcpsAcquisition::get_left_block()
         {
             return acquisition_;
         }
-    else if (item_type_ == "cshort")
+    if (item_type_ == "cshort")
         {
             return acquisition_;
         }
diff --git a/src/algorithms/input_filter/adapters/fir_filter.cc b/src/algorithms/input_filter/adapters/fir_filter.cc
index b436b1407..48dfb4871 100644
--- a/src/algorithms/input_filter/adapters/fir_filter.cc
+++ b/src/algorithms/input_filter/adapters/fir_filter.cc
@@ -299,11 +299,8 @@ gr::basic_block_sptr FirFilter::get_left_block()
         {
             return cshort_to_float_x2_;
         }
-    else
-        {
-            return nullptr;
-            LOG(ERROR) << " Unknown item type conversion";
-        }
+    LOG(WARNING) << "Unknown item type conversion";
+    return nullptr;
 }
 
 
@@ -329,11 +326,8 @@ gr::basic_block_sptr FirFilter::get_right_block()
         {
             return float_to_complex_;
         }
-    else
-        {
-            return nullptr;
-            LOG(ERROR) << " unknown input filter item type";
-        }
+    LOG(WARNING) << "Unknown input filter taps item type";
+    return nullptr;
 }
 
 
diff --git a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
index 9e904d2e8..17ab25dab 100644
--- a/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
+++ b/src/algorithms/input_filter/adapters/freq_xlating_fir_filter.cc
@@ -339,7 +339,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_left_block()
         {
             return gr_char_to_short_;
         }
-    else if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte"))
+    if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte"))
         {
             return gr_char_to_short_;
         }
@@ -373,7 +373,7 @@ gr::basic_block_sptr FreqXlatingFirFilter::get_right_block()
         {
             return freq_xlating_fir_filter_scf_;
         }
-    else if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte"))
+    if ((taps_item_type_ == "float") && (input_item_type_ == "byte") && (output_item_type_ == "cbyte"))
         {
             return complex_to_complex_byte_;
         }
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
index a4a8d2673..03a391700 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
@@ -3653,7 +3653,7 @@ double satwavelen(int sat, int frq, const nav_t *nav)
                 return SPEED_OF_LIGHT / FREQ6; /* L6/LEX */
             if (frq == 4)
                 return SPEED_OF_LIGHT / FREQ7; /* E5b */
-            else if (frq == 5)
+            if (frq == 5)
                 return SPEED_OF_LIGHT / FREQ8; /* E5a+b */
             else if (frq == 6)
                 return SPEED_OF_LIGHT / FREQ9; /* S */
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
index 85f1a562f..bbd16d2ca 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@@ -215,8 +215,5 @@ gr::basic_block_sptr RtlTcpSignalSource::get_right_block()
         {
             return valve_;
         }
-    else
-        {
-            return signal_source_;
-        }
+    return signal_source_;
 }
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
index 6ad323015..c359b6d35 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
@@ -138,10 +138,7 @@ double rtl_tcp_dongle_info::clip_gain(int gain) const
                         {
                             return g;
                         }
-                    else
-                        {
-                            return last_stop;
-                        }
+                    return last_stop;
                 }
             last_stop = g;
         }
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index ac0bb8aad..e0e08a8c0 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -193,7 +193,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalSource(
                     role = "SignalSource" + std::to_string(ID);
                 }
         }
-    catch (const std::exception &e)
+    catch (const std::exception& e)
         {
             LOG(WARNING) << e.what();
         }
@@ -222,7 +222,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
                     role_resampler = "Resampler" + std::to_string(ID);
                 }
         }
-    catch (const std::exception &e)
+    catch (const std::exception& e)
         {
             LOG(WARNING) << e.what();
         }
@@ -259,16 +259,14 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalConditioner(
                 role_conditioner, "Signal_Conditioner"));
             return conditioner_;
         }
-    else
-        {
-            //single-antenna version
-            std::unique_ptr<GNSSBlockInterface> conditioner_(new SignalConditioner(configuration.get(),
-                GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1),
-                GetBlock(configuration, role_inputfilter, input_filter, 1, 1),
-                GetBlock(configuration, role_resampler, resampler, 1, 1),
-                role_conditioner, "Signal_Conditioner"));
-            return conditioner_;
-        }
+
+    //single-antenna version
+    std::unique_ptr<GNSSBlockInterface> conditioner_(new SignalConditioner(configuration.get(),
+        GetBlock(configuration, role_datatypeadapter, data_type_adapter, 1, 1),
+        GetBlock(configuration, role_inputfilter, input_filter, 1, 1),
+        GetBlock(configuration, role_resampler, resampler, 1, 1),
+        role_conditioner, "Signal_Conditioner"));
+    return conditioner_;
 }
 
 
@@ -1119,7 +1117,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
                     channel_absolute_id++;
                 }
         }
-    catch (const std::exception &e)
+    catch (const std::exception& e)
         {
             LOG(WARNING) << e.what();
         }
@@ -1162,7 +1160,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                     block = std::move(block_);
                 }
 
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1178,7 +1176,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                     block = std::move(block_);
                 }
 
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1193,7 +1191,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                         out_streams, queue));
                     block = std::move(block_);
                 }
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1208,7 +1206,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                         out_streams, queue));
                     block = std::move(block_);
                 }
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1222,7 +1220,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                         out_streams, queue));
                     block = std::move(block_);
                 }
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1237,7 +1235,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                         out_streams, queue));
                     block = std::move(block_);
                 }
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1251,7 +1249,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                         out_streams, queue));
                     block = std::move(block_);
                 }
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1265,7 +1263,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                         out_streams, queue));
                     block = std::move(block_);
                 }
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
@@ -1280,7 +1278,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                     block = std::move(block_);
                 }
 
-            catch (const std::exception &e)
+            catch (const std::exception& e)
                 {
                     std::cout << "GNSS-SDR program ended." << std::endl;
                     exit(1);
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc
index 3da6e861f..ae2416ec3 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/galileo_fnav_inav_decoder_test.cc
@@ -180,10 +180,7 @@ public:
                 std::cout << "Galileo E5a FNAV PAGE CRC correct \n";
                 return true;
             }
-        else
-            {
-                return false;
-            }
+        return false;
     }
 
     Galileo_FNAV_INAV_test()

From 45b4478047ec0e56cd90798ec3fc3103e9cc1cbb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 17:15:48 +0100
Subject: [PATCH 048/123] clang-tidy fixes

---
 src/algorithms/libs/rtcm.h                    |  8 ++++----
 src/core/libs/supl/asn-supl/GeneralizedTime.h | 10 +++++-----
 src/core/libs/supl/asn-supl/UTCTime.h         |  4 ++--
 src/core/libs/supl/asn-supl/ber_tlv_tag.h     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 77696cf88..64eeb2d26 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -605,14 +605,14 @@ private:
     class Rtcm_Listener_Room
     {
     public:
-        inline void join(std::shared_ptr<Rtcm_Listener> participant)
+        inline void join(const std::shared_ptr<Rtcm_Listener>& participant)
         {
             participants_.insert(participant);
             for (auto msg : recent_msgs_)
                 participant->deliver(msg);
         }
 
-        inline void leave(std::shared_ptr<Rtcm_Listener> participant)
+        inline void leave(const std::shared_ptr<Rtcm_Listener>& participant)
         {
             participants_.erase(participant);
         }
@@ -754,7 +754,7 @@ private:
             boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
             : io_context_(io_context), socket_(io_context)
         {
-            do_connect(endpoint_iterator);
+            do_connect(std::move(endpoint_iterator));
         }
 
         inline void close()
@@ -778,7 +778,7 @@ private:
     private:
         inline void do_connect(boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
         {
-            boost::asio::async_connect(socket_, endpoint_iterator,
+            boost::asio::async_connect(socket_, std::move(endpoint_iterator),
                 [this](boost::system::error_code ec, boost::asio::ip::tcp::resolver::iterator) {
                     if (!ec)
                         {
diff --git a/src/core/libs/supl/asn-supl/GeneralizedTime.h b/src/core/libs/supl/asn-supl/GeneralizedTime.h
index 9e9583c7a..657461d0f 100644
--- a/src/core/libs/supl/asn-supl/GeneralizedTime.h
+++ b/src/core/libs/supl/asn-supl/GeneralizedTime.h
@@ -34,11 +34,11 @@ extern "C"
  * instead of default local one.
  * On error returns -1 and errno set to EINVAL
  */
-    time_t asn_GT2time(const GeneralizedTime_t *, struct tm *_optional_tm4fill,
+    time_t asn_GT2time(const GeneralizedTime_t * /*st*/, struct tm *_optional_tm4fill,
         int as_gmt);
 
     /* A version of the above function also returning the fractions of seconds */
-    time_t asn_GT2time_frac(const GeneralizedTime_t *,
+    time_t asn_GT2time_frac(const GeneralizedTime_t * /*st*/,
         int *frac_value, int *frac_digits, /* (value / (10 ^ digits)) */
         struct tm *_optional_tm4fill, int as_gmt);
 
@@ -47,7 +47,7 @@ extern "C"
  * For example, parsing of the time ending with ".1" seconds
  * with frac_digits=3 (msec) would yield frac_value = 100.
  */
-    time_t asn_GT2time_prec(const GeneralizedTime_t *,
+    time_t asn_GT2time_prec(const GeneralizedTime_t * /*st*/,
         int *frac_value, int frac_digits,
         struct tm *_optional_tm4fill, int as_gmt);
 
@@ -59,9 +59,9 @@ extern "C"
  * On error, this function returns 0 and sets errno.
  */
     GeneralizedTime_t *asn_time2GT(GeneralizedTime_t *_optional_gt,
-        const struct tm *, int force_gmt);
+        const struct tm * /*tm*/, int force_gmt);
     GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *_optional_gt,
-        const struct tm *, int frac_value, int frac_digits, int force_gmt);
+        const struct tm * /*tm*/, int frac_value, int frac_digits, int force_gmt);
 
 #ifdef __cplusplus
 }
diff --git a/src/core/libs/supl/asn-supl/UTCTime.h b/src/core/libs/supl/asn-supl/UTCTime.h
index 53517fde6..477c7931d 100644
--- a/src/core/libs/supl/asn-supl/UTCTime.h
+++ b/src/core/libs/supl/asn-supl/UTCTime.h
@@ -27,10 +27,10 @@ extern "C"
     struct tm; /* <time.h> */
 
     /* See asn_GT2time() in GeneralizedTime.h */
-    time_t asn_UT2time(const UTCTime_t *, struct tm *_optional_tm4fill, int as_gmt);
+    time_t asn_UT2time(const UTCTime_t * /*st*/, struct tm *_optional_tm4fill, int as_gmt);
 
     /* See asn_time2GT() in GeneralizedTime.h */
-    UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm *, int force_gmt);
+    UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm * /*tm*/, int force_gmt);
 
 #ifdef __cplusplus
 }
diff --git a/src/core/libs/supl/asn-supl/ber_tlv_tag.h b/src/core/libs/supl/asn-supl/ber_tlv_tag.h
index 31b634345..c8361549a 100644
--- a/src/core/libs/supl/asn-supl/ber_tlv_tag.h
+++ b/src/core/libs/supl/asn-supl/ber_tlv_tag.h
@@ -34,7 +34,7 @@ extern "C"
  * Return values correspond to their libc counterparts (if any).
  */
     ssize_t ber_tlv_tag_snprint(ber_tlv_tag_t tag, char *buf, size_t buflen);
-    ssize_t ber_tlv_tag_fwrite(ber_tlv_tag_t tag, FILE *);
+    ssize_t ber_tlv_tag_fwrite(ber_tlv_tag_t tag, FILE * /*f*/);
     char *ber_tlv_tag_string(ber_tlv_tag_t tag);
 
 

From 0707963ab5de9b926fb140fac294cd129e0df8b6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 17:17:35 +0100
Subject: [PATCH 049/123] Use cstdint type names

---
 .../adapters/beidou_b1i_pcps_acquisition.cc   | 14 +++++-----
 .../adapters/beidou_b1i_pcps_acquisition.h    | 27 ++++++++++---------
 .../adapters/file_signal_source.cc            |  4 +--
 .../adapters/file_signal_source.h             |  6 ++---
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
index 733146e4a..84de3096b 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
@@ -81,7 +81,7 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
     dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
     acq_parameters.dump_filename = dump_filename_;
     //--- Find number of samples per spreading code -------------------------
-    code_length_ = static_cast<unsigned int>(std::round(static_cast<double>(fs_in_) / (BEIDOU_B1I_CODE_RATE_HZ / BEIDOU_B1I_CODE_LENGTH_CHIPS)));
+    code_length_ = static_cast<uint32_t>(std::round(static_cast<double>(fs_in_) / (BEIDOU_B1I_CODE_RATE_HZ / BEIDOU_B1I_CODE_LENGTH_CHIPS)));
 
     vector_length_ = code_length_ * sampled_ms_;
 
@@ -144,7 +144,7 @@ void BeidouB1iPcpsAcquisition::stop_acquisition()
 {
 }
 
-void BeidouB1iPcpsAcquisition::set_channel(unsigned int channel)
+void BeidouB1iPcpsAcquisition::set_channel(uint32_t channel)
 {
     channel_ = channel;
     acquisition_->set_channel(channel_);
@@ -170,7 +170,7 @@ void BeidouB1iPcpsAcquisition::set_threshold(float threshold)
 }
 
 
-void BeidouB1iPcpsAcquisition::set_doppler_max(unsigned int doppler_max)
+void BeidouB1iPcpsAcquisition::set_doppler_max(uint32_t doppler_max)
 {
     doppler_max_ = doppler_max;
 
@@ -178,7 +178,7 @@ void BeidouB1iPcpsAcquisition::set_doppler_max(unsigned int doppler_max)
 }
 
 
-void BeidouB1iPcpsAcquisition::set_doppler_step(unsigned int doppler_step)
+void BeidouB1iPcpsAcquisition::set_doppler_step(uint32_t doppler_step)
 {
     doppler_step_ = doppler_step;
 
@@ -213,7 +213,7 @@ void BeidouB1iPcpsAcquisition::set_local_code()
 
     beidou_b1i_code_gen_complex_sampled(code, gnss_synchro_->PRN, fs_in_, 0);
 
-    for (unsigned int i = 0; i < sampled_ms_; i++)
+    for (uint32_t i = 0; i < sampled_ms_; i++)
         {
             memcpy(&(code_[i * code_length_]), code,
                 sizeof(gr_complex) * code_length_);
@@ -239,7 +239,7 @@ void BeidouB1iPcpsAcquisition::set_state(int state)
 float BeidouB1iPcpsAcquisition::calculate_threshold(float pfa)
 {
     //Calculate the threshold
-    unsigned int frequency_bins = 0;
+    uint32_t frequency_bins = 0;
     /*
     for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_)
         {
@@ -250,7 +250,7 @@ float BeidouB1iPcpsAcquisition::calculate_threshold(float pfa)
     frequency_bins = (2 * doppler_max_ + doppler_step_) / doppler_step_;
 
     DLOG(INFO) << "Channel " << channel_ << "  Pfa = " << pfa;
-    unsigned int ncells = vector_length_ * frequency_bins;
+    uint32_t ncells = vector_length_ * frequency_bins;
     double exponent = 1 / static_cast<double>(ncells);
     double val = pow(1.0 - pfa, exponent);
     auto lambda = static_cast<double>(vector_length_);
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
index 13e623949..a0312ebe6 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
@@ -42,6 +42,7 @@
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <string>
+#include <cstdint>
 
 
 class ConfigurationInterface;
@@ -92,7 +93,7 @@ public:
     /*!
      * \brief Set acquisition channel unique ID
      */
-    void set_channel(unsigned int channel) override;
+    void set_channel(uint32_t channel) override;
 
     /*!
      * \brief Set statistics threshold of PCPS algorithm
@@ -102,12 +103,12 @@ public:
     /*!
      * \brief Set maximum Doppler off grid search
      */
-    void set_doppler_max(unsigned int doppler_max) override;
+    void set_doppler_max(uint32_t doppler_max) override;
 
     /*!
      * \brief Set Doppler steps for the grid search
      */
-    void set_doppler_step(unsigned int doppler_step) override;
+    void set_doppler_step(uint32_t doppler_step) override;
 
     /*!
      * \brief Initializes acquisition algorithm.
@@ -153,25 +154,25 @@ private:
     complex_byte_to_float_x2_sptr cbyte_to_float_x2_;
     size_t item_size_;
     std::string item_type_;
-    unsigned int vector_length_;
-    unsigned int code_length_;
+    uint32_t vector_length_;
+    uint32_t code_length_;
     bool bit_transition_flag_;
     bool use_CFAR_algorithm_flag_;
-    unsigned int channel_;
+    uint32_t channel_;
     float threshold_;
-    unsigned int doppler_max_;
-    unsigned int doppler_step_;
-    unsigned int sampled_ms_;
-    unsigned int max_dwells_;
-    long fs_in_;
+    uint32_t doppler_max_;
+    uint32_t doppler_step_;
+    uint32_t sampled_ms_;
+    uint32_t max_dwells_;
+    int64_t  fs_in_;
     bool dump_;
     bool blocking_;
     std::string dump_filename_;
     std::complex<float>* code_;
     Gnss_Synchro* gnss_synchro_;
     std::string role_;
-    unsigned int in_streams_;
-    unsigned int out_streams_;
+    uint32_t in_streams_;
+    uint32_t out_streams_;
 
     float calculate_threshold(float pfa);
 };
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc
index bc4fb6329..c3dbde10f 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@@ -55,8 +55,8 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
 
     double default_seconds_to_skip = 0.0;
     size_t header_size = 0;
-    samples_ = configuration->property(role + ".samples", 0);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
+    samples_ = configuration->property(role + ".samples", 0ULL);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.h b/src/algorithms/signal_source/adapters/file_signal_source.h
index 0d4658304..bfded2ce8 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/file_signal_source.h
@@ -97,19 +97,19 @@ public:
         return repeat_;
     }
 
-    inline long sampling_frequency() const
+    inline int64_t sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    inline long samples() const
+    inline uint64_t samples() const
     {
         return samples_;
     }
 
 private:
     uint64_t samples_;
-    long sampling_frequency_;
+    int64_t sampling_frequency_;
     std::string filename_;
     std::string item_type_;
     bool repeat_;

From 14fb555b3c8fd52abc0de56eb1d9f279dabc32b3 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 17:19:51 +0100
Subject: [PATCH 050/123] Remove modernize-deprecated-headers and
 modernize-use-using checks since they affect C code

---
 .clang-tidy | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index 2e3964f82..425050765 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,3 +1,4 @@
 ---
-Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-deprecated-headers,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,modernize-use-using,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
+Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
 HeaderFilterRegex: '.*'
+FormatStyle: 'file'

From 6abebac5ebeeb41157cf70f77dcc45959cc48277 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 17:51:20 +0100
Subject: [PATCH 051/123] Make use of cstdint type names

---
 .../pcps_acquisition_fine_doppler_cc.h               |  3 ++-
 .../input_filter/adapters/beamformer_filter.cc       |  2 +-
 .../input_filter/adapters/beamformer_filter.h        |  3 ++-
 .../signal_source/adapters/labsat_signal_source.cc   |  2 +-
 .../signal_source/adapters/labsat_signal_source.h    |  2 +-
 .../signal_source/adapters/nsr_file_signal_source.cc |  4 ++--
 .../signal_source/adapters/nsr_file_signal_source.h  | 12 ++++++------
 .../signal_source/adapters/rtl_tcp_signal_source.cc  | 10 +++++-----
 .../signal_source/adapters/rtl_tcp_signal_source.h   |  2 +-
 .../adapters/spir_file_signal_source.cc              |  4 ++--
 .../signal_source/adapters/spir_file_signal_source.h |  9 +++++----
 .../adapters/spir_gss6450_file_signal_source.cc      |  4 ++--
 .../adapters/spir_gss6450_file_signal_source.h       |  6 +++---
 .../signal_source/adapters/uhd_signal_source.cc      | 12 ++++++------
 .../signal_source/adapters/uhd_signal_source.h       |  3 ++-
 15 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
index 544aefc18..e414c6611 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.h
@@ -55,6 +55,7 @@
 #include <gnuradio/block.h>
 #include <gnuradio/fft/fft.h>
 #include <gnuradio/gr_complex.h>
+#include <cstdint>
 #include <fstream>
 #include <string>
 
@@ -86,7 +87,7 @@ private:
     bool start();
 
     Acq_Conf acq_parameters;
-    long d_fs_in;
+    int64_t d_fs_in;
     int d_samples_per_ms;
     int d_max_dwells;
     int d_gnuradio_forecast_samples;
diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.cc b/src/algorithms/input_filter/adapters/beamformer_filter.cc
index 52c19352d..dae0d1386 100644
--- a/src/algorithms/input_filter/adapters/beamformer_filter.cc
+++ b/src/algorithms/input_filter/adapters/beamformer_filter.cc
@@ -67,7 +67,7 @@ BeamformerFilter::BeamformerFilter(
             file_sink_ = gr::blocks::file_sink::make(item_size_, dump_filename_.c_str());
             DLOG(INFO) << "file_sink(" << file_sink_->unique_id() << ")";
         }
-    samples_ = 0;
+    samples_ = 0ULL;
     if (in_stream_ > 8)
         {
             LOG(ERROR) << "This implementation only supports eight input streams";
diff --git a/src/algorithms/input_filter/adapters/beamformer_filter.h b/src/algorithms/input_filter/adapters/beamformer_filter.h
index c97c32732..89df25223 100644
--- a/src/algorithms/input_filter/adapters/beamformer_filter.h
+++ b/src/algorithms/input_filter/adapters/beamformer_filter.h
@@ -34,6 +34,7 @@
 
 #include "gnss_block_interface.h"
 #include <gnuradio/hier_block2.h>
+#include <cstdint>
 #include <string>
 
 class ConfigurationInterface;
@@ -78,7 +79,7 @@ private:
     unsigned int out_stream_;
     std::string item_type_;
     size_t item_size_;
-    unsigned long long samples_;
+    uint64_t samples_;
     bool dump_;
     std::string dump_filename_;
     gr::block_sptr beamformer_;
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
index cf1278d9d..d88619cd9 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
@@ -50,7 +50,7 @@ LabsatSignalSource::LabsatSignalSource(ConfigurationInterface* configuration,
     int channel_selector = configuration->property(role + ".selected_channel", 1);
     std::string default_filename = "./example_capture.LS3";
 
-    samples_ = configuration->property(role + ".samples", 0);
+    samples_ = configuration->property(role + ".samples", 0ULL);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     if (item_type_ == "gr_complex")
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.h b/src/algorithms/signal_source/adapters/labsat_signal_source.h
index 8a36f8ad5..bf8f990ef 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.h
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.h
@@ -81,7 +81,7 @@ private:
     unsigned int out_stream_;
     std::string item_type_;
     size_t item_size_;
-    long samples_;
+    uint64_t samples_;
     std::string filename_;
     bool dump_;
     std::string dump_filename_;
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
index 60566ed5e..7fe8dbd8f 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
@@ -53,8 +53,8 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
     std::string default_item_type = "byte";
     std::string default_dump_filename = "../data/my_capture_dump.dat";
 
-    samples_ = configuration->property(role + ".samples", 0);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
+    samples_ = configuration->property(role + ".samples", 0ULL);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
index 89bc32ac0..a2b3ee547 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.h
@@ -96,27 +96,27 @@ public:
         return repeat_;
     }
 
-    inline long sampling_frequency() const
+    inline int64_t sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    inline long samples() const
+    inline uint64_t samples() const
     {
         return samples_;
     }
 
 private:
-    unsigned long long samples_;
-    long sampling_frequency_;
+    uint64_t samples_;
+    int64_t sampling_frequency_;
     std::string filename_;
     std::string item_type_;
     bool repeat_;
     bool dump_;
     std::string dump_filename_;
     std::string role_;
-    unsigned int in_streams_;
-    unsigned int out_streams_;
+    uint32_t in_streams_;
+    uint32_t out_streams_;
     gr::blocks::file_source::sptr file_source_;
     unpack_byte_2bit_samples_sptr unpack_byte_;
     boost::shared_ptr<gr::block> valve_;
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
index bbd16d2ca..4037de974 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@@ -57,7 +57,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration,
     std::string empty = "";
     std::string default_dump_file = "./data/signal_source.dat";
     std::string default_item_type = "gr_complex";
-    samples_ = configuration->property(role + ".samples", 0);
+    samples_ = configuration->property(role + ".samples", 0ULL);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename",
         default_dump_file);
@@ -122,7 +122,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration,
             item_size_ = sizeof(int16_t);
         }
 
-    if (samples_ != 0)
+    if (samples_ != 0ULL)
         {
             DLOG(INFO) << "Send STOP signal after " << samples_ << " samples";
             valve_ = gnss_sdr_make_valve(item_size_, samples_, queue_);
@@ -167,7 +167,7 @@ void RtlTcpSignalSource::MakeBlock()
 
 void RtlTcpSignalSource::connect(gr::top_block_sptr top_block)
 {
-    if (samples_)
+    if (samples_ != 0ULL)
         {
             top_block->connect(signal_source_, 0, valve_, 0);
             DLOG(INFO) << "connected rtl tcp source to valve";
@@ -187,7 +187,7 @@ void RtlTcpSignalSource::connect(gr::top_block_sptr top_block)
 
 void RtlTcpSignalSource::disconnect(gr::top_block_sptr top_block)
 {
-    if (samples_)
+    if (samples_ != 0ULL)
         {
             top_block->disconnect(signal_source_, 0, valve_, 0);
             if (dump_)
@@ -211,7 +211,7 @@ gr::basic_block_sptr RtlTcpSignalSource::get_left_block()
 
 gr::basic_block_sptr RtlTcpSignalSource::get_right_block()
 {
-    if (samples_ != 0)
+    if (samples_ != 0ULL)
         {
             return valve_;
         }
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
index 3a89bb088..74fdbf77a 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -105,7 +105,7 @@ private:
 
     std::string item_type_;
     size_t item_size_;
-    long samples_;
+    uint64_t samples_;
     bool dump_;
     std::string dump_filename_;
 
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
index d5692e434..2d4b96db5 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
@@ -52,8 +52,8 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration
     std::string default_item_type = "int";
     std::string default_dump_filename = "../data/my_capture_dump.dat";
 
-    samples_ = configuration->property(role + ".samples", 0);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
+    samples_ = configuration->property(role + ".samples", 0ULL);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
index 659f5b19a..ad76ce23b 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.h
@@ -39,6 +39,7 @@
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
+#include <cstdint>
 #include <string>
 
 class ConfigurationInterface;
@@ -93,19 +94,19 @@ public:
         return repeat_;
     }
 
-    inline long sampling_frequency() const
+    inline int64_t sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    inline long samples() const
+    inline uint64_t samples() const
     {
         return samples_;
     }
 
 private:
-    unsigned long long samples_;
-    long sampling_frequency_;
+    uint64_t samples_;
+    int64_t sampling_frequency_;
     std::string filename_;
     std::string item_type_;
     bool repeat_;
diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
index ff8f45411..e94a97fb6 100644
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
@@ -49,8 +49,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(ConfigurationInterface*
     std::string default_dump_filename = "../data/my_capture_dump.dat";
     item_type_ = "int";
 
-    samples_ = configuration->property(role + ".samples", 0);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0.0);
+    samples_ = configuration->property(role + ".samples", 0ULL);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
     filename_ = configuration->property(role + ".filename", default_filename);
     repeat_ = configuration->property(role + ".repeat", false);
     dump_ = configuration->property(role + ".dump", false);
diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
index 71eb9c9df..0757c24af 100644
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.h
@@ -97,19 +97,19 @@ public:
         return repeat_;
     }
 
-    inline long sampling_frequency() const
+    inline int64_t sampling_frequency() const
     {
         return sampling_frequency_;
     }
 
-    inline long samples() const
+    inline uint64_t samples() const
     {
         return samples_;
     }
 
 private:
     uint64_t samples_;
-    double sampling_frequency_;
+    int64_t sampling_frequency_;
     std::string filename_;
     bool repeat_;
     bool dump_;  //Enables dumping the gr_complex sample output
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
index 54a353837..46a48e45a 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@@ -77,7 +77,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
     if (RF_channels_ == 1)
         {
             // Single RF channel UHD operation (backward compatible config file format)
-            samples_.push_back(configuration->property(role + ".samples", 0));
+            samples_.push_back(configuration->property(role + ".samples", 0ULL));
             dump_.push_back(configuration->property(role + ".dump", false));
             dump_filename_.push_back(configuration->property(role + ".dump_filename", default_dump_file));
 
@@ -92,7 +92,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
             for (int i = 0; i < RF_channels_; i++)
                 {
                     // Single RF channel UHD operation (backward compatible config file format)
-                    samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0));
+                    samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0ULL));
                     dump_.push_back(configuration->property(role + ".dump" + std::to_string(i), false));
                     dump_filename_.push_back(configuration->property(role + ".dump_filename" + std::to_string(i), default_dump_file));
 
@@ -215,7 +215,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
 
     for (int i = 0; i < RF_channels_; i++)
         {
-            if (samples_.at(i) != 0)
+            if (samples_.at(i) != 0ULL)
                 {
                     LOG(INFO) << "RF_channel " << i << " Send STOP signal after " << samples_.at(i) << " samples";
                     valve_.push_back(gnss_sdr_make_valve(item_size_, samples_.at(i), queue_));
@@ -247,7 +247,7 @@ void UhdSignalSource::connect(gr::top_block_sptr top_block)
 {
     for (int i = 0; i < RF_channels_; i++)
         {
-            if (samples_.at(i) != 0)
+            if (samples_.at(i) != 0ULL)
                 {
                     top_block->connect(uhd_source_, i, valve_.at(i), 0);
                     DLOG(INFO) << "connected usrp source to valve RF Channel " << i;
@@ -273,7 +273,7 @@ void UhdSignalSource::disconnect(gr::top_block_sptr top_block)
 {
     for (int i = 0; i < RF_channels_; i++)
         {
-            if (samples_.at(i) != 0)
+            if (samples_.at(i) != 0ULL)
                 {
                     top_block->disconnect(uhd_source_, i, valve_.at(i), 0);
                     LOG(INFO) << "UHD source disconnected";
@@ -310,7 +310,7 @@ gr::basic_block_sptr UhdSignalSource::get_right_block()
 gr::basic_block_sptr UhdSignalSource::get_right_block(int RF_channel)
 {
     //TODO: There is a incoherence here: Multichannel UHD is a single block with multiple outputs, but if the sample limit is enabled, the output is a multiple block!
-    if (samples_.at(RF_channel) != 0)
+    if (samples_.at(RF_channel) != 0ULL)
         {
             return valve_.at(RF_channel);
         }
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.h b/src/algorithms/signal_source/adapters/uhd_signal_source.h
index 68d6e6b76..50d233c2e 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.h
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.h
@@ -37,6 +37,7 @@
 #include <gnuradio/hier_block2.h>
 #include <gnuradio/msg_queue.h>
 #include <gnuradio/uhd/usrp_source.h>
+#include <cstdint>
 #include <string>
 #include <vector>
 
@@ -99,7 +100,7 @@ private:
     std::vector<double> freq_;
     std::vector<double> gain_;
     std::vector<double> IF_bandwidth_hz_;
-    std::vector<long> samples_;
+    std::vector<uint64_t> samples_;
     std::vector<bool> dump_;
     std::vector<std::string> dump_filename_;
 

From c8ae93d2b845d21fcad57497785aa9b48bd2a6fd Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 18:36:12 +0100
Subject: [PATCH 052/123] Fix building

---
 src/algorithms/signal_source/adapters/file_signal_source.cc   | 2 +-
 src/algorithms/signal_source/adapters/labsat_signal_source.cc | 2 +-
 .../signal_source/adapters/nsr_file_signal_source.cc          | 4 ++--
 .../signal_source/adapters/rtl_tcp_signal_source.cc           | 2 +-
 .../signal_source/adapters/spir_file_signal_source.cc         | 4 ++--
 .../signal_source/adapters/spir_gss6450_file_signal_source.cc | 4 ++--
 src/algorithms/signal_source/adapters/uhd_signal_source.cc    | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc
index c3dbde10f..c6627d001 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@@ -55,7 +55,7 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
 
     double default_seconds_to_skip = 0.0;
     size_t header_size = 0;
-    samples_ = configuration->property(role + ".samples", 0ULL);
+    samples_ = configuration->property(role + ".samples", 0);
     sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
     filename_ = configuration->property(role + ".filename", default_filename);
 
diff --git a/src/algorithms/signal_source/adapters/labsat_signal_source.cc b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
index d88619cd9..cf1278d9d 100644
--- a/src/algorithms/signal_source/adapters/labsat_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/labsat_signal_source.cc
@@ -50,7 +50,7 @@ LabsatSignalSource::LabsatSignalSource(ConfigurationInterface* configuration,
     int channel_selector = configuration->property(role + ".selected_channel", 1);
     std::string default_filename = "./example_capture.LS3";
 
-    samples_ = configuration->property(role + ".samples", 0ULL);
+    samples_ = configuration->property(role + ".samples", 0);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     if (item_type_ == "gr_complex")
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
index 7fe8dbd8f..60566ed5e 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
@@ -53,8 +53,8 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
     std::string default_item_type = "byte";
     std::string default_dump_filename = "../data/my_capture_dump.dat";
 
-    samples_ = configuration->property(role + ".samples", 0ULL);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
+    samples_ = configuration->property(role + ".samples", 0);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
index 4037de974..a6f6db9ac 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@@ -57,7 +57,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration,
     std::string empty = "";
     std::string default_dump_file = "./data/signal_source.dat";
     std::string default_item_type = "gr_complex";
-    samples_ = configuration->property(role + ".samples", 0ULL);
+    samples_ = configuration->property(role + ".samples", 0);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename",
         default_dump_file);
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
index 2d4b96db5..d5692e434 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
@@ -52,8 +52,8 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration
     std::string default_item_type = "int";
     std::string default_dump_filename = "../data/my_capture_dump.dat";
 
-    samples_ = configuration->property(role + ".samples", 0ULL);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
+    samples_ = configuration->property(role + ".samples", 0);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
diff --git a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
index e94a97fb6..5b9534129 100644
--- a/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_gss6450_file_signal_source.cc
@@ -49,8 +49,8 @@ SpirGSS6450FileSignalSource::SpirGSS6450FileSignalSource(ConfigurationInterface*
     std::string default_dump_filename = "../data/my_capture_dump.dat";
     item_type_ = "int";
 
-    samples_ = configuration->property(role + ".samples", 0ULL);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
+    samples_ = configuration->property(role + ".samples", 0);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
     filename_ = configuration->property(role + ".filename", default_filename);
     repeat_ = configuration->property(role + ".repeat", false);
     dump_ = configuration->property(role + ".dump", false);
diff --git a/src/algorithms/signal_source/adapters/uhd_signal_source.cc b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
index 46a48e45a..1f551fa5d 100644
--- a/src/algorithms/signal_source/adapters/uhd_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/uhd_signal_source.cc
@@ -77,7 +77,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
     if (RF_channels_ == 1)
         {
             // Single RF channel UHD operation (backward compatible config file format)
-            samples_.push_back(configuration->property(role + ".samples", 0ULL));
+            samples_.push_back(configuration->property(role + ".samples", 0));
             dump_.push_back(configuration->property(role + ".dump", false));
             dump_filename_.push_back(configuration->property(role + ".dump_filename", default_dump_file));
 
@@ -92,7 +92,7 @@ UhdSignalSource::UhdSignalSource(ConfigurationInterface* configuration,
             for (int i = 0; i < RF_channels_; i++)
                 {
                     // Single RF channel UHD operation (backward compatible config file format)
-                    samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0ULL));
+                    samples_.push_back(configuration->property(role + ".samples" + std::to_string(i), 0));
                     dump_.push_back(configuration->property(role + ".dump" + std::to_string(i), false));
                     dump_filename_.push_back(configuration->property(role + ".dump_filename" + std::to_string(i), default_dump_file));
 

From 071915407c2927d104ec8782ff7847122a8db764 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 18:36:59 +0100
Subject: [PATCH 053/123] Use empty() instead of size() == 0

---
 src/tests/common-files/gnuplot_i.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 7ef3acad8..5944d01c3 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -861,7 +861,7 @@ Gnuplot &Gnuplot::plot_xy_err(const X &x,
     const E &dy,
     const std::string &title)
 {
-    if (x.size() == 0 || y.size() == 0 || dy.size() == 0)
+    if (x.empty() || y.empty() || dy.empty())
         {
             throw GnuplotException("std::vectors too small");
             return *this;

From 8c0051ca0b19d79a1c02b5e430a6fefc5b21222d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 18:38:42 +0100
Subject: [PATCH 054/123] Apply clang-tidy checks

---
 .../acquisition/acq_performance_test.cc       |  87 +++++++------
 .../glonass_l1_ca_pcps_acquisition_test.cc    |   9 +-
 .../gps_l2_m_pcps_acquisition_test.cc         |  17 ++-
 .../observables/hybrid_observables_test.cc    | 116 +++++++++---------
 .../pvt/rtklib_solver_test.cc                 |  42 +++----
 .../gps_l1_ca_telemetry_decoder_test.cc       |  16 ++-
 .../gps_l1_ca_dll_pll_tracking_test.cc        |  25 ++--
 .../tracking/gps_l1_ca_kf_tracking_test.cc    |  15 ++-
 .../gps_l2_m_dll_pll_tracking_test.cc         |   9 +-
 .../tracking/tracking_pull-in_test.cc         |  45 ++++---
 10 files changed, 185 insertions(+), 196 deletions(-)

diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
index 56c7411e4..63368b59d 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -52,6 +52,7 @@
 #include <gnuradio/blocks/interleaved_char_to_complex.h>
 #include <gnuradio/blocks/skiphead.h>
 #include <gnuradio/top_block.h>
+#include <utility>
 
 
 DEFINE_string(config_file_ptest, std::string(""), "File containing alternative configuration parameters for the acquisition performance test.");
@@ -120,7 +121,7 @@ void AcqPerfTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
             channel_internal_queue.push(rx_message);
         }
@@ -141,8 +142,7 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(concurrent_queue<int>& queue) : gr::block
 
 
 AcqPerfTest_msg_rx::~AcqPerfTest_msg_rx()
-{
-}
+= default;
 
 // -----------------------------------------
 
@@ -173,21 +173,21 @@ protected:
                 cn0_vector = {0.0};
             }
 
-        if (implementation.compare("GPS_L1_CA_PCPS_Acquisition") == 0)
+        if (implementation == "GPS_L1_CA_PCPS_Acquisition")
             {
                 signal_id = "1C";
                 system_id = 'G';
                 coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
                 min_integration_ms = 1;
             }
-        else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition_Fine_Doppler") == 0)
+        else if (implementation == "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler")
             {
                 signal_id = "1C";
                 system_id = 'G';
                 coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
                 min_integration_ms = 1;
             }
-        else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0)
+        else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition")
             {
                 signal_id = "1B";
                 system_id = 'E';
@@ -201,21 +201,21 @@ protected:
                         coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
                     }
             }
-        else if (implementation.compare("GLONASS_L1_CA_PCPS_Acquisition") == 0)
+        else if (implementation == "GLONASS_L1_CA_PCPS_Acquisition")
             {
                 signal_id = "1G";
                 system_id = 'R';
                 coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
                 min_integration_ms = 1;
             }
-        else if (implementation.compare("GLONASS_L2_CA_PCPS_Acquisition") == 0)
+        else if (implementation == "GLONASS_L2_CA_PCPS_Acquisition")
             {
                 signal_id = "2G";
                 system_id = 'R';
                 coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
                 min_integration_ms = 1;
             }
-        else if (implementation.compare("GPS_L2_M_PCPS_Acquisition") == 0)
+        else if (implementation == "GPS_L2_M_PCPS_Acquisition")
             {
                 signal_id = "2S";
                 system_id = 'G';
@@ -229,14 +229,14 @@ protected:
                     }
                 min_integration_ms = 20;
             }
-        else if (implementation.compare("Galileo_E5a_Pcps_Acquisition") == 0)
+        else if (implementation == "Galileo_E5a_Pcps_Acquisition")
             {
                 signal_id = "5X";
                 system_id = 'E';
                 coherent_integration_time_ms = FLAGS_acq_test_coherent_time_ms;
                 min_integration_ms = 1;
             }
-        else if (implementation.compare("GPS_L5i_PCPS_Acquisition") == 0)
+        else if (implementation == "GPS_L5i_PCPS_Acquisition")
             {
                 signal_id = "L5";
                 system_id = 'G';
@@ -265,7 +265,7 @@ protected:
             }
         else
             {
-                float aux = static_cast<float>(FLAGS_acq_test_threshold_init);
+                auto aux = static_cast<float>(FLAGS_acq_test_threshold_init);
                 pfa_vector.push_back(aux);
                 aux = aux + static_cast<float>(FLAGS_acq_test_threshold_step);
                 while (aux <= static_cast<float>(FLAGS_acq_test_threshold_final))
@@ -296,8 +296,7 @@ protected:
     }
 
     ~AcquisitionPerformanceTest()
-    {
-    }
+    = default;
 
     std::vector<double> cn0_vector;
     std::vector<float> pfa_vector;
@@ -450,7 +449,7 @@ int AcquisitionPerformanceTest::generate_signal()
     pid_t wait_result;
     int child_status;
     std::cout << "Generating signal for " << p6 << "..." << std::endl;
-    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], &p6[0], NULL};
+    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], &p6[0], nullptr};
 
     int pid;
     if ((pid = fork()) == -1)
@@ -539,12 +538,12 @@ int AcquisitionPerformanceTest::configure_receiver(double cn0, float pfa, unsign
             config->set_property("Acquisition.dump_channel", std::to_string(dump_channel));
             config->set_property("Acquisition.blocking_on_standby", "true");
 
-            config_f = 0;
+            config_f = nullptr;
         }
     else
         {
             config_f = std::make_shared<FileConfiguration>(FLAGS_config_file_ptest);
-            config = 0;
+            config = nullptr;
         }
     return 0;
 }
@@ -576,35 +575,35 @@ int AcquisitionPerformanceTest::run_receiver()
 
     int nsamples = floor(config->property("GNSS-SDR.internal_fs_sps", 2000000) * generated_signal_duration_s);
     boost::shared_ptr<gr::block> valve = gnss_sdr_make_valve(sizeof(gr_complex), nsamples, queue);
-    if (implementation.compare("GPS_L1_CA_PCPS_Acquisition") == 0)
+    if (implementation == "GPS_L1_CA_PCPS_Acquisition")
         {
             acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L1_CA_PCPS_Acquisition_Fine_Doppler") == 0)
+    else if (implementation == "GPS_L1_CA_PCPS_Acquisition_Fine_Doppler")
         {
             acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFineDoppler>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("Galileo_E1_PCPS_Ambiguous_Acquisition") == 0)
+    else if (implementation == "Galileo_E1_PCPS_Ambiguous_Acquisition")
         {
             acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GLONASS_L1_CA_PCPS_Acquisition") == 0)
+    else if (implementation == "GLONASS_L1_CA_PCPS_Acquisition")
         {
             acquisition = std::make_shared<GlonassL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GLONASS_L2_CA_PCPS_Acquisition") == 0)
+    else if (implementation == "GLONASS_L2_CA_PCPS_Acquisition")
         {
             acquisition = std::make_shared<GlonassL2CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L2_M_PCPS_Acquisition") == 0)
+    else if (implementation == "GPS_L2_M_PCPS_Acquisition")
         {
             acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("Galileo_E5a_Pcps_Acquisition") == 0)
+    else if (implementation == "Galileo_E5a_Pcps_Acquisition")
         {
             acquisition = std::make_shared<GalileoE5aPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L5i_PCPS_Acquisition") == 0)
+    else if (implementation == "GPS_L5i_PCPS_Acquisition")
         {
             acquisition = std::make_shared<GpsL5iPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
@@ -649,12 +648,12 @@ int AcquisitionPerformanceTest::count_executions(const std::string& basename, un
     char buffer[1024];
     fp = popen(&argum2[0], "r");
     int num_executions = 1;
-    if (fp == NULL)
+    if (fp == nullptr)
         {
             std::cout << "Failed to run command: " << argum2 << std::endl;
             return 0;
         }
-    while (fgets(buffer, sizeof(buffer), fp) != NULL)
+    while (fgets(buffer, sizeof(buffer), fp) != nullptr)
         {
             std::string aux = std::string(buffer);
             EXPECT_EQ(aux.empty(), false);
@@ -682,7 +681,7 @@ void AcquisitionPerformanceTest::plot_results()
                         {
                             boost::filesystem::path p(gnuplot_executable);
                             boost::filesystem::path dir = p.parent_path();
-                            std::string gnuplot_path = dir.native();
+                            const std::string& gnuplot_path = dir.native();
                             Gnuplot::set_GNUPlotPath(gnuplot_path);
 
                             Gnuplot g1("linespoints");
@@ -696,7 +695,7 @@ void AcquisitionPerformanceTest::plot_results()
                                 }
                             g1.cmd("set font \"Times,18\"");
                             g1.set_title("Receiver Operating Characteristic for GPS L1 C/A acquisition");
-                            g1.cmd("set label 1 \"" + std::string("Coherent integration time: ") + std::to_string(config->property("Acquisition.coherent_integration_time_ms", 1)) + " ms, Non-coherent integrations: " + std::to_string(config->property("Acquisition.max_dwells", 1)) + " \" at screen 0.12, 0.83 font \"Times,16\"");
+                            g1.cmd("set label 1 \"" + std::string("Coherent integration time: ") + std::to_string(config->property("Acquisition.coherent_integration_time_ms", 1)) + " ms, Non-coherent integrations: " + std::to_string(config->property("Acquisition.max_dwells", 1)) + R"( " at screen 0.12, 0.83 font "Times,16")");
                             g1.cmd("set logscale x");
                             g1.cmd("set yrange [0:1]");
                             g1.cmd("set xrange[0.0001:1]");
@@ -732,7 +731,7 @@ void AcquisitionPerformanceTest::plot_results()
                                 }
                             g2.cmd("set font \"Times,18\"");
                             g2.set_title("Receiver Operating Characteristic for GPS L1 C/A valid acquisition");
-                            g2.cmd("set label 1 \"" + std::string("Coherent integration time: ") + std::to_string(config->property("Acquisition.coherent_integration_time_ms", 1)) + " ms, Non-coherent integrations: " + std::to_string(config->property("Acquisition.max_dwells", 1)) + " \" at screen  0.12, 0.83 font \"Times,16\"");
+                            g2.cmd("set label 1 \"" + std::string("Coherent integration time: ") + std::to_string(config->property("Acquisition.coherent_integration_time_ms", 1)) + " ms, Non-coherent integrations: " + std::to_string(config->property("Acquisition.max_dwells", 1)) + R"( " at screen  0.12, 0.83 font "Times,16")");
                             g2.cmd("set logscale x");
                             g2.cmd("set yrange [0:1]");
                             g2.cmd("set xrange[0.0001:1]");
@@ -778,13 +777,13 @@ TEST_F(AcquisitionPerformanceTest, ROC)
     ASSERT_TRUE(boost::filesystem::create_directory(path_str, ec)) << "Could not create the " << path_str << " folder.";
 
     unsigned int cn0_index = 0;
-    for (std::vector<double>::const_iterator it = cn0_vector.cbegin(); it != cn0_vector.cend(); ++it)
+    for (double it : cn0_vector)
         {
             std::vector<double> meas_Pd_;
             std::vector<double> meas_Pd_correct_;
             std::vector<double> meas_Pfa_;
 
-            if (FLAGS_acq_test_input_file.empty()) std::cout << "Execution for CN0 = " << *it << " dB-Hz" << std::endl;
+            if (FLAGS_acq_test_input_file.empty()) std::cout << "Execution for CN0 = " << it << " dB-Hz" << std::endl;
 
             // Do N_iterations of the experiment
             for (int pfa_iter = 0; pfa_iter < static_cast<int>(pfa_vector.size()); pfa_iter++)
@@ -799,7 +798,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                         }
 
                     // Configure the signal generator
-                    if (FLAGS_acq_test_input_file.empty()) configure_generator(*it);
+                    if (FLAGS_acq_test_input_file.empty()) configure_generator(it);
 
                     for (int iter = 0; iter < N_iterations; iter++)
                         {
@@ -819,13 +818,13 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                                     init();
 
                                     // Configure the receiver
-                                    configure_receiver(*it, pfa_vector[pfa_iter], iter);
+                                    configure_receiver(it, pfa_vector[pfa_iter], iter);
 
                                     // Run it
                                     run_receiver();
 
                                     // count executions
-                                    std::string basename = path_str + std::string("/acquisition_") + std::to_string(*it) + "_" + std::to_string(iter) + "_" + std::to_string(pfa_vector[pfa_iter]) + "_" + gnss_synchro.System + "_" + signal_id;
+                                    std::string basename = path_str + std::string("/acquisition_") + std::to_string(it) + "_" + std::to_string(iter) + "_" + std::to_string(pfa_vector[pfa_iter]) + "_" + gnss_synchro.System + "_" + signal_id;
                                     int num_executions = count_executions(basename, observed_satellite);
 
                                     // Read measured data
@@ -968,7 +967,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                                                 {
                                                     meas_Pd_.push_back(0.0);
                                                 }
-                                            std::cout << TEXT_BOLD_BLACK << "Probability of detection for channel=" << ch << ", CN0=" << *it << " dBHz"
+                                            std::cout << TEXT_BOLD_BLACK << "Probability of detection for channel=" << ch << ", CN0=" << it << " dBHz"
                                                       << ": " << (num_executions > 0 ? computed_Pd : 0.0) << TEXT_RESET << std::endl;
                                         }
                                     if (num_clean_executions > 0)
@@ -985,7 +984,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                                                 }
                                             double computed_Pd_correct = correctly_detected / static_cast<double>(num_clean_executions);
                                             meas_Pd_correct_.push_back(computed_Pd_correct);
-                                            std::cout << TEXT_BOLD_BLACK << "Probability of correct detection for channel=" << ch << ", CN0=" << *it << " dBHz"
+                                            std::cout << TEXT_BOLD_BLACK << "Probability of correct detection for channel=" << ch << ", CN0=" << it << " dBHz"
                                                       << ": " << computed_Pd_correct << TEXT_RESET << std::endl;
                                         }
                                     else
@@ -1003,7 +1002,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                                                         {
                                                             meas_Pfa_.push_back(0.0);
                                                         }
-                                                    std::cout << TEXT_BOLD_BLACK << "Probability of false alarm for channel=" << ch << ", CN0=" << *it << " dBHz"
+                                                    std::cout << TEXT_BOLD_BLACK << "Probability of false alarm for channel=" << ch << ", CN0=" << it << " dBHz"
                                                               << ": " << (num_executions > 0 ? computed_Pfa : 0.0) << TEXT_RESET << std::endl;
                                                 }
                                         }
@@ -1014,14 +1013,14 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                     float sum_pd = static_cast<float>(std::accumulate(meas_Pd_.begin(), meas_Pd_.end(), 0.0));
                     float sum_pd_correct = static_cast<float>(std::accumulate(meas_Pd_correct_.begin(), meas_Pd_correct_.end(), 0.0));
                     float sum_pfa = static_cast<float>(std::accumulate(meas_Pfa_.begin(), meas_Pfa_.end(), 0.0));
-                    if (meas_Pd_.size() > 0 and meas_Pfa_.size() > 0)
+                    if (!meas_Pd_.empty() and !meas_Pfa_.empty())
                         {
                             Pd[cn0_index][pfa_iter] = sum_pd / static_cast<float>(meas_Pd_.size());
                             Pfa[cn0_index][pfa_iter] = sum_pfa / static_cast<float>(meas_Pfa_.size());
                         }
                     else
                         {
-                            if (meas_Pd_.size() > 0)
+                            if (!meas_Pd_.empty())
                                 {
                                     Pd[cn0_index][pfa_iter] = sum_pd / static_cast<float>(meas_Pd_.size());
                                 }
@@ -1029,7 +1028,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                                 {
                                     Pd[cn0_index][pfa_iter] = 0.0;
                                 }
-                            if (meas_Pfa_.size() > 0)
+                            if (!meas_Pfa_.empty())
                                 {
                                     Pfa[cn0_index][pfa_iter] = sum_pfa / static_cast<float>(meas_Pfa_.size());
                                 }
@@ -1038,7 +1037,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                                     Pfa[cn0_index][pfa_iter] = 0.0;
                                 }
                         }
-                    if (meas_Pd_correct_.size() > 0)
+                    if (!meas_Pd_correct_.empty())
                         {
                             Pd_correct[cn0_index][pfa_iter] = sum_pd_correct / static_cast<float>(meas_Pd_correct_.size());
                         }
@@ -1055,9 +1054,9 @@ TEST_F(AcquisitionPerformanceTest, ROC)
 
     // Compute results
     unsigned int aux_index = 0;
-    for (std::vector<double>::const_iterator it = cn0_vector.cbegin(); it != cn0_vector.cend(); ++it)
+    for (double it : cn0_vector)
         {
-            std::cout << "Results for CN0 = " << *it << " dBHz:" << std::endl;
+            std::cout << "Results for CN0 = " << it << " dBHz:" << std::endl;
             std::cout << "Pd = ";
             for (int pfa_iter = 0; pfa_iter < num_thresholds; pfa_iter++)
                 {
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
index 9fca76da0..c1d5bd419 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
@@ -37,6 +37,7 @@
 #include <gnuradio/top_block.h>
 #include <chrono>
 #include <cstdlib>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -84,7 +85,7 @@ void GlonassL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -104,8 +105,7 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() :
 
 
 GlonassL1CaPcpsAcquisitionTest_msg_rx::~GlonassL1CaPcpsAcquisitionTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -122,8 +122,7 @@ protected:
     }
 
     ~GlonassL1CaPcpsAcquisitionTest()
-    {
-    }
+    = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
index f2d5e8e41..0305870db 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
@@ -37,6 +37,7 @@
 #include <gnuradio/blocks/file_source.h>
 #include <gnuradio/top_block.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -87,7 +88,7 @@ void GpsL2MPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast &e)
@@ -105,8 +106,7 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block
 }
 
 GpsL2MPcpsAcquisitionTest_msg_rx::~GpsL2MPcpsAcquisitionTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -127,8 +127,7 @@ protected:
     }
 
     ~GpsL2MPcpsAcquisitionTest()
-    {
-    }
+    = default;
 
     void init();
     void plot_grid();
@@ -181,9 +180,9 @@ void GpsL2MPcpsAcquisitionTest::plot_grid()
 {
     //load the measured values
     std::string basename = "./tmp-acq-gps2/acquisition_test_G_2S";
-    unsigned int sat = static_cast<unsigned int>(gnss_synchro.PRN);
+    auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
 
-    unsigned int samples_per_code = static_cast<unsigned int>(floor(static_cast<double>(sampling_frequency_hz) / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS))));
+    auto samples_per_code = static_cast<unsigned int>(floor(static_cast<double>(sampling_frequency_hz) / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS))));
     acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
     if (!acq_dump.read_binary_acq()) std::cout << "Error reading files" << std::endl;
 
@@ -205,7 +204,7 @@ void GpsL2MPcpsAcquisitionTest::plot_grid()
                 {
                     boost::filesystem::path p(gnuplot_executable);
                     boost::filesystem::path dir = p.parent_path();
-                    std::string gnuplot_path = dir.native();
+                    const std::string& gnuplot_path = dir.native();
                     Gnuplot::set_GNUPlotPath(gnuplot_path);
 
                     Gnuplot g1("impulses");
@@ -362,7 +361,7 @@ TEST_F(GpsL2MPcpsAcquisitionTest, ValidationOfResults)
     ASSERT_EQ(1, msg_rx->rx_message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
 
     double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples);
-    float delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000);
+    auto delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000);
     double doppler_error_hz = std::abs(expected_doppler_hz - gnss_synchro.Acq_doppler_hz);
 
     EXPECT_LE(doppler_error_hz, 200) << "Doppler error exceeds the expected value: 2/(3*integration period)";
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
index feccb8105..10012705b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@@ -80,6 +80,7 @@
 #include <chrono>
 #include <exception>
 #include <unistd.h>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/filter/fir_filter_blk.h>
 #else
@@ -115,7 +116,7 @@ void HybridObservablesTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -133,8 +134,7 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid
 }
 
 HybridObservablesTest_msg_rx::~HybridObservablesTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -168,7 +168,7 @@ void HybridObservablesTest_tlm_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -186,8 +186,7 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block
 }
 
 HybridObservablesTest_tlm_msg_rx::~HybridObservablesTest_tlm_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -229,7 +228,7 @@ public:
         arma::mat& true_ch0,
         arma::vec& true_tow_s,
         arma::mat& measured_ch0,
-        std::string data_title);
+        const std::string& data_title);
     void check_results_carrier_phase_double_diff(
         arma::mat& true_ch0,
         arma::mat& true_ch1,
@@ -237,11 +236,11 @@ public:
         arma::vec& true_tow_ch1_s,
         arma::mat& measured_ch0,
         arma::mat& measured_ch1,
-        std::string data_title);
+        const std::string& data_title);
     void check_results_carrier_doppler(arma::mat& true_ch0,
         arma::vec& true_tow_s,
         arma::mat& measured_ch0,
-        std::string data_title);
+        const std::string& data_title);
     void check_results_carrier_doppler_double_diff(
         arma::mat& true_ch0,
         arma::mat& true_ch1,
@@ -249,7 +248,7 @@ public:
         arma::vec& true_tow_ch1_s,
         arma::mat& measured_ch0,
         arma::mat& measured_ch1,
-        std::string data_title);
+        const std::string& data_title);
     void check_results_code_pseudorange(
         arma::mat& true_ch0,
         arma::mat& true_ch1,
@@ -257,13 +256,13 @@ public:
         arma::vec& true_tow_ch1_s,
         arma::mat& measured_ch0,
         arma::mat& measured_ch1,
-        std::string data_title);
+        const std::string& data_title);
 
     void check_results_duplicated_satellite(
         arma::mat& measured_sat1,
         arma::mat& measured_sat2,
         int ch_id,
-        std::string data_title);
+        const std::string& data_title);
 
     HybridObservablesTest()
     {
@@ -280,8 +279,7 @@ public:
     }
 
     ~HybridObservablesTest()
-    {
-    }
+    = default;
 
     bool ReadRinexObs(std::vector<arma::mat>* obs_vec, Gnss_Synchro gnss);
 
@@ -328,7 +326,7 @@ int HybridObservablesTest::generate_signal()
 {
     int child_status;
 
-    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], NULL};
+    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], nullptr};
 
     int pid;
     if ((pid = fork()) == -1)
@@ -374,7 +372,7 @@ bool HybridObservablesTest::acquire_signal()
     std::string System_and_Signal;
     std::string signal;
     //create the correspondign acquisition block according to the desired tracking signal
-    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "1C";
@@ -386,7 +384,7 @@ bool HybridObservablesTest::acquire_signal()
             //acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFineDoppler>(config.get(), "Acquisition", 1, 0);
             acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "1B";
@@ -397,7 +395,7 @@ bool HybridObservablesTest::acquire_signal()
             config->set_property("Acquisition.max_dwells", std::to_string(FLAGS_external_signal_acquisition_dwells));
             acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L2_M_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L2_M_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "2S";
@@ -408,7 +406,7 @@ bool HybridObservablesTest::acquire_signal()
             config->set_property("Acquisition.max_dwells", std::to_string(FLAGS_external_signal_acquisition_dwells));
             acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "5X";
@@ -424,7 +422,7 @@ bool HybridObservablesTest::acquire_signal()
             acquisition = std::make_shared<GalileoE5aNoncoherentIQAcquisitionCaf>(config.get(), "Acquisition", 1, 0);
         }
 
-    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "5X";
@@ -435,7 +433,7 @@ bool HybridObservablesTest::acquire_signal()
             config->set_property("Acquisition.max_dwells", std::to_string(FLAGS_external_signal_acquisition_dwells));
             acquisition = std::make_shared<GalileoE5aPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "L5";
@@ -641,7 +639,7 @@ bool HybridObservablesTest::acquire_signal()
     std::cout << "Total signal acquisition run time "
               << elapsed_seconds.count()
               << " [seconds]" << std::endl;
-    if (gnss_synchro_vec.size() > 0)
+    if (!gnss_synchro_vec.empty())
         {
             return true;
         }
@@ -684,7 +682,7 @@ void HybridObservablesTest::configure_receiver(
     config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(baseband_sampling_freq));
 
     std::string System_and_Signal;
-    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking")
         {
             gnss_synchro_master.System = 'G';
             std::string signal = "1C";
@@ -697,7 +695,7 @@ void HybridObservablesTest::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "GPS_L1_CA_Telemetry_Decoder");
         }
-    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
         {
             gnss_synchro_master.System = 'E';
             std::string signal = "1B";
@@ -713,7 +711,7 @@ void HybridObservablesTest::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "Galileo_E1B_Telemetry_Decoder");
         }
-    else if (implementation.compare("GPS_L2_M_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L2_M_DLL_PLL_Tracking")
         {
             gnss_synchro_master.System = 'G';
             std::string signal = "2S";
@@ -726,7 +724,7 @@ void HybridObservablesTest::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "GPS_L2C_Telemetry_Decoder");
         }
-    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking") == 0 or implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking" or implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
         {
             gnss_synchro_master.System = 'E';
             std::string signal = "5X";
@@ -734,7 +732,7 @@ void HybridObservablesTest::configure_receiver(
             const char* str = signal.c_str();                                     // get a C style null terminated string
             std::memcpy(static_cast<void*>(gnss_synchro_master.Signal), str, 3);  // copy string into synchro char array: 2 char + null
 
-            if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+            if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
                 {
                     config->supersede_property("Tracking.implementation", std::string("Galileo_E5a_DLL_PLL_Tracking"));
                 }
@@ -744,7 +742,7 @@ void HybridObservablesTest::configure_receiver(
 
             config->set_property("TelemetryDecoder.implementation", "Galileo_E5a_Telemetry_Decoder");
         }
-    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking")
         {
             gnss_synchro_master.System = 'G';
             std::string signal = "L5";
@@ -784,7 +782,7 @@ void HybridObservablesTest::check_results_carrier_phase(
     arma::mat& true_ch0,
     arma::vec& true_tow_s,
     arma::mat& measured_ch0,
-    std::string data_title)
+    const std::string& data_title)
 {
     //1. True value interpolation to match the measurement times
 
@@ -865,7 +863,7 @@ void HybridObservablesTest::check_results_carrier_phase_double_diff(
     arma::vec& true_tow_ch1_s,
     arma::mat& measured_ch0,
     arma::mat& measured_ch1,
-    std::string data_title)
+    const std::string& data_title)
 {
     //1. True value interpolation to match the measurement times
 
@@ -956,7 +954,7 @@ void HybridObservablesTest::check_results_carrier_doppler_double_diff(
     arma::vec& true_tow_ch1_s,
     arma::mat& measured_ch0,
     arma::mat& measured_ch1,
-    std::string data_title)
+    const std::string& data_title)
 {
     //1. True value interpolation to match the measurement times
 
@@ -1044,7 +1042,7 @@ void HybridObservablesTest::check_results_carrier_doppler(
     arma::mat& true_ch0,
     arma::vec& true_tow_s,
     arma::mat& measured_ch0,
-    std::string data_title)
+    const std::string& data_title)
 {
     //1. True value interpolation to match the measurement times
 
@@ -1122,7 +1120,7 @@ void HybridObservablesTest::check_results_duplicated_satellite(
     arma::mat& measured_sat1,
     arma::mat& measured_sat2,
     int ch_id,
-    std::string data_title)
+    const std::string& data_title)
 {
     //1. True value interpolation to match the measurement times
 
@@ -1377,8 +1375,8 @@ bool HybridObservablesTest::save_mat_xy(std::vector<double>& x, std::vector<doub
             matvar_t* matvar;
             filename.append(".mat");
             std::cout << "save_mat_xy write " << filename << std::endl;
-            matfp = Mat_CreateVer(filename.c_str(), NULL, MAT_FT_MAT5);
-            if (reinterpret_cast<int64_t*>(matfp) != NULL)
+            matfp = Mat_CreateVer(filename.c_str(), nullptr, MAT_FT_MAT5);
+            if (reinterpret_cast<int64_t*>(matfp) != nullptr)
                 {
                     size_t dims[2] = {1, x.size()};
                     matvar = Mat_VarCreate("x", MAT_C_DOUBLE, MAT_T_DOUBLE, 2, dims, &x[0], 0);
@@ -1410,7 +1408,7 @@ void HybridObservablesTest::check_results_code_pseudorange(
     arma::vec& true_tow_ch1_s,
     arma::mat& measured_ch0,
     arma::mat& measured_ch1,
-    std::string data_title)
+    const std::string& data_title)
 {
     //1. True value interpolation to match the measurement times
 
@@ -1534,7 +1532,7 @@ bool HybridObservablesTest::ReadRinexObs(std::vector<arma::mat>* obs_vec, Gnss_S
                             gpstk::CommonTime time = r_ref_data.time;
                             double sow(static_cast<gpstk::GPSWeekSecond>(time).sow);
 
-                            gpstk::Rinex3ObsData::DataMap::iterator pointer = r_ref_data.obs.find(prn);
+                            auto pointer = r_ref_data.obs.find(prn);
                             if (pointer == r_ref_data.obs.end())
                                 {
                                     // PRN not present; do nothing
@@ -1679,7 +1677,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
         FLAGS_high_dyn);
 
 
-    for (unsigned int n = 0; n < gnss_synchro_vec.size(); n++)
+    for (auto & n : gnss_synchro_vec)
         {
             //setup the signal synchronization, simulating an acquisition
             if (!FLAGS_enable_external_signal_file)
@@ -1689,9 +1687,9 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
                     std::vector<std::shared_ptr<tracking_true_obs_reader>> true_reader_vec;
                     //read true data from the generator logs
                     true_reader_vec.push_back(std::make_shared<tracking_true_obs_reader>());
-                    std::cout << "Loading true observable data for PRN " << gnss_synchro_vec.at(n).PRN << std::endl;
+                    std::cout << "Loading true observable data for PRN " << n.PRN << std::endl;
                     std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
-                    true_obs_file.append(std::to_string(gnss_synchro_vec.at(n).PRN));
+                    true_obs_file.append(std::to_string(n.PRN));
                     true_obs_file.append(".dat");
                     ASSERT_NO_THROW({
                         if (true_reader_vec.back()->open_obs_file(true_obs_file) == false)
@@ -1713,17 +1711,17 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
 
                     std::cout << "Initial Doppler [Hz]=" << true_reader_vec.back()->doppler_l1_hz << " Initial code delay [Chips]="
                               << true_reader_vec.back()->prn_delay_chips << std::endl;
-                    gnss_synchro_vec.at(n).Acq_delay_samples = (GPS_L1_CA_CODE_LENGTH_CHIPS - true_reader_vec.back()->prn_delay_chips / GPS_L1_CA_CODE_LENGTH_CHIPS) * baseband_sampling_freq * GPS_L1_CA_CODE_PERIOD;
-                    gnss_synchro_vec.at(n).Acq_doppler_hz = true_reader_vec.back()->doppler_l1_hz;
-                    gnss_synchro_vec.at(n).Acq_samplestamp_samples = 0;
+                    n.Acq_delay_samples = (GPS_L1_CA_CODE_LENGTH_CHIPS - true_reader_vec.back()->prn_delay_chips / GPS_L1_CA_CODE_LENGTH_CHIPS) * baseband_sampling_freq * GPS_L1_CA_CODE_PERIOD;
+                    n.Acq_doppler_hz = true_reader_vec.back()->doppler_l1_hz;
+                    n.Acq_samplestamp_samples = 0;
                 }
             else
                 {
                     //based on the signal acquisition process
-                    std::cout << "Estimated Initial Doppler " << gnss_synchro_vec.at(n).Acq_doppler_hz
-                              << " [Hz], estimated Initial code delay " << gnss_synchro_vec.at(n).Acq_delay_samples << " [Samples]"
-                              << " Acquisition SampleStamp is " << gnss_synchro_vec.at(n).Acq_samplestamp_samples << std::endl;
-                    gnss_synchro_vec.at(n).Acq_samplestamp_samples = 0;
+                    std::cout << "Estimated Initial Doppler " << n.Acq_doppler_hz
+                              << " [Hz], estimated Initial code delay " << n.Acq_delay_samples << " [Samples]"
+                              << " Acquisition SampleStamp is " << n.Acq_samplestamp_samples << std::endl;
+                    n.Acq_samplestamp_samples = 0;
                 }
         }
 
@@ -1777,10 +1775,10 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
     //Observables
     std::shared_ptr<ObservablesInterface> observables(new HybridObservables(config.get(), "Observables", tracking_ch_vec.size() + 1, tracking_ch_vec.size()));
 
-    for (unsigned int n = 0; n < tracking_ch_vec.size(); n++)
+    for (auto & n : tracking_ch_vec)
         {
             ASSERT_NO_THROW({
-                tracking_ch_vec.at(n)->connect(top_block);
+                n->connect(top_block);
             }) << "Failure connecting tracking to the top_block.";
         }
 
@@ -1817,9 +1815,9 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
         file_source->seek(2 * FLAGS_skip_samples, 0);  //skip head. ibyte, two bytes per complex sample
     }) << "Failure connecting the blocks.";
 
-    for (unsigned int n = 0; n < tracking_ch_vec.size(); n++)
+    for (auto & n : tracking_ch_vec)
         {
-            tracking_ch_vec.at(n)->start_tracking();
+            n->start_tracking();
         }
 
     EXPECT_NO_THROW({
@@ -1844,7 +1842,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
                     }
             }) << "Failure opening true observables file";
 
-            unsigned int nepoch = static_cast<unsigned int>(true_observables.num_epochs());
+            auto nepoch = static_cast<unsigned int>(true_observables.num_epochs());
 
             std::cout << "True observation epochs = " << nepoch << std::endl;
 
@@ -1892,7 +1890,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
             }
     }) << "Failure opening dump observables file";
 
-    unsigned int nepoch = static_cast<unsigned int>(estimated_observables.num_epochs());
+    auto nepoch = static_cast<unsigned int>(estimated_observables.num_epochs());
     std::cout << "Measured observations epochs = " << nepoch << std::endl;
 
     // Matrices for storing columnwise measured RX_time, TOW, Doppler, Carrier phase and Pseudorange
@@ -1923,12 +1921,12 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
 
     //Cut measurement tail zeros
     arma::uvec index;
-    for (unsigned int n = 0; n < measured_obs_vec.size(); n++)
+    for (auto & n : measured_obs_vec)
         {
-            index = arma::find(measured_obs_vec.at(n).col(0) > 0.0, 1, "last");
-            if ((index.size() > 0) and index(0) < (nepoch - 1))
+            index = arma::find(n.col(0) > 0.0, 1, "last");
+            if ((!index.empty()) and index(0) < (nepoch - 1))
                 {
-                    measured_obs_vec.at(n).shed_rows(index(0) + 1, nepoch - 1);
+                    n.shed_rows(index(0) + 1, nepoch - 1);
                 }
         }
 
@@ -1937,7 +1935,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
     for (unsigned int n = 0; n < measured_obs_vec.size(); n++)
         {
             index = arma::find(measured_obs_vec.at(n).col(0) >= (measured_obs_vec.at(n)(0, 0) + initial_transitory_s), 1, "first");
-            if ((index.size() > 0) and (index(0) > 0))
+            if ((!index.empty()) and (index(0) > 0))
                 {
                     measured_obs_vec.at(n).shed_rows(0, index(0));
                 }
@@ -1945,7 +1943,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
             if (!FLAGS_duplicated_satellites_test)
                 {
                     index = arma::find(measured_obs_vec.at(n).col(0) >= true_obs_vec.at(n)(0, 0), 1, "first");
-                    if ((index.size() > 0) and (index(0) > 0))
+                    if ((!index.empty()) and (index(0) > 0))
                         {
                             measured_obs_vec.at(n).shed_rows(0, index(0));
                         }
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
index d4ae24ba8..2bf2b0a12 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
@@ -58,11 +58,11 @@ rtk_t configure_rtklib_options()
     int positioning_mode = -1;
     std::string default_pos_mode("Single");
     std::string positioning_mode_str = configuration->property(role + ".positioning_mode", default_pos_mode); /* (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h */
-    if (positioning_mode_str.compare("Single") == 0) positioning_mode = PMODE_SINGLE;
-    if (positioning_mode_str.compare("Static") == 0) positioning_mode = PMODE_STATIC;
-    if (positioning_mode_str.compare("Kinematic") == 0) positioning_mode = PMODE_KINEMA;
-    if (positioning_mode_str.compare("PPP_Static") == 0) positioning_mode = PMODE_PPP_STATIC;
-    if (positioning_mode_str.compare("PPP_Kinematic") == 0) positioning_mode = PMODE_PPP_KINEMA;
+    if (positioning_mode_str == "Single") positioning_mode = PMODE_SINGLE;
+    if (positioning_mode_str == "Static") positioning_mode = PMODE_STATIC;
+    if (positioning_mode_str == "Kinematic") positioning_mode = PMODE_KINEMA;
+    if (positioning_mode_str == "PPP_Static") positioning_mode = PMODE_PPP_STATIC;
+    if (positioning_mode_str == "PPP_Kinematic") positioning_mode = PMODE_PPP_KINEMA;
 
     if (positioning_mode == -1)
         {
@@ -107,12 +107,12 @@ rtk_t configure_rtklib_options()
     std::string default_iono_model("OFF");
     std::string iono_model_str = configuration->property(role + ".iono_model", default_iono_model); /*  (IONOOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
     int iono_model = -1;
-    if (iono_model_str.compare("OFF") == 0) iono_model = IONOOPT_OFF;
-    if (iono_model_str.compare("Broadcast") == 0) iono_model = IONOOPT_BRDC;
-    if (iono_model_str.compare("SBAS") == 0) iono_model = IONOOPT_SBAS;
-    if (iono_model_str.compare("Iono-Free-LC") == 0) iono_model = IONOOPT_IFLC;
-    if (iono_model_str.compare("Estimate_STEC") == 0) iono_model = IONOOPT_EST;
-    if (iono_model_str.compare("IONEX") == 0) iono_model = IONOOPT_TEC;
+    if (iono_model_str == "OFF") iono_model = IONOOPT_OFF;
+    if (iono_model_str == "Broadcast") iono_model = IONOOPT_BRDC;
+    if (iono_model_str == "SBAS") iono_model = IONOOPT_SBAS;
+    if (iono_model_str == "Iono-Free-LC") iono_model = IONOOPT_IFLC;
+    if (iono_model_str == "Estimate_STEC") iono_model = IONOOPT_EST;
+    if (iono_model_str == "IONEX") iono_model = IONOOPT_TEC;
     if (iono_model == -1)
         {
             //warn user and set the default
@@ -126,11 +126,11 @@ rtk_t configure_rtklib_options()
     std::string default_trop_model("OFF");
     int trop_model = -1;
     std::string trop_model_str = configuration->property(role + ".trop_model", default_trop_model); /*  (TROPOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
-    if (trop_model_str.compare("OFF") == 0) trop_model = TROPOPT_OFF;
-    if (trop_model_str.compare("Saastamoinen") == 0) trop_model = TROPOPT_SAAS;
-    if (trop_model_str.compare("SBAS") == 0) trop_model = TROPOPT_SBAS;
-    if (trop_model_str.compare("Estimate_ZTD") == 0) trop_model = TROPOPT_EST;
-    if (trop_model_str.compare("Estimate_ZTD_Grad") == 0) trop_model = TROPOPT_ESTG;
+    if (trop_model_str == "OFF") trop_model = TROPOPT_OFF;
+    if (trop_model_str == "Saastamoinen") trop_model = TROPOPT_SAAS;
+    if (trop_model_str == "SBAS") trop_model = TROPOPT_SBAS;
+    if (trop_model_str == "Estimate_ZTD") trop_model = TROPOPT_EST;
+    if (trop_model_str == "Estimate_ZTD_Grad") trop_model = TROPOPT_ESTG;
     if (trop_model == -1)
         {
             //warn user and set the default
@@ -175,11 +175,11 @@ rtk_t configure_rtklib_options()
     std::string default_gps_ar("Continuous");
     std::string integer_ambiguity_resolution_gps_str = configuration->property(role + ".AR_GPS", default_gps_ar); /* Integer Ambiguity Resolution mode for GPS (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */
     int integer_ambiguity_resolution_gps = -1;
-    if (integer_ambiguity_resolution_gps_str.compare("OFF") == 0) integer_ambiguity_resolution_gps = ARMODE_OFF;
-    if (integer_ambiguity_resolution_gps_str.compare("Continuous") == 0) integer_ambiguity_resolution_gps = ARMODE_CONT;
-    if (integer_ambiguity_resolution_gps_str.compare("Instantaneous") == 0) integer_ambiguity_resolution_gps = ARMODE_INST;
-    if (integer_ambiguity_resolution_gps_str.compare("Fix-and-Hold") == 0) integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
-    if (integer_ambiguity_resolution_gps_str.compare("PPP-AR") == 0) integer_ambiguity_resolution_gps = ARMODE_PPPAR;
+    if (integer_ambiguity_resolution_gps_str == "OFF") integer_ambiguity_resolution_gps = ARMODE_OFF;
+    if (integer_ambiguity_resolution_gps_str == "Continuous") integer_ambiguity_resolution_gps = ARMODE_CONT;
+    if (integer_ambiguity_resolution_gps_str == "Instantaneous") integer_ambiguity_resolution_gps = ARMODE_INST;
+    if (integer_ambiguity_resolution_gps_str == "Fix-and-Hold") integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
+    if (integer_ambiguity_resolution_gps_str == "PPP-AR") integer_ambiguity_resolution_gps = ARMODE_PPPAR;
     if (integer_ambiguity_resolution_gps == -1)
         {
             //warn user and set the default
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
index 4f5da024e..518472edd 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -38,6 +38,7 @@
 #include <exception>
 #include <string>
 #include <unistd.h>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -91,7 +92,7 @@ void GpsL1CADllPllTelemetryDecoderTest_msg_rx::msg_handler_events(pmt::pmt_t msg
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -109,8 +110,7 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_
 }
 
 GpsL1CADllPllTelemetryDecoderTest_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -144,7 +144,7 @@ void GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::msg_handler_events(pmt::pmt_t
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -162,8 +162,7 @@ GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::GpsL1CADllPllTelemetryDecoderTest_
 }
 
 GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -200,8 +199,7 @@ public:
     }
 
     ~GpsL1CATelemetryDecoderTest()
-    {
-    }
+    = default;
 
     void configure_receiver();
 
@@ -238,7 +236,7 @@ int GpsL1CATelemetryDecoderTest::generate_signal()
 {
     int child_status;
 
-    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], NULL};
+    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], nullptr};
 
     int pid;
     if ((pid = fork()) == -1)
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
index 58fd52407..b9750b5e3 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@@ -52,6 +52,7 @@
 #include <matio.h>
 #include <chrono>
 #include <unistd.h>
+#include <utility>
 #include <vector>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
@@ -89,7 +90,7 @@ void GpsL1CADllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;  //3 -> loss of lock
             //std::cout << "Received trk message: " << rx_message << std::endl;
         }
@@ -110,8 +111,7 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block
 
 
 GpsL1CADllPllTrackingTest_msg_rx::~GpsL1CADllPllTrackingTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -167,8 +167,7 @@ public:
     }
 
     ~GpsL1CADllPllTrackingTest()
-    {
-    }
+    = default;
 
     void configure_receiver(double PLL_wide_bw_hz,
         double DLL_wide_bw_hz,
@@ -210,7 +209,7 @@ int GpsL1CADllPllTrackingTest::generate_signal()
 {
     int child_status;
 
-    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], &p6[0], NULL};
+    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], &p6[0], nullptr};
 
     int pid;
     if ((pid = fork()) == -1)
@@ -730,7 +729,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
                                     double pull_in_offset_s = FLAGS_skip_trk_transitory_s;
 
                                     arma::uvec initial_meas_point = arma::find(trk_timestamp_s >= (true_timestamp_s(0) + pull_in_offset_s), 1, "first");
-                                    if (initial_meas_point.size() > 0 and tracking_last_msg != 3)
+                                    if (!initial_meas_point.empty() and tracking_last_msg != 3)
                                         {
                                             trk_timestamp_s = trk_timestamp_s.subvec(initial_meas_point(0), trk_timestamp_s.size() - 1);
                                             trk_acc_carrier_phase_cycles = trk_acc_carrier_phase_cycles.subvec(initial_meas_point(0), trk_acc_carrier_phase_cycles.size() - 1);
@@ -750,9 +749,9 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
                                             rmse_doppler.push_back(rmse);
 
                                             code_phase_error_chips = check_results_codephase(true_timestamp_s, true_prn_delay_chips, trk_timestamp_s, trk_prn_delay_chips, mean_error, std_dev_error, rmse);
-                                            for (unsigned int ii = 0; ii < code_phase_error_chips.size(); ii++)
+                                            for (double code_phase_error_chip : code_phase_error_chips)
                                                 {
-                                                    code_phase_error_meters.push_back(GPS_L1_CA_CHIP_PERIOD * code_phase_error_chips.at(ii) * GPS_C_m_s);
+                                                    code_phase_error_meters.push_back(GPS_L1_CA_CHIP_PERIOD * code_phase_error_chip * GPS_C_m_s);
                                                 }
                                             mean_code_phase_error.push_back(mean_error);
                                             std_dev_code_phase_error.push_back(std_dev_error);
@@ -821,9 +820,9 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
                                 {
                                     boost::filesystem::path p(gnuplot_executable);
                                     boost::filesystem::path dir = p.parent_path();
-                                    std::string gnuplot_path = dir.native();
+                                    const std::string& gnuplot_path = dir.native();
                                     Gnuplot::set_GNUPlotPath(gnuplot_path);
-                                    unsigned int decimate = static_cast<unsigned int>(FLAGS_plot_decimate);
+                                    auto decimate = static_cast<unsigned int>(FLAGS_plot_decimate);
 
                                     if (FLAGS_plot_detail_level >= 2)
                                         {
@@ -1165,8 +1164,8 @@ bool GpsL1CADllPllTrackingTest::save_mat_xy(std::vector<double>& x, std::vector<
             matvar_t* matvar;
             filename.erase(filename.length() - 4, 4);
             filename.append(".mat");
-            matfp = Mat_CreateVer(filename.c_str(), NULL, MAT_FT_MAT73);
-            if (reinterpret_cast<int64_t*>(matfp) != NULL)
+            matfp = Mat_CreateVer(filename.c_str(), nullptr, MAT_FT_MAT73);
+            if (reinterpret_cast<int64_t*>(matfp) != nullptr)
                 {
                     size_t dims[2] = {1, x.size()};
                     matvar = Mat_VarCreate("x", MAT_C_DOUBLE, MAT_T_DOUBLE, 2, dims, &x[0], 0);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
index 96c84302f..341185dad 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
@@ -51,6 +51,7 @@
 #include <gtest/gtest.h>
 #include <chrono>
 #include <unistd.h>
+#include <utility>
 #include <vector>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
@@ -91,7 +92,7 @@ void GpsL1CAKfTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            long int message = pmt::to_long(msg);
+            long int message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -111,8 +112,7 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C
 
 
 GpsL1CAKfTrackingTest_msg_rx::~GpsL1CAKfTrackingTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -158,8 +158,7 @@ public:
     }
 
     ~GpsL1CAKfTrackingTest()
-    {
-    }
+    = default;
 
     void configure_receiver();
 
@@ -196,7 +195,7 @@ int GpsL1CAKfTrackingTest::generate_signal()
 {
     int child_status;
 
-    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], NULL};
+    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], nullptr};
 
     int pid;
     if ((pid = fork()) == -1)
@@ -528,7 +527,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults)
                         {
                             boost::filesystem::path p(gnuplot_executable);
                             boost::filesystem::path dir = p.parent_path();
-                            std::string gnuplot_path = dir.native();
+                            const std::string& gnuplot_path = dir.native();
                             Gnuplot::set_GNUPlotPath(gnuplot_path);
 
                             std::vector<double> timevec;
@@ -544,7 +543,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults)
                             g1.set_xlabel("Time [s]");
                             g1.set_ylabel("Correlators' output");
                             g1.cmd("set key box opaque");
-                            unsigned int decimate = static_cast<unsigned int>(FLAGS_plot_decimate);
+                            auto decimate = static_cast<unsigned int>(FLAGS_plot_decimate);
                             g1.plot_xy(timevec, prompt, "Prompt", decimate);
                             g1.plot_xy(timevec, early, "Early", decimate);
                             g1.plot_xy(timevec, late, "Late", decimate);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
index d56f2f3ab..fe9cd4c85 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
@@ -46,6 +46,7 @@
 #include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
 #include <chrono>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -83,7 +84,7 @@ void GpsL2MDllPllTrackingTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast& e)
@@ -103,8 +104,7 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block("
 
 
 GpsL2MDllPllTrackingTest_msg_rx::~GpsL2MDllPllTrackingTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -121,8 +121,7 @@ protected:
     }
 
     ~GpsL2MDllPllTrackingTest()
-    {
-    }
+    = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
index 2d9861d6f..e64973c8f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
@@ -67,6 +67,7 @@
 #include <gtest/gtest.h>
 #include <chrono>
 #include <cstdint>
+#include <utility>
 #include <vector>
 #ifdef GR_GREATER_38
 #include <gnuradio/filter/fir_filter_blk.h>
@@ -105,7 +106,7 @@ void TrackingPullInTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;  //3 -> loss of lock
             //std::cout << "Received trk message: " << rx_message << std::endl;
         }
@@ -126,8 +127,7 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull
 
 
 TrackingPullInTest_msg_rx::~TrackingPullInTest_msg_rx()
-{
-}
+= default;
 
 
 // ###########################################################
@@ -203,8 +203,7 @@ public:
     }
 
     ~TrackingPullInTest()
-    {
-    }
+    = default;
 
     void configure_receiver(double PLL_wide_bw_hz,
         double DLL_wide_bw_hz,
@@ -249,7 +248,7 @@ int TrackingPullInTest::generate_signal()
 {
     int child_status;
 
-    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], &p6[0], NULL};
+    char* const parmList[] = {&generator_binary[0], &generator_binary[0], &p1[0], &p2[0], &p3[0], &p4[0], &p5[0], &p6[0], nullptr};
 
     int pid;
     if ((pid = fork()) == -1)
@@ -290,7 +289,7 @@ void TrackingPullInTest::configure_receiver(
     config->set_property("GNSS-SDR.internal_fs_sps", std::to_string(baseband_sampling_freq));
 
     std::string System_and_Signal;
-    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking")
         {
             gnss_synchro.System = 'G';
             std::string signal = "1C";
@@ -299,7 +298,7 @@ void TrackingPullInTest::configure_receiver(
             config->set_property("Tracking.early_late_space_chips", "0.5");
             config->set_property("Tracking.early_late_space_narrow_chips", "0.5");
         }
-    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
         {
             gnss_synchro.System = 'E';
             std::string signal = "1B";
@@ -311,7 +310,7 @@ void TrackingPullInTest::configure_receiver(
             config->set_property("Tracking.very_early_late_space_narrow_chips", "0.6");
             config->set_property("Tracking.track_pilot", "true");
         }
-    else if (implementation.compare("GPS_L2_M_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L2_M_DLL_PLL_Tracking")
         {
             gnss_synchro.System = 'G';
             std::string signal = "2S";
@@ -320,13 +319,13 @@ void TrackingPullInTest::configure_receiver(
             config->set_property("Tracking.early_late_space_chips", "0.5");
             config->set_property("Tracking.track_pilot", "true");
         }
-    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking") == 0 or implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking" or implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
         {
             gnss_synchro.System = 'E';
             std::string signal = "5X";
             System_and_Signal = "Galileo E5a";
             signal.copy(gnss_synchro.Signal, 2, 0);
-            if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+            if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
                 {
                     config->supersede_property("Tracking.implementation", std::string("Galileo_E5a_DLL_PLL_Tracking"));
                 }
@@ -334,7 +333,7 @@ void TrackingPullInTest::configure_receiver(
             config->set_property("Tracking.track_pilot", "true");
             config->set_property("Tracking.order", "2");
         }
-    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking")
         {
             gnss_synchro.System = 'G';
             std::string signal = "L5";
@@ -394,7 +393,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
     std::string System_and_Signal;
     std::string signal;
     //create the correspondign acquisition block according to the desired tracking signal
-    if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
+    if (implementation == "GPS_L1_CA_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "1C";
@@ -406,7 +405,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
             //acquisition = std::make_shared<GpsL1CaPcpsAcquisitionFineDoppler>(config.get(), "Acquisition", 1, 0);
             acquisition = std::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
+    else if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "1B";
@@ -417,7 +416,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
             config->set_property("Acquisition.max_dwells", std::to_string(FLAGS_external_signal_acquisition_dwells));
             acquisition = std::make_shared<GalileoE1PcpsAmbiguousAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L2_M_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L2_M_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "2S";
@@ -428,7 +427,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
             config->set_property("Acquisition.max_dwells", std::to_string(FLAGS_external_signal_acquisition_dwells));
             acquisition = std::make_shared<GpsL2MPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking_b") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking_b")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "5X";
@@ -444,7 +443,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
             acquisition = std::make_shared<GalileoE5aNoncoherentIQAcquisitionCaf>(config.get(), "Acquisition", 1, 0);
         }
 
-    else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking") == 0)
+    else if (implementation == "Galileo_E5a_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'E';
             signal = "5X";
@@ -455,7 +454,7 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
             config->set_property("Acquisition.max_dwells", std::to_string(FLAGS_external_signal_acquisition_dwells));
             acquisition = std::make_shared<GalileoE5aPcpsAcquisition>(config.get(), "Acquisition", 1, 0);
         }
-    else if (implementation.compare("GPS_L5_DLL_PLL_Tracking") == 0)
+    else if (implementation == "GPS_L5_DLL_PLL_Tracking")
         {
             tmp_gnss_synchro.System = 'G';
             signal = "L5";
@@ -870,7 +869,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
                                         std::cout << " Waiting for valve...\n";
                                         //wait the valve message indicating the circulation of the amount of samples of the delay
                                         gr::message::sptr queue_message = queue->delete_head();
-                                        if (queue_message != 0)
+                                        if (queue_message != nullptr)
                                             {
                                                 control_messages_ = control_message_factory_->GetControlMessages(queue_message);
                                             }
@@ -965,9 +964,9 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
                                                 {
                                                     boost::filesystem::path p(gnuplot_executable);
                                                     boost::filesystem::path dir = p.parent_path();
-                                                    std::string gnuplot_path = dir.native();
+                                                    const std::string& gnuplot_path = dir.native();
                                                     Gnuplot::set_GNUPlotPath(gnuplot_path);
-                                                    unsigned int decimate = static_cast<unsigned int>(FLAGS_plot_decimate);
+                                                    auto decimate = static_cast<unsigned int>(FLAGS_plot_decimate);
 
                                                     if (FLAGS_plot_detail_level >= 2 and FLAGS_show_plots)
                                                         {
@@ -989,7 +988,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
                                                             g1.plot_xy(trk_timestamp_s, prompt, "Prompt", decimate);
                                                             g1.plot_xy(trk_timestamp_s, early, "Early", decimate);
                                                             g1.plot_xy(trk_timestamp_s, late, "Late", decimate);
-                                                            if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
+                                                            if (implementation == "Galileo_E1_DLL_PLL_VEML_Tracking")
                                                                 {
                                                                     g1.plot_xy(trk_timestamp_s, v_early, "Very Early", decimate);
                                                                     g1.plot_xy(trk_timestamp_s, v_late, "Very Late", decimate);
@@ -1099,7 +1098,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
                 {
                     g4.disablescreen();
                 }
-            g4.cmd("set palette defined ( 0 \"black\", 1 \"green\" )");
+            g4.cmd(R"(set palette defined ( 0 "black", 1 "green" ))");
             g4.cmd("set key off");
             g4.cmd("set view map");
             std::string title;

From d8eaa98e064b869717a6e83c4cc54c4dabcb476d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 19:27:14 +0100
Subject: [PATCH 055/123] Fix building

---
 src/algorithms/signal_source/adapters/file_signal_source.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc
index c6627d001..bc4fb6329 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@@ -56,7 +56,7 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
     double default_seconds_to_skip = 0.0;
     size_t header_size = 0;
     samples_ = configuration->property(role + ".samples", 0);
-    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0LL);
+    sampling_frequency_ = configuration->property(role + ".sampling_frequency", 0);
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present

From 73b734190414d38d685d7633ea095b3fa3c86cf2 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 21:13:02 +0100
Subject: [PATCH 056/123] clang-tidy: apply
 readability-braces-around-statements plus code formatting

See http://releases.llvm.org/7.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/readability-braces-around-statements.html
Code formatting applied with:
  find ../src/ -iname *.h -o -iname *.cc | xargs clang-format -i
---
 src/algorithms/PVT/adapters/rtklib_pvt.cc     |  316 +++-
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      |   51 +-
 src/algorithms/PVT/libs/geojson_printer.cc    |    5 +-
 src/algorithms/PVT/libs/gpx_printer.cc        |   10 +-
 src/algorithms/PVT/libs/kml_printer.cc        |   10 +-
 src/algorithms/PVT/libs/ls_pvt.cc             |    5 +-
 src/algorithms/PVT/libs/nmea_printer.cc       |   27 +-
 src/algorithms/PVT/libs/rinex_printer.cc      |  515 ++++--
 src/algorithms/PVT/libs/rinex_printer.h       |   44 +-
 src/algorithms/PVT/libs/rtcm_printer.cc       |   17 +-
 src/algorithms/PVT/libs/rtklib_solver.cc      |   20 +-
 .../adapters/beidou_b1i_pcps_acquisition.cc   |    5 +-
 .../adapters/beidou_b1i_pcps_acquisition.h    |    4 +-
 ...lileo_e1_pcps_8ms_ambiguous_acquisition.cc |   10 +-
 .../galileo_e1_pcps_ambiguous_acquisition.cc  |   10 +-
 ...eo_e1_pcps_cccwsr_ambiguous_acquisition.cc |    5 +-
 ...e1_pcps_quicksync_ambiguous_acquisition.cc |   10 +-
 ...ileo_e1_pcps_tong_ambiguous_acquisition.cc |   10 +-
 ...ileo_e5a_noncoherent_iq_acquisition_caf.cc |   10 +-
 .../adapters/galileo_e5a_pcps_acquisition.cc  |    5 +-
 .../glonass_l1_ca_pcps_acquisition.cc         |    5 +-
 .../glonass_l2_ca_pcps_acquisition.cc         |    5 +-
 .../adapters/gps_l1_ca_pcps_acquisition.cc    |    5 +-
 ...gps_l1_ca_pcps_acquisition_fine_doppler.cc |    5 +-
 .../gps_l1_ca_pcps_assisted_acquisition.cc    |    5 +-
 .../gps_l1_ca_pcps_quicksync_acquisition.cc   |    5 +-
 .../gps_l1_ca_pcps_tong_acquisition.cc        |    5 +-
 .../adapters/gps_l2_m_pcps_acquisition.cc     |    5 +-
 .../adapters/gps_l5i_pcps_acquisition.cc      |    5 +-
 .../galileo_pcps_8ms_acquisition_cc.cc        |    2 +-
 .../gnuradio_blocks/pcps_acquisition.cc       |   15 +-
 .../pcps_acquisition_fine_doppler_cc.cc       |    5 +-
 .../pcps_assisted_acquisition_cc.cc           |    5 +-
 .../pcps_quicksync_acquisition_cc.cc          |   15 +-
 src/algorithms/channel/adapters/channel.cc    |   15 +-
 .../libs/beidou_b1i_signal_processing.cc      |    4 +-
 .../libs/beidou_b1i_signal_processing.h       |    2 +-
 src/algorithms/libs/geofunctions.cc           |   27 +-
 src/algorithms/libs/gnss_sdr_flags.cc         |   72 +-
 .../libs/gps_sdr_signal_processing.cc         |    4 +-
 src/algorithms/libs/rtcm.cc                   |  274 ++-
 src/algorithms/libs/rtcm.h                    |   27 +-
 src/algorithms/libs/rtklib/rtklib.h           |    2 +-
 .../libs/rtklib/rtklib_conversions.cc         |   10 +-
 .../libs/rtklib/rtklib_ephemeris.cc           |  208 ++-
 src/algorithms/libs/rtklib/rtklib_ionex.cc    |  153 +-
 src/algorithms/libs/rtklib/rtklib_lambda.cc   |  118 +-
 src/algorithms/libs/rtklib/rtklib_pntpos.cc   |  174 +-
 src/algorithms/libs/rtklib/rtklib_ppp.cc      |  447 +++--
 src/algorithms/libs/rtklib/rtklib_preceph.cc  |  356 +++-
 src/algorithms/libs/rtklib/rtklib_rtcm.cc     |  108 +-
 src/algorithms/libs/rtklib/rtklib_rtcm2.cc    |   66 +-
 src/algorithms/libs/rtklib/rtklib_rtcm3.cc    |  484 +++--
 src/algorithms/libs/rtklib/rtklib_rtkcmn.cc   | 1266 ++++++++++---
 src/algorithms/libs/rtklib/rtklib_rtkpos.cc   |  966 ++++++----
 src/algorithms/libs/rtklib/rtklib_rtksvr.cc   |  317 +++-
 src/algorithms/libs/rtklib/rtklib_sbas.cc     |  384 +++-
 src/algorithms/libs/rtklib/rtklib_solution.cc |  588 +++++--
 src/algorithms/libs/rtklib/rtklib_stream.cc   |  782 +++++++--
 src/algorithms/libs/rtklib/rtklib_tides.cc    |   45 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc  |    5 +-
 .../adapters/file_signal_source.cc            |   10 +-
 .../adapters/nsr_file_signal_source.cc        |   10 +-
 .../adapters/spir_file_signal_source.cc       |   10 +-
 .../two_bit_cpx_file_signal_source.cc         |   10 +-
 .../two_bit_packed_file_signal_source.cc      |   10 +-
 .../gnuradio_blocks/labsat23_source.cc        |    5 +-
 .../gnuradio_blocks/unpack_2bit_samples.cc    |    4 +-
 .../signal_source/libs/gnss_sdr_valve.cc      |    5 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc         |    5 +-
 .../sbas_l1_telemetry_decoder_cc.cc           |    8 +-
 .../telemetry_decoder/libs/convolutional.h    |   12 +-
 .../libs/libswiftcnav/bits.c                  |   45 +-
 .../telemetry_decoder/libs/libswiftcnav/edc.c |   85 +-
 .../libs/libswiftcnav/viterbi27.c             |   81 +-
 .../telemetry_decoder/libs/viterbi_decoder.cc |    4 +-
 .../adapters/beidou_b1i_dll_pll_tracking.cc   |   30 +-
 .../galileo_e1_dll_pll_veml_tracking.cc       |   30 +-
 .../galileo_e1_tcp_connector_tracking.cc      |   10 +-
 .../adapters/galileo_e5a_dll_pll_tracking.cc  |   30 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking.cc   |   10 +-
 .../glonass_l1_ca_dll_pll_tracking.cc         |   10 +-
 .../glonass_l2_ca_dll_pll_c_aid_tracking.cc   |   10 +-
 .../glonass_l2_ca_dll_pll_tracking.cc         |   10 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking.cc       |   10 +-
 .../adapters/gps_l1_ca_dll_pll_tracking.cc    |   30 +-
 .../adapters/gps_l1_ca_kf_tracking.cc         |    5 +-
 .../adapters/gps_l2_m_dll_pll_tracking.cc     |   30 +-
 .../adapters/gps_l5_dll_pll_tracking.cc       |   30 +-
 .../gnuradio_blocks/dll_pll_veml_tracking.cc  |   18 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc   |    5 +-
 ...glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc |    5 +-
 ...glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc |    5 +-
 .../glonass_l1_ca_dll_pll_tracking_cc.cc      |    5 +-
 ...glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc |    5 +-
 ...glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc |    5 +-
 .../glonass_l2_ca_dll_pll_tracking_cc.cc      |    5 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc    |    5 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc    |    5 +-
 .../gps_l1_ca_kf_tracking_cc.cc               |    5 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc    |    5 +-
 src/core/libs/INIReader.cc                    |    4 +-
 src/core/libs/ini.cc                          |   33 +-
 src/core/libs/supl/supl.c                     | 1563 +++++++++--------
 src/core/receiver/control_thread.cc           |   24 +-
 src/core/receiver/gnss_flowgraph.cc           |   37 +-
 .../beidou_dnav_navigation_message.h          |   10 +-
 .../glonass_gnav_navigation_message.cc        |   28 +-
 src/core/system_parameters/gnss_satellite.cc  |   10 +-
 src/tests/common-files/gnuplot_i.h            |  229 ++-
 src/tests/system-tests/position_test.cc       |   14 +-
 src/tests/system-tests/ttff.cc                |    9 +-
 .../unit-tests/arithmetic/fft_length_test.cc  |    5 +-
 .../acquisition/acq_performance_test.cc       |   45 +-
 ...8ms_ambiguous_acquisition_gsoc2013_test.cc |    6 +-
 ...cps_ambiguous_acquisition_gsoc2013_test.cc |    6 +-
 ...e1_pcps_ambiguous_acquisition_gsoc_test.cc |    6 +-
 ...ileo_e1_pcps_ambiguous_acquisition_test.cc |   11 +-
 ...wsr_ambiguous_acquisition_gsoc2013_test.cc |    6 +-
 ...ync_ambiguous_acquisition_gsoc2014_test.cc |    6 +-
 ...ong_ambiguous_acquisition_gsoc2013_test.cc |    6 +-
 ...cps_acquisition_gsoc2014_gensource_test.cc |    6 +-
 ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc |    6 +-
 .../glonass_l1_ca_pcps_acquisition_test.cc    |    6 +-
 ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc |    6 +-
 .../gps_l1_ca_pcps_acquisition_test.cc        |    5 +-
 ...cps_quicksync_acquisition_gsoc2014_test.cc |    6 +-
 ..._ca_pcps_tong_acquisition_gsoc2013_test.cc |    6 +-
 .../gps_l2_m_pcps_acquisition_test.cc         |   13 +-
 .../filter/fir_filter_test.cc                 |   20 +-
 .../filter/notch_filter_lite_test.cc          |    5 +-
 .../filter/notch_filter_test.cc               |    5 +-
 .../filter/pulse_blanking_filter_test.cc      |    5 +-
 .../libs/acquisition_dump_reader.cc           |   15 +-
 .../observables/hybrid_observables_test.cc    |   33 +-
 .../pvt/nmea_printer_test.cc                  |    3 +-
 .../pvt/rinex_printer_test.cc                 |   55 +-
 .../pvt/rtklib_solver_test.cc                 |  105 +-
 .../gps_l1_ca_telemetry_decoder_test.cc       |   13 +-
 .../tracking/galileo_e5a_tracking_test.cc     |    3 +-
 ...onass_l1_ca_dll_pll_c_aid_tracking_test.cc |    6 +-
 .../glonass_l1_ca_dll_pll_tracking_test.cc    |    6 +-
 .../gps_l1_ca_dll_pll_tracking_test.cc        |   10 +-
 .../tracking/gps_l1_ca_kf_tracking_test.cc    |   10 +-
 .../gps_l2_m_dll_pll_tracking_test.cc         |    6 +-
 .../tracking/tracking_pull-in_test.cc         |   15 +-
 146 files changed, 8150 insertions(+), 2979 deletions(-)

diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 560ff1ca8..33e6e5acc 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -190,58 +190,174 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     int glo_2G_count = configuration->property("Channels_2G.count", 0);
     int bds_B1_count = configuration->property("Channels_B1.count", 0);
 
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 1;  // L1
-    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 2;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 3;  // L5
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 4;  // E1
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 5;  // E5a
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 6;
-
-    if ((gps_1C_count != 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 7;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 8;  // L1+L5
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 9;  // L1+E1
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 10;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 11;
-    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 12;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 13;  // L5+E5a
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 14;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 15;
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 1;  // L1
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 2;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 3;  // L5
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 4;  // E1
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 5;  // E5a
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 6;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 7;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 8;  // L1+L5
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 9;  // L1+E1
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 10;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 11;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 12;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 13;  // L5+E5a
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 14;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 15;
+        }
     //if( (gps_1C_count == 0) && (gps_2S_count == 0)  && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) pvt_output_parameters.type_of_receiver = 16;
-    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 17;
-    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 18;
+    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 17;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count != 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 18;
+        }
     //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) pvt_output_parameters.type_of_receiver = 19;
     //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0)) pvt_output_parameters.type_of_receiver = 20;
-    if ((gps_1C_count != 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 21;
+    if ((gps_1C_count != 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 21;
+        }
     //if( (gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count = 0)) pvt_output_parameters.type_of_receiver = 22;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 23;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 24;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count != 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 25;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 26;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 27;
-    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 28;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 29;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 30;
-    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 31;
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 23;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 24;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count != 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 25;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 26;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 27;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 28;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 29;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 30;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count != 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count != 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 31;
+        }
 
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count != 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0)) pvt_output_parameters.type_of_receiver = 32;  // L1+E1+L5+E5a
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count != 0) && (gal_1B_count != 0) && (gal_E5a_count != 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count == 0))
+        {
+            pvt_output_parameters.type_of_receiver = 32;  // L1+E1+L5+E5a
+        }
     // BeiDou B1I Receiver
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0)) pvt_output_parameters.type_of_receiver = 50;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0)) pvt_output_parameters.type_of_receiver = 51;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0)) pvt_output_parameters.type_of_receiver = 52;
-    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count != 0)) pvt_output_parameters.type_of_receiver = 53;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0)) pvt_output_parameters.type_of_receiver = 54;
-    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count != 0)) pvt_output_parameters.type_of_receiver = 55;
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0))
+        {
+            pvt_output_parameters.type_of_receiver = 50;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0))
+        {
+            pvt_output_parameters.type_of_receiver = 51;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0))
+        {
+            pvt_output_parameters.type_of_receiver = 52;
+        }
+    if ((gps_1C_count == 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count == 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count != 0))
+        {
+            pvt_output_parameters.type_of_receiver = 53;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count == 0) && (glo_2G_count == 0) && (bds_B1_count != 0))
+        {
+            pvt_output_parameters.type_of_receiver = 54;
+        }
+    if ((gps_1C_count != 0) && (gps_2S_count == 0) && (gps_L5_count == 0) && (gal_1B_count != 0) && (gal_E5a_count == 0) && (gal_E5b_count == 0) && (glo_1G_count != 0) && (glo_2G_count == 0) && (bds_B1_count != 0))
+        {
+            pvt_output_parameters.type_of_receiver = 55;
+        }
 
     // RTKLIB PVT solver options
     // Settings 1
     int positioning_mode = -1;
     std::string default_pos_mode("Single");
     std::string positioning_mode_str = configuration->property(role + ".positioning_mode", default_pos_mode);  //  (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h
-    if (positioning_mode_str == "Single") positioning_mode = PMODE_SINGLE;
-    if (positioning_mode_str == "Static") positioning_mode = PMODE_STATIC;
-    if (positioning_mode_str == "Kinematic") positioning_mode = PMODE_KINEMA;
-    if (positioning_mode_str == "PPP_Static") positioning_mode = PMODE_PPP_STATIC;
-    if (positioning_mode_str == "PPP_Kinematic") positioning_mode = PMODE_PPP_KINEMA;
+    if (positioning_mode_str == "Single")
+        {
+            positioning_mode = PMODE_SINGLE;
+        }
+    if (positioning_mode_str == "Static")
+        {
+            positioning_mode = PMODE_STATIC;
+        }
+    if (positioning_mode_str == "Kinematic")
+        {
+            positioning_mode = PMODE_KINEMA;
+        }
+    if (positioning_mode_str == "PPP_Static")
+        {
+            positioning_mode = PMODE_PPP_STATIC;
+        }
+    if (positioning_mode_str == "PPP_Kinematic")
+        {
+            positioning_mode = PMODE_PPP_KINEMA;
+        }
 
     if (positioning_mode == -1)
         {
@@ -255,10 +371,22 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
 
     int num_bands = 0;
 
-    if ((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0) || (bds_B1_count > 0)) num_bands = 1;
-    if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gps_2S_count > 0) || (glo_2G_count > 0))) num_bands = 2;
-    if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gal_E5a_count > 0) || (gal_E5b_count > 0) || (gps_L5_count > 0))) num_bands = 2;
-    if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gps_2S_count > 0) || (glo_2G_count > 0)) && ((gal_E5a_count > 0) || (gal_E5b_count > 0) || (gps_L5_count > 0))) num_bands = 3;
+    if ((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0) || (bds_B1_count > 0))
+        {
+            num_bands = 1;
+        }
+    if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gps_2S_count > 0) || (glo_2G_count > 0)))
+        {
+            num_bands = 2;
+        }
+    if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gal_E5a_count > 0) || (gal_E5b_count > 0) || (gps_L5_count > 0)))
+        {
+            num_bands = 2;
+        }
+    if (((gps_1C_count > 0) || (gal_1B_count > 0) || (glo_1G_count > 0)) && ((gps_2S_count > 0) || (glo_2G_count > 0)) && ((gal_E5a_count > 0) || (gal_E5b_count > 0) || (gps_L5_count > 0)))
+        {
+            num_bands = 3;
+        }
 
     int number_of_frequencies = configuration->property(role + ".num_bands", num_bands); /* (1:L1, 2:L1+L2, 3:L1+L2+L5) */
     if ((number_of_frequencies < 1) || (number_of_frequencies > 3))
@@ -286,12 +414,30 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     std::string default_iono_model("OFF");
     std::string iono_model_str = configuration->property(role + ".iono_model", default_iono_model); /*  (IONOOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
     int iono_model = -1;
-    if (iono_model_str == "OFF") iono_model = IONOOPT_OFF;
-    if (iono_model_str == "Broadcast") iono_model = IONOOPT_BRDC;
-    if (iono_model_str == "SBAS") iono_model = IONOOPT_SBAS;
-    if (iono_model_str == "Iono-Free-LC") iono_model = IONOOPT_IFLC;
-    if (iono_model_str == "Estimate_STEC") iono_model = IONOOPT_EST;
-    if (iono_model_str == "IONEX") iono_model = IONOOPT_TEC;
+    if (iono_model_str == "OFF")
+        {
+            iono_model = IONOOPT_OFF;
+        }
+    if (iono_model_str == "Broadcast")
+        {
+            iono_model = IONOOPT_BRDC;
+        }
+    if (iono_model_str == "SBAS")
+        {
+            iono_model = IONOOPT_SBAS;
+        }
+    if (iono_model_str == "Iono-Free-LC")
+        {
+            iono_model = IONOOPT_IFLC;
+        }
+    if (iono_model_str == "Estimate_STEC")
+        {
+            iono_model = IONOOPT_EST;
+        }
+    if (iono_model_str == "IONEX")
+        {
+            iono_model = IONOOPT_TEC;
+        }
     if (iono_model == -1)
         {
             //warn user and set the default
@@ -305,11 +451,26 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     std::string default_trop_model("OFF");
     int trop_model = -1;
     std::string trop_model_str = configuration->property(role + ".trop_model", default_trop_model); /*  (TROPOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
-    if (trop_model_str == "OFF") trop_model = TROPOPT_OFF;
-    if (trop_model_str == "Saastamoinen") trop_model = TROPOPT_SAAS;
-    if (trop_model_str == "SBAS") trop_model = TROPOPT_SBAS;
-    if (trop_model_str == "Estimate_ZTD") trop_model = TROPOPT_EST;
-    if (trop_model_str == "Estimate_ZTD_Grad") trop_model = TROPOPT_ESTG;
+    if (trop_model_str == "OFF")
+        {
+            trop_model = TROPOPT_OFF;
+        }
+    if (trop_model_str == "Saastamoinen")
+        {
+            trop_model = TROPOPT_SAAS;
+        }
+    if (trop_model_str == "SBAS")
+        {
+            trop_model = TROPOPT_SBAS;
+        }
+    if (trop_model_str == "Estimate_ZTD")
+        {
+            trop_model = TROPOPT_EST;
+        }
+    if (trop_model_str == "Estimate_ZTD_Grad")
+        {
+            trop_model = TROPOPT_ESTG;
+        }
     if (trop_model == -1)
         {
             //warn user and set the default
@@ -339,10 +500,22 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     int earth_tide = configuration->property(role + ".earth_tide", 0);
 
     int nsys = 0;
-    if ((gps_1C_count > 0) || (gps_2S_count > 0) || (gps_L5_count > 0)) nsys += SYS_GPS;
-    if ((gal_1B_count > 0) || (gal_E5a_count > 0) || (gal_E5b_count > 0)) nsys += SYS_GAL;
-    if ((glo_1G_count > 0) || (glo_2G_count > 0)) nsys += SYS_GLO;
-    if ((bds_B1_count > 0)) nsys += SYS_BDS;
+    if ((gps_1C_count > 0) || (gps_2S_count > 0) || (gps_L5_count > 0))
+        {
+            nsys += SYS_GPS;
+        }
+    if ((gal_1B_count > 0) || (gal_E5a_count > 0) || (gal_E5b_count > 0))
+        {
+            nsys += SYS_GAL;
+        }
+    if ((glo_1G_count > 0) || (glo_2G_count > 0))
+        {
+            nsys += SYS_GLO;
+        }
+    if ((bds_B1_count > 0))
+        {
+            nsys += SYS_BDS;
+        }
 
     int navigation_system = configuration->property(role + ".navigation_system", nsys); /* (SYS_XXX) see src/algorithms/libs/rtklib/rtklib.h */
     if ((navigation_system < 1) || (navigation_system > 255))                           /* GPS: 1   SBAS: 2   GPS+SBAS: 3 Galileo: 8  Galileo+GPS: 9 GPS+SBAS+Galileo: 11 All: 255 */
@@ -356,11 +529,26 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     std::string default_gps_ar("Continuous");
     std::string integer_ambiguity_resolution_gps_str = configuration->property(role + ".AR_GPS", default_gps_ar); /* Integer Ambiguity Resolution mode for GPS (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */
     int integer_ambiguity_resolution_gps = -1;
-    if (integer_ambiguity_resolution_gps_str == "OFF") integer_ambiguity_resolution_gps = ARMODE_OFF;
-    if (integer_ambiguity_resolution_gps_str == "Continuous") integer_ambiguity_resolution_gps = ARMODE_CONT;
-    if (integer_ambiguity_resolution_gps_str == "Instantaneous") integer_ambiguity_resolution_gps = ARMODE_INST;
-    if (integer_ambiguity_resolution_gps_str == "Fix-and-Hold") integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
-    if (integer_ambiguity_resolution_gps_str == "PPP-AR") integer_ambiguity_resolution_gps = ARMODE_PPPAR;
+    if (integer_ambiguity_resolution_gps_str == "OFF")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_OFF;
+        }
+    if (integer_ambiguity_resolution_gps_str == "Continuous")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_CONT;
+        }
+    if (integer_ambiguity_resolution_gps_str == "Instantaneous")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_INST;
+        }
+    if (integer_ambiguity_resolution_gps_str == "Fix-and-Hold")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
+        }
+    if (integer_ambiguity_resolution_gps_str == "PPP-AR")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_PPPAR;
+        }
     if (integer_ambiguity_resolution_gps == -1)
         {
             //warn user and set the default
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 2e0bec8d5..0cdeafcd5 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -176,9 +176,18 @@ void rtklib_pvt_cc::msg_handler_telemetry(const pmt::pmt_t& msg)
                     Galileo_Almanac sv2 = galileo_almanac_helper->get_almanac(2);
                     Galileo_Almanac sv3 = galileo_almanac_helper->get_almanac(3);
 
-                    if (sv1.i_satellite_PRN != 0) d_pvt_solver->galileo_almanac_map[sv1.i_satellite_PRN] = sv1;
-                    if (sv2.i_satellite_PRN != 0) d_pvt_solver->galileo_almanac_map[sv2.i_satellite_PRN] = sv2;
-                    if (sv3.i_satellite_PRN != 0) d_pvt_solver->galileo_almanac_map[sv3.i_satellite_PRN] = sv3;
+                    if (sv1.i_satellite_PRN != 0)
+                        {
+                            d_pvt_solver->galileo_almanac_map[sv1.i_satellite_PRN] = sv1;
+                        }
+                    if (sv2.i_satellite_PRN != 0)
+                        {
+                            d_pvt_solver->galileo_almanac_map[sv2.i_satellite_PRN] = sv2;
+                        }
+                    if (sv3.i_satellite_PRN != 0)
+                        {
+                            d_pvt_solver->galileo_almanac_map[sv3.i_satellite_PRN] = sv3;
+                        }
                     DLOG(INFO) << "New Galileo Almanac data have arrived ";
                 }
             else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac>))
@@ -1421,10 +1430,22 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                             send_sys_v_ttff_msg(ttff);
                                             first_fix = false;
                                         }
-                                    if (d_kml_output_enabled) d_kml_dump->print_position(d_pvt_solver, false);
-                                    if (d_gpx_output_enabled) d_gpx_dump->print_position(d_pvt_solver, false);
-                                    if (d_geojson_output_enabled) d_geojson_printer->print_position(d_pvt_solver, false);
-                                    if (d_nmea_output_file_enabled) d_nmea_printer->Print_Nmea_Line(d_pvt_solver, false);
+                                    if (d_kml_output_enabled)
+                                        {
+                                            d_kml_dump->print_position(d_pvt_solver, false);
+                                        }
+                                    if (d_gpx_output_enabled)
+                                        {
+                                            d_gpx_dump->print_position(d_pvt_solver, false);
+                                        }
+                                    if (d_geojson_output_enabled)
+                                        {
+                                            d_geojson_printer->print_position(d_pvt_solver, false);
+                                        }
+                                    if (d_nmea_output_file_enabled)
+                                        {
+                                            d_nmea_printer->Print_Nmea_Line(d_pvt_solver, false);
+                                        }
 
                                     /*
                                      *   TYPE  |  RECEIVER
@@ -1638,7 +1659,9 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                     std::string glo_signal("1G");
                                                                     rp->rinex_obs_header(rp->obsFile, gps_ephemeris_iter->second, glonass_gnav_ephemeris_iter->second, d_rx_time, glo_signal);
                                                                     if (d_rinex_version == 3)
-                                                                        rp->rinex_nav_header(rp->navMixFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model, d_pvt_solver->glonass_gnav_utc_model, d_pvt_solver->glonass_gnav_almanac);
+                                                                        {
+                                                                            rp->rinex_nav_header(rp->navMixFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model, d_pvt_solver->glonass_gnav_utc_model, d_pvt_solver->glonass_gnav_almanac);
+                                                                        }
                                                                     if (d_rinex_version == 2)
                                                                         {
                                                                             rp->rinex_nav_header(rp->navFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model);
@@ -1672,7 +1695,9 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                     std::string glo_signal("2G");
                                                                     rp->rinex_obs_header(rp->obsFile, gps_ephemeris_iter->second, glonass_gnav_ephemeris_iter->second, d_rx_time, glo_signal);
                                                                     if (d_rinex_version == 3)
-                                                                        rp->rinex_nav_header(rp->navMixFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model, d_pvt_solver->glonass_gnav_utc_model, d_pvt_solver->glonass_gnav_almanac);
+                                                                        {
+                                                                            rp->rinex_nav_header(rp->navMixFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model, d_pvt_solver->glonass_gnav_utc_model, d_pvt_solver->glonass_gnav_almanac);
+                                                                        }
                                                                     if (d_rinex_version == 2)
                                                                         {
                                                                             rp->rinex_nav_header(rp->navFile, d_pvt_solver->gps_iono, d_pvt_solver->gps_utc_model);
@@ -1780,7 +1805,9 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                     break;
                                                                 case 26:  //  GPS L1 C/A + GLONASS L1 C/A
                                                                     if (d_rinex_version == 3)
-                                                                        rp->log_rinex_nav(rp->navMixFile, d_pvt_solver->gps_ephemeris_map, d_pvt_solver->glonass_gnav_ephemeris_map);
+                                                                        {
+                                                                            rp->log_rinex_nav(rp->navMixFile, d_pvt_solver->gps_ephemeris_map, d_pvt_solver->glonass_gnav_ephemeris_map);
+                                                                        }
                                                                     if (d_rinex_version == 2)
                                                                         {
                                                                             rp->log_rinex_nav(rp->navFile, d_pvt_solver->gps_ephemeris_map);
@@ -1795,7 +1822,9 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
                                                                     break;
                                                                 case 29:  //  GPS L1 C/A + GLONASS L2 C/A
                                                                     if (d_rinex_version == 3)
-                                                                        rp->log_rinex_nav(rp->navMixFile, d_pvt_solver->gps_ephemeris_map, d_pvt_solver->glonass_gnav_ephemeris_map);
+                                                                        {
+                                                                            rp->log_rinex_nav(rp->navMixFile, d_pvt_solver->gps_ephemeris_map, d_pvt_solver->glonass_gnav_ephemeris_map);
+                                                                        }
                                                                     if (d_rinex_version == 2)
                                                                         {
                                                                             rp->log_rinex_nav(rp->navFile, d_pvt_solver->gps_ephemeris_map);
diff --git a/src/algorithms/PVT/libs/geojson_printer.cc b/src/algorithms/PVT/libs/geojson_printer.cc
index 22da08606..504393422 100644
--- a/src/algorithms/PVT/libs/geojson_printer.cc
+++ b/src/algorithms/PVT/libs/geojson_printer.cc
@@ -221,7 +221,10 @@ bool GeoJSON_Printer::close_file()
             // if nothing is written, erase the file
             if (first_pos == true)
                 {
-                    if (remove(filename_.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+                    if (remove(filename_.c_str()) != 0)
+                        {
+                            LOG(INFO) << "Error deleting temporary file";
+                        }
                 }
             return true;
         }
diff --git a/src/algorithms/PVT/libs/gpx_printer.cc b/src/algorithms/PVT/libs/gpx_printer.cc
index 8075b21fa..1e2fddf01 100644
--- a/src/algorithms/PVT/libs/gpx_printer.cc
+++ b/src/algorithms/PVT/libs/gpx_printer.cc
@@ -171,7 +171,10 @@ bool Gpx_Printer::print_position(const std::shared_ptr<rtklib_solver>& position,
     double vdop = position_->get_vdop();
     double pdop = position_->get_pdop();
     std::string utc_time = to_iso_extended_string(position_->get_position_UTC_time());
-    if (utc_time.length() < 23) utc_time += ".";
+    if (utc_time.length() < 23)
+        {
+            utc_time += ".";
+        }
     utc_time.resize(23, '0');  // time up to ms
     utc_time.append("Z");      // UTC time zone
 
@@ -229,6 +232,9 @@ Gpx_Printer::~Gpx_Printer()
         }
     if (!positions_printed)
         {
-            if (remove(gpx_filename.c_str()) != 0) LOG(INFO) << "Error deleting temporary GPX file";
+            if (remove(gpx_filename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary GPX file";
+                }
         }
 }
diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc
index 627e26416..f7f48aae3 100644
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@@ -229,7 +229,10 @@ bool Kml_Printer::print_position(const std::shared_ptr<rtklib_solver>& position,
     double vdop = position_->get_vdop();
     double pdop = position_->get_pdop();
     std::string utc_time = to_iso_extended_string(position_->get_position_UTC_time());
-    if (utc_time.length() < 23) utc_time += ".";
+    if (utc_time.length() < 23)
+        {
+            utc_time += ".";
+        }
     utc_time.resize(23, '0');  // time up to ms
     utc_time.append("Z");      // UTC time zone
 
@@ -330,6 +333,9 @@ Kml_Printer::~Kml_Printer()
         }
     if (!positions_printed)
         {
-            if (remove(kml_filename.c_str()) != 0) LOG(INFO) << "Error deleting temporary KML file";
+            if (remove(kml_filename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary KML file";
+                }
         }
 }
diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc
index 9077dcd68..3ca239972 100644
--- a/src/algorithms/PVT/libs/ls_pvt.cc
+++ b/src/algorithms/PVT/libs/ls_pvt.cc
@@ -253,7 +253,10 @@ arma::vec Ls_Pvt::leastSquarePos(const arma::mat& satpos, const arma::vec& obs,
                                         {
                                             //--- Find delay due to troposphere (in meters)
                                             Ls_Pvt::tropo(&trop, sin(*elev * GPS_PI / 180.0), h / 1000.0, 1013.0, 293.0, 50.0, 0.0, 0.0, 0.0);
-                                            if (trop > 5.0) trop = 0.0;  //check for erratic values
+                                            if (trop > 5.0)
+                                                {
+                                                    trop = 0.0;  //check for erratic values
+                                                }
                                         }
                                 }
                         }
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 39b374bc7..3d4ebc74a 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -161,10 +161,16 @@ int Nmea_Printer::init_serial(const std::string& serial_device)
     int64_t PARITY;
 
     fd = open(serial_device.c_str(), O_RDWR | O_NOCTTY | O_NDELAY | O_CLOEXEC);
-    if (fd == -1) return fd;  // failed to open TTY port
+    if (fd == -1)
+        {
+            return fd;  // failed to open TTY port
+        }
 
-    if (fcntl(fd, F_SETFL, 0) == -1) LOG(INFO) << "Error enabling direct I/O";  // clear all flags on descriptor, enable direct I/O
-    tcgetattr(fd, &options);                                                    // read serial port options
+    if (fcntl(fd, F_SETFL, 0) == -1)
+        {
+            LOG(INFO) << "Error enabling direct I/O";  // clear all flags on descriptor, enable direct I/O
+        }
+    tcgetattr(fd, &options);  // read serial port options
 
     BAUD = B9600;
     // BAUD  =  B38400;
@@ -367,13 +373,22 @@ std::string Nmea_Printer::get_UTC_NMEA_time(boost::posix_time::ptime d_position_
     utc_seconds = td.seconds();
     utc_milliseconds = td.total_milliseconds() - td.total_seconds() * 1000;
 
-    if (utc_hours < 10) sentence_str << "0";  //  two digits for hours
+    if (utc_hours < 10)
+        {
+            sentence_str << "0";  //  two digits for hours
+        }
     sentence_str << utc_hours;
 
-    if (utc_mins < 10) sentence_str << "0";  //  two digits for minutes
+    if (utc_mins < 10)
+        {
+            sentence_str << "0";  //  two digits for minutes
+        }
     sentence_str << utc_mins;
 
-    if (utc_seconds < 10) sentence_str << "0";  //  two digits for seconds
+    if (utc_seconds < 10)
+        {
+            sentence_str << "0";  //  two digits for seconds
+        }
     sentence_str << utc_seconds;
 
     if (utc_milliseconds < 10)
diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index dfa3aaa08..415cae4a7 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -230,31 +230,52 @@ Rinex_Printer::~Rinex_Printer()
     // If nothing written, erase the files.
     if (posn == 0)
         {
-            if (remove(navfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(navfilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
     if (poso == 0)
         {
-            if (remove(obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(obsfilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
     if (poss == 0)
         {
-            if (remove(sbsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(sbsfilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
     if (posng == 0)
         {
-            if (remove(navGalfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(navGalfilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
     if (posmn == 0)
         {
-            if (remove(navMixfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(navMixfilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
     if (posnr == 0)
         {
-            if (remove(navGlofilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(navGlofilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
     if (posnc == 0)
         {
-            if (remove(navBdsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+            if (remove(navBdsfilename.c_str()) != 0)
+                {
+                    LOG(INFO) << "Error deleting temporary file";
+                }
         }
 }
 
@@ -277,8 +298,14 @@ std::string Rinex_Printer::createFilename(const std::string& type)
     boost::gregorian::date today = boost::gregorian::day_clock::local_day();
     const int32_t dayOfTheYear = today.day_of_year();
     std::stringstream strm0;
-    if (dayOfTheYear < 100) strm0 << "0";  // three digits for day of the year
-    if (dayOfTheYear < 10) strm0 << "0";   // three digits for day of the year
+    if (dayOfTheYear < 100)
+        {
+            strm0 << "0";  // three digits for day of the year
+        }
+    if (dayOfTheYear < 10)
+        {
+            strm0 << "0";  // three digits for day of the year
+        }
     strm0 << dayOfTheYear;
     std::string dayOfTheYearTag = strm0.str();
 
@@ -332,7 +359,10 @@ std::string Rinex_Printer::createFilename(const std::string& type)
 
     int32_t local_minute = pt_tm.tm_min;
     std::stringstream strm2;
-    if (local_minute < 10) strm2 << "0";  // at least two digits for minutes
+    if (local_minute < 10)
+        {
+            strm2 << "0";  // at least two digits for minutes
+        }
     strm2 << local_minute;
 
     std::string minTag = strm2.str();
@@ -374,12 +404,18 @@ std::string Rinex_Printer::getLocalTime()
 
     std::stringstream strmHour;
     int32_t utc_hour = pt_tm.tm_hour;
-    if (utc_hour < 10) strmHour << "0";  //  two digits for hours
+    if (utc_hour < 10)
+        {
+            strmHour << "0";  //  two digits for hours
+        }
     strmHour << utc_hour;
 
     std::stringstream strmMin;
     int32_t utc_minute = pt_tm.tm_min;
-    if (utc_minute < 10) strmMin << "0";  //  two digits for minutes
+    if (utc_minute < 10)
+        {
+            strmMin << "0";  //  two digits for minutes
+        }
     strmMin << utc_minute;
 
     if (version == 2)
@@ -421,7 +457,10 @@ std::string Rinex_Printer::getLocalTime()
 
             std::stringstream strm2;
             int32_t utc_seconds = pt_tm.tm_sec;
-            if (utc_seconds < 10) strm2 << "0";  //  two digits for seconds
+            if (utc_seconds < 10)
+                {
+                    strm2 << "0";  //  two digits for seconds
+                }
             strm2 << utc_seconds;
             line += strm2.str();
             line += std::string(1, ' ');
@@ -1716,19 +1755,31 @@ void Rinex_Printer::rinex_sbs_header(std::fstream& out)
     strYear << utc_year;
     std::stringstream strMonth;
     int32_t utc_month = pt.date().month().as_number();
-    if (utc_month < 10) strMonth << "0";  //  two digits for months
+    if (utc_month < 10)
+        {
+            strMonth << "0";  //  two digits for months
+        }
     strMonth << utc_month;
     std::stringstream strmDay;
     int32_t utc_day = pt.date().day().as_number();
-    if (utc_day < 10) strmDay << "0";  //  two digits for days
+    if (utc_day < 10)
+        {
+            strmDay << "0";  //  two digits for days
+        }
     strmDay << utc_day;
     std::stringstream strmHour;
     int32_t utc_hour = pt_tm.tm_hour;
-    if (utc_hour < 10) strmHour << "0";  //  two digits for hours
+    if (utc_hour < 10)
+        {
+            strmHour << "0";  //  two digits for hours
+        }
     strmHour << utc_hour;
     std::stringstream strmMin;
     int32_t utc_minute = pt_tm.tm_min;
-    if (utc_minute < 10) strmMin << "0";  //  two digits for minutes
+    if (utc_minute < 10)
+        {
+            strmMin << "0";  //  two digits for minutes
+        }
     strmMin << utc_minute;
     std::string time_str;
     time_str += strmDay.str();
@@ -2959,7 +3010,10 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps
             if (version == 3)
                 {
                     line += satelliteSystem["GPS"];
-                    if (gps_ephemeris_iter->second.i_satellite_PRN < 10) line += std::string("0");
+                    if (gps_ephemeris_iter->second.i_satellite_PRN < 10)
+                        {
+                            line += std::string("0");
+                        }
                     line += std::to_string(gps_ephemeris_iter->second.i_satellite_PRN);
                     std::string year(timestring, 0, 4);
                     line += std::string(1, ' ');
@@ -3156,12 +3210,30 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps
             if (gps_ephemeris_iter->second.satelliteBlock.at(gps_ephemeris_iter->second.i_satellite_PRN) == "IIA")
                 {
                     // Block II/IIA (Table 20-XI IS-GPS-200E )
-                    if ((gps_ephemeris_iter->second.d_IODC > 239) && (gps_ephemeris_iter->second.d_IODC < 248)) curve_fit_interval = 8;
-                    if (((gps_ephemeris_iter->second.d_IODC > 247) && (gps_ephemeris_iter->second.d_IODC < 256)) || (gps_ephemeris_iter->second.d_IODC == 496)) curve_fit_interval = 14;
-                    if ((gps_ephemeris_iter->second.d_IODC > 496) && (gps_ephemeris_iter->second.d_IODC < 504)) curve_fit_interval = 26;
-                    if ((gps_ephemeris_iter->second.d_IODC > 503) && (gps_ephemeris_iter->second.d_IODC < 511)) curve_fit_interval = 50;
-                    if (((gps_ephemeris_iter->second.d_IODC > 751) && (gps_ephemeris_iter->second.d_IODC < 757)) || (gps_ephemeris_iter->second.d_IODC == 511)) curve_fit_interval = 74;
-                    if (gps_ephemeris_iter->second.d_IODC == 757) curve_fit_interval = 98;
+                    if ((gps_ephemeris_iter->second.d_IODC > 239) && (gps_ephemeris_iter->second.d_IODC < 248))
+                        {
+                            curve_fit_interval = 8;
+                        }
+                    if (((gps_ephemeris_iter->second.d_IODC > 247) && (gps_ephemeris_iter->second.d_IODC < 256)) || (gps_ephemeris_iter->second.d_IODC == 496))
+                        {
+                            curve_fit_interval = 14;
+                        }
+                    if ((gps_ephemeris_iter->second.d_IODC > 496) && (gps_ephemeris_iter->second.d_IODC < 504))
+                        {
+                            curve_fit_interval = 26;
+                        }
+                    if ((gps_ephemeris_iter->second.d_IODC > 503) && (gps_ephemeris_iter->second.d_IODC < 511))
+                        {
+                            curve_fit_interval = 50;
+                        }
+                    if (((gps_ephemeris_iter->second.d_IODC > 751) && (gps_ephemeris_iter->second.d_IODC < 757)) || (gps_ephemeris_iter->second.d_IODC == 511))
+                        {
+                            curve_fit_interval = 74;
+                        }
+                    if (gps_ephemeris_iter->second.d_IODC == 757)
+                        {
+                            curve_fit_interval = 98;
+                        }
                 }
 
             if ((gps_ephemeris_iter->second.satelliteBlock.at(gps_ephemeris_iter->second.i_satellite_PRN) == "IIR") ||
@@ -3170,9 +3242,18 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps
                 (gps_ephemeris_iter->second.satelliteBlock.at(gps_ephemeris_iter->second.i_satellite_PRN) == "IIIA"))
                 {
                     // Block IIR/IIR-M/IIF/IIIA (Table 20-XII IS-GPS-200E )
-                    if ((gps_ephemeris_iter->second.d_IODC > 239) && (gps_ephemeris_iter->second.d_IODC < 248)) curve_fit_interval = 8;
-                    if (((gps_ephemeris_iter->second.d_IODC > 247) && (gps_ephemeris_iter->second.d_IODC < 256)) || (gps_ephemeris_iter->second.d_IODC == 496)) curve_fit_interval = 14;
-                    if (((gps_ephemeris_iter->second.d_IODC > 496) && (gps_ephemeris_iter->second.d_IODC < 504)) || ((gps_ephemeris_iter->second.d_IODC > 1020) && (gps_ephemeris_iter->second.d_IODC < 1024))) curve_fit_interval = 26;
+                    if ((gps_ephemeris_iter->second.d_IODC > 239) && (gps_ephemeris_iter->second.d_IODC < 248))
+                        {
+                            curve_fit_interval = 8;
+                        }
+                    if (((gps_ephemeris_iter->second.d_IODC > 247) && (gps_ephemeris_iter->second.d_IODC < 256)) || (gps_ephemeris_iter->second.d_IODC == 496))
+                        {
+                            curve_fit_interval = 14;
+                        }
+                    if (((gps_ephemeris_iter->second.d_IODC > 496) && (gps_ephemeris_iter->second.d_IODC < 504)) || ((gps_ephemeris_iter->second.d_IODC > 1020) && (gps_ephemeris_iter->second.d_IODC < 1024)))
+                        {
+                            curve_fit_interval = 26;
+                        }
                 }
             line += Rinex_Printer::doub2for(curve_fit_interval, 18, 2);
             line += std::string(1, ' ');
@@ -3208,7 +3289,10 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps
             std::string minutes(timestring, 11, 2);
             std::string seconds(timestring, 13, 2);
             line += satelliteSystem["GPS"];
-            if (gps_ephemeris_iter->second.i_satellite_PRN < 10) line += std::string("0");
+            if (gps_ephemeris_iter->second.i_satellite_PRN < 10)
+                {
+                    line += std::string("0");
+                }
             line += std::to_string(gps_ephemeris_iter->second.i_satellite_PRN);
             std::string year(timestring, 0, 4);
             line += std::string(1, ' ');
@@ -3242,7 +3326,10 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps
                 {
                     // Toe1: Toe in message type 10,  Toe2: Toe in message type 11,
                     fake_cnav_iode = fake_cnav_iode + 1;
-                    if (fake_cnav_iode == 240) fake_cnav_iode = 1;
+                    if (fake_cnav_iode == 240)
+                        {
+                            fake_cnav_iode = 1;
+                        }
                 }
 
             line += Rinex_Printer::doub2for(fake_cnav_iode, 18, 2);
@@ -3365,7 +3452,10 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gal
             std::string seconds(timestring, 13, 2);
 
             line += satelliteSystem["Galileo"];
-            if (galileo_ephemeris_iter->second.i_satellite_PRN < 10) line += std::string("0");
+            if (galileo_ephemeris_iter->second.i_satellite_PRN < 10)
+                {
+                    line += std::string("0");
+                }
             line += std::to_string(galileo_ephemeris_iter->second.i_satellite_PRN);
             std::string year(timestring, 0, 4);
             line += std::string(1, ' ');
@@ -3470,22 +3560,58 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gal
             line += std::string(1, ' ');
             std::string E1B_HS;
             std::string E5B_HS;
-            if (galileo_ephemeris_iter->second.E1B_HS_5 == 0) E1B_HS = "00";
-            if (galileo_ephemeris_iter->second.E1B_HS_5 == 1) E1B_HS = "01";
-            if (galileo_ephemeris_iter->second.E1B_HS_5 == 2) E1B_HS = "10";
-            if (galileo_ephemeris_iter->second.E1B_HS_5 == 3) E1B_HS = "11";
-            if (galileo_ephemeris_iter->second.E5b_HS_5 == 0) E5B_HS = "00";
-            if (galileo_ephemeris_iter->second.E5b_HS_5 == 1) E5B_HS = "01";
-            if (galileo_ephemeris_iter->second.E5b_HS_5 == 2) E5B_HS = "10";
-            if (galileo_ephemeris_iter->second.E5b_HS_5 == 3) E5B_HS = "11";
+            if (galileo_ephemeris_iter->second.E1B_HS_5 == 0)
+                {
+                    E1B_HS = "00";
+                }
+            if (galileo_ephemeris_iter->second.E1B_HS_5 == 1)
+                {
+                    E1B_HS = "01";
+                }
+            if (galileo_ephemeris_iter->second.E1B_HS_5 == 2)
+                {
+                    E1B_HS = "10";
+                }
+            if (galileo_ephemeris_iter->second.E1B_HS_5 == 3)
+                {
+                    E1B_HS = "11";
+                }
+            if (galileo_ephemeris_iter->second.E5b_HS_5 == 0)
+                {
+                    E5B_HS = "00";
+                }
+            if (galileo_ephemeris_iter->second.E5b_HS_5 == 1)
+                {
+                    E5B_HS = "01";
+                }
+            if (galileo_ephemeris_iter->second.E5b_HS_5 == 2)
+                {
+                    E5B_HS = "10";
+                }
+            if (galileo_ephemeris_iter->second.E5b_HS_5 == 3)
+                {
+                    E5B_HS = "11";
+                }
 
-            if (E1B_HS == "11") LOG(WARNING) << "Signal Component currently in Test";
-            if (E1B_HS == "10") LOG(WARNING) << "Signal will be out of service";
-            if (E1B_HS == "01") LOG(WARNING) << "Signal out of service";
+            if (E1B_HS == "11")
+                {
+                    LOG(WARNING) << "Signal Component currently in Test";
+                }
+            if (E1B_HS == "10")
+                {
+                    LOG(WARNING) << "Signal will be out of service";
+                }
+            if (E1B_HS == "01")
+                {
+                    LOG(WARNING) << "Signal out of service";
+                }
             E1B_HS = "00";  // *************** CHANGE THIS WHEN GALILEO SIGNAL IS VALID
 
             std::string E1B_DVS = std::to_string(galileo_ephemeris_iter->second.E1B_DVS_5);
-            if (E1B_DVS == "1") LOG(WARNING) << "Navigation data without guarantee";
+            if (E1B_DVS == "1")
+                {
+                    LOG(WARNING) << "Navigation data without guarantee";
+                }
             E1B_DVS = "0";  // *************** CHANGE THIS WHEN GALILEO SIGNAL IS VALID
 
             std::string SVhealth_str = E5B_HS + std::to_string(galileo_ephemeris_iter->second.E5b_DVS_5) + "11" + "1" + E1B_DVS + E1B_HS + std::to_string(galileo_ephemeris_iter->second.E1B_DVS_5);
@@ -3607,7 +3733,10 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Glo
             if (version == 3)
                 {
                     line += satelliteSystem["GLONASS"];
-                    if (glonass_gnav_ephemeris_iter->second.i_satellite_PRN < 10) line += std::string("0");
+                    if (glonass_gnav_ephemeris_iter->second.i_satellite_PRN < 10)
+                        {
+                            line += std::string("0");
+                        }
                     line += std::to_string(glonass_gnav_ephemeris_iter->second.i_satellite_PRN);
                     std::string year(timestring, 0, 4);
                     line += std::string(1, ' ');
@@ -3773,7 +3902,10 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Bei
             std::string seconds(timestring, 13, 2);
 
             line += satelliteSystem["Beidou"];
-            if (bds_ephemeris_iter->second.i_satellite_PRN < 10) line += std::string("0");
+            if (bds_ephemeris_iter->second.i_satellite_PRN < 10)
+                {
+                    line += std::string("0");
+                }
             line += std::to_string(bds_ephemeris_iter->second.i_satellite_PRN);
             std::string year(timestring, 0, 4);
             line += std::string(1, ' ');
@@ -4009,7 +4141,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Glonass_Gnav_Ephem
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -4332,7 +4467,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -4684,7 +4822,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -4990,7 +5131,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Galileo_Ephemeris&
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -5310,7 +5454,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& eph
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -5564,7 +5711,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -5812,7 +5962,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& eph
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -6090,7 +6243,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -6433,7 +6589,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -6748,7 +6907,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Galileo_Ephemeris&
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -7012,7 +7174,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -7291,7 +7456,10 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Beidou_Dnav_Epheme
     line += Rinex_Printer::leftJustify("GNSS-SDR", 20);           // add flag and property
     line += Rinex_Printer::leftJustify("Software Receiver", 20);  // add flag and property
     //line += Rinex_Printer::leftJustify(google::VersionString(), 20); // add flag and property
-    if (gnss_sdr_version.length() > 20) gnss_sdr_version.resize(9, ' ');
+    if (gnss_sdr_version.length() > 20)
+        {
+            gnss_sdr_version.resize(9, ' ');
+        }
     line += Rinex_Printer::leftJustify(gnss_sdr_version, 20);
     line += Rinex_Printer::leftJustify("REC # / TYPE / VERS", 20);
     lengthCheck(line);
@@ -7779,7 +7947,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
                  observables_iter++)
                 {
                     line += satelliteSystem["GLONASS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) line += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            line += std::string(1, '0');
+                        }
                     line += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                 }
             // Receiver clock offset (optional)
@@ -7837,7 +8008,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
                     lineObs += Rinex_Printer::rightJustify(Rinex_Printer::asString<int32_t>(ssi), 1);
                     //GLONASS L1 SIGNAL STRENGTH
                     lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
-                    if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+                    if (lineObs.size() < 80)
+                        {
+                            lineObs += std::string(80 - lineObs.size(), ' ');
+                        }
                     out << lineObs << std::endl;
                 }
         }
@@ -7893,7 +8067,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
                     std::string lineObs;
                     lineObs.clear();
                     lineObs += satelliteSystem["GLONASS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            lineObs += std::string(1, '0');
+                        }
                     lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                     //lineObs += std::string(2, ' ');
                     lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.Pseudorange_m, 3), 14);
@@ -7941,7 +8118,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Glonass_Gnav_Ephemeri
                     //GLONASS L1 SIGNAL STRENGTH
                     lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-                    if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+                    if (lineObs.size() < 80)
+                        {
+                            lineObs += std::string(80 - lineObs.size(), ' ');
+                        }
                     out << lineObs << std::endl;
                 }
         }
@@ -8104,7 +8284,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
                  observables_iter++)
                 {
                     line += satelliteSystem["GPS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) line += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            line += std::string(1, '0');
+                        }
                     line += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                 }
             // Add list of GLONASS L1 satellites
@@ -8113,7 +8296,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
                  observables_iter++)
                 {
                     line += satelliteSystem["GLONASS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) line += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            line += std::string(1, '0');
+                        }
                     line += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                 }
             // Add list of GLONASS L2 satellites
@@ -8122,7 +8308,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
                  observables_iter++)
                 {
                     line += satelliteSystem["GLONASS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) line += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            line += std::string(1, '0');
+                        }
                     line += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                 }
         }
@@ -8143,9 +8332,18 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
             if (version == 3)
                 {
                     // Specify system only if in version 3
-                    if (s == "G") lineObs += satelliteSystem["GPS"];
-                    if (s == "R") lineObs += satelliteSystem["GLONASS"];  // should not happen
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+                    if (s == "G")
+                        {
+                            lineObs += satelliteSystem["GPS"];
+                        }
+                    if (s == "R")
+                        {
+                            lineObs += satelliteSystem["GLONASS"];  // should not happen
+                        }
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            lineObs += std::string(1, '0');
+                        }
                     lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                 }
 
@@ -8194,7 +8392,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
             // SIGNAL STRENGTH
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 
@@ -8207,7 +8408,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
             if (version == 3)
                 {
                     lineObs += satelliteSystem["GLONASS"];
-                    if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+                    if (static_cast<int32_t>(*it) < 10)
+                        {
+                            lineObs += std::string(1, '0');
+                        }
                     lineObs += std::to_string(static_cast<int32_t>(*it));
                 }
             ret = total_glo_map.equal_range(*it);
@@ -8260,7 +8464,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -8386,9 +8593,18 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
 
             s.assign(1, observables_iter->second.System);
             // Specify system only if in version 3
-            if (s == "G") lineObs += satelliteSystem["GPS"];
-            if (s == "R") lineObs += satelliteSystem["GLONASS"];  // should not happen
-            if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+            if (s == "G")
+                {
+                    lineObs += satelliteSystem["GPS"];
+                }
+            if (s == "R")
+                {
+                    lineObs += satelliteSystem["GLONASS"];  // should not happen
+                }
+            if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
 
             // Pseudorange Measurements
@@ -8436,7 +8652,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
             // SIGNAL STRENGTH
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 
@@ -8447,7 +8666,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
         {
             lineObs.clear();
             lineObs += satelliteSystem["GLONASS"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
 
             ret = total_glo_map.equal_range(*it);
@@ -8500,7 +8722,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& g
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -8626,9 +8851,18 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
             lineObs.clear();
 
             s.assign(1, observables_iter->second.System);
-            if (s == "E") lineObs += satelliteSystem["Galileo"];
-            if (s == "R") lineObs += satelliteSystem["GLONASS"];  // should not happen
-            if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+            if (s == "E")
+                {
+                    lineObs += satelliteSystem["Galileo"];
+                }
+            if (s == "R")
+                {
+                    lineObs += satelliteSystem["GLONASS"];  // should not happen
+                }
+            if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.Pseudorange_m, 3), 14);
 
@@ -8674,7 +8908,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
             // SIGNAL STRENGTH
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 
@@ -8685,7 +8922,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
         {
             lineObs.clear();
             lineObs += satelliteSystem["Galileo"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_glo_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -8735,7 +8975,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ga
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -8812,7 +9055,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
                  observables_iter++)
                 {
                     line += satelliteSystem["GPS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) line += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            line += std::string(1, '0');
+                        }
                     line += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                 }
             // Receiver clock offset (optional)
@@ -8870,7 +9116,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
                     lineObs += Rinex_Printer::rightJustify(Rinex_Printer::asString<int32_t>(ssi), 1);
                     //GPS L1 SIGNAL STRENGTH
                     lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
-                    if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+                    if (lineObs.size() < 80)
+                        {
+                            lineObs += std::string(80 - lineObs.size(), ' ');
+                        }
                     out << lineObs << std::endl;
                 }
         }
@@ -8927,7 +9176,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
                     std::string lineObs;
                     lineObs.clear();
                     lineObs += satelliteSystem["GPS"];
-                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+                    if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                        {
+                            lineObs += std::string(1, '0');
+                        }
                     lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
                     //lineObs += std::string(2, ' ');
                     lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.Pseudorange_m, 3), 14);
@@ -8975,7 +9227,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
                     //GPS L1 SIGNAL STRENGTH
                     lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-                    if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+                    if (lineObs.size() < 80)
+                        {
+                            lineObs += std::string(80 - lineObs.size(), ' ');
+                        }
                     out << lineObs << std::endl;
                 }
         }
@@ -9048,7 +9303,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e
             std::string lineObs;
             lineObs.clear();
             lineObs += satelliteSystem["GPS"];
-            if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
             //lineObs += std::string(2, ' ');
             //GPS L2 PSEUDORANGE
@@ -9097,7 +9355,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e
             //GPS L2 SIGNAL STRENGTH
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -9266,7 +9527,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
         {
             lineObs.clear();
             lineObs += satelliteSystem["GPS"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_mmap.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -9316,7 +9580,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& eph, c
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -9506,7 +9773,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep
         {
             lineObs.clear();
             lineObs += satelliteSystem["Galileo"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -9556,7 +9826,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& ep
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -9701,9 +9974,18 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
             lineObs.clear();
 
             s.assign(1, observables_iter->second.System);
-            if (s == "G") lineObs += satelliteSystem["GPS"];
-            if (s == "E") lineObs += satelliteSystem["Galileo"];  // should not happen
-            if (static_cast<int32_t>(observables_iter->second.PRN) < 10) lineObs += std::string(1, '0');
+            if (s == "G")
+                {
+                    lineObs += satelliteSystem["GPS"];
+                }
+            if (s == "E")
+                {
+                    lineObs += satelliteSystem["Galileo"];  // should not happen
+                }
+            if (static_cast<int32_t>(observables_iter->second.PRN) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(observables_iter->second.PRN));
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.Pseudorange_m, 3), 14);
 
@@ -9749,7 +10031,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
             // SIGNAL STRENGTH
             lineObs += Rinex_Printer::rightJustify(asString(observables_iter->second.CN0_dB_hz, 3), 14);
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 
@@ -9760,7 +10045,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
         {
             lineObs.clear();
             lineObs += satelliteSystem["Galileo"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_gal_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -9810,7 +10098,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
@@ -9989,7 +10280,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e
         {
             lineObs.clear();
             lineObs += satelliteSystem["GPS"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_gps_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -10048,7 +10342,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& e
         {
             lineObs.clear();
             lineObs += satelliteSystem["Galileo"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_gal_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -10298,7 +10595,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
         {
             lineObs.clear();
             lineObs += satelliteSystem["GPS"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_gps_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -10357,7 +10657,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Gps_Ephemeris& gps_ep
         {
             lineObs.clear();
             lineObs += satelliteSystem["Galileo"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_gal_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -10539,7 +10842,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris
         {
             lineObs.clear();
             lineObs += satelliteSystem["Beidou"];
-            if (static_cast<int32_t>(*it) < 10) lineObs += std::string(1, '0');
+            if (static_cast<int32_t>(*it) < 10)
+                {
+                    lineObs += std::string(1, '0');
+                }
             lineObs += std::to_string(static_cast<int32_t>(*it));
             ret = total_map.equal_range(*it);
             for (auto iter = ret.first; iter != ret.second; ++iter)
@@ -10577,7 +10883,10 @@ void Rinex_Printer::log_rinex_obs(std::fstream& out, const Beidou_Dnav_Ephemeris
                     lineObs += Rinex_Printer::rightJustify(asString(iter->second.CN0_dB_hz, 3), 14);
                 }
 
-            if (lineObs.size() < 80) lineObs += std::string(80 - lineObs.size(), ' ');
+            if (lineObs.size() < 80)
+                {
+                    lineObs += std::string(80 - lineObs.size(), ' ');
+                }
             out << lineObs << std::endl;
         }
 }
diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h
index b5ea3357d..1c4475592 100644
--- a/src/algorithms/PVT/libs/rinex_printer.h
+++ b/src/algorithms/PVT/libs/rinex_printer.h
@@ -676,8 +676,15 @@ inline std::string Rinex_Printer::doub2for(const double& d,
     short exponentLength = expLen;
 
     /* Validate the assumptions regarding the input arguments */
-    if (exponentLength < 0) exponentLength = 1;
-    if (exponentLength > 3 && checkSwitch) exponentLength = 3;
+    if (exponentLength < 0)
+        {
+            exponentLength = 1;
+        }
+
+    if (exponentLength > 3 && checkSwitch)
+        {
+            exponentLength = 3;
+        }
 
     std::string toReturn = doub2sci(d, length, exponentLength, true, checkSwitch);
     sci2for(toReturn, 0, length, exponentLength, checkSwitch);
@@ -696,8 +703,15 @@ inline std::string Rinex_Printer::doub2sci(const double& d,
     short exponentLength = expLen;
 
     /* Validate the assumptions regarding the input arguments */
-    if (exponentLength < 0) exponentLength = 1;
-    if (exponentLength > 3 && checkSwitch) exponentLength = 3;
+    if (exponentLength < 0)
+        {
+            exponentLength = 1;
+        }
+
+    if (exponentLength > 3 && checkSwitch)
+        {
+            exponentLength = 3;
+        }
 
     std::stringstream c;
     c.setf(std::ios::scientific, std::ios::floatfield);
@@ -709,7 +723,10 @@ inline std::string Rinex_Printer::doub2sci(const double& d,
     //    an extra -1 for '-' or ' ' if it's positive or negative
     int expSize = 0;
     if (showSign)
-        expSize = 1;
+        {
+            expSize = 1;
+        }
+
     c.precision(length - 3 - exponentLength - 1 - expSize);
     c << d;
     c >> toReturn;
@@ -751,7 +768,9 @@ inline std::string& Rinex_Printer::sci2for(std::string& aStr,
             aStr[idx - 1] = '.';
             // Only add one to the exponent if the number is non-zero
             if (asDouble(aStr.substr(startPos, length)) != 0.0)
-                expAdd = 1;
+                {
+                    expAdd = 1;
+                }
         }
 
     idx = aStr.find('e', startPos);
@@ -766,9 +785,13 @@ inline std::string& Rinex_Printer::sci2for(std::string& aStr,
 
     // Change the exponent character to D normally, or E of checkSwitch is false.
     if (checkSwitch)
-        aStr[idx] = 'D';
+        {
+            aStr[idx] = 'D';
+        }
     else
-        aStr[idx] = 'E';
+        {
+            aStr[idx] = 'E';
+        }
 
     // Change the exponent itself
     if (redoexp)
@@ -784,7 +807,10 @@ inline std::string& Rinex_Printer::sci2for(std::string& aStr,
                     iexp -= iexp * 2;
                 }
             else
-                aStr += "+";
+                {
+                    aStr += "+";
+                }
+
             aStr += Rinex_Printer::rightJustify(asString(iexp), expLen, '0');
         }
 
diff --git a/src/algorithms/PVT/libs/rtcm_printer.cc b/src/algorithms/PVT/libs/rtcm_printer.cc
index 39c7fe650..d3416be6e 100644
--- a/src/algorithms/PVT/libs/rtcm_printer.cc
+++ b/src/algorithms/PVT/libs/rtcm_printer.cc
@@ -201,7 +201,10 @@ Rtcm_Printer::~Rtcm_Printer()
                 }
             if (pos == 0)
                 {
-                    if (remove(rtcm_filename.c_str()) != 0) LOG(INFO) << "Error deleting temporary RTCM file";
+                    if (remove(rtcm_filename.c_str()) != 0)
+                        {
+                            LOG(INFO) << "Error deleting temporary RTCM file";
+                        }
                 }
         }
     try
@@ -368,10 +371,16 @@ int Rtcm_Printer::init_serial(const std::string& serial_device)
     int64_t PARITY;
 
     fd = open(serial_device.c_str(), O_RDWR | O_NOCTTY | O_NDELAY | O_CLOEXEC);
-    if (fd == -1) return fd;  // failed to open TTY port
+    if (fd == -1)
+        {
+            return fd;  // failed to open TTY port
+        }
 
-    if (fcntl(fd, F_SETFL, 0) == -1) LOG(INFO) << "Error enabling direct I/O";  // clear all flags on descriptor, enable direct I/O
-    tcgetattr(fd, &options);                                                    // read serial port options
+    if (fcntl(fd, F_SETFL, 0) == -1)
+        {
+            LOG(INFO) << "Error enabling direct I/O";  // clear all flags on descriptor, enable direct I/O
+        }
+    tcgetattr(fd, &options);  // read serial port options
 
     BAUD = B9600;
     //BAUD  =  B38400;
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index 6057276ab..aeabc0517 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -76,7 +76,10 @@ rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag
     count_valid_position = 0;
     this->set_averaging_flag(false);
     rtk_ = rtk;
-    for (double &i : dop_) i = 0.0;
+    for (double &i : dop_)
+        {
+            i = 0.0;
+        }
     pvt_sol = {{0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}, '0', '0', '0', 0, 0, 0};
     ssat_t ssat0 = {0, 0, {0.0}, {0.0}, {0.0}, {'0'}, {'0'}, {'0'}, {'0'}, {'0'}, {}, {}, {}, {}, 0.0, 0.0, 0.0, 0.0, {{{0, 0}}, {{0, 0}}}, {{}, {}}};
     for (auto &i : pvt_ssat)
@@ -505,7 +508,10 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
                     }
                 }
         }
-    if (band1 == true and band2 == true) gps_dual_band = true;
+    if (band1 == true and band2 == true)
+        {
+            gps_dual_band = true;
+        }
 
     for (gnss_observables_iter = gnss_observables_map.cbegin();
          gnss_observables_iter != gnss_observables_map.cend();
@@ -864,7 +870,10 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
                                 }
                         }
 
-                    if (index_aux > 0) dops(index_aux, azel.data(), 0.0, dop_.data());
+                    if (index_aux > 0)
+                        {
+                            dops(index_aux, azel.data(), 0.0, dop_.data());
+                        }
                     this->set_valid_position(true);
                     arma::vec rx_position_and_time(4);
                     rx_position_and_time(0) = pvt_sol.rr[0];  // [m]
@@ -893,7 +902,10 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
                     if (ground_speed_ms >= 1.0)
                         {
                             new_cog = atan2(enuv[0], enuv[1]) * R2D;
-                            if (new_cog < 0.0) new_cog += 360.0;
+                            if (new_cog < 0.0)
+                                {
+                                    new_cog += 360.0;
+                                }
                             this->set_course_over_ground(new_cog);
                         }
 
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
index 84de3096b..7ee2a7277 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
@@ -68,7 +68,10 @@ BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
     blocking_ = configuration_->property(role + ".blocking", true);
     acq_parameters.blocking = blocking_;
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters.doppler_max = doppler_max_;
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
     acq_parameters.sampled_ms = sampled_ms_;
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
index a0312ebe6..334aff555 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
@@ -41,8 +41,8 @@
 #include <gnuradio/blocks/float_to_complex.h>
 #include <gnuradio/blocks/stream_to_vector.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
-#include <string>
 #include <cstdint>
+#include <string>
 
 
 class ConfigurationInterface;
@@ -164,7 +164,7 @@ private:
     uint32_t doppler_step_;
     uint32_t sampled_ms_;
     uint32_t max_dwells_;
-    int64_t  fs_in_;
+    int64_t fs_in_;
     bool dump_;
     bool blocking_;
     std::string dump_filename_;
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
index 7af5d228f..0f6449ff0 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
@@ -61,7 +61,10 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 4);
 
     if (sampled_ms_ % 4 != 0)
@@ -145,7 +148,10 @@ void GalileoE1Pcps8msAmbiguousAcquisition::set_threshold(float threshold)
 {
     float pfa = configuration_->property(role_ + std::to_string(channel_) + ".pfa", 0.0);
 
-    if (pfa == 0.0) pfa = configuration_->property(role_ + ".pfa", 0.0);
+    if (pfa == 0.0)
+        {
+            pfa = configuration_->property(role_ + ".pfa", 0.0);
+        }
 
     if (pfa == 0.0)
         {
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 79e25061c..5f4137f7d 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -62,7 +62,10 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     acq_parameters_.fs_in = fs_in_;
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters_.doppler_max = doppler_max_;
     acq_parameters_.ms_per_code = 4;
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", acq_parameters_.ms_per_code);
@@ -187,7 +190,10 @@ void GalileoE1PcpsAmbiguousAcquisition::set_threshold(float threshold)
 {
     float pfa = configuration_->property(role_ + std::to_string(channel_) + ".pfa", 0.0);
 
-    if (pfa == 0.0) pfa = configuration_->property(role_ + ".pfa", 0.0);
+    if (pfa == 0.0)
+        {
+            pfa = configuration_->property(role_ + ".pfa", 0.0);
+        }
 
     if (pfa == 0.0)
         {
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
index 76869f266..a0de0804d 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
@@ -60,7 +60,10 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 4);
 
     if (sampled_ms_ % 4 != 0)
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
index b409eee0b..7437faa8c 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
@@ -61,7 +61,10 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 8);
 
     /*--- Find number of samples per spreading code (4 ms)  -----------------*/
@@ -179,7 +182,10 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisition::set_threshold(float threshold)
 {
     float pfa = configuration_->property(role_ + std::to_string(channel_) + ".pfa", 0.0);
 
-    if (pfa == 0.0) pfa = configuration_->property(role_ + ".pfa", 0.0);
+    if (pfa == 0.0)
+        {
+            pfa = configuration_->property(role_ + ".pfa", 0.0);
+        }
 
     if (pfa == 0.0)
         {
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
index 20418f7ef..bdc0c3971 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
@@ -61,7 +61,10 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 4);
 
     if (sampled_ms_ % 4 != 0)
@@ -149,7 +152,10 @@ void GalileoE1PcpsTongAmbiguousAcquisition::set_threshold(float threshold)
 {
     float pfa = configuration_->property(role_ + std::to_string(channel_) + ".pfa", 0.0);
 
-    if (pfa == 0.0) pfa = configuration_->property(role_ + ".pfa", 0.0);
+    if (pfa == 0.0)
+        {
+            pfa = configuration_->property(role_ + ".pfa", 0.0);
+        }
 
     if (pfa == 0.0)
         {
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
index c6c4f663d..8d65ea52a 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -66,7 +66,10 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     CAF_window_hz_ = configuration_->property(role + ".CAF_window_hz", 0);
     Zero_padding = configuration_->property(role + ".Zero_padding", 0);
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
@@ -155,7 +158,10 @@ void GalileoE5aNoncoherentIQAcquisitionCaf::set_threshold(float threshold)
 {
     float pfa = configuration_->property(role_ + std::to_string(channel_) + ".pfa", 0.0);
 
-    if (pfa == 0.0) pfa = configuration_->property(role_ + ".pfa", 0.0);
+    if (pfa == 0.0)
+        {
+            pfa = configuration_->property(role_ + ".pfa", 0.0);
+        }
 
     if (pfa == 0.0)
         {
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
index 4b7abfc8f..079599926 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
@@ -70,7 +70,10 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
     acq_parameters_.dump = dump_;
     acq_parameters_.dump_channel = configuration_->property(role + ".dump_channel", 0);
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters_.doppler_max = doppler_max_;
     sampled_ms_ = 1;
     max_dwells_ = configuration_->property(role + ".max_dwells", 1);
diff --git a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
index 050190ee7..4480fd30b 100644
--- a/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/glonass_l1_ca_pcps_acquisition.cc
@@ -71,7 +71,10 @@ GlonassL1CaPcpsAcquisition::GlonassL1CaPcpsAcquisition(
     blocking_ = configuration_->property(role + ".blocking", true);
     acq_parameters.blocking = blocking_;
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters.doppler_max = doppler_max_;
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
     acq_parameters.sampled_ms = sampled_ms_;
diff --git a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc
index 93aa9736d..6770310d7 100644
--- a/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/glonass_l2_ca_pcps_acquisition.cc
@@ -70,7 +70,10 @@ GlonassL2CaPcpsAcquisition::GlonassL2CaPcpsAcquisition(
     blocking_ = configuration_->property(role + ".blocking", true);
     acq_parameters.blocking = blocking_;
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters.doppler_max = doppler_max_;
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
     bit_transition_flag_ = configuration_->property(role + ".bit_transition_flag", false);
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
index ce0ea4065..e27f37581 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -70,7 +70,10 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
     blocking_ = configuration_->property(role + ".blocking", true);
     acq_parameters_.blocking = blocking_;
     doppler_max_ = configuration_->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters_.doppler_max = doppler_max_;
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
     acq_parameters_.sampled_ms = sampled_ms_;
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
index 4e16b54ec..4fb0e46cf 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
@@ -67,7 +67,10 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
     acq_parameters.dump_filename = dump_filename_;
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters.doppler_max = doppler_max_;
     sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
     acq_parameters.sampled_ms = sampled_ms_;
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
index fb7a140b7..3770b7c7a 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
@@ -61,7 +61,10 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
     fs_in_ = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration->property(role + ".dump", false);
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     doppler_min_ = configuration->property(role + ".doppler_min", -doppler_max_);
     sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
     max_dwells_ = configuration->property(role + ".max_dwells", 1);
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
index a3d896ccc..2691b1161 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
@@ -61,7 +61,10 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 4);
 
     //--- Find number of samples per spreading code -------------------------
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
index 0b3a627ba..162ea96ae 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
@@ -61,7 +61,10 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
     fs_in_ = configuration_->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump_ = configuration_->property(role + ".dump", false);
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 1);
 
     tong_init_val_ = configuration->property(role + ".tong_init_val", 1);
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
index dcf663121..00fcb7624 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -68,7 +68,10 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
     blocking_ = configuration_->property(role + ".blocking", true);
     acq_parameters_.blocking = blocking_;
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters_.doppler_max = doppler_max_;
     bit_transition_flag_ = configuration_->property(role + ".bit_transition_flag", false);
     acq_parameters_.bit_transition_flag = bit_transition_flag_;
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
index f436da1d4..d3b722823 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -69,7 +69,10 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
     blocking_ = configuration_->property(role + ".blocking", true);
     acq_parameters_.blocking = blocking_;
     doppler_max_ = configuration->property(role + ".doppler_max", 5000);
-    if (FLAGS_doppler_max != 0) doppler_max_ = FLAGS_doppler_max;
+    if (FLAGS_doppler_max != 0)
+        {
+            doppler_max_ = FLAGS_doppler_max;
+        }
     acq_parameters_.doppler_max = doppler_max_;
     bit_transition_flag_ = configuration_->property(role + ".bit_transition_flag", false);
     acq_parameters_.bit_transition_flag = bit_transition_flag_;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index 05ac683e0..cb528d0b1 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -134,7 +134,7 @@ galileo_pcps_8ms_acquisition_cc::~galileo_pcps_8ms_acquisition_cc()
                     d_dump_file.close();
                 }
         }
-    catch (const std::ifstream::failure &e)
+    catch (const std::ofstream::failure &e)
         {
             std::cerr << "Problem closing Acquisition dump file: " << d_dump_filename << '\n';
         }
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
index d95bb24cb..8a806c80f 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc
@@ -317,7 +317,10 @@ void pcps_acquisition::init()
     d_num_doppler_bins = static_cast<uint32_t>(std::ceil(static_cast<double>(static_cast<int32_t>(acq_parameters.doppler_max) - static_cast<int32_t>(-acq_parameters.doppler_max)) / static_cast<double>(d_doppler_step)));
 
     // Create the carrier Doppler wipeoff signals
-    if (d_grid_doppler_wipeoffs == nullptr) d_grid_doppler_wipeoffs = new gr_complex*[d_num_doppler_bins];
+    if (d_grid_doppler_wipeoffs == nullptr)
+        {
+            d_grid_doppler_wipeoffs = new gr_complex*[d_num_doppler_bins];
+        }
     if (acq_parameters.make_2_steps && (d_grid_doppler_wipeoffs_step_two == nullptr))
         {
             d_grid_doppler_wipeoffs_step_two = new gr_complex*[d_num_doppler_bins_step2];
@@ -629,7 +632,10 @@ float pcps_acquisition::first_vs_second_peak_statistic(uint32_t& indext, int32_t
         {
             d_tmp_buffer[idx] = 0.0;
             idx++;
-            if (idx == static_cast<int32_t>(d_fft_size)) idx = 0;
+            if (idx == static_cast<int32_t>(d_fft_size))
+                {
+                    idx = 0;
+                }
         }
     while (idx != excludeRangeIndex2);
 
@@ -842,7 +848,10 @@ void pcps_acquisition::acquisition_core(uint64_t samp_count)
 
             if (d_num_noncoherent_integrations_counter == acq_parameters.max_dwells)
                 {
-                    if (d_state != 0) send_negative_acquisition();
+                    if (d_state != 0)
+                        {
+                            send_negative_acquisition();
+                        }
                     d_state = 0;
                     d_active = false;
                     d_step_two = false;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
index c7a67b47c..db21bbc2b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_fine_doppler_cc.cc
@@ -313,7 +313,10 @@ double pcps_acquisition_fine_doppler_cc::compute_CAF()
         {
             d_grid_data[index_doppler][idx] = 0.0;
             idx++;
-            if (idx == static_cast<int>(d_fft_size)) idx = 0;
+            if (idx == static_cast<int>(d_fft_size))
+                {
+                    idx = 0;
+                }
         }
     while (idx != excludeRangeIndex2);
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 1934ee5e8..5e8100f59 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -392,7 +392,10 @@ int pcps_assisted_acquisition_cc::general_work(int noutput_items,
     switch (d_state)
         {
         case 0:  // S0. StandBy
-            if (d_active == true) d_state = 1;
+            if (d_active == true)
+                {
+                    d_state = 1;
+                }
             d_sample_counter += static_cast<uint64_t>(ninput_items[0]);  // sample counter
             consume_each(ninput_items[0]);
             break;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index 48ae578e6..a55b352c9 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -218,7 +218,10 @@ void pcps_quicksync_acquisition_cc::init()
     d_mag = 0.0;
     d_input_power = 0.0;
 
-    if (d_doppler_step == 0) d_doppler_step = 250;
+    if (d_doppler_step == 0)
+        {
+            d_doppler_step = 250;
+        }
 
     // Count the number of bins
     d_num_doppler_bins = 0;
@@ -545,7 +548,10 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items,
                 DLOG(INFO) << "test statistics threshold " << d_threshold;
                 DLOG(INFO) << "folding factor " << d_folding_factor;
                 DLOG(INFO) << "possible delay correlation output";
-                for (int32_t i = 0; i < static_cast<int32_t>(d_folding_factor); i++) DLOG(INFO) << d_possible_delay[i] << "\t\t\t" << d_corr_output_f[i];
+                for (int32_t i = 0; i < static_cast<int32_t>(d_folding_factor); i++)
+                    {
+                        DLOG(INFO) << d_possible_delay[i] << "\t\t\t" << d_corr_output_f[i];
+                    }
                 DLOG(INFO) << "code phase " << d_gnss_synchro->Acq_delay_samples;
                 DLOG(INFO) << "doppler " << d_gnss_synchro->Acq_doppler_hz;
                 DLOG(INFO) << "magnitude folded " << d_mag;
@@ -574,7 +580,10 @@ int pcps_quicksync_acquisition_cc::general_work(int noutput_items,
                 DLOG(INFO) << "test statistics threshold " << d_threshold;
                 DLOG(INFO) << "folding factor " << d_folding_factor;
                 DLOG(INFO) << "possible delay    corr output";
-                for (int32_t i = 0; i < static_cast<int32_t>(d_folding_factor); i++) DLOG(INFO) << d_possible_delay[i] << "\t\t\t" << d_corr_output_f[i];
+                for (int32_t i = 0; i < static_cast<int32_t>(d_folding_factor); i++)
+                    {
+                        DLOG(INFO) << d_possible_delay[i] << "\t\t\t" << d_corr_output_f[i];
+                    }
                 DLOG(INFO) << "code phase " << d_gnss_synchro->Acq_delay_samples;
                 DLOG(INFO) << "doppler " << d_gnss_synchro->Acq_doppler_hz;
                 DLOG(INFO) << "magnitude folded " << d_mag;
diff --git a/src/algorithms/channel/adapters/channel.cc b/src/algorithms/channel/adapters/channel.cc
index 946f17a65..12fafc3de 100644
--- a/src/algorithms/channel/adapters/channel.cc
+++ b/src/algorithms/channel/adapters/channel.cc
@@ -75,14 +75,23 @@ Channel::Channel(ConfigurationInterface* configuration, uint32_t channel, std::s
     // IMPORTANT: Do not change the order between set_doppler_step and set_threshold
 
     uint32_t doppler_step = configuration->property("Acquisition_" + implementation_ + std::to_string(channel_) + ".doppler_step", 0);
-    if (doppler_step == 0) doppler_step = configuration->property("Acquisition_" + implementation_ + ".doppler_step", 500);
-    if (FLAGS_doppler_step != 0) doppler_step = static_cast<uint32_t>(FLAGS_doppler_step);
+    if (doppler_step == 0)
+        {
+            doppler_step = configuration->property("Acquisition_" + implementation_ + ".doppler_step", 500);
+        }
+    if (FLAGS_doppler_step != 0)
+        {
+            doppler_step = static_cast<uint32_t>(FLAGS_doppler_step);
+        }
     DLOG(INFO) << "Channel " << channel_ << " Doppler_step = " << doppler_step;
 
     acq_->set_doppler_step(doppler_step);
 
     float threshold = configuration->property("Acquisition_" + implementation_ + std::to_string(channel_) + ".threshold", 0.0);
-    if (threshold == 0.0) threshold = configuration->property("Acquisition_" + implementation_ + ".threshold", 0.0);
+    if (threshold == 0.0)
+        {
+            threshold = configuration->property("Acquisition_" + implementation_ + ".threshold", 0.0);
+        }
 
     acq_->set_threshold(threshold);
 
diff --git a/src/algorithms/libs/beidou_b1i_signal_processing.cc b/src/algorithms/libs/beidou_b1i_signal_processing.cc
index b9618223e..d95b2844e 100644
--- a/src/algorithms/libs/beidou_b1i_signal_processing.cc
+++ b/src/algorithms/libs/beidou_b1i_signal_processing.cc
@@ -58,7 +58,9 @@ void beidou_b1i_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift)
 
     /* A simple error check */
     if ((prn_idx < 0) || (prn_idx > 51))
-        return;
+        {
+            return;
+        }
 
     /*for (lcv = 0; lcv < 11; lcv++)
         {
diff --git a/src/algorithms/libs/beidou_b1i_signal_processing.h b/src/algorithms/libs/beidou_b1i_signal_processing.h
index 16c842523..2e420eaae 100644
--- a/src/algorithms/libs/beidou_b1i_signal_processing.h
+++ b/src/algorithms/libs/beidou_b1i_signal_processing.h
@@ -34,8 +34,8 @@
 #define GNSS_SDR_BEIDOU_B1I_SDR_SIGNAL_PROCESSING_H_
 
 #include <complex>
-#include <iostream>
 #include <cstdint>
+#include <iostream>
 
 //! Generates int32_t GPS L1 C/A code for the desired SV ID and code shift
 void beidou_b1i_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift);
diff --git a/src/algorithms/libs/geofunctions.cc b/src/algorithms/libs/geofunctions.cc
index bf67e07f8..48137050b 100644
--- a/src/algorithms/libs/geofunctions.cc
+++ b/src/algorithms/libs/geofunctions.cc
@@ -304,8 +304,14 @@ arma::vec CTM_to_Euler(const arma::mat &C)
     arma::mat CTM(C);
     arma::vec eul = arma::zeros(3, 1);
     eul(0) = atan2(CTM(1, 2), CTM(2, 2));  // roll
-    if (CTM(0, 2) < -1.0) CTM(0, 2) = -1.0;
-    if (CTM(0, 2) > 1.0) CTM(0, 2) = 1.0;
+    if (CTM(0, 2) < -1.0)
+        {
+            CTM(0, 2) = -1.0;
+        }
+    if (CTM(0, 2) > 1.0)
+        {
+            CTM(0, 2) = 1.0;
+        }
     eul(1) = -asin(CTM(0, 2));             // pitch
     eul(2) = atan2(CTM(0, 1), CTM(0, 0));  // yaw
     return eul;
@@ -614,7 +620,10 @@ void cart2utm(const arma::vec &r_eb_e, int zone, arma::vec &r_enu)
     // Ellipsoidal latitude, longitude to spherical latitude, longitude
     bool neg_geo = false;
 
-    if (B < 0.0) neg_geo = true;
+    if (B < 0.0)
+        {
+            neg_geo = true;
+        }
 
     double Bg_r = fabs(B);
     double res_clensin = clsin(bg, 4, 2.0 * Bg_r);
@@ -732,10 +741,14 @@ int findUtmZone(double latitude_deg, double longitude_deg)
 
     // Check value bounds
     if ((longitude_deg > 180.0) || (longitude_deg < -180.0))
-        std::cout << "Longitude value exceeds limits (-180:180).\n";
+        {
+            std::cout << "Longitude value exceeds limits (-180:180).\n";
+        }
 
     if ((latitude_deg > 84.0) || (latitude_deg < -80.0))
-        std::cout << "Latitude value exceeds limits (-80:84).\n";
+        {
+            std::cout << "Latitude value exceeds limits (-80:84).\n";
+        }
 
     //
     // Find zone
@@ -769,7 +782,9 @@ int findUtmZone(double latitude_deg, double longitude_deg)
         {
             // Correction for zone 32
             if ((longitude_deg >= 3.0) && (longitude_deg < 12.0))
-                utmZone = 32;
+                {
+                    utmZone = 32;
+                }
         }
     return utmZone;
 }
diff --git a/src/algorithms/libs/gnss_sdr_flags.cc b/src/algorithms/libs/gnss_sdr_flags.cc
index 3eba67822..e44812281 100644
--- a/src/algorithms/libs/gnss_sdr_flags.cc
+++ b/src/algorithms/libs/gnss_sdr_flags.cc
@@ -69,8 +69,10 @@ DEFINE_double(pll_bw_hz, 0.0, "If defined, bandwidth of the PLL low pass filter,
 
 static bool ValidateC(const char* flagname, const std::string& value)
 {
-    if (boost::filesystem::exists(value) or value == "-")  // value is ok
-        return true;
+    if (boost::filesystem::exists(value) or value == "-")
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ". The file '" << value << "' does not exist." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -78,8 +80,10 @@ static bool ValidateC(const char* flagname, const std::string& value)
 
 static bool ValidateConfigFile(const char* flagname, const std::string& value)
 {
-    if (boost::filesystem::exists(value) or value == std::string(GNSSSDR_INSTALL_DIR "/share/gnss-sdr/conf/default.conf"))  // value is ok
-        return true;
+    if (boost::filesystem::exists(value) or value == std::string(GNSSSDR_INSTALL_DIR "/share/gnss-sdr/conf/default.conf"))
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ". The file '" << value << "' does not exist." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -87,8 +91,10 @@ static bool ValidateConfigFile(const char* flagname, const std::string& value)
 
 static bool ValidateS(const char* flagname, const std::string& value)
 {
-    if (boost::filesystem::exists(value) or value == "-")  // value is ok
-        return true;
+    if (boost::filesystem::exists(value) or value == "-")
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ". The file '" << value << "' does not exist." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -96,8 +102,10 @@ static bool ValidateS(const char* flagname, const std::string& value)
 
 static bool ValidateSignalSource(const char* flagname, const std::string& value)
 {
-    if (boost::filesystem::exists(value) or value == "-")  // value is ok
-        return true;
+    if (boost::filesystem::exists(value) or value == "-")
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ". The file '" << value << "' does not exist." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -106,8 +114,10 @@ static bool ValidateSignalSource(const char* flagname, const std::string& value)
 static bool ValidateDopplerMax(const char* flagname, int32_t value)
 {
     const int32_t max_value = 1000000;
-    if (value >= 0 && value < max_value)  // value is ok
-        return true;
+    if (value >= 0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " Hz." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -116,8 +126,10 @@ static bool ValidateDopplerMax(const char* flagname, int32_t value)
 static bool ValidateDopplerStep(const char* flagname, int32_t value)
 {
     const int32_t max_value = 10000;
-    if (value >= 0 && value < max_value)  // value is ok
-        return true;
+    if (value >= 0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " Hz." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -126,8 +138,10 @@ static bool ValidateDopplerStep(const char* flagname, int32_t value)
 static bool ValidateCn0Samples(const char* flagname, int32_t value)
 {
     const int32_t max_value = 10000;
-    if (value > 0 && value < max_value)  // value is ok
-        return true;
+    if (value > 0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " samples." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -136,8 +150,10 @@ static bool ValidateCn0Samples(const char* flagname, int32_t value)
 static bool ValidateCn0Min(const char* flagname, int32_t value)
 {
     const int32_t max_value = 100;
-    if (value > 0 && value < max_value)  // value is ok
-        return true;
+    if (value > 0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " dB-Hz." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -146,8 +162,10 @@ static bool ValidateCn0Min(const char* flagname, int32_t value)
 static bool ValidateMaxLockFail(const char* flagname, int32_t value)
 {
     const int32_t max_value = 10000;
-    if (value > 0 && value < max_value)  // value is ok
-        return true;
+    if (value > 0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " fails." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -156,8 +174,10 @@ static bool ValidateMaxLockFail(const char* flagname, int32_t value)
 static bool ValidateCarrierLockTh(const char* flagname, double value)
 {
     const double max_value = 1.508;
-    if (value > 0.0 && value < max_value)  // value is ok
-        return true;
+    if (value > 0.0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " rad." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -166,8 +186,10 @@ static bool ValidateCarrierLockTh(const char* flagname, double value)
 static bool ValidateDllBw(const char* flagname, double value)
 {
     const double max_value = 10000.0;
-    if (value >= 0.0 && value < max_value)  // value is ok
-        return true;
+    if (value >= 0.0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " Hz." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
@@ -176,8 +198,10 @@ static bool ValidateDllBw(const char* flagname, double value)
 static bool ValidatePllBw(const char* flagname, double value)
 {
     const double max_value = 10000.0;
-    if (value >= 0.0 && value < max_value)  // value is ok
-        return true;
+    if (value >= 0.0 && value < max_value)
+        {  // value is ok
+            return true;
+        }
     std::cout << "Invalid value for flag -" << flagname << ": " << value << ". Allowed range is 0 < " << flagname << " < " << max_value << " Hz." << std::endl;
     std::cout << "GNSS-SDR program ended." << std::endl;
     return false;
diff --git a/src/algorithms/libs/gps_sdr_signal_processing.cc b/src/algorithms/libs/gps_sdr_signal_processing.cc
index e87593f6e..945be5607 100644
--- a/src/algorithms/libs/gps_sdr_signal_processing.cc
+++ b/src/algorithms/libs/gps_sdr_signal_processing.cc
@@ -64,7 +64,9 @@ void gps_l1_ca_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift)
 
     /* A simple error check */
     if ((prn_idx < 0) || (prn_idx > 51))
-        return;
+        {
+            return;
+        }
 
     for (lcv = 0; lcv < 10; lcv++)
         {
diff --git a/src/algorithms/libs/rtcm.cc b/src/algorithms/libs/rtcm.cc
index 9adda308a..72015187e 100644
--- a/src/algorithms/libs/rtcm.cc
+++ b/src/algorithms/libs/rtcm.cc
@@ -344,8 +344,14 @@ int32_t Rtcm::bin_to_sint(const std::string& s) const
 // Find the sign for glonass data fields (neg = 1, pos = 0)
 static inline uint64_t glo_sgn(double val)
 {
-    if (val < 0) return 1;   // If value is negative return 1
-    if (val == 0) return 0;  // Positive or equal to zero return 0
+    if (val < 0)
+        {
+            return 1;  // If value is negative return 1
+        }
+    if (val == 0)
+        {
+            return 0;  // Positive or equal to zero return 0
+        }
     return 0;
 }
 
@@ -2283,10 +2289,22 @@ std::string Rtcm::print_MSM_1(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1071;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1071;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1081;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1091;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1071;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1071;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1081;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1091;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (gal_eph.i_satellite_PRN != 0) && (glo_gnav_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -2466,10 +2484,22 @@ std::string Rtcm::print_MSM_2(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1072;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1072;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1082;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1092;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1072;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1072;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1082;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1092;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (gal_eph.i_satellite_PRN != 0) && (glo_gnav_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -2567,10 +2597,22 @@ std::string Rtcm::print_MSM_3(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1073;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1073;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1083;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1093;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1073;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1073;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1083;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1093;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (gal_eph.i_satellite_PRN != 0) && (glo_gnav_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -2671,10 +2713,22 @@ std::string Rtcm::print_MSM_4(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1074;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1074;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1084;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1094;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1074;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1074;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1084;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1094;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (gal_eph.i_satellite_PRN != 0) && (glo_gnav_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -2818,10 +2872,22 @@ std::string Rtcm::print_MSM_5(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1075;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1075;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1085;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1095;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1075;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1075;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1085;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1095;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (gal_eph.i_satellite_PRN != 0) && (glo_gnav_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -2974,10 +3040,22 @@ std::string Rtcm::print_MSM_6(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1076;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1076;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1086;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1096;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1076;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1076;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1086;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1096;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (gal_eph.i_satellite_PRN != 0) && (glo_gnav_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -3081,10 +3159,22 @@ std::string Rtcm::print_MSM_7(const Gps_Ephemeris& gps_eph,
     bool more_messages)
 {
     uint32_t msg_number = 0;
-    if (gps_eph.i_satellite_PRN != 0) msg_number = 1077;
-    if (gps_cnav_eph.i_satellite_PRN != 0) msg_number = 1077;
-    if (glo_gnav_eph.i_satellite_PRN != 0) msg_number = 1087;
-    if (gal_eph.i_satellite_PRN != 0) msg_number = 1097;
+    if (gps_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1077;
+        }
+    if (gps_cnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1077;
+        }
+    if (glo_gnav_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1087;
+        }
+    if (gal_eph.i_satellite_PRN != 0)
+        {
+            msg_number = 1097;
+        }
     if (((gps_eph.i_satellite_PRN != 0) || (gps_cnav_eph.i_satellite_PRN != 0)) && (glo_gnav_eph.i_satellite_PRN != 0) && (gal_eph.i_satellite_PRN != 0))
         {
             LOG(WARNING) << "MSM messages for observables from different systems are not defined";  //print two messages?
@@ -3461,13 +3551,34 @@ uint32_t Rtcm::lock_time(const Glonass_Gnav_Ephemeris& eph, double obs_time, con
 uint32_t Rtcm::lock_time_indicator(uint32_t lock_time_period_s)
 {
     // Table 3.4-2
-    if (lock_time_period_s <= 0) return 0;
-    if (lock_time_period_s < 24) return lock_time_period_s;
-    if (lock_time_period_s < 72) return (lock_time_period_s + 24) / 2;
-    if (lock_time_period_s < 168) return (lock_time_period_s + 120) / 4;
-    if (lock_time_period_s < 360) return (lock_time_period_s + 408) / 8;
-    if (lock_time_period_s < 744) return (lock_time_period_s + 1176) / 16;
-    if (lock_time_period_s < 937) return (lock_time_period_s + 3096) / 32;
+    if (lock_time_period_s <= 0)
+        {
+            return 0;
+        }
+    if (lock_time_period_s < 24)
+        {
+            return lock_time_period_s;
+        }
+    if (lock_time_period_s < 72)
+        {
+            return (lock_time_period_s + 24) / 2;
+        }
+    if (lock_time_period_s < 168)
+        {
+            return (lock_time_period_s + 120) / 4;
+        }
+    if (lock_time_period_s < 360)
+        {
+            return (lock_time_period_s + 408) / 8;
+        }
+    if (lock_time_period_s < 744)
+        {
+            return (lock_time_period_s + 1176) / 16;
+        }
+    if (lock_time_period_s < 937)
+        {
+            return (lock_time_period_s + 3096) / 32;
+        }
     return 127;
 }
 
@@ -3475,21 +3586,66 @@ uint32_t Rtcm::lock_time_indicator(uint32_t lock_time_period_s)
 uint32_t Rtcm::msm_lock_time_indicator(uint32_t lock_time_period_s)
 {
     // Table 3.5-74
-    if (lock_time_period_s < 32) return 0;
-    if (lock_time_period_s < 64) return 1;
-    if (lock_time_period_s < 128) return 2;
-    if (lock_time_period_s < 256) return 3;
-    if (lock_time_period_s < 512) return 4;
-    if (lock_time_period_s < 1024) return 5;
-    if (lock_time_period_s < 2048) return 6;
-    if (lock_time_period_s < 4096) return 7;
-    if (lock_time_period_s < 8192) return 8;
-    if (lock_time_period_s < 16384) return 9;
-    if (lock_time_period_s < 32768) return 10;
-    if (lock_time_period_s < 65536) return 11;
-    if (lock_time_period_s < 131072) return 12;
-    if (lock_time_period_s < 262144) return 13;
-    if (lock_time_period_s < 524288) return 14;
+    if (lock_time_period_s < 32)
+        {
+            return 0;
+        }
+    if (lock_time_period_s < 64)
+        {
+            return 1;
+        }
+    if (lock_time_period_s < 128)
+        {
+            return 2;
+        }
+    if (lock_time_period_s < 256)
+        {
+            return 3;
+        }
+    if (lock_time_period_s < 512)
+        {
+            return 4;
+        }
+    if (lock_time_period_s < 1024)
+        {
+            return 5;
+        }
+    if (lock_time_period_s < 2048)
+        {
+            return 6;
+        }
+    if (lock_time_period_s < 4096)
+        {
+            return 7;
+        }
+    if (lock_time_period_s < 8192)
+        {
+            return 8;
+        }
+    if (lock_time_period_s < 16384)
+        {
+            return 9;
+        }
+    if (lock_time_period_s < 32768)
+        {
+            return 10;
+        }
+    if (lock_time_period_s < 65536)
+        {
+            return 11;
+        }
+    if (lock_time_period_s < 131072)
+        {
+            return 12;
+        }
+    if (lock_time_period_s < 262144)
+        {
+            return 13;
+        }
+    if (lock_time_period_s < 524288)
+        {
+            return 14;
+        }
     return 15;
 }
 
@@ -3520,8 +3676,8 @@ uint32_t Rtcm::msm_extended_lock_time_indicator(uint32_t lock_time_period_s)
     if( 16777216 <= lock_time_period_s && lock_time_period_s < 33554432 ) return (640 + (lock_time_period_s - 16777216) / 524288 );
     if( 33554432 <= lock_time_period_s && lock_time_period_s < 67108864 ) return (672 + (lock_time_period_s - 33554432) / 1048576);
     if( 67108864 <= lock_time_period_s                                  ) return (704                                            );
-    return 1023; // will never happen
-}
+     return 1023; // will never happen
+ }
 // clang-format on
 
 // *****************************************************************************************************
@@ -5182,8 +5338,14 @@ int32_t Rtcm::set_DF399(const Gnss_Synchro& gnss_synchro)
         }
 
     double rough_phase_range_rate_ms = std::round(-gnss_synchro.Carrier_Doppler_hz * lambda);
-    if (rough_phase_range_rate_ms < -8191) rough_phase_range_rate_ms = -8192;
-    if (rough_phase_range_rate_ms > 8191) rough_phase_range_rate_ms = -8192;
+    if (rough_phase_range_rate_ms < -8191)
+        {
+            rough_phase_range_rate_ms = -8192;
+        }
+    if (rough_phase_range_rate_ms > 8191)
+        {
+            rough_phase_range_rate_ms = -8192;
+        }
 
     DF399 = std::bitset<14>(static_cast<int32_t>(rough_phase_range_rate_ms));
     return 0;
diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 64eeb2d26..f409d4e84 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -553,7 +553,9 @@ private:
         {
             body_length_ = new_length;
             if (body_length_ > max_body_length)
-                body_length_ = max_body_length;
+                {
+                    body_length_ = max_body_length;
+                }
         }
 
         inline bool decode_header()
@@ -609,7 +611,9 @@ private:
         {
             participants_.insert(participant);
             for (auto msg : recent_msgs_)
-                participant->deliver(msg);
+                {
+                    participant->deliver(msg);
+                }
         }
 
         inline void leave(const std::shared_ptr<Rtcm_Listener>& participant)
@@ -621,10 +625,14 @@ private:
         {
             recent_msgs_.push_back(msg);
             while (recent_msgs_.size() > max_recent_msgs)
-                recent_msgs_.pop_front();
+                {
+                    recent_msgs_.pop_front();
+                }
 
             for (auto participant : participants_)
-                participant->deliver(msg);
+                {
+                    participant->deliver(msg);
+                }
         }
 
     private:
@@ -854,7 +862,11 @@ private:
                     std::string message;
                     Rtcm_Message msg;
                     queue_->wait_and_pop(message);  //message += '\n';
-                    if (message == "Goodbye") break;
+                    if (message == "Goodbye")
+                        {
+                            break;
+                        }
+
                     const char* char_msg = message.c_str();
                     msg.body_length(message.length());
                     std::memcpy(msg.body(), char_msg, msg.body_length());
@@ -918,7 +930,10 @@ private:
                                         LOG(INFO) << "Serving client from " << remote_addr;
                                     }
                             }
-                        if (start_session) std::make_shared<Rtcm_Session>(std::move(socket_), room_)->start();
+                        if (start_session)
+                            {
+                                std::make_shared<Rtcm_Session>(std::move(socket_), room_)->start();
+                            }
                     }
                 else
                     {
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index 7edb5786b..00ba91be2 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -343,7 +343,7 @@ const int POSOPT_RINEX = 3;   //!< pos option: rinex header pos
 const int MAXSTRPATH = 1024;  //!<  max length of stream path
 const int MAXSTRMSG = 1024;   //!<  max length of stream message
 
-using fatalfunc_t = void (const char *);  //!<  fatal callback function type
+using fatalfunc_t = void(const char *);  //!<  fatal callback function type
 
 #define STR_MODE_R 0x1  /* stream mode: read */
 #define STR_MODE_W 0x2  /* stream mode: write */
diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.cc b/src/algorithms/libs/rtklib/rtklib_conversions.cc
index 0f732e3cd..ffd595c44 100644
--- a/src/algorithms/libs/rtklib/rtklib_conversions.cc
+++ b/src/algorithms/libs/rtklib/rtklib_conversions.cc
@@ -49,8 +49,14 @@ obsd_t insert_obs_to_rtklib(obsd_t& rtklib_obs, const Gnss_Synchro& gnss_synchro
             break;
         }
     double CN0_dB_Hz_est = gnss_synchro.CN0_dB_hz;
-    if (CN0_dB_Hz_est > 63.75) CN0_dB_Hz_est = 63.75;
-    if (CN0_dB_Hz_est < 0.0) CN0_dB_Hz_est = 0.0;
+    if (CN0_dB_Hz_est > 63.75)
+        {
+            CN0_dB_Hz_est = 63.75;
+        }
+    if (CN0_dB_Hz_est < 0.0)
+        {
+            CN0_dB_Hz_est = 0.0;
+        }
     auto CN0_dB_Hz = static_cast<unsigned char>(std::round(CN0_dB_Hz_est / 0.25));
     rtklib_obs.SNR[band] = CN0_dB_Hz;
     //Galileo is the third satellite system for RTKLIB, so, add the required offset to discriminate Galileo ephemeris
diff --git a/src/algorithms/libs/rtklib/rtklib_ephemeris.cc b/src/algorithms/libs/rtklib/rtklib_ephemeris.cc
index c942c0d2c..bd72b7f9f 100644
--- a/src/algorithms/libs/rtklib/rtklib_ephemeris.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ephemeris.cc
@@ -99,8 +99,14 @@ double var_uraeph(int ura)
 double var_urassr(int ura)
 {
     double std_;
-    if (ura <= 0) return std::pow(DEFURASSR, 2.0);
-    if (ura >= 63) return std::pow(5.4665, 2.0);
+    if (ura <= 0)
+        {
+            return std::pow(DEFURASSR, 2.0);
+        }
+    if (ura >= 63)
+        {
+            return std::pow(5.4665, 2.0);
+        }
     std_ = (std::pow((ura >> 3) & 7, 2.0) * (1.0 + (ura & 7) / 4.0) - 1.0) * 1e-3;
     return std::pow(std_, 2.0);
 }
@@ -323,13 +329,25 @@ void glorbit(double t, double *x, const double *acc)
     int i;
 
     deq(x, k1, acc);
-    for (i = 0; i < 6; i++) w[i] = x[i] + k1[i] * t / 2.0;
+    for (i = 0; i < 6; i++)
+        {
+            w[i] = x[i] + k1[i] * t / 2.0;
+        }
     deq(w, k2, acc);
-    for (i = 0; i < 6; i++) w[i] = x[i] + k2[i] * t / 2.0;
+    for (i = 0; i < 6; i++)
+        {
+            w[i] = x[i] + k2[i] * t / 2.0;
+        }
     deq(w, k3, acc);
-    for (i = 0; i < 6; i++) w[i] = x[i] + k3[i] * t;
+    for (i = 0; i < 6; i++)
+        {
+            w[i] = x[i] + k3[i] * t;
+        }
     deq(w, k4, acc);
-    for (i = 0; i < 6; i++) x[i] += (k1[i] + 2.0 * k2[i] + 2.0 * k3[i] + k4[i]) * t / 6.0;
+    for (i = 0; i < 6; i++)
+        {
+            x[i] += (k1[i] + 2.0 * k2[i] + 2.0 * k3[i] + k4[i]) * t / 6.0;
+        }
 }
 
 
@@ -386,10 +404,16 @@ void geph2pos(gtime_t time, const geph_t *geph, double *rs, double *dts,
         }
     for (tt = t < 0.0 ? -TSTEP : TSTEP; fabs(t) > 1e-9; t -= tt)
         {
-            if (fabs(t) < TSTEP) tt = t;
+            if (fabs(t) < TSTEP)
+                {
+                    tt = t;
+                }
             glorbit(tt, x, geph->acc);
         }
-    for (i = 0; i < 3; i++) rs[i] = x[i];
+    for (i = 0; i < 3; i++)
+        {
+            rs[i] = x[i];
+        }
 
     *var = std::pow(ERREPH_GLO, 2.0);
 }
@@ -476,10 +500,22 @@ eph_t *seleph(gtime_t time, int sat, int iode, const nav_t *nav)
 
     for (i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
-            if (iode >= 0 && nav->eph[i].iode != iode) continue;
-            if ((t = fabs(timediff(nav->eph[i].toe, time))) > tmax) continue;
-            if (iode >= 0) return nav->eph + i;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
+            if (iode >= 0 && nav->eph[i].iode != iode)
+                {
+                    continue;
+                }
+            if ((t = fabs(timediff(nav->eph[i].toe, time))) > tmax)
+                {
+                    continue;
+                }
+            if (iode >= 0)
+                {
+                    return nav->eph + i;
+                }
             if (t <= tmin)
                 {
                     j = i;
@@ -506,10 +542,22 @@ geph_t *selgeph(gtime_t time, int sat, int iode, const nav_t *nav)
 
     for (i = 0; i < nav->ng; i++)
         {
-            if (nav->geph[i].sat != sat) continue;
-            if (iode >= 0 && nav->geph[i].iode != iode) continue;
-            if ((t = fabs(timediff(nav->geph[i].toe, time))) > tmax) continue;
-            if (iode >= 0) return nav->geph + i;
+            if (nav->geph[i].sat != sat)
+                {
+                    continue;
+                }
+            if (iode >= 0 && nav->geph[i].iode != iode)
+                {
+                    continue;
+                }
+            if ((t = fabs(timediff(nav->geph[i].toe, time))) > tmax)
+                {
+                    continue;
+                }
+            if (iode >= 0)
+                {
+                    return nav->geph + i;
+                }
             if (t <= tmin)
                 {
                     j = i;
@@ -536,8 +584,14 @@ seph_t *selseph(gtime_t time, int sat, const nav_t *nav)
 
     for (i = 0; i < nav->ns; i++)
         {
-            if (nav->seph[i].sat != sat) continue;
-            if ((t = fabs(timediff(nav->seph[i].t0, time))) > tmax) continue;
+            if (nav->seph[i].sat != sat)
+                {
+                    continue;
+                }
+            if ((t = fabs(timediff(nav->seph[i].t0, time))) > tmax)
+                {
+                    continue;
+                }
             if (t <= tmin)
                 {
                     j = i;
@@ -568,21 +622,32 @@ int ephclk(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
 
     if (sys == SYS_GPS || sys == SYS_GAL || sys == SYS_QZS || sys == SYS_BDS)
         {
-            if (!(eph = seleph(teph, sat, -1, nav))) return 0;
+            if (!(eph = seleph(teph, sat, -1, nav)))
+                {
+                    return 0;
+                }
             *dts = eph2clk(time, eph);
         }
     else if (sys == SYS_GLO)
         {
-            if (!(geph = selgeph(teph, sat, -1, nav))) return 0;
+            if (!(geph = selgeph(teph, sat, -1, nav)))
+                {
+                    return 0;
+                }
             *dts = geph2clk(time, geph);
         }
     else if (sys == SYS_SBS)
         {
-            if (!(seph = selseph(teph, sat, nav))) return 0;
+            if (!(seph = selseph(teph, sat, nav)))
+                {
+                    return 0;
+                }
             *dts = seph2clk(time, seph);
         }
     else
-        return 0;
+        {
+            return 0;
+        }
 
     return 1;
 }
@@ -606,7 +671,10 @@ int ephpos(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
 
     if (sys == SYS_GPS || sys == SYS_GAL || sys == SYS_QZS || sys == SYS_BDS)
         {
-            if (!(eph = seleph(teph, sat, iode, nav))) return 0;
+            if (!(eph = seleph(teph, sat, iode, nav)))
+                {
+                    return 0;
+                }
 
             eph2pos(time, eph, rs, dts, var);
             time = timeadd(time, tt);
@@ -615,7 +683,10 @@ int ephpos(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
         }
     else if (sys == SYS_GLO)
         {
-            if (!(geph = selgeph(teph, sat, iode, nav))) return 0;
+            if (!(geph = selgeph(teph, sat, iode, nav)))
+                {
+                    return 0;
+                }
             geph2pos(time, geph, rs, dts, var);
             time = timeadd(time, tt);
             geph2pos(time, geph, rst, dtst, var);
@@ -623,7 +694,10 @@ int ephpos(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
         }
     else if (sys == SYS_SBS)
         {
-            if (!(seph = selseph(teph, sat, nav))) return 0;
+            if (!(seph = selseph(teph, sat, nav)))
+                {
+                    return 0;
+                }
 
             seph2pos(time, seph, rs, dts, var);
             time = timeadd(time, tt);
@@ -631,10 +705,15 @@ int ephpos(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             *svh = seph->svh;
         }
     else
-        return 0;
+        {
+            return 0;
+        }
 
     /* satellite velocity and clock drift by differential approx */
-    for (i = 0; i < 3; i++) rs[i + 3] = (rst[i] - rs[i]) / tt;
+    for (i = 0; i < 3; i++)
+        {
+            rs[i + 3] = (rst[i] - rs[i]) / tt;
+        }
     dts[1] = (dtst[0] - dts[0]) / tt;
 
     return 1;
@@ -654,7 +733,10 @@ int satpos_sbas(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
     for (i = 0; i < nav->sbssat.nsat; i++)
         {
             sbs = nav->sbssat.sat + i;
-            if (sbs->sat == sat) break;
+            if (sbs->sat == sat)
+                {
+                    break;
+                }
         }
     if (i >= nav->sbssat.nsat)
         {
@@ -664,10 +746,16 @@ int satpos_sbas(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             return 0;
         }
     /* satellite position and clock by broadcast ephemeris */
-    if (!ephpos(time, teph, sat, nav, sbs->lcorr.iode, rs, dts, var, svh)) return 0;
+    if (!ephpos(time, teph, sat, nav, sbs->lcorr.iode, rs, dts, var, svh))
+        {
+            return 0;
+        }
 
     /* sbas satellite correction (long term and fast) */
-    if (sbssatcorr(time, sat, nav, rs, dts, var)) return 1;
+    if (sbssatcorr(time, sat, nav, rs, dts, var))
+        {
+            return 1;
+        }
     *svh = -1;
     return 0;
 }
@@ -716,10 +804,19 @@ int satpos_ssr(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             *svh = -1;
             return 0;
         }
-    if (ssr->udi[0] >= 1.0) t1 -= ssr->udi[0] / 2.0;
-    if (ssr->udi[1] >= 1.0) t2 -= ssr->udi[0] / 2.0;
+    if (ssr->udi[0] >= 1.0)
+        {
+            t1 -= ssr->udi[0] / 2.0;
+        }
+    if (ssr->udi[1] >= 1.0)
+        {
+            t2 -= ssr->udi[0] / 2.0;
+        }
 
-    for (i = 0; i < 3; i++) deph[i] = ssr->deph[i] + ssr->ddeph[i] * t1;
+    for (i = 0; i < 3; i++)
+        {
+            deph[i] = ssr->deph[i] + ssr->ddeph[i] * t1;
+        }
     dclk = ssr->dclk[0] + ssr->dclk[1] * t2 + ssr->dclk[2] * t2 * t2;
 
     /* ssr highrate clock correction (ref [4]) */
@@ -735,13 +832,19 @@ int satpos_ssr(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             return 0;
         }
     /* satellite position and clock by broadcast ephemeris */
-    if (!ephpos(time, teph, sat, nav, ssr->iode, rs, dts, var, svh)) return 0;
+    if (!ephpos(time, teph, sat, nav, ssr->iode, rs, dts, var, svh))
+        {
+            return 0;
+        }
 
     /* satellite clock for gps, galileo and qzss */
     sys = satsys(sat, nullptr);
     if (sys == SYS_GPS || sys == SYS_GAL || sys == SYS_QZS || sys == SYS_BDS)
         {
-            if (!(eph = seleph(teph, sat, ssr->iode, nav))) return 0;
+            if (!(eph = seleph(teph, sat, ssr->iode, nav)))
+                {
+                    return 0;
+                }
 
             /* satellite clock by clock parameters */
             tk = timediff(time, eph->toc);
@@ -752,7 +855,10 @@ int satpos_ssr(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             dts[0] -= 2.0 * dot(rs, rs + 3, 3) / SPEED_OF_LIGHT / SPEED_OF_LIGHT;
         }
     /* radial-along-cross directions in ecef */
-    if (!normv3(rs + 3, ea)) return 0;
+    if (!normv3(rs + 3, ea))
+        {
+            return 0;
+        }
     cross3(rs, rs + 3, rc);
     if (!normv3(rc, ec))
         {
@@ -819,9 +925,13 @@ int satpos(gtime_t time, gtime_t teph, int sat, int ephopt,
             return satpos_ssr(time, teph, sat, nav, 1, rs, dts, var, svh);
         case EPHOPT_PREC:
             if (!peph2pos(time, sat, nav, 1, rs, dts, var))
-                break;
+                {
+                    break;
+                }
             else
-                return 1;
+                {
+                    return 1;
+                }
             //TODO: enable lex
             //case EPHOPT_LEX   :
             //    if (!lexeph2pos(time, sat, nav, rs, dts, var)) break; else return 1;
@@ -866,14 +976,25 @@ void satposs(gtime_t teph, const obsd_t *obs, int n, const nav_t *nav,
 
     for (i = 0; i < n && i < MAXOBS; i++)
         {
-            for (j = 0; j < 6; j++) rs[j + i * 6] = 0.0;
-            for (j = 0; j < 2; j++) dts[j + i * 2] = 0.0;
+            for (j = 0; j < 6; j++)
+                {
+                    rs[j + i * 6] = 0.0;
+                }
+            for (j = 0; j < 2; j++)
+                {
+                    dts[j + i * 2] = 0.0;
+                }
             var[i] = 0.0;
             svh[i] = 0;
 
             /* search any pseudorange */
             for (j = 0, pr = 0.0; j < NFREQ; j++)
-                if ((pr = obs[i].P[j]) != 0.0) break;
+                {
+                    if ((pr = obs[i].P[j]) != 0.0)
+                        {
+                            break;
+                        }
+                }
 
             if (j >= NFREQ)
                 {
@@ -901,7 +1022,10 @@ void satposs(gtime_t teph, const obsd_t *obs, int n, const nav_t *nav,
             /* if no precise clock available, use broadcast clock instead */
             if (dts[i * 2] == 0.0)
                 {
-                    if (!ephclk(time[i], teph, obs[i].sat, nav, dts + i * 2)) continue;
+                    if (!ephclk(time[i], teph, obs[i].sat, nav, dts + i * 2))
+                        {
+                            continue;
+                        }
                     dts[1 + i * 2] = 0.0;
                     *var = std::pow(STD_BRDCCLK, 2.0);
                 }
diff --git a/src/algorithms/libs/rtklib/rtklib_ionex.cc b/src/algorithms/libs/rtklib/rtklib_ionex.cc
index ab02c788f..8ba2bb950 100644
--- a/src/algorithms/libs/rtklib/rtklib_ionex.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ionex.cc
@@ -64,9 +64,18 @@
 /* get index -----------------------------------------------------------------*/
 int getindex(double value, const double *range)
 {
-    if (range[2] == 0.0) return 0;
-    if (range[1] > 0.0 && (value < range[0] || range[1] < value)) return -1;
-    if (range[1] < 0.0 && (value < range[1] || range[0] < value)) return -1;
+    if (range[2] == 0.0)
+        {
+            return 0;
+        }
+    if (range[1] > 0.0 && (value < range[0] || range[1] < value))
+        {
+            return -1;
+        }
+    if (range[1] < 0.0 && (value < range[1] || range[0] < value))
+        {
+            return -1;
+        }
     return static_cast<int>(floor((value - range[0]) / range[2] + 0.5));
 }
 
@@ -81,7 +90,10 @@ int nitem(const double *range)
 /* data index (i:lat,j:lon,k:hgt) --------------------------------------------*/
 int dataindex(int i, int j, int k, const int *ndata)
 {
-    if (i < 0 || ndata[0] <= i || j < 0 || ndata[1] <= j || k < 0 || ndata[2] <= k) return -1;
+    if (i < 0 || ndata[0] <= i || j < 0 || ndata[1] <= j || k < 0 || ndata[2] <= k)
+        {
+            return -1;
+        }
     return i + ndata[0] * (j + ndata[1] * k);
 }
 
@@ -99,7 +111,10 @@ tec_t *addtec(const double *lats, const double *lons, const double *hgts,
     ndata[0] = nitem(lats);
     ndata[1] = nitem(lons);
     ndata[2] = nitem(hgts);
-    if (ndata[0] <= 1 || ndata[1] <= 1 || ndata[2] <= 0) return nullptr;
+    if (ndata[0] <= 1 || ndata[1] <= 1 || ndata[2] <= 0)
+        {
+            return nullptr;
+        }
 
     if (nav->nt >= nav->ntmax)
         {
@@ -149,11 +164,17 @@ void readionexdcb(FILE *fp, double *dcb, double *rms)
 
     trace(3, "readionexdcb:\n");
 
-    for (i = 0; i < MAXSAT; i++) dcb[i] = rms[i] = 0.0;
+    for (i = 0; i < MAXSAT; i++)
+        {
+            dcb[i] = rms[i] = 0.0;
+        }
 
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (strlen(buff) < 60) continue;
+            if (strlen(buff) < 60)
+                {
+                    continue;
+                }
             label = buff + 60;
 
             if (strstr(label, "PRN / BIAS / RMS") == label)
@@ -170,7 +191,9 @@ void readionexdcb(FILE *fp, double *dcb, double *rms)
                     rms[sat - 1] = str2num(buff, 16, 10);
                 }
             else if (strstr(label, "END OF AUX DATA") == label)
-                break;
+                {
+                    break;
+                }
         }
 }
 
@@ -186,12 +209,18 @@ double readionexh(FILE *fp, double *lats, double *lons, double *hgts,
 
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (strlen(buff) < 60) continue;
+            if (strlen(buff) < 60)
+                {
+                    continue;
+                }
             label = buff + 60;
 
             if (strstr(label, "IONEX VERSION / TYPE") == label)
                 {
-                    if (buff[20] == 'I') ver = str2num(buff, 0, 8);
+                    if (buff[20] == 'I')
+                        {
+                            ver = str2num(buff, 0, 8);
+                        }
                 }
             else if (strstr(label, "BASE RADIUS") == label)
                 {
@@ -247,11 +276,17 @@ int readionexb(FILE *fp, const double *lats, const double *lons,
 
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (strlen(buff) < 60) continue;
+            if (strlen(buff) < 60)
+                {
+                    continue;
+                }
 
             if (strstr(label, "START OF TEC MAP") == label)
                 {
-                    if ((p = addtec(lats, lons, hgts, rb, nav))) type = 1;
+                    if ((p = addtec(lats, lons, hgts, rb, nav)))
+                        {
+                            type = 1;
+                        }
                 }
             else if (strstr(label, "END OF TEC MAP") == label)
                 {
@@ -279,13 +314,18 @@ int readionexb(FILE *fp, const double *lats, const double *lons,
                         {
                             for (i = nav->nt - 1; i >= 0; i--)
                                 {
-                                    if (fabs(timediff(time, nav->tec[i].time)) >= 1.0) continue;
+                                    if (fabs(timediff(time, nav->tec[i].time)) >= 1.0)
+                                        {
+                                            continue;
+                                        }
                                     p = nav->tec + i;
                                     break;
                                 }
                         }
                     else if (p)
-                        p->time = time;
+                        {
+                            p->time = time;
+                        }
                 }
             else if (strstr(label, "LAT/LON1/LON2/DLON/H") == label && p)
                 {
@@ -301,17 +341,30 @@ int readionexb(FILE *fp, const double *lats, const double *lons,
 
                     for (m = 0; m < n; m++)
                         {
-                            if (m % 16 == 0 && !fgets(buff, sizeof(buff), fp)) break;
+                            if (m % 16 == 0 && !fgets(buff, sizeof(buff), fp))
+                                {
+                                    break;
+                                }
 
                             j = getindex(lon[0] + lon[2] * m, p->lons);
-                            if ((index = dataindex(i, j, k, p->ndata)) < 0) continue;
+                            if ((index = dataindex(i, j, k, p->ndata)) < 0)
+                                {
+                                    continue;
+                                }
 
-                            if ((x = str2num(buff, m % 16 * 5, 5)) == 9999.0) continue;
+                            if ((x = str2num(buff, m % 16 * 5, 5)) == 9999.0)
+                                {
+                                    continue;
+                                }
 
                             if (type == 1)
-                                p->data[index] = x * std::pow(10.0, nexp);
+                                {
+                                    p->data[index] = x * std::pow(10.0, nexp);
+                                }
                             else
-                                p->rms[index] = static_cast<float>(x * std::pow(10.0, nexp));
+                                {
+                                    p->rms[index] = static_cast<float>(x * std::pow(10.0, nexp));
+                                }
                         }
                 }
         }
@@ -387,7 +440,10 @@ void readtec(const char *file, nav_t *nav, int opt)
         {
             if (!(efiles[i] = static_cast<char *>(malloc(1024))))
                 {
-                    for (i--; i >= 0; i--) free(efiles[i]);
+                    for (i--; i >= 0; i--)
+                        {
+                            free(efiles[i]);
+                        }
                     return;
                 }
         }
@@ -414,10 +470,16 @@ void readtec(const char *file, nav_t *nav, int opt)
             readionexb(fp, lats, lons, hgts, rb, nexp, nav);
             fclose(fp);
         }
-    for (i = 0; i < MAXEXFILE; i++) free(efiles[i]);
+    for (i = 0; i < MAXEXFILE; i++)
+        {
+            free(efiles[i]);
+        }
 
     /* combine tec grid data */
-    if (nav->nt > 0) combtec(nav);
+    if (nav->nt > 0)
+        {
+            combtec(nav);
+        }
 
     /* P1-P2 dcb */
     for (i = 0; i < MAXSAT; i++)
@@ -437,14 +499,21 @@ int interptec(const tec_t *tec, int k, const double *posp, double *value,
     trace(3, "interptec: k=%d posp=%.2f %.2f\n", k, posp[0] * R2D, posp[1] * R2D);
     *value = *rms = 0.0;
 
-    if (tec->lats[2] == 0.0 || tec->lons[2] == 0.0) return 0;
+    if (tec->lats[2] == 0.0 || tec->lons[2] == 0.0)
+        {
+            return 0;
+        }
 
     dlat = posp[0] * R2D - tec->lats[0];
     dlon = posp[1] * R2D - tec->lons[0];
     if (tec->lons[2] > 0.0)
-        dlon -= floor(dlon / 360) * 360.0; /*  0 <= dlon<360 */
+        {
+            dlon -= floor(dlon / 360) * 360.0; /*  0 <= dlon<360 */
+        }
     else
-        dlon += floor(-dlon / 360) * 360.0; /* -360<dlon <= 0 */
+        {
+            dlon += floor(-dlon / 360) * 360.0; /* -360<dlon <= 0 */
+        }
 
     a = dlat / tec->lats[2];
     b = dlon / tec->lons[2];
@@ -456,7 +525,10 @@ int interptec(const tec_t *tec, int k, const double *posp, double *value,
     /* get gridded tec data */
     for (n = 0; n < 4; n++)
         {
-            if ((index = dataindex(i + (n % 2), j + (n < 2 ? 0 : 1), k, tec->ndata)) < 0) continue;
+            if ((index = dataindex(i + (n % 2), j + (n < 2 ? 0 : 1), k, tec->ndata)) < 0)
+                {
+                    continue;
+                }
             d[n] = tec->data[index];
             r[n] = tec->rms[index];
         }
@@ -491,13 +563,18 @@ int interptec(const tec_t *tec, int k, const double *posp, double *value,
         {
             i = 0;
             for (n = 0; n < 4; n++)
-                if (d[n] > 0.0)
-                    {
-                        i++;
-                        *value += d[n];
-                        *rms += r[n];
-                    }
-            if (i == 0) return 0;
+                {
+                    if (d[n] > 0.0)
+                        {
+                            i++;
+                            *value += d[n];
+                            *rms += r[n];
+                        }
+                }
+            if (i == 0)
+                {
+                    return 0;
+                }
             *value /= i;
             *rms /= i;
         }
@@ -537,7 +614,10 @@ int iondelay(gtime_t time, const tec_t *tec, const double *pos,
                     posp[1] += 2.0 * PI * timediff(time, tec->time) / 86400.0;
                 }
             /* interpolate tec grid data */
-            if (!interptec(tec, i, posp, &vtec, &rms)) return 0;
+            if (!interptec(tec, i, posp, &vtec, &rms))
+                {
+                    return 0;
+                }
 
             *delay += fact * fs * vtec;
             *var += fact * fact * fs * fs * rms * rms;
@@ -580,7 +660,10 @@ int iontec(gtime_t time, const nav_t *nav, const double *pos,
         }
     for (i = 0; i < nav->nt; i++)
         {
-            if (timediff(nav->tec[i].time, time) > 0.0) break;
+            if (timediff(nav->tec[i].time, time) > 0.0)
+                {
+                    break;
+                }
         }
     if (i == 0 || i >= nav->nt)
         {
diff --git a/src/algorithms/libs/rtklib/rtklib_lambda.cc b/src/algorithms/libs/rtklib/rtklib_lambda.cc
index c493e05e5..8aaba735f 100644
--- a/src/algorithms/libs/rtklib/rtklib_lambda.cc
+++ b/src/algorithms/libs/rtklib/rtklib_lambda.cc
@@ -69,13 +69,27 @@ int LD(int n, const double *Q, double *L, double *D)
                     break;
                 }
             a = sqrt(D[i]);
-            for (j = 0; j <= i; j++) L[i + j * n] = A[i + j * n] / a;
+            for (j = 0; j <= i; j++)
+                {
+                    L[i + j * n] = A[i + j * n] / a;
+                }
             for (j = 0; j <= i - 1; j++)
-                for (k = 0; k <= j; k++) A[j + k * n] -= L[i + k * n] * L[i + j * n];
-            for (j = 0; j <= i; j++) L[i + j * n] /= L[i + i * n];
+                {
+                    for (k = 0; k <= j; k++)
+                        {
+                            A[j + k * n] -= L[i + k * n] * L[i + j * n];
+                        }
+                }
+            for (j = 0; j <= i; j++)
+                {
+                    L[i + j * n] /= L[i + i * n];
+                }
         }
     free(A);
-    if (info) fprintf(stderr, "%s : LD factorization error\n", __FILE__);
+    if (info)
+        {
+            fprintf(stderr, "%s : LD factorization error\n", __FILE__);
+        }
     return info;
 }
 
@@ -87,8 +101,14 @@ void gauss(int n, double *L, double *Z, int i, int j)
 
     if ((mu = static_cast<int> ROUND_LAMBDA(L[i + j * n])) != 0)
         {
-            for (k = i; k < n; k++) L[k + n * j] -= static_cast<double>(mu) * L[k + i * n];
-            for (k = 0; k < n; k++) Z[k + n * j] -= static_cast<double>(mu) * Z[k + i * n];
+            for (k = i; k < n; k++)
+                {
+                    L[k + n * j] -= static_cast<double>(mu) * L[k + i * n];
+                }
+            for (k = 0; k < n; k++)
+                {
+                    Z[k + n * j] -= static_cast<double>(mu) * Z[k + i * n];
+                }
         }
 }
 
@@ -111,8 +131,14 @@ void perm(int n, double *L, double *D, int j, double del, double *Z)
             L[j + 1 + k * n] = eta * a0 + lam * a1;
         }
     L[j + 1 + j * n] = lam;
-    for (k = j + 2; k < n; k++) SWAP_LAMBDA(L[k + j * n], L[k + (j + 1) * n]);
-    for (k = 0; k < n; k++) SWAP_LAMBDA(Z[k + j * n], Z[k + (j + 1) * n]);
+    for (k = j + 2; k < n; k++)
+        {
+            SWAP_LAMBDA(L[k + j * n], L[k + (j + 1) * n]);
+        }
+    for (k = 0; k < n; k++)
+        {
+            SWAP_LAMBDA(Z[k + j * n], Z[k + (j + 1) * n]);
+        }
 }
 
 
@@ -127,7 +153,12 @@ void reduction(int n, double *L, double *D, double *Z)
     while (j >= 0)
         {
             if (j <= k)
-                for (i = j + 1; i < n; i++) gauss(n, L, Z, i, j);
+                {
+                    for (i = j + 1; i < n; i++)
+                        {
+                            gauss(n, L, Z, i, j);
+                        }
+                }
             del = D[j] + L[j + 1 + j * n] * L[j + 1 + j * n] * D[j + 1];
             if (del + 1E-6 < D[j + 1])
                 { /* compared considering numerical error */
@@ -136,7 +167,9 @@ void reduction(int n, double *L, double *D, double *Z)
                     j = n - 2;
                 }
             else
-                j--;
+                {
+                    j--;
+                }
         }
 }
 
@@ -164,7 +197,9 @@ int search(int n, int m, const double *L, const double *D,
                         {
                             dist[--k] = newdist;
                             for (i = 0; i <= k; i++)
-                                S[k + i * n] = S[k + 1 + i * n] + (z[k + 1] - zb[k + 1]) * L[k + 1 + i * n];
+                                {
+                                    S[k + i * n] = S[k + 1 + i * n] + (z[k + 1] - zb[k + 1]) * L[k + 1 + i * n];
+                                }
                             zb[k] = zs[k] + S[k + k * n];
                             z[k] = ROUND_LAMBDA(zb[k]);
                             y = zb[k] - z[k];
@@ -174,18 +209,32 @@ int search(int n, int m, const double *L, const double *D,
                         {
                             if (nn < m)
                                 {
-                                    if (nn == 0 || newdist > s[imax]) imax = nn;
-                                    for (i = 0; i < n; i++) zn[i + nn * n] = z[i];
+                                    if (nn == 0 || newdist > s[imax])
+                                        {
+                                            imax = nn;
+                                        }
+                                    for (i = 0; i < n; i++)
+                                        {
+                                            zn[i + nn * n] = z[i];
+                                        }
                                     s[nn++] = newdist;
                                 }
                             else
                                 {
                                     if (newdist < s[imax])
                                         {
-                                            for (i = 0; i < n; i++) zn[i + imax * n] = z[i];
+                                            for (i = 0; i < n; i++)
+                                                {
+                                                    zn[i + imax * n] = z[i];
+                                                }
                                             s[imax] = newdist;
                                             for (i = imax = 0; i < m; i++)
-                                                if (s[imax] < s[i]) imax = i;
+                                                {
+                                                    if (s[imax] < s[i])
+                                                        {
+                                                            imax = i;
+                                                        }
+                                                }
                                         }
                                     maxdist = s[imax];
                                 }
@@ -197,7 +246,9 @@ int search(int n, int m, const double *L, const double *D,
             else
                 {
                     if (k == n - 1)
-                        break;
+                        {
+                            break;
+                        }
 
                     k++;
                     z[k] += step[k];
@@ -209,9 +260,15 @@ int search(int n, int m, const double *L, const double *D,
         { /* sort by s */
             for (j = i + 1; j < m; j++)
                 {
-                    if (s[i] < s[j]) continue;
+                    if (s[i] < s[j])
+                        {
+                            continue;
+                        }
                     SWAP_LAMBDA(s[i], s[j]);
-                    for (k = 0; k < n; k++) SWAP_LAMBDA(zn[k + i * n], zn[k + j * n]);
+                    for (k = 0; k < n; k++)
+                        {
+                            SWAP_LAMBDA(zn[k + i * n], zn[k + j * n]);
+                        }
                 }
         }
     free(S);
@@ -247,7 +304,10 @@ int lambda(int n, int m, const double *a, const double *Q, double *F,
     int info;
     double *L, *D, *Z, *z, *E;
 
-    if (n <= 0 || m <= 0) return -1;
+    if (n <= 0 || m <= 0)
+        {
+            return -1;
+        }
     L = zeros(n, n);
     D = mat(n, 1);
     Z = eye(n);
@@ -288,16 +348,21 @@ int lambda_reduction(int n, const double *Q, double *Z)
     double *L, *D;
     int i, j, info;
 
-    if (n <= 0) return -1;
+    if (n <= 0)
+        {
+            return -1;
+        }
 
     L = zeros(n, n);
     D = mat(n, 1);
 
     for (i = 0; i < n; i++)
-        for (j = 0; j < n; j++)
-            {
-                Z[i + j * n] = i == j ? 1.0 : 0.0;
-            }
+        {
+            for (j = 0; j < n; j++)
+                {
+                    Z[i + j * n] = i == j ? 1.0 : 0.0;
+                }
+        }
     /* LD factorization */
     if ((info = LD(n, Q, L, D)))
         {
@@ -330,7 +395,10 @@ int lambda_search(int n, int m, const double *a, const double *Q,
     double *L, *D;
     int info;
 
-    if (n <= 0 || m <= 0) return -1;
+    if (n <= 0 || m <= 0)
+        {
+            return -1;
+        }
 
     L = zeros(n, n);
     D = mat(n, 1);
diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
index d143cb302..58c1192e5 100644
--- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
@@ -62,7 +62,10 @@ double varerr(const prcopt_t *opt, double el, int sys)
     double fact, varr;
     fact = sys == SYS_GLO ? EFACT_GLO : (sys == SYS_SBS ? EFACT_SBS : EFACT_GPS);
     varr = std::pow(opt->err[0], 2.0) * (std::pow(opt->err[1], 2.0) + std::pow(opt->err[2], 2.0) / sin(el));
-    if (opt->ionoopt == IONOOPT_IFLC) varr *= std::pow(2, 3.0); /* iono-free */
+    if (opt->ionoopt == IONOOPT_IFLC)
+        {
+            varr *= std::pow(2, 3.0); /* iono-free */
+        }
     return std::pow(fact, 2.0) * varr;
 }
 
@@ -73,7 +76,10 @@ double gettgd(int sat, const nav_t *nav)
     int i;
     for (i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
             return SPEED_OF_LIGHT * nav->eph[i].tgd[0];
         }
     return 0.0;
@@ -84,7 +90,10 @@ double getiscl1(int sat, const nav_t *nav)
 {
     for (int i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
             return SPEED_OF_LIGHT * nav->eph[i].isc[0];
         }
     return 0.0;
@@ -94,7 +103,10 @@ double getiscl2(int sat, const nav_t *nav)
 {
     for (int i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
             return SPEED_OF_LIGHT * nav->eph[i].isc[1];
         }
     return 0.0;
@@ -104,7 +116,10 @@ double getiscl5i(int sat, const nav_t *nav)
 {
     for (int i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
             return SPEED_OF_LIGHT * nav->eph[i].isc[2];
         }
     return 0.0;
@@ -114,7 +129,10 @@ double getiscl5q(int sat, const nav_t *nav)
 {
     for (int i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
             return SPEED_OF_LIGHT * nav->eph[i].isc[3];
         }
     return 0.0;
@@ -407,7 +425,10 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
 
     trace(3, "resprng : n=%d\n", n);
 
-    for (i = 0; i < 3; i++) rr[i] = x[i];
+    for (i = 0; i < 3; i++)
+        {
+            rr[i] = x[i];
+        }
     dtr = x[3];
 
     ecef2pos(rr, pos);
@@ -417,7 +438,10 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
             vsat[i] = 0;
             azel[i * 2] = azel[1 + i * 2] = resp[i] = 0.0;
 
-            if (!(sys = satsys(obs[i].sat, nullptr))) continue;
+            if (!(sys = satsys(obs[i].sat, nullptr)))
+                {
+                    continue;
+                }
 
             /* reject duplicated observation data */
             if (i < n - 1 && i < MAXOBS - 1 && obs[i].sat == obs[i + 1].sat)
@@ -477,7 +501,10 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
             v[nv] = P - (r + dtr - SPEED_OF_LIGHT * dts[i * 2] + dion + dtrp);
 
             /* design matrix */
-            for (j = 0; j < NX; j++) H[j + nv * NX] = j < 3 ? -e[j] : (j == 3 ? 1.0 : 0.0);
+            for (j = 0; j < NX; j++)
+                {
+                    H[j + nv * NX] = j < 3 ? -e[j] : (j == 3 ? 1.0 : 0.0);
+                }
 
             /* time system and receiver bias offset correction */
             if (sys == SYS_GLO)
@@ -499,7 +526,9 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
                     mask[3] = 1;
                 }
             else
-                mask[0] = 1;
+                {
+                    mask[0] = 1;
+                }
 
             vsat[i] = 1;
             resp[i] = v[nv];
@@ -514,9 +543,15 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
     /* constraint to avoid rank-deficient */
     for (i = 0; i < 4; i++)
         {
-            if (mask[i]) continue;
+            if (mask[i])
+                {
+                    continue;
+                }
             v[nv] = 0.0;
-            for (j = 0; j < NX; j++) H[j + nv * NX] = j == i + 3 ? 1.0 : 0.0;
+            for (j = 0; j < NX; j++)
+                {
+                    H[j + nv * NX] = j == i + 3 ? 1.0 : 0.0;
+                }
             var[nv++] = 0.01;
         }
     return nv;
@@ -544,7 +579,10 @@ int valsol(const double *azel, const int *vsat, int n,
     /* large gdop check */
     for (i = ns = 0; i < n; i++)
         {
-            if (!vsat[i]) continue;
+            if (!vsat[i])
+                {
+                    continue;
+                }
             azels[ns * 2] = azel[i * 2];
             azels[1 + ns * 2] = azel[1 + i * 2];
             ns++;
@@ -574,7 +612,10 @@ int estpos(const obsd_t *obs, int n, const double *rs, const double *dts,
     H = mat(NX, n + 4);
     var = mat(n + 4, 1);
 
-    for (i = 0; i < 3; i++) x[i] = sol->rr[i];
+    for (i = 0; i < 3; i++)
+        {
+            x[i] = sol->rr[i];
+        }
 
     for (i = 0; i < MAXITR; i++)
         {
@@ -591,7 +632,10 @@ int estpos(const obsd_t *obs, int n, const double *rs, const double *dts,
                 {
                     sig = sqrt(var[j]);
                     v[j] /= sig;
-                    for (k = 0; k < NX; k++) H[k + j * NX] /= sig;
+                    for (k = 0; k < NX; k++)
+                        {
+                            H[k + j * NX] /= sig;
+                        }
                 }
             /* least square estimation */
             if ((info = lsq(H, v, NX, nv, dx, Q)))
@@ -599,7 +643,10 @@ int estpos(const obsd_t *obs, int n, const double *rs, const double *dts,
                     sprintf(msg, "lsq error info=%d", info);
                     break;
                 }
-            for (j = 0; j < NX; j++) x[j] += dx[j];
+            for (j = 0; j < NX; j++)
+                {
+                    x[j] += dx[j];
+                }
 
             if (norm_rtk(dx, NX) < 1e-4)
                 {
@@ -609,8 +656,14 @@ int estpos(const obsd_t *obs, int n, const double *rs, const double *dts,
                     sol->dtr[1] = x[4] / SPEED_OF_LIGHT; /* glo-gps time offset (s) */
                     sol->dtr[2] = x[5] / SPEED_OF_LIGHT; /* gal-gps time offset (s) */
                     sol->dtr[3] = x[6] / SPEED_OF_LIGHT; /* bds-gps time offset (s) */
-                    for (j = 0; j < 6; j++) sol->rr[j] = j < 3 ? x[j] : 0.0;
-                    for (j = 0; j < 3; j++) sol->qr[j] = static_cast<float>(Q[j + j * NX]);
+                    for (j = 0; j < 6; j++)
+                        {
+                            sol->rr[j] = j < 3 ? x[j] : 0.0;
+                        }
+                    for (j = 0; j < 3; j++)
+                        {
+                            sol->qr[j] = static_cast<float>(Q[j + j * NX]);
+                        }
                     sol->qr[3] = static_cast<float>(Q[1]);      /* cov xy */
                     sol->qr[4] = static_cast<float>(Q[2 + NX]); /* cov yz */
                     sol->qr[5] = static_cast<float>(Q[2]);      /* cov zx */
@@ -629,7 +682,10 @@ int estpos(const obsd_t *obs, int n, const double *rs, const double *dts,
                     return stat;
                 }
         }
-    if (i >= MAXITR) sprintf(msg, "iteration divergent i=%d", i);
+    if (i >= MAXITR)
+        {
+            sprintf(msg, "iteration divergent i=%d", i);
+        }
 
     free(v);
     free(H);
@@ -653,7 +709,10 @@ int raim_fde(const obsd_t *obs, int n, const double *rs,
 
     trace(3, "raim_fde: %s n=%2d\n", time_str(obs[0].time, 0), n);
 
-    if (!(obs_e = static_cast<obsd_t *>(malloc(sizeof(obsd_t) * n)))) return 0;
+    if (!(obs_e = static_cast<obsd_t *>(malloc(sizeof(obsd_t) * n))))
+        {
+            return 0;
+        }
     rs_e = mat(6, n);
     dts_e = mat(2, n);
     vare_e = mat(1, n);
@@ -667,7 +726,10 @@ int raim_fde(const obsd_t *obs, int n, const double *rs,
             /* satellite exclution */
             for (j = k = 0; j < n; j++)
                 {
-                    if (j == i) continue;
+                    if (j == i)
+                        {
+                            continue;
+                        }
                     obs_e[k] = obs[j];
                     matcpy(rs_e + 6 * k, rs + 6 * j, 6, 1);
                     matcpy(dts_e + 2 * k, dts + 2 * j, 2, 1);
@@ -683,7 +745,10 @@ int raim_fde(const obsd_t *obs, int n, const double *rs,
                 }
             for (j = nvsat = 0, rms_e = 0.0; j < n - 1; j++)
                 {
-                    if (!vsat_e[j]) continue;
+                    if (!vsat_e[j])
+                        {
+                            continue;
+                        }
                     rms_e += std::pow(resp_e[j], 2.0);
                     nvsat++;
                 }
@@ -697,12 +762,18 @@ int raim_fde(const obsd_t *obs, int n, const double *rs,
 
             trace(3, "raim_fde: exsat=%2d rms=%8.3f\n", obs[i].sat, rms_e);
 
-            if (rms_e > rms) continue;
+            if (rms_e > rms)
+                {
+                    continue;
+                }
 
             /* save result */
             for (j = k = 0; j < n; j++)
                 {
-                    if (j == i) continue;
+                    if (j == i)
+                        {
+                            continue;
+                        }
                     matcpy(azel + 2 * j, azel_e + 2 * k, 2, 1);
                     vsat[j] = vsat_e[k];
                     resp[j] = resp_e[k++];
@@ -749,9 +820,18 @@ int resdop(const obsd_t *obs, int n, const double *rs, const double *dts,
 
     for (i = 0; i < n && i < MAXOBS; i++)
         {
-            if (obs[i].code[0] != CODE_NONE) band = 0;
-            if (obs[i].code[1] != CODE_NONE) band = 1;
-            if (obs[i].code[2] != CODE_NONE) band = 2;
+            if (obs[i].code[0] != CODE_NONE)
+                {
+                    band = 0;
+                }
+            if (obs[i].code[1] != CODE_NONE)
+                {
+                    band = 1;
+                }
+            if (obs[i].code[2] != CODE_NONE)
+                {
+                    band = 2;
+                }
             lam = nav->lam[obs[i].sat - 1][band];
 
             if (obs[i].D[band] == 0.0 || lam == 0.0 || !vsat[i] || norm_rtk(rs + 3 + i * 6, 3) <= 0.0)
@@ -766,7 +846,10 @@ int resdop(const obsd_t *obs, int n, const double *rs, const double *dts,
             matmul("TN", 3, 1, 3, 1.0, E, a, 0.0, e);
 
             /* satellite velocity relative to receiver in ecef */
-            for (j = 0; j < 3; j++) vs[j] = rs[j + 3 + i * 6] - x[j];
+            for (j = 0; j < 3; j++)
+                {
+                    vs[j] = rs[j + 3 + i * 6] - x[j];
+                }
 
             /* range rate with earth rotation correction */
             rate = dot(vs, e, 3) + DEFAULT_OMEGA_EARTH_DOT / SPEED_OF_LIGHT * (rs[4 + i * 6] * rr[0] + rs[1 + i * 6] * x[0] - rs[3 + i * 6] * rr[1] - rs[i * 6] * x[1]);
@@ -775,7 +858,10 @@ int resdop(const obsd_t *obs, int n, const double *rs, const double *dts,
             v[nv] = -lam * obs[i].D[band] - (rate + x[3] - SPEED_OF_LIGHT * dts[1 + i * 2]);
 
             /* design matrix */
-            for (j = 0; j < 4; j++) H[j + nv * 4] = j < 3 ? -e[j] : 1.0;
+            for (j = 0; j < 4; j++)
+                {
+                    H[j + nv * 4] = j < 3 ? -e[j] : 1.0;
+                }
 
             nv++;
         }
@@ -804,13 +890,22 @@ void estvel(const obsd_t *obs, int n, const double *rs, const double *dts,
                     break;
                 }
             /* least square estimation */
-            if (lsq(H, v, 4, nv, dx, Q)) break;
+            if (lsq(H, v, 4, nv, dx, Q))
+                {
+                    break;
+                }
 
-            for (j = 0; j < 4; j++) x[j] += dx[j];
+            for (j = 0; j < 4; j++)
+                {
+                    x[j] += dx[j];
+                }
 
             if (norm_rtk(dx, 4) < 1e-6)
                 {
-                    for (i = 0; i < 3; i++) sol->rr[i + 3] = x[i];
+                    for (i = 0; i < 3; i++)
+                        {
+                            sol->rr[i + 3] = x[i];
+                        }
                     break;
                 }
         }
@@ -882,11 +977,17 @@ int pntpos(const obsd_t *obs, int n, const nav_t *nav,
             stat = raim_fde(obs, n, rs, dts, var, svh, nav, &opt_, sol, azel_, vsat, resp, msg);
         }
     /* estimate receiver velocity with doppler */
-    if (stat) estvel(obs, n, rs, dts, nav, &opt_, sol, azel_, vsat);
+    if (stat)
+        {
+            estvel(obs, n, rs, dts, nav, &opt_, sol, azel_, vsat);
+        }
 
     if (azel)
         {
-            for (i = 0; i < n * 2; i++) azel[i] = azel_[i];
+            for (i = 0; i < n * 2; i++)
+                {
+                    azel[i] = azel_[i];
+                }
         }
     if (ssat)
         {
@@ -902,7 +1003,10 @@ int pntpos(const obsd_t *obs, int n, const nav_t *nav,
                     ssat[obs[i].sat - 1].azel[0] = azel_[i * 2];
                     ssat[obs[i].sat - 1].azel[1] = azel_[1 + i * 2];
                     ssat[obs[i].sat - 1].snr[0] = obs[i].SNR[0];
-                    if (!vsat[i]) continue;
+                    if (!vsat[i])
+                        {
+                            continue;
+                        }
                     ssat[obs[i].sat - 1].vs = 1;
                     ssat[obs[i].sat - 1].resp[0] = resp[i];
                 }
diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.cc b/src/algorithms/libs/rtklib/rtklib_ppp.cc
index d6bbed928..9f7ee252f 100644
--- a/src/algorithms/libs/rtklib/rtklib_ppp.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc
@@ -117,8 +117,14 @@ double p_gamma(double a, double x, double log_gamma_a)
     double y, w;
     int i;
 
-    if (x == 0.0) return 0.0;
-    if (x >= a + 1.0) return 1.0 - q_gamma(a, x, log_gamma_a);
+    if (x == 0.0)
+        {
+            return 0.0;
+        }
+    if (x >= a + 1.0)
+        {
+            return 1.0 - q_gamma(a, x, log_gamma_a);
+        }
 
     y = w = exp(a * log(x) - x - log_gamma_a) / a;
 
@@ -126,7 +132,10 @@ double p_gamma(double a, double x, double log_gamma_a)
         {
             w *= x / (a + i);
             y += w;
-            if (fabs(w) < 1E-15) break;
+            if (fabs(w) < 1E-15)
+                {
+                    break;
+                }
         }
     return y;
 }
@@ -137,7 +146,10 @@ double q_gamma(double a, double x, double log_gamma_a)
     double y, w, la = 1.0, lb = x + 1.0 - a, lc;
     int i;
 
-    if (x < a + 1.0) return 1.0 - p_gamma(a, x, log_gamma_a);
+    if (x < a + 1.0)
+        {
+            return 1.0 - p_gamma(a, x, log_gamma_a);
+        }
     w = exp(-x + a * log(x) - log_gamma_a);
     y = w / lb;
     for (i = 2; i < 100; i++)
@@ -147,7 +159,10 @@ double q_gamma(double a, double x, double log_gamma_a)
             lb = lc;
             w *= (i - 1 - a) / i;
             y += w / la / lb;
-            if (fabs(w / la / lb) < 1E-15) break;
+            if (fabs(w / la / lb) < 1E-15)
+                {
+                    break;
+                }
         }
     return y;
 }
@@ -186,9 +201,15 @@ void average_LC(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav __attribu
         {
             sat = obs[i].sat;
 
-            if (azel[1 + 2 * i] < rtk->opt.elmin) continue;
+            if (azel[1 + 2 * i] < rtk->opt.elmin)
+                {
+                    continue;
+                }
 
-            if (satsys(sat, nullptr) != SYS_GPS) continue;
+            if (satsys(sat, nullptr) != SYS_GPS)
+                {
+                    continue;
+                }
 
             /* triple-freq carrier and code LC (m) */
             LC1 = L_LC(1, -1, 0, obs[i].L) - P_LC(1, 1, 0, obs[i].P);
@@ -212,7 +233,10 @@ void average_LC(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav __attribu
                     amb->LC[0] = amb->LC[1] = amb->LC[2] = 0.0;
                     amb->LCv[0] = amb->LCv[1] = amb->LCv[2] = 0.0;
                     amb->fixcnt = 0;
-                    for (j = 0; j < MAXSAT; j++) amb->flags[j] = 0;
+                    for (j = 0; j < MAXSAT; j++)
+                        {
+                            amb->flags[j] = 0;
+                        }
                 }
             /* averaging */
             if (LC1)
@@ -246,7 +270,10 @@ int fix_amb_WL(rtk_t *rtk, const nav_t *nav, int sat1, int sat2, int *NW)
 
     amb1 = rtk->ambc + sat1 - 1;
     amb2 = rtk->ambc + sat2 - 1;
-    if (!amb1->n[0] || !amb2->n[0]) return 0;
+    if (!amb1->n[0] || !amb2->n[0])
+        {
+            return 0;
+        }
 
         /* wide-lane ambiguity */
 #ifndef REV_WL_FCB
@@ -285,15 +312,27 @@ int is_depend(int sat1, int sat2, int *flgs, int *max_flg)
     else if (flgs[sat1 - 1] > flgs[sat2 - 1])
         {
             for (i = 0; i < MAXSAT; i++)
-                if (flgs[i] == flgs[sat2 - 1]) flgs[i] = flgs[sat1 - 1];
+                {
+                    if (flgs[i] == flgs[sat2 - 1])
+                        {
+                            flgs[i] = flgs[sat1 - 1];
+                        }
+                }
         }
     else if (flgs[sat1 - 1] < flgs[sat2 - 1])
         {
             for (i = 0; i < MAXSAT; i++)
-                if (flgs[i] == flgs[sat1 - 1]) flgs[i] = flgs[sat2 - 1];
+                {
+                    if (flgs[i] == flgs[sat1 - 1])
+                        {
+                            flgs[i] = flgs[sat2 - 1];
+                        }
+                }
         }
     else
-        return 0; /* linear depenent */
+        {
+            return 0; /* linear depenent */
+        }
     return 1;
 }
 
@@ -305,18 +344,26 @@ int sel_amb(int *sat1, int *sat2, double *N, double *var, int n)
 
     /* sort by variance */
     for (i = 0; i < n; i++)
-        for (j = 1; j < n - i; j++)
-            {
-                if (var[j] >= var[j - 1]) continue;
-                SWAP_I(sat1[j], sat1[j - 1]);
-                SWAP_I(sat2[j], sat2[j - 1]);
-                SWAP_D(N[j], N[j - 1]);
-                SWAP_D(var[j], var[j - 1]);
-            }
+        {
+            for (j = 1; j < n - i; j++)
+                {
+                    if (var[j] >= var[j - 1])
+                        {
+                            continue;
+                        }
+                    SWAP_I(sat1[j], sat1[j - 1]);
+                    SWAP_I(sat2[j], sat2[j - 1]);
+                    SWAP_D(N[j], N[j - 1]);
+                    SWAP_D(var[j], var[j - 1]);
+                }
+        }
     /* select linearly independent satellite pair */
     for (i = j = 0; i < n; i++)
         {
-            if (!is_depend(sat1[i], sat2[i], flgs, &max_flg)) continue;
+            if (!is_depend(sat1[i], sat2[i], flgs, &max_flg))
+                {
+                    continue;
+                }
             sat1[j] = sat1[i];
             sat2[j] = sat2[i];
             N[j] = N[i];
@@ -333,7 +380,10 @@ int fix_sol(rtk_t *rtk, const int *sat1, const int *sat2,
     double *v, *H, *R;
     int i, j, k, info;
 
-    if (n <= 0) return 0;
+    if (n <= 0)
+        {
+            return 0;
+        }
 
     v = zeros(n, 1);
     H = zeros(rtk->nx, n);
@@ -420,7 +470,10 @@ int fix_amb_ROUND(rtk_t *rtk, int *sat1, int *sat2, const int *NW, int n)
             /* check residuals */
             v = rtk->ssat[sat1[i] - 1].resc[0] - rtk->ssat[sat2[i] - 1].resc[0];
             vc = v + (BC - (rtk->x[j] - rtk->x[k]));
-            if (fabs(vc) > THRES_RES) continue;
+            if (fabs(vc) > THRES_RES)
+                {
+                    continue;
+                }
 
             sat1[m] = sat1[i];
             sat2[m] = sat2[i];
@@ -461,7 +514,10 @@ int fix_amb_ILS(rtk_t *rtk, int *sat1, int *sat2, int *NW, int n)
     for (i = 0; i < n; i++)
         {
             /* check linear independency */
-            if (!is_depend(sat1[i], sat2[i], flgs, &max_flg)) continue;
+            if (!is_depend(sat1[i], sat2[i], flgs, &max_flg))
+                {
+                    continue;
+                }
 
             j = IB_PPP(sat1[i], &rtk->opt);
             k = IB_PPP(sat2[i], &rtk->opt);
@@ -471,7 +527,10 @@ int fix_amb_ILS(rtk_t *rtk, int *sat1, int *sat2, int *NW, int n)
             N1[m] = ROUND_PPP(B1[m]);
 
             /* validation of narrow-lane ambiguity */
-            if (fabs(N1[m] - B1[m]) > rtk->opt.thresar[2]) continue;
+            if (fabs(N1[m] - B1[m]) > rtk->opt.thresar[2])
+                {
+                    continue;
+                }
 
             /* narrow-lane ambiguity transformation matrix */
             D[j + m * rtk->nx] = 1.0 / lam_NL;
@@ -562,7 +621,10 @@ int pppamb(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav,
     double elmask;
     int i, j, m = 0, stat = 0, *NW, *sat1, *sat2;
 
-    if (n <= 0 || rtk->opt.ionoopt != IONOOPT_IFLC || rtk->opt.nf < 2) return 0;
+    if (n <= 0 || rtk->opt.ionoopt != IONOOPT_IFLC || rtk->opt.nf < 2)
+        {
+            return 0;
+        }
 
     trace(3, "pppamb: time=%s n=%d\n", time_str(obs[0].time, 0), n);
 
@@ -577,20 +639,28 @@ int pppamb(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav,
 
     /* fix wide-lane ambiguity */
     for (i = 0; i < n - 1; i++)
-        for (j = i + 1; j < n; j++)
-            {
-                if (!rtk->ssat[obs[i].sat - 1].vsat[0] ||
-                    !rtk->ssat[obs[j].sat - 1].vsat[0] ||
-                    azel[1 + i * 2] < elmask || azel[1 + j * 2] < elmask) continue;
+        {
+            for (j = i + 1; j < n; j++)
+                {
+                    if (!rtk->ssat[obs[i].sat - 1].vsat[0] ||
+                        !rtk->ssat[obs[j].sat - 1].vsat[0] ||
+                        azel[1 + i * 2] < elmask || azel[1 + j * 2] < elmask)
+                        {
+                            continue;
+                        }
 #if 0
             /* test already fixed */
             if (rtk->ambc[obs[i].sat-1].flags[obs[j].sat-1] &&
                     rtk->ambc[obs[j].sat-1].flags[obs[i].sat-1]) continue;
 #endif
-                sat1[m] = obs[i].sat;
-                sat2[m] = obs[j].sat;
-                if (fix_amb_WL(rtk, nav, sat1[m], sat2[m], NW + m)) m++;
-            }
+                    sat1[m] = obs[i].sat;
+                    sat2[m] = obs[j].sat;
+                    if (fix_amb_WL(rtk, nav, sat1[m], sat2[m], NW + m))
+                        {
+                            m++;
+                        }
+                }
+        }
     /* fix narrow-lane ambiguity */
     if (rtk->opt.modear == ARMODE_PPPAR)
         {
@@ -615,7 +685,10 @@ void pppoutsolstat(rtk_t *rtk, int level, FILE *fp)
     int i, j, week, nfreq = 1;
     char id[32];
 
-    if (level <= 0 || !fp) return;
+    if (level <= 0 || !fp)
+        {
+            return;
+        }
 
     trace(3, "pppoutsolstat:\n");
 
@@ -654,13 +727,19 @@ void pppoutsolstat(rtk_t *rtk, int level, FILE *fp)
             fprintf(fp, "$TRPG,%d,%.3f,%d,%d,%.5f,%.5f,%.5f,%.5f\n", week, tow,
                 rtk->sol.stat, 1, rtk->x[i + 1], rtk->x[i + 2], 0.0, 0.0);
         }
-    if (rtk->sol.stat == SOLQ_NONE || level <= 1) return;
+    if (rtk->sol.stat == SOLQ_NONE || level <= 1)
+        {
+            return;
+        }
 
     /* residuals and status */
     for (i = 0; i < MAXSAT; i++)
         {
             ssat = rtk->ssat + i;
-            if (!ssat->vs) continue;
+            if (!ssat->vs)
+                {
+                    continue;
+                }
             satno2id(i + 1, id);
             for (j = 0; j < nfreq; j++)
                 {
@@ -685,16 +764,25 @@ void testeclipse(const obsd_t *obs, int n, const nav_t *nav, double *rs)
 
     /* unit vector of sun direction (ecef) */
     sunmoonpos(gpst2utc(obs[0].time), erpv, rsun, nullptr, nullptr);
-    if (normv3(rsun, esun) == 0) trace(1, "Error computing the norm");
+    if (normv3(rsun, esun) == 0)
+        {
+            trace(1, "Error computing the norm");
+        }
 
     for (i = 0; i < n; i++)
         {
             type = nav->pcvs[obs[i].sat - 1].type;
 
-            if ((r = norm_rtk(rs + i * 6, 3)) <= 0.0) continue;
+            if ((r = norm_rtk(rs + i * 6, 3)) <= 0.0)
+                {
+                    continue;
+                }
 #if 1
             /* only block IIA */
-            if (*type && !strstr(type, "BLOCK IIA")) continue;
+            if (*type && !strstr(type, "BLOCK IIA"))
+                {
+                    continue;
+                }
 #endif
             /* sun-earth-satellite angle */
             cosa = dot(rs + i * 6, esun, 3) / r;
@@ -702,12 +790,18 @@ void testeclipse(const obsd_t *obs, int n, const nav_t *nav, double *rs)
             ang = acos(cosa);
 
             /* test eclipse */
-            if (ang < PI / 2.0 || r * sin(ang) > RE_WGS84) continue;
+            if (ang < PI / 2.0 || r * sin(ang) > RE_WGS84)
+                {
+                    continue;
+                }
 
             trace(2, "eclipsing sat excluded %s sat=%2d\n", time_str(obs[0].time, 0),
                 obs[i].sat);
 
-            for (j = 0; j < 3; j++) rs[j + i * 6] = 0.0;
+            for (j = 0; j < 3; j++)
+                {
+                    rs[j + i * 6] = 0.0;
+                }
         }
 }
 
@@ -746,9 +840,15 @@ double varerr(int sat __attribute__((unused)), int sys, double el, int type, con
         }
     else
         { /* normal error model */
-            if (type == 1) fact *= opt->eratio[0];
+            if (type == 1)
+                {
+                    fact *= opt->eratio[0];
+                }
             fact *= sys == SYS_GLO ? EFACT_GLO : (sys == SYS_SBS ? EFACT_SBS : EFACT_GPS);
-            if (opt->ionoopt == IONOOPT_IFLC) fact *= 3.0;
+            if (opt->ionoopt == IONOOPT_IFLC)
+                {
+                    fact *= 3.0;
+                }
             a = fact * opt->err[1];
             b = fact * opt->err[2];
         }
@@ -780,9 +880,15 @@ int ifmeas(const obsd_t *obs, const nav_t *nav, const double *azel,
     trace(4, "ifmeas  :\n");
 
     /* L1-L2 for GPS/GLO/QZS, L1-L5 for GAL/SBS */
-    if (NFREQ >= 3 && (satsys(obs->sat, nullptr) & (SYS_GAL | SYS_SBS))) j = 2;
+    if (NFREQ >= 3 && (satsys(obs->sat, nullptr) & (SYS_GAL | SYS_SBS)))
+        {
+            j = 2;
+        }
 
-    if (NFREQ < 2 || lam[i] == 0.0 || lam[j] == 0.0) return 0;
+    if (NFREQ < 2 || lam[i] == 0.0 || lam[j] == 0.0)
+        {
+            return 0;
+        }
 
     /* test snr mask */
     if (testsnr(0, i, azel[1], obs->SNR[i] * 0.25, &opt->snrmask) ||
@@ -804,18 +910,30 @@ int ifmeas(const obsd_t *obs, const nav_t *nav, const double *azel,
         {
             P1_C1 = nav->lexeph[obs->sat - 1].isc[0] * SPEED_OF_LIGHT; /* ISC_L1C/A */
         }
-    if (L1 == 0.0 || L2 == 0.0 || P1 == 0.0 || P2 == 0.0) return 0;
+    if (L1 == 0.0 || L2 == 0.0 || P1 == 0.0 || P2 == 0.0)
+        {
+            return 0;
+        }
 
     /* iono-free phase with windup correction */
     meas[0] = c1 * L1 + c2 * L2 - (c1 * lam[i] + c2 * lam[j]) * phw;
 
     /* iono-free code with dcb correction */
-    if (obs->code[i] == CODE_L1C) P1 += P1_C1; /* C1->P1 */
-    if (obs->code[j] == CODE_L2C) P2 += P2_C2; /* C2->P2 */
+    if (obs->code[i] == CODE_L1C)
+        {
+            P1 += P1_C1; /* C1->P1 */
+        }
+    if (obs->code[j] == CODE_L2C)
+        {
+            P2 += P2_C2; /* C2->P2 */
+        }
     meas[1] = c1 * P1 + c2 * P2;
     var[1] = std::pow(ERR_CBIAS, 2.0);
 
-    if (opt->sateph == EPHOPT_SBAS) meas[1] -= P1_C1; /* sbas clock based C1 */
+    if (opt->sateph == EPHOPT_SBAS)
+        {
+            meas[1] -= P1_C1; /* sbas clock based C1 */
+        }
 
     /* gps-glonass h/w bias correction for code */
     if (opt->exterr.ena[3] && satsys(obs->sat, nullptr) == SYS_GLO)
@@ -825,8 +943,14 @@ int ifmeas(const obsd_t *obs, const nav_t *nav, const double *azel,
     /* antenna phase center variation correction */
     for (k = 0; k < 2; k++)
         {
-            if (dants) meas[k] -= c1 * dants[i] + c2 * dants[j];
-            if (dantr) meas[k] -= c1 * dantr[i] + c2 * dantr[j];
+            if (dants)
+                {
+                    meas[k] -= c1 * dants[i] + c2 * dants[j];
+                }
+            if (dantr)
+                {
+                    meas[k] -= c1 * dantr[i] + c2 * dantr[j];
+                }
         }
     return 1;
 }
@@ -838,7 +962,10 @@ double gettgd_ppp(int sat, const nav_t *nav)
     int i;
     for (i = 0; i < nav->n; i++)
         {
-            if (nav->eph[i].sat != sat) continue;
+            if (nav->eph[i].sat != sat)
+                {
+                    continue;
+                }
             return SPEED_OF_LIGHT * nav->eph[i].tgd[0];
         }
     return 0.0;
@@ -903,9 +1030,15 @@ int corrmeas(const obsd_t *obs, const nav_t *nav, const double *pos,
         {
             return ifmeas(obs, nav, azel, opt, dantr, dants, phw, meas, var);
         }
-    if (lam[0] == 0.0 || obs->L[0] == 0.0 || obs->P[0] == 0.0) return 0;
+    if (lam[0] == 0.0 || obs->L[0] == 0.0 || obs->P[0] == 0.0)
+        {
+            return 0;
+        }
 
-    if (testsnr(0, 0, azel[1], obs->SNR[0] * 0.25, &opt->snrmask)) return 0;
+    if (testsnr(0, 0, azel[1], obs->SNR[0] * 0.25, &opt->snrmask))
+        {
+            return 0;
+        }
 
     L1 = obs->L[0] * lam[0];
     P1 = obs->P[0];
@@ -918,8 +1051,11 @@ int corrmeas(const obsd_t *obs, const nav_t *nav, const double *pos,
         {
             P1_P2 = (1.0 - gamma) * gettgd_ppp(obs->sat, nav);
         }
-    if (obs->code[0] == CODE_L1C) P1 += P1_C1; /* C1->P1 */
-    PC = P1 - P1_P2 / (1.0 - gamma);           /* P1->PC */
+    if (obs->code[0] == CODE_L1C)
+        {
+            P1 += P1_C1; /* C1->P1 */
+        }
+    PC = P1 - P1_P2 / (1.0 - gamma); /* P1->PC */
 
     /* slant ionospheric delay L1 (m) */
     if (!corr_ion(obs->time, nav, obs->sat, pos, azel, opt->ionoopt, &ion, &vari, brk))
@@ -938,8 +1074,14 @@ int corrmeas(const obsd_t *obs, const nav_t *nav, const double *pos,
     /* antenna phase center variation correction */
     for (i = 0; i < 2; i++)
         {
-            if (dants) meas[i] -= dants[0];
-            if (dantr) meas[i] -= dantr[0];
+            if (dants)
+                {
+                    meas[i] -= dants[0];
+                }
+            if (dantr)
+                {
+                    meas[i] -= dantr[0];
+                }
         }
     return 1;
 }
@@ -950,7 +1092,10 @@ double gfmeas(const obsd_t *obs, const nav_t *nav)
 {
     const double *lam = nav->lam[obs->sat - 1];
 
-    if (lam[0] == 0.0 || lam[1] == 0.0 || obs->L[0] == 0.0 || obs->L[1] == 0.0) return 0.0;
+    if (lam[0] == 0.0 || lam[1] == 0.0 || obs->L[0] == 0.0 || obs->L[1] == 0.0)
+        {
+            return 0.0;
+        }
 
     return lam[0] * obs->L[0] - lam[1] * obs->L[1];
 }
@@ -966,16 +1111,25 @@ void udpos_ppp(rtk_t *rtk)
     /* fixed mode */
     if (rtk->opt.mode == PMODE_PPP_FIXED)
         {
-            for (i = 0; i < 3; i++) initx(rtk, rtk->opt.ru[i], 1E-8, i);
+            for (i = 0; i < 3; i++)
+                {
+                    initx(rtk, rtk->opt.ru[i], 1E-8, i);
+                }
             return;
         }
     /* initialize position for first epoch */
     if (norm_rtk(rtk->x, 3) <= 0.0)
         {
-            for (i = 0; i < 3; i++) initx(rtk, rtk->sol.rr[i], VAR_POS_PPP, i);
+            for (i = 0; i < 3; i++)
+                {
+                    initx(rtk, rtk->sol.rr[i], VAR_POS_PPP, i);
+                }
         }
     /* static ppp mode */
-    if (rtk->opt.mode == PMODE_PPP_STATIC) return;
+    if (rtk->opt.mode == PMODE_PPP_STATIC)
+        {
+            return;
+        }
 
     /* kinmatic mode without dynamics */
     for (i = 0; i < 3; i++)
@@ -1027,7 +1181,10 @@ void udtrop_ppp(rtk_t *rtk)
 
             if (rtk->opt.tropopt >= TROPOPT_ESTG)
                 {
-                    for (j = 0; j < 2; j++) initx(rtk, 1E-6, VAR_GRA_PPP, ++i);
+                    for (j = 0; j < 2; j++)
+                        {
+                            initx(rtk, 1E-6, VAR_GRA_PPP, ++i);
+                        }
                 }
         }
     else
@@ -1053,14 +1210,19 @@ void detslp_ll(rtk_t *rtk, const obsd_t *obs, int n)
     trace(3, "detslp_ll: n=%d\n", n);
 
     for (i = 0; i < n && i < MAXOBS; i++)
-        for (j = 0; j < rtk->opt.nf; j++)
-            {
-                if (obs[i].L[j] == 0.0 || !(obs[i].LLI[j] & 3)) continue;
+        {
+            for (j = 0; j < rtk->opt.nf; j++)
+                {
+                    if (obs[i].L[j] == 0.0 || !(obs[i].LLI[j] & 3))
+                        {
+                            continue;
+                        }
 
-                trace(3, "detslp_ll: slip detected sat=%2d f=%d\n", obs[i].sat, j + 1);
+                    trace(3, "detslp_ll: slip detected sat=%2d f=%d\n", obs[i].sat, j + 1);
 
-                rtk->ssat[obs[i].sat - 1].slip[j] = 1;
-            }
+                    rtk->ssat[obs[i].sat - 1].slip[j] = 1;
+                }
+        }
 }
 
 
@@ -1074,7 +1236,10 @@ void detslp_gf(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
 
     for (i = 0; i < n && i < MAXOBS; i++)
         {
-            if ((g1 = gfmeas(obs + i, nav)) == 0.0) continue;
+            if ((g1 = gfmeas(obs + i, nav)) == 0.0)
+                {
+                    continue;
+                }
 
             g0 = rtk->ssat[obs[i].sat - 1].gf;
             rtk->ssat[obs[i].sat - 1].gf = g1;
@@ -1086,7 +1251,10 @@ void detslp_gf(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
                     trace(3, "detslip_gf: slip detected sat=%2d gf=%8.3f->%8.3f\n",
                         obs[i].sat, g0, g1);
 
-                    for (j = 0; j < rtk->opt.nf; j++) rtk->ssat[obs[i].sat - 1].slip[j] |= 1;
+                    for (j = 0; j < rtk->opt.nf; j++)
+                        {
+                            rtk->ssat[obs[i].sat - 1].slip[j] |= 1;
+                        }
                 }
         }
 }
@@ -1101,10 +1269,12 @@ void udbias_ppp(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
     trace(3, "udbias  : n=%d\n", n);
 
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < rtk->opt.nf; j++)
-            {
-                rtk->ssat[i].slip[j] = 0;
-            }
+        {
+            for (j = 0; j < rtk->opt.nf; j++)
+                {
+                    rtk->ssat[i].slip[j] = 0;
+                }
+        }
     /* detect cycle slip by LLI */
     detslp_ll(rtk, obs, n);
 
@@ -1126,7 +1296,10 @@ void udbias_ppp(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
             sat = obs[i].sat;
             j = IB_PPP(sat, &rtk->opt);
             if (!corrmeas(obs + i, nav, pos, rtk->ssat[sat - 1].azel, &rtk->opt, nullptr, nullptr,
-                    0.0, meas, var, &brk)) continue;
+                    0.0, meas, var, &brk))
+                {
+                    continue;
+                }
 
             if (brk)
                 {
@@ -1135,7 +1308,10 @@ void udbias_ppp(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
                 }
             bias[i] = meas[0] - meas[1];
             if (rtk->x[j] == 0.0 ||
-                rtk->ssat[sat - 1].slip[0] || rtk->ssat[sat - 1].slip[1]) continue;
+                rtk->ssat[sat - 1].slip[0] || rtk->ssat[sat - 1].slip[1])
+                {
+                    continue;
+                }
             offset += bias[i] - rtk->x[j];
             k++;
         }
@@ -1145,7 +1321,10 @@ void udbias_ppp(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
             for (i = 0; i < MAXSAT; i++)
                 {
                     j = IB_PPP(i + 1, &rtk->opt);
-                    if (rtk->x[j] != 0.0) rtk->x[j] += offset / k;
+                    if (rtk->x[j] != 0.0)
+                        {
+                            rtk->x[j] += offset / k;
+                        }
                 }
             trace(2, "phase-code jump corrected: %s n=%2d dt=%12.9fs\n",
                 time_str(rtk->sol.time, 0), k, offset / k / SPEED_OF_LIGHT);
@@ -1158,9 +1337,15 @@ void udbias_ppp(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
             rtk->P[j + j * rtk->nx] += std::pow(rtk->opt.prn[0], 2.0) * fabs(rtk->tt);
 
             if (rtk->x[j] != 0.0 &&
-                !rtk->ssat[sat - 1].slip[0] && !rtk->ssat[sat - 1].slip[1]) continue;
+                !rtk->ssat[sat - 1].slip[0] && !rtk->ssat[sat - 1].slip[1])
+                {
+                    continue;
+                }
 
-            if (bias[i] == 0.0) continue;
+            if (bias[i] == 0.0)
+                {
+                    continue;
+                }
 
             /* reinitialize phase-bias if detecting cycle slip */
             initx(rtk, bias[i], VAR_BIAS, IB_PPP(sat, &rtk->opt));
@@ -1203,7 +1388,10 @@ void satantpcv(const double *rs, const double *rr, const pcv_t *pcv,
             ru[i] = rr[i] - rs[i];
             rz[i] = -rs[i];
         }
-    if (!normv3(ru, eu) || !normv3(rz, ez)) return;
+    if (!normv3(ru, eu) || !normv3(rz, ez))
+        {
+            return;
+        }
 
     cosa = dot(eu, ez, 3);
     cosa = cosa < -1.0 ? -1.0 : (cosa > 1.0 ? 1.0 : cosa);
@@ -1256,9 +1444,15 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do
 
     trace(3, "res_ppp : n=%d nx=%d\n", n, nx);
 
-    for (i = 0; i < MAXSAT; i++) rtk->ssat[i].vsat[0] = 0;
+    for (i = 0; i < MAXSAT; i++)
+        {
+            rtk->ssat[i].vsat[0] = 0;
+        }
 
-    for (i = 0; i < 3; i++) rr[i] = x[i];
+    for (i = 0; i < 3; i++)
+        {
+            rr[i] = x[i];
+        }
 
     /* earth tides correction */
     if (opt->tidecorr)
@@ -1267,21 +1461,33 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do
 
             tidedisp(gpst2utc(obs[0].time), rr, tideopt, &nav->erp, opt->odisp[0],
                 disp);
-            for (i = 0; i < 3; i++) rr[i] += disp[i];
+            for (i = 0; i < 3; i++)
+                {
+                    rr[i] += disp[i];
+                }
         }
     ecef2pos(rr, pos);
 
     for (i = 0; i < n && i < MAXOBS; i++)
         {
             sat = obs[i].sat;
-            if (!(sys = satsys(sat, nullptr)) || !rtk->ssat[sat - 1].vs) continue;
+            if (!(sys = satsys(sat, nullptr)) || !rtk->ssat[sat - 1].vs)
+                {
+                    continue;
+                }
 
             /* geometric distance/azimuth/elevation angle */
             if ((r = geodist(rs + i * 6, rr, e)) <= 0.0 ||
-                satazel(pos, e, azel + i * 2) < opt->elmin) continue;
+                satazel(pos, e, azel + i * 2) < opt->elmin)
+                {
+                    continue;
+                }
 
             /* excluded satellite? */
-            if (satexclude(obs[i].sat, svh[i], opt)) continue;
+            if (satexclude(obs[i].sat, svh[i], opt))
+                {
+                    continue;
+                }
 
             /* tropospheric delay correction */
             if (opt->tropopt == TROPOPT_SAAS)
@@ -1330,13 +1536,22 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do
             for (j = 0; j < 2; j++)
                 { /* for phase and code */
 
-                    if (meas[j] == 0.0) continue;
+                    if (meas[j] == 0.0)
+                        {
+                            continue;
+                        }
 
-                    for (k = 0; k < nx; k++) H[k + nx * nv] = 0.0;
+                    for (k = 0; k < nx; k++)
+                        {
+                            H[k + nx * nv] = 0.0;
+                        }
 
                     v[nv] = meas[j] - r;
 
-                    for (k = 0; k < 3; k++) H[k + nx * nv] = -e[k];
+                    for (k = 0; k < 3; k++)
+                        {
+                            H[k + nx * nv] = -e[k];
+                        }
 
                     if (sys != SYS_GLO)
                         {
@@ -1363,9 +1578,13 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do
                     var[nv] = varerr(obs[i].sat, sys, azel[1 + i * 2], j, opt) + varm[j] + vare[i] + vart;
 
                     if (j == 0)
-                        rtk->ssat[sat - 1].resc[0] = v[nv];
+                        {
+                            rtk->ssat[sat - 1].resc[0] = v[nv];
+                        }
                     else
-                        rtk->ssat[sat - 1].resp[0] = v[nv];
+                        {
+                            rtk->ssat[sat - 1].resp[0] = v[nv];
+                        }
 
                         /* test innovation */
 #if 0
@@ -1380,15 +1599,20 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do
                     rtk->ssat[sat - 1].rejc[0]++;
                     continue;
                 }
-            if (j == 0) rtk->ssat[sat - 1].vsat[0] = 1;
+            if (j == 0)
+                {
+                    rtk->ssat[sat - 1].vsat[0] = 1;
+                }
             nv++;
         }
 }
 for (i = 0; i < nv; i++)
-    for (j = 0; j < nv; j++)
-        {
-            R[i + j * nv] = i == j ? var[i] : 0.0;
-        }
+    {
+        for (j = 0; j < nv; j++)
+            {
+                R[i + j * nv] = i == j ? var[i] : 0.0;
+            }
+    }
 trace(5, "x=\n");
 tracemat(5, x, 1, nx, 8, 3);
 trace(5, "v=\n");
@@ -1422,7 +1646,10 @@ void pppos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
     var = mat(1, n);
     azel = zeros(2, n);
 
-    for (i = 0; i < MAXSAT; i++) rtk->ssat[i].fix[0] = 0;
+    for (i = 0; i < MAXSAT; i++)
+        {
+            rtk->ssat[i].fix[0] = 0;
+        }
 
     /* temporal update of states */
     udstate_ppp(rtk, obs, n, nav);
@@ -1449,7 +1676,10 @@ void pppos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
     for (i = 0; i < rtk->opt.niter; i++)
         {
             /* phase and code residuals */
-            if ((nv = res_ppp(i, obs, n, rs, dts, var, svh, nav, xp, rtk, v, H, R, azel)) <= 0) break;
+            if ((nv = res_ppp(i, obs, n, rs, dts, var, svh, nav, xp, rtk, v, H, R, azel)) <= 0)
+                {
+                    break;
+                }
 
             /* measurement update */
             matcpy(Pp, rtk->P, rtk->nx, rtk->nx);
@@ -1476,13 +1706,19 @@ void pppos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
             /* ambiguity resolution in ppp */
             if (opt->modear == ARMODE_PPPAR || opt->modear == ARMODE_PPPAR_ILS)
                 {
-                    if (pppamb(rtk, obs, n, nav, azel)) stat = SOLQ_FIX;
+                    if (pppamb(rtk, obs, n, nav, azel))
+                        {
+                            stat = SOLQ_FIX;
+                        }
                 }
             /* update solution status */
             rtk->sol.ns = 0;
             for (i = 0; i < n && i < MAXOBS; i++)
                 {
-                    if (!rtk->ssat[obs[i].sat - 1].vsat[0]) continue;
+                    if (!rtk->ssat[obs[i].sat - 1].vsat[0])
+                        {
+                            continue;
+                        }
                     rtk->ssat[obs[i].sat - 1].lock[0]++;
                     rtk->ssat[obs[i].sat - 1].outc[0] = 0;
                     rtk->ssat[obs[i].sat - 1].fix[0] = 4;
@@ -1506,7 +1742,10 @@ void pppos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
                 }
             for (i = 0; i < MAXSAT; i++)
                 {
-                    if (rtk->ssat[i].slip[0] & 3) rtk->ssat[i].slipc[0]++;
+                    if (rtk->ssat[i].slip[0] & 3)
+                        {
+                            rtk->ssat[i].slipc[0]++;
+                        }
                 }
         }
     free(rs);
diff --git a/src/algorithms/libs/rtklib/rtklib_preceph.cc b/src/algorithms/libs/rtklib/rtklib_preceph.cc
index 3c9f34c40..61217a8ae 100644
--- a/src/algorithms/libs/rtklib/rtklib_preceph.cc
+++ b/src/algorithms/libs/rtklib/rtklib_preceph.cc
@@ -67,12 +67,30 @@
 /* satellite code to satellite system ----------------------------------------*/
 int code2sys(char code)
 {
-    if (code == 'G' || code == ' ') return SYS_GPS;
-    if (code == 'R') return SYS_GLO;
-    if (code == 'E') return SYS_GAL; /* extension to sp3-c */
-    if (code == 'J') return SYS_QZS; /* extension to sp3-c */
-    if (code == 'C') return SYS_BDS; /* extension to sp3-c */
-    if (code == 'L') return SYS_LEO; /* extension to sp3-c */
+    if (code == 'G' || code == ' ')
+        {
+            return SYS_GPS;
+        }
+    if (code == 'R')
+        {
+            return SYS_GLO;
+        }
+    if (code == 'E')
+        {
+            return SYS_GAL; /* extension to sp3-c */
+        }
+    if (code == 'J')
+        {
+            return SYS_QZS; /* extension to sp3-c */
+        }
+    if (code == 'C')
+        {
+            return SYS_BDS; /* extension to sp3-c */
+        }
+    if (code == 'L')
+        {
+            return SYS_LEO; /* extension to sp3-c */
+        }
     return SYS_NONE;
 }
 
@@ -88,12 +106,18 @@ int readsp3h(FILE *fp, gtime_t *time, char *type, int *sats,
 
     for (i = 0; i < 22; i++)
         {
-            if (!fgets(buff, sizeof(buff), fp)) break;
+            if (!fgets(buff, sizeof(buff), fp))
+                {
+                    break;
+                }
 
             if (i == 0)
                 {
                     *type = buff[2];
-                    if (str2time(buff, 3, 28, time)) return 0;
+                    if (str2time(buff, 3, 28, time))
+                        {
+                            return 0;
+                        }
                 }
             else if (2 <= i && i <= 6)
                 {
@@ -105,7 +129,10 @@ int readsp3h(FILE *fp, gtime_t *time, char *type, int *sats,
                         {
                             sys = code2sys(buff[9 + 3 * j]);
                             prn = static_cast<int>(str2num(buff, 10 + 3 * j, 2));
-                            if (k < MAXSAT) sats[k++] = satno(sys, prn);
+                            if (k < MAXSAT)
+                                {
+                                    sats[k++] = satno(sys, prn);
+                                }
                         }
                 }
             else if (i == 12)
@@ -160,14 +187,20 @@ void readsp3b(FILE *fp, char type, int *sats __attribute__((unused)), int ns, co
 
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (!strncmp(buff, "EOF", 3)) break;
+            if (!strncmp(buff, "EOF", 3))
+                {
+                    break;
+                }
 
             if (buff[0] != '*' || str2time(buff, 3, 28, &time))
                 {
                     trace(2, "sp3 invalid epoch %31.31s\n", buff);
                     continue;
                 }
-            if (!strcmp(tsys, "UTC")) time = utc2gpst(time); /* utc->gpst */
+            if (!strcmp(tsys, "UTC"))
+                {
+                    time = utc2gpst(time); /* utc->gpst */
+                }
             peph.time = time;
             peph.index = index;
 
@@ -188,16 +221,26 @@ void readsp3b(FILE *fp, char type, int *sats __attribute__((unused)), int ns, co
                 }
             for (i = pred_o = pred_c = v = 0; i < n && fgets(buff, sizeof(buff), fp); i++)
                 {
-                    if (strlen(buff) < 4 || (buff[0] != 'P' && buff[0] != 'V')) continue;
+                    if (strlen(buff) < 4 || (buff[0] != 'P' && buff[0] != 'V'))
+                        {
+                            continue;
+                        }
 
                     sys = buff[1] == ' ' ? SYS_GPS : code2sys(buff[1]);
                     prn = static_cast<int>(str2num(buff, 2, 2));
                     if (sys == SYS_SBS)
-                        prn += 100;
+                        {
+                            prn += 100;
+                        }
                     else if (sys == SYS_QZS)
-                        prn += 192; /* extension to sp3-c */
+                        {
+                            prn += 192; /* extension to sp3-c */
+                        }
 
-                    if (!(sat = satno(sys, prn))) continue;
+                    if (!(sat = satno(sys, prn)))
+                        {
+                            continue;
+                        }
 
                     if (buff[0] == 'P')
                         {
@@ -207,10 +250,22 @@ void readsp3b(FILE *fp, char type, int *sats __attribute__((unused)), int ns, co
                     for (j = 0; j < 4; j++)
                         {
                             /* read option for predicted value */
-                            if (j < 3 && (opt & 1) && pred_o) continue;
-                            if (j < 3 && (opt & 2) && !pred_o) continue;
-                            if (j == 3 && (opt & 1) && pred_c) continue;
-                            if (j == 3 && (opt & 2) && !pred_c) continue;
+                            if (j < 3 && (opt & 1) && pred_o)
+                                {
+                                    continue;
+                                }
+                            if (j < 3 && (opt & 2) && !pred_o)
+                                {
+                                    continue;
+                                }
+                            if (j == 3 && (opt & 1) && pred_c)
+                                {
+                                    continue;
+                                }
+                            if (j == 3 && (opt & 2) && !pred_c)
+                                {
+                                    continue;
+                                }
 
                             val = str2num(buff, 4 + j * 14, 14);
                             std = str2num(buff, 61 + j * 3, j < 3 ? 2 : 3);
@@ -242,7 +297,10 @@ void readsp3b(FILE *fp, char type, int *sats __attribute__((unused)), int ns, co
                 }
             if (v)
                 {
-                    if (!addpeph(nav, &peph)) return;
+                    if (!addpeph(nav, &peph))
+                        {
+                            return;
+                        }
                 }
         }
 }
@@ -266,7 +324,10 @@ void combpeph(nav_t *nav, int opt)
 
     qsort(nav->peph, nav->ne, sizeof(peph_t), cmppeph);
 
-    if (opt & 4) return;
+    if (opt & 4)
+        {
+            return;
+        }
 
     for (i = 0, j = 1; j < nav->ne; j++)
         {
@@ -274,15 +335,32 @@ void combpeph(nav_t *nav, int opt)
                 {
                     for (k = 0; k < MAXSAT; k++)
                         {
-                            if (norm_rtk(nav->peph[j].pos[k], 4) <= 0.0) continue;
-                            for (m = 0; m < 4; m++) nav->peph[i].pos[k][m] = nav->peph[j].pos[k][m];
-                            for (m = 0; m < 4; m++) nav->peph[i].std[k][m] = nav->peph[j].std[k][m];
-                            for (m = 0; m < 4; m++) nav->peph[i].vel[k][m] = nav->peph[j].vel[k][m];
-                            for (m = 0; m < 4; m++) nav->peph[i].vst[k][m] = nav->peph[j].vst[k][m];
+                            if (norm_rtk(nav->peph[j].pos[k], 4) <= 0.0)
+                                {
+                                    continue;
+                                }
+                            for (m = 0; m < 4; m++)
+                                {
+                                    nav->peph[i].pos[k][m] = nav->peph[j].pos[k][m];
+                                }
+                            for (m = 0; m < 4; m++)
+                                {
+                                    nav->peph[i].std[k][m] = nav->peph[j].std[k][m];
+                                }
+                            for (m = 0; m < 4; m++)
+                                {
+                                    nav->peph[i].vel[k][m] = nav->peph[j].vel[k][m];
+                                }
+                            for (m = 0; m < 4; m++)
+                                {
+                                    nav->peph[i].vst[k][m] = nav->peph[j].vst[k][m];
+                                }
                         }
                 }
             else if (++i < j)
-                nav->peph[i] = nav->peph[j];
+                {
+                    nav->peph[i] = nav->peph[j];
+                }
         }
     nav->ne = i + 1;
 
@@ -318,7 +396,10 @@ void readsp3(const char *file, nav_t *nav, int opt)
         {
             if (!(efiles[i] = static_cast<char *>(malloc(1024))))
                 {
-                    for (i--; i >= 0; i--) free(efiles[i]);
+                    for (i--; i >= 0; i--)
+                        {
+                            free(efiles[i]);
+                        }
                     return;
                 }
         }
@@ -327,10 +408,16 @@ void readsp3(const char *file, nav_t *nav, int opt)
 
     for (i = j = 0; i < n; i++)
         {
-            if (!(ext = strrchr(efiles[i], '.'))) continue;
+            if (!(ext = strrchr(efiles[i], '.')))
+                {
+                    continue;
+                }
 
             if (!strstr(ext + 1, "sp3") && !strstr(ext + 1, ".SP3") &&
-                !strstr(ext + 1, "eph") && !strstr(ext + 1, ".EPH")) continue;
+                !strstr(ext + 1, "eph") && !strstr(ext + 1, ".EPH"))
+                {
+                    continue;
+                }
 
             if (!(fp = fopen(efiles[i], "re")))
                 {
@@ -345,10 +432,16 @@ void readsp3(const char *file, nav_t *nav, int opt)
 
             fclose(fp);
         }
-    for (i = 0; i < MAXEXFILE; i++) free(efiles[i]);
+    for (i = 0; i < MAXEXFILE; i++)
+        {
+            free(efiles[i]);
+        }
 
     /* combine precise ephemeris */
-    if (nav->ne > 0) combpeph(nav, opt);
+    if (nav->ne > 0)
+        {
+            combpeph(nav, opt);
+        }
 }
 
 
@@ -368,7 +461,10 @@ int readsap(const char *file, gtime_t time, nav_t *nav)
 
     trace(3, "readsap : file=%s time=%s\n", file, time_str(time, 0));
 
-    if (!readpcv(file, &pcvs)) return 0;
+    if (!readpcv(file, &pcvs))
+        {
+            return 0;
+        }
 
     for (i = 0; i < MAXSAT; i++)
         {
@@ -398,21 +494,36 @@ int readdcbf(const char *file, nav_t *nav, const sta_t *sta)
     while (fgets(buff, sizeof(buff), fp))
         {
             if (strstr(buff, "DIFFERENTIAL (P1-P2) CODE BIASES"))
-                type = 1;
+                {
+                    type = 1;
+                }
             else if (strstr(buff, "DIFFERENTIAL (P1-C1) CODE BIASES"))
-                type = 2;
+                {
+                    type = 2;
+                }
             else if (strstr(buff, "DIFFERENTIAL (P2-C2) CODE BIASES"))
-                type = 3;
+                {
+                    type = 3;
+                }
 
-            if (!type || sscanf(buff, "%s %s", str1, str2) < 1) continue;
+            if (!type || sscanf(buff, "%s %s", str1, str2) < 1)
+                {
+                    continue;
+                }
 
-            if ((cbias = str2num(buff, 26, 9)) == 0.0) continue;
+            if ((cbias = str2num(buff, 26, 9)) == 0.0)
+                {
+                    continue;
+                }
 
             if (sta && (!strcmp(str1, "G") || !strcmp(str1, "R")))
                 { /* receiver dcb */
                     for (i = 0; i < MAXRCV; i++)
                         {
-                            if (!strcmp(sta[i].name, str2)) break;
+                            if (!strcmp(sta[i].name, str2))
+                                {
+                                    break;
+                                }
                         }
                     if (i < MAXRCV)
                         {
@@ -448,15 +559,20 @@ int readdcb(const char *file, nav_t *nav, const sta_t *sta)
     trace(3, "readdcb : file=%s\n", file);
 
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < 3; j++)
-            {
-                nav->cbias[i][j] = 0.0;
-            }
+        {
+            for (j = 0; j < 3; j++)
+                {
+                    nav->cbias[i][j] = 0.0;
+                }
+        }
     for (i = 0; i < MAXEXFILE; i++)
         {
             if (!(efiles[i] = static_cast<char *>(malloc(1024))))
                 {
-                    for (i--; i >= 0; i--) free(efiles[i]);
+                    for (i--; i >= 0; i--)
+                        {
+                            free(efiles[i]);
+                        }
                     return 0;
                 }
         }
@@ -466,7 +582,10 @@ int readdcb(const char *file, nav_t *nav, const sta_t *sta)
         {
             readdcbf(efiles[i], nav, sta);
         }
-    for (i = 0; i < MAXEXFILE; i++) free(efiles[i]);
+    for (i = 0; i < MAXEXFILE; i++)
+        {
+            free(efiles[i]);
+        }
 
     return 1;
 }
@@ -500,10 +619,12 @@ int addfcb(nav_t *nav, gtime_t ts, gtime_t te, int sat,
             nav->fcb = nav_fcb;
         }
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < 3; j++)
-            {
-                nav->fcb[nav->nf].bias[i][j] = nav->fcb[nav->nf].std[i][j] = 0.0;
-            }
+        {
+            for (j = 0; j < 3; j++)
+                {
+                    nav->fcb[nav->nf].bias[i][j] = nav->fcb[nav->nf].std[i][j] = 0.0;
+                }
+        }
     for (i = 0; i < 3; i++)
         {
             nav->fcb[nav->nf].bias[sat - 1][i] = bias[i];
@@ -533,14 +654,23 @@ int readfcbf(const char *file, nav_t *nav)
         }
     while (fgets(buff, sizeof(buff), fp))
         {
-            if ((p = strchr(buff, '#'))) *p = '\0';
+            if ((p = strchr(buff, '#')))
+                {
+                    *p = '\0';
+                }
             if (sscanf(buff,
                     "%lf/%lf/%lf %lf:%lf:%lf %lf/%lf/%lf %lf:%lf:%lf %s"
                     "%lf %lf %lf %lf %lf %lf",
                     ep1, ep1 + 1, ep1 + 2, ep1 + 3, ep1 + 4, ep1 + 5,
                     ep2, ep2 + 1, ep2 + 2, ep2 + 3, ep2 + 4, ep2 + 5, str, bias, std, bias + 1, std + 1,
-                    bias + 2, std + 2) < 17) continue;
-            if (!(sat = satid2no(str))) continue;
+                    bias + 2, std + 2) < 17)
+                {
+                    continue;
+                }
+            if (!(sat = satid2no(str)))
+                {
+                    continue;
+                }
             ts = epoch2time(ep1);
             te = epoch2time(ep2);
             if (!addfcb(nav, ts, te, sat, bias, std))
@@ -581,7 +711,10 @@ int readfcb(const char *file, nav_t *nav)
         {
             if (!(efiles[i] = static_cast<char *>(malloc(1024))))
                 {
-                    for (i--; i >= 0; i--) free(efiles[i]);
+                    for (i--; i >= 0; i--)
+                        {
+                            free(efiles[i]);
+                        }
                     return 0;
                 }
         }
@@ -591,7 +724,10 @@ int readfcb(const char *file, nav_t *nav)
         {
             readfcbf(efiles[i], nav);
         }
-    for (i = 0; i < MAXEXFILE; i++) free(efiles[i]);
+    for (i = 0; i < MAXEXFILE; i++)
+        {
+            free(efiles[i]);
+        }
 
     if (nav->nf > 1)
         {
@@ -640,18 +776,26 @@ int pephpos(gtime_t time, int sat, const nav_t *nav, double *rs,
         {
             k = (i + j) / 2;
             if (timediff(nav->peph[k].time, time) < 0.0)
-                i = k + 1;
+                {
+                    i = k + 1;
+                }
             else
-                j = k;
+                {
+                    j = k;
+                }
         }
     index = i <= 0 ? 0 : i - 1;
 
     /* polynomial interpolation for orbit */
     i = index - (NMAX + 1) / 2;
     if (i < 0)
-        i = 0;
+        {
+            i = 0;
+        }
     else if (i + NMAX >= nav->ne)
-        i = nav->ne - NMAX - 1;
+        {
+            i = nav->ne - NMAX - 1;
+        }
 
     for (j = 0; j <= NMAX; j++)
         {
@@ -683,14 +827,21 @@ int pephpos(gtime_t time, int sat, const nav_t *nav, double *rs,
         }
     if (vare)
         {
-            for (i = 0; i < 3; i++) s[i] = nav->peph[index].std[sat - 1][i];
+            for (i = 0; i < 3; i++)
+                {
+                    s[i] = nav->peph[index].std[sat - 1][i];
+                }
             std = norm_rtk(s, 3);
 
             /* extrapolation error for orbit */
             if (t[0] > 0.0)
-                std += EXTERR_EPH * std::pow(t[0], 2.0) / 2.0;
+                {
+                    std += EXTERR_EPH * std::pow(t[0], 2.0) / 2.0;
+                }
             else if (t[NMAX] < 0.0)
-                std += EXTERR_EPH * std::pow(t[NMAX], 2.0) / 2.0;
+                {
+                    std += EXTERR_EPH * std::pow(t[NMAX], 2.0) / 2.0;
+                }
             *vare = std::pow(std, 2.0);
         }
     /* linear interpolation for clock */
@@ -723,7 +874,10 @@ int pephpos(gtime_t time, int sat, const nav_t *nav, double *rs,
         {
             dts[0] = 0.0;
         }
-    if (varc) *varc = std::pow(std, 2.0);
+    if (varc)
+        {
+            *varc = std::pow(std, 2.0);
+        }
     return 1;
 }
 
@@ -749,9 +903,13 @@ int pephclk(gtime_t time, int sat, const nav_t *nav, double *dts,
         {
             k = (i + j) / 2;
             if (timediff(nav->pclk[k].time, time) < 0.0)
-                i = k + 1;
+                {
+                    i = k + 1;
+                }
             else
-                j = k;
+                {
+                    j = k;
+                }
         }
     index = i <= 0 ? 0 : i - 1;
 
@@ -763,12 +921,18 @@ int pephclk(gtime_t time, int sat, const nav_t *nav, double *dts,
 
     if (t[0] <= 0.0)
         {
-            if ((dts[0] = c[0]) == 0.0) return 0;
+            if ((dts[0] = c[0]) == 0.0)
+                {
+                    return 0;
+                }
             std = nav->pclk[index].std[sat - 1][0] * SPEED_OF_LIGHT - EXTERR_CLK * t[0];
         }
     else if (t[1] >= 0.0)
         {
-            if ((dts[0] = c[1]) == 0.0) return 0;
+            if ((dts[0] = c[1]) == 0.0)
+                {
+                    return 0;
+                }
             std = nav->pclk[index + 1].std[sat - 1][0] * SPEED_OF_LIGHT + EXTERR_CLK * t[1];
         }
     else if (c[0] != 0.0 && c[1] != 0.0)
@@ -782,7 +946,10 @@ int pephclk(gtime_t time, int sat, const nav_t *nav, double *dts,
             trace(3, "prec clock outage %s sat=%2d\n", time_str(time, 0), sat);
             return 0;
         }
-    if (varc) *varc = std::pow(std, 2.0);
+    if (varc)
+        {
+            *varc = std::pow(std, 2.0);
+        }
     return 1;
 }
 
@@ -813,17 +980,38 @@ void satantoff(gtime_t time, const double *rs, int sat, const nav_t *nav,
     sunmoonpos(gpst2utc(time), erpv, rsun, nullptr, &gmst);
 
     /* unit vectors of satellite fixed coordinates */
-    for (i = 0; i < 3; i++) r[i] = -rs[i];
-    if (!normv3(r, ez)) return;
-    for (i = 0; i < 3; i++) r[i] = rsun[i] - rs[i];
-    if (!normv3(r, es)) return;
+    for (i = 0; i < 3; i++)
+        {
+            r[i] = -rs[i];
+        }
+    if (!normv3(r, ez))
+        {
+            return;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            r[i] = rsun[i] - rs[i];
+        }
+    if (!normv3(r, es))
+        {
+            return;
+        }
     cross3(ez, es, r);
-    if (!normv3(r, ey)) return;
+    if (!normv3(r, ey))
+        {
+            return;
+        }
     cross3(ey, ez, ex);
 
-    if (NFREQ >= 3 && (satsys(sat, nullptr) & (SYS_GAL | SYS_SBS))) k = 2;
+    if (NFREQ >= 3 && (satsys(sat, nullptr) & (SYS_GAL | SYS_SBS)))
+        {
+            k = 2;
+        }
 
-    if (NFREQ < 2 || lam[j] == 0.0 || lam[k] == 0.0) return;
+    if (NFREQ < 2 || lam[j] == 0.0 || lam[k] == 0.0)
+        {
+            return;
+        }
 
     gamma = std::pow(lam[k], 2.0) / std::pow(lam[j], 2.0);
     C1 = gamma / (gamma - 1.0);
@@ -865,15 +1053,24 @@ int peph2pos(gtime_t time, int sat, const nav_t *nav, int opt,
 
     trace(4, "peph2pos: time=%s sat=%2d opt=%d\n", time_str(time, 3), sat, opt);
 
-    if (sat <= 0 || MAXSAT < sat) return 0;
+    if (sat <= 0 || MAXSAT < sat)
+        {
+            return 0;
+        }
 
     /* satellite position and clock bias */
     if (!pephpos(time, sat, nav, rss, dtss, &vare, &varc) ||
-        !pephclk(time, sat, nav, dtss, &varc)) return 0;
+        !pephclk(time, sat, nav, dtss, &varc))
+        {
+            return 0;
+        }
 
     time = timeadd(time, tt);
     if (!pephpos(time, sat, nav, rst, dtst, nullptr, nullptr) ||
-        !pephclk(time, sat, nav, dtst, nullptr)) return 0;
+        !pephclk(time, sat, nav, dtst, nullptr))
+        {
+            return 0;
+        }
 
     /* satellite antenna offset correction */
     if (opt)
@@ -895,7 +1092,10 @@ int peph2pos(gtime_t time, int sat, const nav_t *nav, int opt,
         { /* no precise clock */
             dts[0] = dts[1] = 0.0;
         }
-    if (var) *var = vare + varc;
+    if (var)
+        {
+            *var = vare + varc;
+        }
 
     return 1;
 }
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm.cc b/src/algorithms/libs/rtklib/rtklib_rtcm.cc
index c82065d2c..53c34663d 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm.cc
@@ -94,19 +94,30 @@ int init_rtcm(rtcm_t *rtcm)
             rtcm->ssr[i] = ssr0;
         }
     rtcm->msg[0] = rtcm->msgtype[0] = rtcm->opt[0] = '\0';
-    for (i = 0; i < 6; i++) rtcm->msmtype[i][0] = '\0';
+    for (i = 0; i < 6; i++)
+        {
+            rtcm->msmtype[i][0] = '\0';
+        }
     rtcm->obsflag = rtcm->ephsat = 0;
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < NFREQ + NEXOBS; j++)
-            {
-                rtcm->cp[i][j] = 0.0;
-                rtcm->lock[i][j] = rtcm->loss[i][j] = 0;
-                rtcm->lltime[i][j] = time0;
-            }
+        {
+            for (j = 0; j < NFREQ + NEXOBS; j++)
+                {
+                    rtcm->cp[i][j] = 0.0;
+                    rtcm->lock[i][j] = rtcm->loss[i][j] = 0;
+                    rtcm->lltime[i][j] = time0;
+                }
+        }
     rtcm->nbyte = rtcm->nbit = rtcm->len = 0;
     rtcm->word = 0;
-    for (i = 0; i < 100; i++) rtcm->nmsg2[i] = 0;
-    for (i = 0; i < 300; i++) rtcm->nmsg3[i] = 0;
+    for (i = 0; i < 100; i++)
+        {
+            rtcm->nmsg2[i] = 0;
+        }
+    for (i = 0; i < 300; i++)
+        {
+            rtcm->nmsg3[i] = 0;
+        }
 
     rtcm->obs.data = nullptr;
     rtcm->nav.eph = nullptr;
@@ -123,9 +134,18 @@ int init_rtcm(rtcm_t *rtcm)
     rtcm->obs.n = 0;
     rtcm->nav.n = MAXSAT;
     rtcm->nav.ng = MAXPRNGLO;
-    for (i = 0; i < MAXOBS; i++) rtcm->obs.data[i] = data0;
-    for (i = 0; i < MAXSAT; i++) rtcm->nav.eph[i] = eph0;
-    for (i = 0; i < MAXPRNGLO; i++) rtcm->nav.geph[i] = geph0;
+    for (i = 0; i < MAXOBS; i++)
+        {
+            rtcm->obs.data[i] = data0;
+        }
+    for (i = 0; i < MAXSAT; i++)
+        {
+            rtcm->nav.eph[i] = eph0;
+        }
+    for (i = 0; i < MAXPRNGLO; i++)
+        {
+            rtcm->nav.geph[i] = geph0;
+        }
     return 1;
 }
 
@@ -173,7 +193,10 @@ int input_rtcm2(rtcm_t *rtcm, unsigned char data)
 
     trace(5, "input_rtcm2: data=%02x\n", data);
 
-    if ((data & 0xC0) != 0x40) return 0; /* ignore if upper 2bit != 01 */
+    if ((data & 0xC0) != 0x40)
+        {
+            return 0; /* ignore if upper 2bit != 01 */
+        }
 
     for (i = 0; i < 6; i++, data >>= 1)
         { /* decode 6-of-8 form */
@@ -183,17 +206,28 @@ int input_rtcm2(rtcm_t *rtcm, unsigned char data)
             if (rtcm->nbyte == 0)
                 {
                     preamb = static_cast<unsigned char>(rtcm->word >> 22);
-                    if (rtcm->word & 0x40000000) preamb ^= 0xFF; /* decode preamble */
-                    if (preamb != RTCM2PREAMB) continue;
+                    if (rtcm->word & 0x40000000)
+                        {
+                            preamb ^= 0xFF; /* decode preamble */
+                        }
+                    if (preamb != RTCM2PREAMB)
+                        {
+                            continue;
+                        }
 
                     /* check parity */
-                    if (!decode_word(rtcm->word, rtcm->buff)) continue;
+                    if (!decode_word(rtcm->word, rtcm->buff))
+                        {
+                            continue;
+                        }
                     rtcm->nbyte = 3;
                     rtcm->nbit = 0;
                     continue;
                 }
             if (++rtcm->nbit < 30)
-                continue;
+                {
+                    continue;
+                }
 
             rtcm->nbit = 0;
 
@@ -206,8 +240,14 @@ int input_rtcm2(rtcm_t *rtcm, unsigned char data)
                     continue;
                 }
             rtcm->nbyte += 3;
-            if (rtcm->nbyte == 6) rtcm->len = (rtcm->buff[5] >> 3) * 3 + 6;
-            if (rtcm->nbyte < rtcm->len) continue;
+            if (rtcm->nbyte == 6)
+                {
+                    rtcm->len = (rtcm->buff[5] >> 3) * 3 + 6;
+                }
+            if (rtcm->nbyte < rtcm->len)
+                {
+                    continue;
+                }
             rtcm->nbyte = 0;
             rtcm->word &= 0x3;
 
@@ -290,7 +330,10 @@ int input_rtcm3(rtcm_t *rtcm, unsigned char data)
     /* synchronize frame */
     if (rtcm->nbyte == 0)
         {
-            if (data != RTCM3PREAMB) return 0;
+            if (data != RTCM3PREAMB)
+                {
+                    return 0;
+                }
             rtcm->buff[rtcm->nbyte++] = data;
             return 0;
         }
@@ -300,7 +343,10 @@ int input_rtcm3(rtcm_t *rtcm, unsigned char data)
         {
             rtcm->len = getbitu(rtcm->buff, 14, 10) + 3; /* length without parity */
         }
-    if (rtcm->nbyte < 3 || rtcm->nbyte < rtcm->len + 3) return 0;
+    if (rtcm->nbyte < 3 || rtcm->nbyte < rtcm->len + 3)
+        {
+            return 0;
+        }
     rtcm->nbyte = 0;
 
     /* check parity */
@@ -329,8 +375,14 @@ int input_rtcm2f(rtcm_t *rtcm, FILE *fp)
 
     for (i = 0; i < 4096; i++)
         {
-            if ((data = fgetc(fp)) == EOF) return -2;
-            if ((ret = input_rtcm2(rtcm, static_cast<unsigned char>(data)))) return ret;
+            if ((data = fgetc(fp)) == EOF)
+                {
+                    return -2;
+                }
+            if ((ret = input_rtcm2(rtcm, static_cast<unsigned char>(data))))
+                {
+                    return ret;
+                }
         }
     return 0; /* return at every 4k bytes */
 }
@@ -351,8 +403,14 @@ int input_rtcm3f(rtcm_t *rtcm, FILE *fp)
 
     for (i = 0; i < 4096; i++)
         {
-            if ((data = fgetc(fp)) == EOF) return -2;
-            if ((ret = input_rtcm3(rtcm, static_cast<unsigned char>(data)))) return ret;
+            if ((data = fgetc(fp)) == EOF)
+                {
+                    return -2;
+                }
+            if ((ret = input_rtcm3(rtcm, static_cast<unsigned char>(data))))
+                {
+                    return ret;
+                }
         }
     return 0; /* return at every 4k bytes */
 }
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm2.cc b/src/algorithms/libs/rtklib/rtklib_rtcm2.cc
index c7af88ccd..24528c762 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm2.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm2.cc
@@ -63,14 +63,21 @@ void adjhour(rtcm_t *rtcm, double zcnt)
     int week;
 
     /* if no time, get cpu time */
-    if (rtcm->time.time == 0) rtcm->time = utc2gpst(timeget());
+    if (rtcm->time.time == 0)
+        {
+            rtcm->time = utc2gpst(timeget());
+        }
     tow = time2gpst(rtcm->time, &week);
     hour = floor(tow / 3600.0);
     sec = tow - hour * 3600.0;
     if (zcnt < sec - 1800.0)
-        zcnt += 3600.0;
+        {
+            zcnt += 3600.0;
+        }
     else if (zcnt > sec + 1800.0)
-        zcnt -= 3600.0;
+        {
+            zcnt -= 3600.0;
+        }
     rtcm->time = gpst2time(week, hour * 3600 + zcnt);
 }
 
@@ -82,9 +89,15 @@ int obsindex(obs_t *obs, gtime_t time, int sat)
 
     for (i = 0; i < obs->n; i++)
         {
-            if (obs->data[i].sat == sat) return i; /* field already exists */
+            if (obs->data[i].sat == sat)
+                {
+                    return i; /* field already exists */
+                }
+        }
+    if (i >= MAXOBS)
+        {
+            return -1; /* overflow */
         }
-    if (i >= MAXOBS) return -1; /* overflow */
 
     /* add new field */
     obs->data[i].time = time;
@@ -122,7 +135,10 @@ int decode_type1(rtcm_t *rtcm)
             i += 8;
             iod = getbits(rtcm->buff, i, 8);
             i += 8;
-            if (prn == 0) prn = 32;
+            if (prn == 0)
+                {
+                    prn = 32;
+                }
             if (prc == 0x80000000 || rrc == 0xFFFF8000)
                 {
                     trace(2, "rtcm2 1 prc/rrc indicates satellite problem: prn=%d\n", prn);
@@ -290,7 +306,10 @@ int decode_type17(rtcm_t *rtcm)
             trace(2, "rtcm2 17 length error: len=%d\n", rtcm->len);
             return -1;
         }
-    if (prn == 0) prn = 32;
+    if (prn == 0)
+        {
+            prn = 32;
+        }
     sat = satno(SYS_GPS, prn);
     eph.sat = sat;
     eph.week = adjgpsweek(week);
@@ -346,14 +365,20 @@ int decode_type18(rtcm_t *rtcm)
             i += 5;
             cp = getbits(rtcm->buff, i, 32);
             i += 32;
-            if (prn == 0) prn = 32;
+            if (prn == 0)
+                {
+                    prn = 32;
+                }
             if (!(sat = satno(sys ? SYS_GLO : SYS_GPS, prn)))
                 {
                     trace(2, "rtcm2 18 satellite number error: sys=%d prn=%d\n", sys, prn);
                     continue;
                 }
             time = timeadd(rtcm->time, usec * 1E-6);
-            if (sys) time = utc2gpst(time); /* convert glonass time to gpst */
+            if (sys)
+                {
+                    time = utc2gpst(time); /* convert glonass time to gpst */
+                }
 
             tt = timediff(rtcm->obs.data[0].time, time);
             if (rtcm->obsflag || fabs(tt) > 1E-9)
@@ -414,14 +439,20 @@ int decode_type19(rtcm_t *rtcm)
             i += 5 + 8;
             pr = getbitu(rtcm->buff, i, 32);
             i += 32;
-            if (prn == 0) prn = 32;
+            if (prn == 0)
+                {
+                    prn = 32;
+                }
             if (!(sat = satno(sys ? SYS_GLO : SYS_GPS, prn)))
                 {
                     trace(2, "rtcm2 19 satellite number error: sys=%d prn=%d\n", sys, prn);
                     continue;
                 }
             time = timeadd(rtcm->time, usec * 1E-6);
-            if (sys) time = utc2gpst(time); /* convert glonass time to gpst */
+            if (sys)
+                {
+                    time = utc2gpst(time); /* convert glonass time to gpst */
+                }
 
             tt = timediff(rtcm->obs.data[0].time, time);
             if (rtcm->obsflag || fabs(tt) > 1E-9)
@@ -479,7 +510,10 @@ int decode_type22(rtcm_t *rtcm)
             del[1][2] = getbits(rtcm->buff, i, 8) / 1600.0;
         }
     rtcm->sta.deltype = 1; /* xyz */
-    for (j = 0; j < 3; j++) rtcm->sta.del[j] = del[0][j];
+    for (j = 0; j < 3; j++)
+        {
+            rtcm->sta.del[j] = del[0][j];
+        }
     rtcm->sta.hgt = hgt;
     return 5;
 }
@@ -640,9 +674,13 @@ int decode_rtcm2(rtcm_t *rtcm)
     if (ret >= 0)
         {
             if (1 <= type && type <= 99)
-                rtcm->nmsg2[type]++;
+                {
+                    rtcm->nmsg2[type]++;
+                }
             else
-                rtcm->nmsg2[0]++;
+                {
+                    rtcm->nmsg2[0]++;
+                }
         }
     return ret;
 }
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
index abda7995f..42721e641 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
@@ -115,12 +115,19 @@ void adjweek(rtcm_t *rtcm, double tow)
     int week;
 
     /* if no time, get cpu time */
-    if (rtcm->time.time == 0) rtcm->time = utc2gpst(timeget());
+    if (rtcm->time.time == 0)
+        {
+            rtcm->time = utc2gpst(timeget());
+        }
     tow_p = time2gpst(rtcm->time, &week);
     if (tow < tow_p - 302400.0)
-        tow += 604800.0;
+        {
+            tow += 604800.0;
+        }
     else if (tow > tow_p + 302400.0)
-        tow -= 604800.0;
+        {
+            tow -= 604800.0;
+        }
     rtcm->time = gpst2time(week, tow);
 }
 
@@ -130,7 +137,10 @@ int adjbdtweek(int week)
 {
     int w;
     (void)time2bdt(gpst2bdt(utc2gpst(timeget())), &w);
-    if (w < 1) w = 1; /* use 2006/1/1 if time is earlier than 2006/1/1 */
+    if (w < 1)
+        {
+            w = 1; /* use 2006/1/1 if time is earlier than 2006/1/1 */
+        }
     return week + (w - week + 512) / 1024 * 1024;
 }
 
@@ -142,15 +152,22 @@ void adjday_glot(rtcm_t *rtcm, double tod)
     double tow, tod_p;
     int week;
 
-    if (rtcm->time.time == 0) rtcm->time = utc2gpst(timeget());
+    if (rtcm->time.time == 0)
+        {
+            rtcm->time = utc2gpst(timeget());
+        }
     time = timeadd(gpst2utc(rtcm->time), 10800.0); /* glonass time */
     tow = time2gpst(time, &week);
     tod_p = fmod(tow, 86400.0);
     tow -= tod_p;
     if (tod < tod_p - 43200.0)
-        tod += 86400.0;
+        {
+            tod += 86400.0;
+        }
     else if (tod > tod_p + 43200.0)
-        tod -= 86400.0;
+        {
+            tod -= 86400.0;
+        }
     time = gpst2time(week, tow + tod);
     rtcm->time = utc2gpst(timeadd(time, -10800.0));
 }
@@ -160,11 +177,17 @@ void adjday_glot(rtcm_t *rtcm, double tod)
 double adjcp(rtcm_t *rtcm, int sat, int freq, double cp)
 {
     if (rtcm->cp[sat - 1][freq] == 0.0)
-        ;
+        {
+            ;
+        }
     else if (cp < rtcm->cp[sat - 1][freq] - 750.0)
-        cp += 1500.0;
+        {
+            cp += 1500.0;
+        }
     else if (cp > rtcm->cp[sat - 1][freq] + 750.0)
-        cp -= 1500.0;
+        {
+            cp -= 1500.0;
+        }
     rtcm->cp[sat - 1][freq] = cp;
     return cp;
 }
@@ -193,9 +216,15 @@ int obsindex3(obs_t *obs, gtime_t time, int sat)
 
     for (i = 0; i < obs->n; i++)
         {
-            if (obs->data[i].sat == sat) return i; /* field already exists */
+            if (obs->data[i].sat == sat)
+                {
+                    return i; /* field already exists */
+                }
+        }
+    if (i >= MAXOBS)
+        {
+            return -1; /* overflow */
         }
-    if (i >= MAXOBS) return -1; /* overflow */
 
     /* add new field */
     obs->data[i].time = time;
@@ -220,7 +249,10 @@ int test_staid(rtcm_t *rtcm, int staid)
     /* test station id option */
     if ((p = strstr(rtcm->opt, "-STA=")) && sscanf(p, "-STA=%d", &id) == 1)
         {
-            if (staid != id) return 0;
+            if (staid != id)
+                {
+                    return 0;
+                }
         }
     /* save station id */
     if (rtcm->staid == 0 || rtcm->obsflag)
@@ -266,7 +298,10 @@ int decode_head1001(rtcm_t *rtcm, int *sync)
             return -1;
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     adjweek(rtcm, tow);
 
@@ -287,7 +322,10 @@ int decode_head1001(rtcm_t *rtcm, int *sync)
 int decode_type1001(rtcm_t *rtcm)
 {
     int sync;
-    if (decode_head1001(rtcm, &sync) < 0) return -1;
+    if (decode_head1001(rtcm, &sync) < 0)
+        {
+            return -1;
+        }
     rtcm->obsflag = !sync;
     return sync ? 0 : 1;
 }
@@ -299,7 +337,10 @@ int decode_type1002(rtcm_t *rtcm)
     double pr1, cnr1, tt, cp1;
     int i = 24 + 64, j, index, nsat, sync, prn, code, sat, ppr1, lock1, amb, sys;
 
-    if ((nsat = decode_head1001(rtcm, &sync)) < 0) return -1;
+    if ((nsat = decode_head1001(rtcm, &sync)) < 0)
+        {
+            return -1;
+        }
 
     for (j = 0; j < nsat && rtcm->obs.n < MAXOBS && i + 74 <= rtcm->len * 8; j++)
         {
@@ -336,7 +377,10 @@ int decode_type1002(rtcm_t *rtcm)
                 {
                     rtcm->obs.n = rtcm->obsflag = 0;
                 }
-            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0) continue;
+            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0)
+                {
+                    continue;
+                }
             pr1 = pr1 * 0.02 + amb * PRUNIT_GPS;
             if (ppr1 != static_cast<int>(0xFFF80000))
                 {
@@ -356,7 +400,10 @@ int decode_type1002(rtcm_t *rtcm)
 int decode_type1003(rtcm_t *rtcm)
 {
     int sync;
-    if (decode_head1001(rtcm, &sync) < 0) return -1;
+    if (decode_head1001(rtcm, &sync) < 0)
+        {
+            return -1;
+        }
     rtcm->obsflag = !sync;
     return sync ? 0 : 1;
 }
@@ -370,7 +417,10 @@ int decode_type1004(rtcm_t *rtcm)
     int i = 24 + 64, j, index, nsat, sync, prn, sat, code1, code2, pr21, ppr1, ppr2;
     int lock1, lock2, amb, sys;
 
-    if ((nsat = decode_head1001(rtcm, &sync)) < 0) return -1;
+    if ((nsat = decode_head1001(rtcm, &sync)) < 0)
+        {
+            return -1;
+        }
 
     for (j = 0; j < nsat && rtcm->obs.n < MAXOBS && i + 125 <= rtcm->len * 8; j++)
         {
@@ -417,7 +467,10 @@ int decode_type1004(rtcm_t *rtcm)
                 {
                     rtcm->obs.n = rtcm->obsflag = 0;
                 }
-            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0) continue;
+            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0)
+                {
+                    continue;
+                }
             pr1 = pr1 * 0.02 + amb * PRUNIT_GPS;
             if (ppr1 != static_cast<int>(0xFFF80000))
                 {
@@ -481,13 +534,19 @@ int decode_type1005(rtcm_t *rtcm)
     if (rtcm->outtype)
         {
             msg = rtcm->msgtype + strlen(rtcm->msgtype);
-            for (j = 0; j < 3; j++) re[j] = rr[j] * 0.0001;
+            for (j = 0; j < 3; j++)
+                {
+                    re[j] = rr[j] * 0.0001;
+                }
             ecef2pos(re, pos);
             sprintf(msg, " staid=%4d pos=%.8f %.8f %.3f", staid, pos[0] * R2D, pos[1] * R2D,
                 pos[2]);
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     rtcm->sta.deltype = 0; /* xyz */
     for (j = 0; j < 3; j++)
@@ -530,13 +589,19 @@ int decode_type1006(rtcm_t *rtcm)
     if (rtcm->outtype)
         {
             msg = rtcm->msgtype + strlen(rtcm->msgtype);
-            for (j = 0; j < 3; j++) re[j] = rr[j] * 0.0001;
+            for (j = 0; j < 3; j++)
+                {
+                    re[j] = rr[j] * 0.0001;
+                }
             ecef2pos(re, pos);
             sprintf(msg, " staid=%4d pos=%.8f %.8f %.3f anth=%.3f", staid, pos[0] * R2D,
                 pos[1] * R2D, pos[2], anth);
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     rtcm->sta.deltype = 1; /* xyz */
     for (j = 0; j < 3; j++)
@@ -581,7 +646,10 @@ int decode_type1007(rtcm_t *rtcm)
             sprintf(msg, " staid=%4d", staid);
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     strncpy(rtcm->sta.antdes, des, n);
     rtcm->sta.antdes[n] = '\0';
@@ -629,7 +697,10 @@ int decode_type1008(rtcm_t *rtcm)
             sprintf(msg, " staid=%4d", staid);
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     strncpy(rtcm->sta.antdes, des, n);
     rtcm->sta.antdes[n] = '\0';
@@ -666,7 +737,10 @@ int decode_head1009(rtcm_t *rtcm, int *sync)
             return -1;
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     adjday_glot(rtcm, tod);
 
@@ -687,7 +761,10 @@ int decode_head1009(rtcm_t *rtcm, int *sync)
 int decode_type1009(rtcm_t *rtcm)
 {
     int sync;
-    if (decode_head1009(rtcm, &sync) < 0) return -1;
+    if (decode_head1009(rtcm, &sync) < 0)
+        {
+            return -1;
+        }
     rtcm->obsflag = !sync;
     return sync ? 0 : 1;
 }
@@ -699,7 +776,10 @@ int decode_type1010(rtcm_t *rtcm)
     double pr1, cnr1, tt, cp1, lam1;
     int i = 24 + 61, j, index, nsat, sync, prn, sat, code, freq, ppr1, lock1, amb, sys = SYS_GLO;
 
-    if ((nsat = decode_head1009(rtcm, &sync)) < 0) return -1;
+    if ((nsat = decode_head1009(rtcm, &sync)) < 0)
+        {
+            return -1;
+        }
 
     for (j = 0; j < nsat && rtcm->obs.n < MAXOBS && i + 79 <= rtcm->len * 8; j++)
         {
@@ -729,7 +809,10 @@ int decode_type1010(rtcm_t *rtcm)
                 {
                     rtcm->obs.n = rtcm->obsflag = 0;
                 }
-            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0) continue;
+            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0)
+                {
+                    continue;
+                }
             pr1 = pr1 * 0.02 + amb * PRUNIT_GLO;
             if (ppr1 != static_cast<int>(0xFFF80000))
                 {
@@ -750,7 +833,10 @@ int decode_type1010(rtcm_t *rtcm)
 int decode_type1011(rtcm_t *rtcm)
 {
     int sync;
-    if (decode_head1009(rtcm, &sync) < 0) return -1;
+    if (decode_head1009(rtcm, &sync) < 0)
+        {
+            return -1;
+        }
     rtcm->obsflag = !sync;
     return sync ? 0 : 1;
 }
@@ -763,7 +849,10 @@ int decode_type1012(rtcm_t *rtcm)
     int i = 24 + 61, j, index, nsat, sync, prn, sat, freq, code1, code2, pr21, ppr1, ppr2;
     int lock1, lock2, amb, sys = SYS_GLO;
 
-    if ((nsat = decode_head1009(rtcm, &sync)) < 0) return -1;
+    if ((nsat = decode_head1009(rtcm, &sync)) < 0)
+        {
+            return -1;
+        }
 
     for (j = 0; j < nsat && rtcm->obs.n < MAXOBS && i + 130 <= rtcm->len * 8; j++)
         {
@@ -803,7 +892,10 @@ int decode_type1012(rtcm_t *rtcm)
                 {
                     rtcm->obs.n = rtcm->obsflag = 0;
                 }
-            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0) continue;
+            if ((index = obsindex3(&rtcm->obs, rtcm->time, sat)) < 0)
+                {
+                    continue;
+                }
             pr1 = pr1 * 0.02 + amb * PRUNIT_GLO;
             if (ppr1 != static_cast<int>(0xFFF80000))
                 {
@@ -945,7 +1037,10 @@ int decode_type1019(rtcm_t *rtcm)
     eph.A = sqrtA * sqrtA;
     if (!strstr(rtcm->opt, "-EPHALL"))
         {
-            if (eph.iode == rtcm->nav.eph[sat - 1].iode) return 0; /* unchanged */
+            if (eph.iode == rtcm->nav.eph[sat - 1].iode)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.eph[sat - 1] = eph;
     rtcm->ephsat = sat;
@@ -1021,27 +1116,41 @@ int decode_type1020(rtcm_t *rtcm)
     geph.sat = sat;
     geph.svh = bn;
     geph.iode = tb & 0x7F;
-    if (rtcm->time.time == 0) rtcm->time = utc2gpst(timeget());
+    if (rtcm->time.time == 0)
+        {
+            rtcm->time = utc2gpst(timeget());
+        }
     tow = time2gpst(gpst2utc(rtcm->time), &week);
     tod = fmod(tow, 86400.0);
     tow -= tod;
     tof = tk_h * 3600.0 + tk_m * 60.0 + tk_s - 10800.0; /* lt->utc */
     if (tof < tod - 43200.0)
-        tof += 86400.0;
+        {
+            tof += 86400.0;
+        }
     else if (tof > tod + 43200.0)
-        tof -= 86400.0;
+        {
+            tof -= 86400.0;
+        }
     geph.tof = utc2gpst(gpst2time(week, tow + tof));
     toe = tb * 900.0 - 10800.0; /* lt->utc */
     if (toe < tod - 43200.0)
-        toe += 86400.0;
+        {
+            toe += 86400.0;
+        }
     else if (toe > tod + 43200.0)
-        toe -= 86400.0;
+        {
+            toe -= 86400.0;
+        }
     geph.toe = utc2gpst(gpst2time(week, tow + toe)); /* utc->gpst */
 
     if (!strstr(rtcm->opt, "-EPHALL"))
         {
             if (fabs(timediff(geph.toe, rtcm->nav.geph[prn - 1].toe)) < 1.0 &&
-                geph.svh == rtcm->nav.geph[prn - 1].svh) return 0; /* unchanged */
+                geph.svh == rtcm->nav.geph[prn - 1].svh)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.geph[prn - 1] = geph;
     rtcm->ephsat = sat;
@@ -1230,7 +1339,10 @@ int decode_type1033(rtcm_t *rtcm)
             sprintf(msg, " staid=%4d", staid);
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     strncpy(rtcm->sta.antdes, des, n);
     rtcm->sta.antdes[n] = '\0';
@@ -1386,7 +1498,10 @@ int decode_type1044(rtcm_t *rtcm)
     if (!strstr(rtcm->opt, "-EPHALL"))
         {
             if (eph.iode == rtcm->nav.eph[sat - 1].iode &&
-                eph.iodc == rtcm->nav.eph[sat - 1].iodc) return 0; /* unchanged */
+                eph.iodc == rtcm->nav.eph[sat - 1].iodc)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.eph[sat - 1] = eph;
     rtcm->ephsat = sat;
@@ -1490,7 +1605,10 @@ int decode_type1045(rtcm_t *rtcm)
     eph.code = 2; /* data source = f/nav e5a */
     if (!strstr(rtcm->opt, "-EPHALL"))
         {
-            if (eph.iode == rtcm->nav.eph[sat - 1].iode) return 0; /* unchanged */
+            if (eph.iode == rtcm->nav.eph[sat - 1].iode)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.eph[sat - 1] = eph;
     rtcm->ephsat = sat;
@@ -1594,7 +1712,10 @@ int decode_type1046(rtcm_t *rtcm)
     eph.code = 2; /* data source = f/nav e5a */
     if (!strstr(rtcm->opt, "-EPHALL"))
         {
-            if (eph.iode == rtcm->nav.eph[sat - 1].iode) return 0; /* unchanged */
+            if (eph.iode == rtcm->nav.eph[sat - 1].iode)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.eph[sat - 1] = eph;
     rtcm->ephsat = sat;
@@ -1704,7 +1825,10 @@ int decode_type1047(rtcm_t *rtcm)
         {
             if (timediff(eph.toe, rtcm->nav.eph[sat - 1].toe) == 0.0 &&
                 eph.iode == rtcm->nav.eph[sat - 1].iode &&
-                eph.iodc == rtcm->nav.eph[sat - 1].iodc) return 0; /* unchanged */
+                eph.iodc == rtcm->nav.eph[sat - 1].iodc)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.eph[sat - 1] = eph;
     rtcm->ephsat = sat;
@@ -1809,7 +1933,10 @@ int decode_type63(rtcm_t *rtcm)
         {
             if (timediff(eph.toe, rtcm->nav.eph[sat - 1].toe) == 0.0 &&
                 eph.iode == rtcm->nav.eph[sat - 1].iode &&
-                eph.iodc == rtcm->nav.eph[sat - 1].iodc) return 0; /* unchanged */
+                eph.iodc == rtcm->nav.eph[sat - 1].iodc)
+                {
+                    return 0; /* unchanged */
+                }
         }
     rtcm->nav.eph[sat - 1] = eph;
     rtcm->ephsat = sat;
@@ -1828,7 +1955,10 @@ int decode_ssr1_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
 #ifndef SSR_QZSS_DRAFT_V05
     ns = sys == SYS_QZS ? 4 : 6;
 #endif
-    if (i + (sys == SYS_GLO ? 53 : 50 + ns) > rtcm->len * 8) return -1;
+    if (i + (sys == SYS_GLO ? 53 : 50 + ns) > rtcm->len * 8)
+        {
+            return -1;
+        }
 
     if (sys == SYS_GLO)
         {
@@ -1883,7 +2013,10 @@ int decode_ssr2_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
 #ifndef SSR_QZSS_DRAFT_V05
     ns = sys == SYS_QZS ? 4 : 6;
 #endif
-    if (i + (sys == SYS_GLO ? 52 : 49 + ns) > rtcm->len * 8) return -1;
+    if (i + (sys == SYS_GLO ? 52 : 49 + ns) > rtcm->len * 8)
+        {
+            return -1;
+        }
 
     if (sys == SYS_GLO)
         {
@@ -1936,7 +2069,10 @@ int decode_ssr7_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
 #ifndef SSR_QZSS_DRAFT_V05
     ns = sys == SYS_QZS ? 4 : 6;
 #endif
-    if (i + (sys == SYS_GLO ? 54 : 51 + ns) > rtcm->len * 8) return -1;
+    if (i + (sys == SYS_GLO ? 54 : 51 + ns) > rtcm->len * 8)
+        {
+            return -1;
+        }
 
     if (sys == SYS_GLO)
         {
@@ -2214,7 +2350,10 @@ int decode_ssr3(rtcm_t *rtcm, int sys)
             nbias = getbitu(rtcm->buff, i, 5);
             i += 5;
 
-            for (k = 0; k < MAXCODE; k++) cbias[k] = 0.0;
+            for (k = 0; k < MAXCODE; k++)
+                {
+                    cbias[k] = 0.0;
+                }
             for (k = 0; k < nbias && i + 19 <= rtcm->len * 8; k++)
                 {
                     mode = getbitu(rtcm->buff, i, 5);
@@ -2544,7 +2683,10 @@ int decode_ssr7(rtcm_t *rtcm, int sys)
             yaw_rate = getbits(rtcm->buff, i, 8);
             i += 8;
 
-            for (k = 0; k < MAXCODE; k++) pbias[k] = stdpb[k] = 0.0;
+            for (k = 0; k < MAXCODE; k++)
+                {
+                    pbias[k] = stdpb[k] = 0.0;
+                }
             for (k = 0; k < nbias && i + 49 <= rtcm->len * 8; k++)
                 {
                     mode = getbitu(rtcm->buff, i, 5);
@@ -2596,7 +2738,10 @@ void sigindex(int sys, const unsigned char *code, const int *freq, int n,
     /* test code priority */
     for (i = 0; i < n; i++)
         {
-            if (!code[i]) continue;
+            if (!code[i])
+                {
+                    continue;
+                }
 
             if (freq[i] > NFREQ)
                 { /* save as extended signal if freq > NFREQ */
@@ -2609,20 +2754,29 @@ void sigindex(int sys, const unsigned char *code, const int *freq, int n,
             /* select highest priority signal */
             if (pri > pri_h[freq[i] - 1])
                 {
-                    if (index[freq[i] - 1]) ex[index[freq[i] - 1] - 1] = 1;
+                    if (index[freq[i] - 1])
+                        {
+                            ex[index[freq[i] - 1] - 1] = 1;
+                        }
                     pri_h[freq[i] - 1] = pri;
                     index[freq[i] - 1] = i + 1;
                 }
             else
-                ex[i] = 1;
+                {
+                    ex[i] = 1;
+                }
         }
     /* signal index in obs data */
     for (i = nex = 0; i < n; i++)
         {
             if (ex[i] == 0)
-                ind[i] = freq[i] - 1;
+                {
+                    ind[i] = freq[i] - 1;
+                }
             else if (nex < NEXOBS)
-                ind[i] = NFREQ + nex++;
+                {
+                    ind[i] = NFREQ + nex++;
+                }
             else
                 { /* no space in obs data */
                     trace(2, "rtcm msm: no space in obs data sys=%d code=%d\n", sys, code[i]);
@@ -2704,17 +2858,27 @@ void save_msm_obs(rtcm_t *rtcm, int sys, msm_h_t *h, const double *r,
             if (sys == SYS_BDS)
                 {
                     if (freq[i] == 5)
-                        freq[i] = 2; /* B2 */
+                        {
+                            freq[i] = 2; /* B2 */
+                        }
                     else if (freq[i] == 4)
-                        freq[i] = 3; /* B3 */
+                        {
+                            freq[i] = 3; /* B3 */
+                        }
                 }
             if (code[i] != CODE_NONE)
                 {
-                    if (q) q += sprintf(q, "L%s%s", sig[i], i < h->nsig - 1 ? ", " : "");
+                    if (q)
+                        {
+                            q += sprintf(q, "L%s%s", sig[i], i < h->nsig - 1 ? ", " : "");
+                        }
                 }
             else
                 {
-                    if (q) q += sprintf(q, "(%d)%s", h->sigs[i], i < h->nsig - 1 ? ", " : "");
+                    if (q)
+                        {
+                            q += sprintf(q, "(%d)%s", h->sigs[i], i < h->nsig - 1 ? ", " : "");
+                        }
 
                     trace(2, "rtcm3 %d: unknown signal id=%2d\n", type, h->sigs[i]);
                 }
@@ -2728,9 +2892,13 @@ void save_msm_obs(rtcm_t *rtcm, int sys, msm_h_t *h, const double *r,
         {
             prn = h->sats[i];
             if (sys == SYS_QZS)
-                prn += MINPRNQZS - 1;
+                {
+                    prn += MINPRNQZS - 1;
+                }
             else if (sys == SYS_SBS)
-                prn += MINPRNSBS - 1;
+                {
+                    prn += MINPRNSBS - 1;
+                }
 
             if ((sat = satno(sys, prn)))
                 {
@@ -2747,7 +2915,10 @@ void save_msm_obs(rtcm_t *rtcm, int sys, msm_h_t *h, const double *r,
                 }
             for (k = 0; k < h->nsig; k++)
                 {
-                    if (!h->cellmask[k + i * h->nsig]) continue;
+                    if (!h->cellmask[k + i * h->nsig])
+                        {
+                            continue;
+                        }
 
                     if (sat && index >= 0 && ind[k] >= 0)
                         {
@@ -2843,13 +3014,19 @@ int decode_msm_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
                 {
                     mask = getbitu(rtcm->buff, i, 1);
                     i += 1;
-                    if (mask) h->sats[h->nsat++] = j;
+                    if (mask)
+                        {
+                            h->sats[h->nsat++] = j;
+                        }
                 }
             for (j = 1; j <= 32; j++)
                 {
                     mask = getbitu(rtcm->buff, i, 1);
                     i += 1;
-                    if (mask) h->sigs[h->nsig++] = j;
+                    if (mask)
+                        {
+                            h->sigs[h->nsig++] = j;
+                        }
                 }
         }
     else
@@ -2858,7 +3035,10 @@ int decode_msm_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
             return -1;
         }
     /* test station id */
-    if (!test_staid(rtcm, staid)) return -1;
+    if (!test_staid(rtcm, staid))
+        {
+            return -1;
+        }
 
     if (h->nsat * h->nsig > 64)
         {
@@ -2876,7 +3056,10 @@ int decode_msm_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
         {
             h->cellmask[j] = getbitu(rtcm->buff, i, 1);
             i += 1;
-            if (h->cellmask[j]) ncell++;
+            if (h->cellmask[j])
+                {
+                    ncell++;
+                }
         }
     *hsize = i;
 
@@ -2898,7 +3081,10 @@ int decode_msm0(rtcm_t *rtcm, int sys)
 {
     msm_h_t h = {0, 0, 0, 0, 0, 0, 0, 0, {0}, {0}, {0}};
     int i, sync, iod;
-    if (decode_msm_head(rtcm, sys, &sync, &iod, &h, &i) < 0) return -1;
+    if (decode_msm_head(rtcm, sys, &sync, &iod, &h, &i) < 0)
+        {
+            return -1;
+        }
     rtcm->obsflag = !sync;
     return sync ? 0 : 1;
 }
@@ -2914,7 +3100,10 @@ int decode_msm4(rtcm_t *rtcm, int sys)
     type = getbitu(rtcm->buff, 24, 12);
 
     /* decode msm header */
-    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0) return -1;
+    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0)
+        {
+            return -1;
+        }
 
     if (i + h.nsat * 18 + ncell * 48 > rtcm->len * 8)
         {
@@ -2922,34 +3111,52 @@ int decode_msm4(rtcm_t *rtcm, int sys)
                 ncell, rtcm->len);
             return -1;
         }
-    for (j = 0; j < h.nsat; j++) r[j] = 0.0;
-    for (j = 0; j < ncell; j++) pr[j] = cp[j] = -1E16;
+    for (j = 0; j < h.nsat; j++)
+        {
+            r[j] = 0.0;
+        }
+    for (j = 0; j < ncell; j++)
+        {
+            pr[j] = cp[j] = -1E16;
+        }
 
     /* decode satellite data */
     for (j = 0; j < h.nsat; j++)
         { /* range */
             rng = getbitu(rtcm->buff, i, 8);
             i += 8;
-            if (rng != 255) r[j] = rng * RANGE_MS;
+            if (rng != 255)
+                {
+                    r[j] = rng * RANGE_MS;
+                }
         }
     for (j = 0; j < h.nsat; j++)
         {
             rng_m = getbitu(rtcm->buff, i, 10);
             i += 10;
-            if (r[j] != 0.0) r[j] += rng_m * TWO_N10 * RANGE_MS;
+            if (r[j] != 0.0)
+                {
+                    r[j] += rng_m * TWO_N10 * RANGE_MS;
+                }
         }
     /* decode signal data */
     for (j = 0; j < ncell; j++)
         { /* pseudorange */
             prv = getbits(rtcm->buff, i, 15);
             i += 15;
-            if (prv != -16384) pr[j] = prv * TWO_N24 * RANGE_MS;
+            if (prv != -16384)
+                {
+                    pr[j] = prv * TWO_N24 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* phaserange */
             cpv = getbits(rtcm->buff, i, 22);
             i += 22;
-            if (cpv != -2097152) cp[j] = cpv * TWO_N29 * RANGE_MS;
+            if (cpv != -2097152)
+                {
+                    cp[j] = cpv * TWO_N29 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* lock time */
@@ -2985,7 +3192,10 @@ int decode_msm5(rtcm_t *rtcm, int sys)
     type = getbitu(rtcm->buff, 24, 12);
 
     /* decode msm header */
-    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0) return -1;
+    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0)
+        {
+            return -1;
+        }
 
     if (i + h.nsat * 36 + ncell * 63 > rtcm->len * 8)
         {
@@ -2998,14 +3208,20 @@ int decode_msm5(rtcm_t *rtcm, int sys)
             r[j] = rr[j] = 0.0;
             ex[j] = 15;
         }
-    for (j = 0; j < ncell; j++) pr[j] = cp[j] = rrf[j] = -1E16;
+    for (j = 0; j < ncell; j++)
+        {
+            pr[j] = cp[j] = rrf[j] = -1E16;
+        }
 
     /* decode satellite data */
     for (j = 0; j < h.nsat; j++)
         { /* range */
             rng = getbitu(rtcm->buff, i, 8);
             i += 8;
-            if (rng != 255) r[j] = rng * RANGE_MS;
+            if (rng != 255)
+                {
+                    r[j] = rng * RANGE_MS;
+                }
         }
     for (j = 0; j < h.nsat; j++)
         { /* extended info */
@@ -3016,26 +3232,38 @@ int decode_msm5(rtcm_t *rtcm, int sys)
         {
             rng_m = getbitu(rtcm->buff, i, 10);
             i += 10;
-            if (r[j] != 0.0) r[j] += rng_m * TWO_N10 * RANGE_MS;
+            if (r[j] != 0.0)
+                {
+                    r[j] += rng_m * TWO_N10 * RANGE_MS;
+                }
         }
     for (j = 0; j < h.nsat; j++)
         { /* phaserangerate */
             rate = getbits(rtcm->buff, i, 14);
             i += 14;
-            if (rate != -8192) rr[j] = rate * 1.0;
+            if (rate != -8192)
+                {
+                    rr[j] = rate * 1.0;
+                }
         }
     /* decode signal data */
     for (j = 0; j < ncell; j++)
         { /* pseudorange */
             prv = getbits(rtcm->buff, i, 15);
             i += 15;
-            if (prv != -16384) pr[j] = prv * TWO_N24 * RANGE_MS;
+            if (prv != -16384)
+                {
+                    pr[j] = prv * TWO_N24 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* phaserange */
             cpv = getbits(rtcm->buff, i, 22);
             i += 22;
-            if (cpv != -2097152) cp[j] = cpv * TWO_N29 * RANGE_MS;
+            if (cpv != -2097152)
+                {
+                    cp[j] = cpv * TWO_N29 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* lock time */
@@ -3056,7 +3284,10 @@ int decode_msm5(rtcm_t *rtcm, int sys)
         { /* phaserangerate */
             rrv = getbits(rtcm->buff, i, 15);
             i += 15;
-            if (rrv != -16384) rrf[j] = rrv * 0.0001;
+            if (rrv != -16384)
+                {
+                    rrf[j] = rrv * 0.0001;
+                }
         }
     /* save obs data in msm message */
     save_msm_obs(rtcm, sys, &h, r, pr, cp, rr, rrf, cnr, lock, ex, half);
@@ -3076,7 +3307,10 @@ int decode_msm6(rtcm_t *rtcm, int sys)
     type = getbitu(rtcm->buff, 24, 12);
 
     /* decode msm header */
-    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0) return -1;
+    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0)
+        {
+            return -1;
+        }
 
     if (i + h.nsat * 18 + ncell * 65 > rtcm->len * 8)
         {
@@ -3084,34 +3318,52 @@ int decode_msm6(rtcm_t *rtcm, int sys)
                 ncell, rtcm->len);
             return -1;
         }
-    for (j = 0; j < h.nsat; j++) r[j] = 0.0;
-    for (j = 0; j < ncell; j++) pr[j] = cp[j] = -1E16;
+    for (j = 0; j < h.nsat; j++)
+        {
+            r[j] = 0.0;
+        }
+    for (j = 0; j < ncell; j++)
+        {
+            pr[j] = cp[j] = -1E16;
+        }
 
     /* decode satellite data */
     for (j = 0; j < h.nsat; j++)
         { /* range */
             rng = getbitu(rtcm->buff, i, 8);
             i += 8;
-            if (rng != 255) r[j] = rng * RANGE_MS;
+            if (rng != 255)
+                {
+                    r[j] = rng * RANGE_MS;
+                }
         }
     for (j = 0; j < h.nsat; j++)
         {
             rng_m = getbitu(rtcm->buff, i, 10);
             i += 10;
-            if (r[j] != 0.0) r[j] += rng_m * TWO_N10 * RANGE_MS;
+            if (r[j] != 0.0)
+                {
+                    r[j] += rng_m * TWO_N10 * RANGE_MS;
+                }
         }
     /* decode signal data */
     for (j = 0; j < ncell; j++)
         { /* pseudorange */
             prv = getbits(rtcm->buff, i, 20);
             i += 20;
-            if (prv != -524288) pr[j] = prv * TWO_N29 * RANGE_MS;
+            if (prv != -524288)
+                {
+                    pr[j] = prv * TWO_N29 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* phaserange */
             cpv = getbits(rtcm->buff, i, 24);
             i += 24;
-            if (cpv != -8388608) cp[j] = cpv * TWO_N31 * RANGE_MS;
+            if (cpv != -8388608)
+                {
+                    cp[j] = cpv * TWO_N31 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* lock time */
@@ -3147,7 +3399,10 @@ int decode_msm7(rtcm_t *rtcm, int sys)
     type = getbitu(rtcm->buff, 24, 12);
 
     /* decode msm header */
-    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0) return -1;
+    if ((ncell = decode_msm_head(rtcm, sys, &sync, &iod, &h, &i)) < 0)
+        {
+            return -1;
+        }
 
     if (i + h.nsat * 36 + ncell * 80 > rtcm->len * 8)
         {
@@ -3160,14 +3415,20 @@ int decode_msm7(rtcm_t *rtcm, int sys)
             r[j] = rr[j] = 0.0;
             ex[j] = 15;
         }
-    for (j = 0; j < ncell; j++) pr[j] = cp[j] = rrf[j] = -1E16;
+    for (j = 0; j < ncell; j++)
+        {
+            pr[j] = cp[j] = rrf[j] = -1E16;
+        }
 
     /* decode satellite data */
     for (j = 0; j < h.nsat; j++)
         { /* range */
             rng = getbitu(rtcm->buff, i, 8);
             i += 8;
-            if (rng != 255) r[j] = rng * RANGE_MS;
+            if (rng != 255)
+                {
+                    r[j] = rng * RANGE_MS;
+                }
         }
     for (j = 0; j < h.nsat; j++)
         { /* extended info */
@@ -3178,26 +3439,38 @@ int decode_msm7(rtcm_t *rtcm, int sys)
         {
             rng_m = getbitu(rtcm->buff, i, 10);
             i += 10;
-            if (r[j] != 0.0) r[j] += rng_m * TWO_N10 * RANGE_MS;
+            if (r[j] != 0.0)
+                {
+                    r[j] += rng_m * TWO_N10 * RANGE_MS;
+                }
         }
     for (j = 0; j < h.nsat; j++)
         { /* phaserangerate */
             rate = getbits(rtcm->buff, i, 14);
             i += 14;
-            if (rate != -8192) rr[j] = rate * 1.0;
+            if (rate != -8192)
+                {
+                    rr[j] = rate * 1.0;
+                }
         }
     /* decode signal data */
     for (j = 0; j < ncell; j++)
         { /* pseudorange */
             prv = getbits(rtcm->buff, i, 20);
             i += 20;
-            if (prv != -524288) pr[j] = prv * TWO_N29 * RANGE_MS;
+            if (prv != -524288)
+                {
+                    pr[j] = prv * TWO_N29 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* phaserange */
             cpv = getbits(rtcm->buff, i, 24);
             i += 24;
-            if (cpv != -8388608) cp[j] = cpv * TWO_N31 * RANGE_MS;
+            if (cpv != -8388608)
+                {
+                    cp[j] = cpv * TWO_N31 * RANGE_MS;
+                }
         }
     for (j = 0; j < ncell; j++)
         { /* lock time */
@@ -3218,7 +3491,10 @@ int decode_msm7(rtcm_t *rtcm, int sys)
         { /* phaserangerate */
             rrv = getbits(rtcm->buff, i, 15);
             i += 15;
-            if (rrv != -16384) rrf[j] = rrv * 0.0001;
+            if (rrv != -16384)
+                {
+                    rrf[j] = rrv * 0.0001;
+                }
         }
     /* save obs data in msm message */
     save_msm_obs(rtcm, sys, &h, r, pr, cp, rr, rrf, cnr, lock, ex, half);
@@ -3624,11 +3900,17 @@ int decode_rtcm3(rtcm_t *rtcm)
         {
             type -= 1000;
             if (1 <= type && type <= 299)
-                rtcm->nmsg3[type]++; /* 1001-1299 */
+                {
+                    rtcm->nmsg3[type]++; /* 1001-1299 */
+                }
             else if (1000 <= type && type <= 1099)
-                rtcm->nmsg3[type - 700]++; /* 2000-2099 */
+                {
+                    rtcm->nmsg3[type - 700]++; /* 2000-2099 */
+                }
             else
-                rtcm->nmsg3[0]++;
+                {
+                    rtcm->nmsg3[0]++;
+                }
         }
     return ret;
 }
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
index 03a391700..70b854400 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
@@ -263,33 +263,60 @@ void fatalerr(const char *format, ...)
  *-----------------------------------------------------------------------------*/
 int satno(int sys, int prn)
 {
-    if (prn <= 0) return 0;
+    if (prn <= 0)
+        {
+            return 0;
+        }
     switch (sys)
         {
         case SYS_GPS:
-            if (prn < MINPRNGPS || MAXPRNGPS < prn) return 0;
+            if (prn < MINPRNGPS || MAXPRNGPS < prn)
+                {
+                    return 0;
+                }
             return prn - MINPRNGPS + 1;
         case SYS_GLO:
-            if (prn < MINPRNGLO || MAXPRNGLO < prn) return 0;
+            if (prn < MINPRNGLO || MAXPRNGLO < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + prn - MINPRNGLO + 1;
         case SYS_GAL:
-            if (prn < MINPRNGAL || MAXPRNGAL < prn) return 0;
+            if (prn < MINPRNGAL || MAXPRNGAL < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + NSATGLO + prn - MINPRNGAL + 1;
         case SYS_QZS:
-            if (prn < MINPRNQZS || MAXPRNQZS < prn) return 0;
+            if (prn < MINPRNQZS || MAXPRNQZS < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + NSATGLO + NSATGAL + prn - MINPRNQZS + 1;
         case SYS_BDS:
-            if (prn < MINPRNBDS || MAXPRNBDS < prn) return 0;
+            if (prn < MINPRNBDS || MAXPRNBDS < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + NSATGLO + NSATGAL + NSATQZS + prn - MINPRNBDS + 1;
         case SYS_IRN:
-            if (prn < MINPRNIRN || MAXPRNIRN < prn) return 0;
+            if (prn < MINPRNIRN || MAXPRNIRN < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + NSATGLO + NSATGAL + NSATQZS + NSATBDS + prn - MINPRNIRN + 1;
         case SYS_LEO:
-            if (prn < MINPRNLEO || MAXPRNLEO < prn) return 0;
+            if (prn < MINPRNLEO || MAXPRNLEO < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + NSATGLO + NSATGAL + NSATQZS + NSATBDS + NSATIRN +
                    prn - MINPRNLEO + 1;
         case SYS_SBS:
-            if (prn < MINPRNSBS || MAXPRNSBS < prn) return 0;
+            if (prn < MINPRNSBS || MAXPRNSBS < prn)
+                {
+                    return 0;
+                }
             return NSATGPS + NSATGLO + NSATGAL + NSATQZS + NSATBDS + NSATIRN + NSATLEO +
                    prn - MINPRNSBS + 1;
         }
@@ -307,7 +334,9 @@ int satsys(int sat, int *prn)
 {
     int sys = SYS_NONE;
     if (sat <= 0 || MAXSAT < sat)
-        sat = 0;
+        {
+            sat = 0;
+        }
     else if (sat <= NSATGPS)
         {
             sys = SYS_GPS;
@@ -349,8 +378,13 @@ int satsys(int sat, int *prn)
             sat += MINPRNSBS - 1;
         }
     else
-        sat = 0;
-    if (prn) *prn = sat;
+        {
+            sat = 0;
+        }
+    if (prn)
+        {
+            *prn = sat;
+        }
     return sys;
 }
 
@@ -369,16 +403,27 @@ int satid2no(const char *id)
     if (sscanf(id, "%d", &prn) == 1)
         {
             if (MINPRNGPS <= prn && prn <= MAXPRNGPS)
-                sys = SYS_GPS;
+                {
+                    sys = SYS_GPS;
+                }
             else if (MINPRNSBS <= prn && prn <= MAXPRNSBS)
-                sys = SYS_SBS;
+                {
+                    sys = SYS_SBS;
+                }
             else if (MINPRNQZS <= prn && prn <= MAXPRNQZS)
-                sys = SYS_QZS;
+                {
+                    sys = SYS_QZS;
+                }
             else
-                return 0;
+                {
+                    return 0;
+                }
             return satno(sys, prn);
         }
-    if (sscanf(id, "%c%d", &code, &prn) < 2) return 0;
+    if (sscanf(id, "%c%d", &code, &prn) < 2)
+        {
+            return 0;
+        }
 
     switch (code)
         {
@@ -485,14 +530,20 @@ int satexclude(int sat, int svh, const prcopt_t *opt)
                     trace(3, "excluded satellite: sat=%3d svh=%02X\n", sat, svh);
                     return 1; /* excluded satellite */
                 }
-            if (opt->exsats[sat - 1] == 2) return 0; /* included satellite */
+            if (opt->exsats[sat - 1] == 2)
+                {
+                    return 0; /* included satellite */
+                }
             if (!(sys & opt->navsys))
                 {
                     trace(3, "unselected sat sys: sat=%3d svh=%02X\n", sat, svh);
                     return 1; /* unselected sat sys */
                 }
         }
-    if (sys == SYS_QZS) svh &= 0xFE; /* mask QZSS LEX health */
+    if (sys == SYS_QZS)
+        {
+            svh &= 0xFE; /* mask QZSS LEX health */
+        }
     if (svh)
         {
             trace(3, "unhealthy satellite: sat=%3d svh=%02X\n", sat, svh);
@@ -517,17 +568,26 @@ int testsnr(int base, int freq, double el, double snr,
     double minsnr, a;
     int i;
 
-    if (!mask->ena[base] || freq < 0 || freq >= NFREQ) return 0;
+    if (!mask->ena[base] || freq < 0 || freq >= NFREQ)
+        {
+            return 0;
+        }
 
     a = (el * R2D + 5.0) / 10.0;
     i = static_cast<int>(floor(a));
     a -= i;
     if (i < 1)
-        minsnr = mask->mask[freq][0];
+        {
+            minsnr = mask->mask[freq][0];
+        }
     else if (i > 8)
-        minsnr = mask->mask[freq][8];
+        {
+            minsnr = mask->mask[freq][8];
+        }
     else
-        minsnr = (1.0 - a) * mask->mask[freq][i - 1] + a * mask->mask[freq][i];
+        {
+            minsnr = (1.0 - a) * mask->mask[freq][i - 1] + a * mask->mask[freq][i];
+        }
 
     return snr < minsnr;
 }
@@ -544,11 +604,20 @@ int testsnr(int base, int freq, double el, double snr,
 unsigned char obs2code(const char *obs, int *freq)
 {
     int i;
-    if (freq) *freq = 0;
+    if (freq)
+        {
+            *freq = 0;
+        }
     for (i = 1; *obscodes[i]; i++)
         {
-            if (strcmp(obscodes[i], obs) != 0) continue;
-            if (freq) *freq = obsfreqs[i];
+            if (strcmp(obscodes[i], obs) != 0)
+                {
+                    continue;
+                }
+            if (freq)
+                {
+                    *freq = obsfreqs[i];
+                }
             return static_cast<unsigned char>(i);
         }
     return CODE_NONE;
@@ -566,9 +635,18 @@ unsigned char obs2code(const char *obs, int *freq)
  *-----------------------------------------------------------------------------*/
 char *code2obs(unsigned char code, int *freq)
 {
-    if (freq) *freq = 0;
-    if (code <= CODE_NONE || MAXCODE < code) return (char *)"";
-    if (freq) *freq = obsfreqs[code];
+    if (freq)
+        {
+            *freq = 0;
+        }
+    if (code <= CODE_NONE || MAXCODE < code)
+        {
+            return (char *)"";
+        }
+    if (freq)
+        {
+            *freq = obsfreqs[code];
+        }
     return obscodes[code];
 }
 
@@ -585,16 +663,40 @@ void setcodepri(int sys, int freq, const char *pri)
 {
     trace(3, "setcodepri : sys=%d freq=%d pri=%s\n", sys, freq, pri);
 
-    if (freq <= 0 || MAXFREQ < freq) return;
+    if (freq <= 0 || MAXFREQ < freq)
+        {
+            return;
+        }
     if (strlen(pri) < 17)
         {
-            if (sys & SYS_GPS) strcpy(codepris[0][freq - 1], pri);
-            if (sys & SYS_GLO) strcpy(codepris[1][freq - 1], pri);
-            if (sys & SYS_GAL) strcpy(codepris[2][freq - 1], pri);
-            if (sys & SYS_QZS) strcpy(codepris[3][freq - 1], pri);
-            if (sys & SYS_SBS) strcpy(codepris[4][freq - 1], pri);
-            if (sys & SYS_BDS) strcpy(codepris[5][freq - 1], pri);
-            if (sys & SYS_IRN) strcpy(codepris[6][freq - 1], pri);
+            if (sys & SYS_GPS)
+                {
+                    strcpy(codepris[0][freq - 1], pri);
+                }
+            if (sys & SYS_GLO)
+                {
+                    strcpy(codepris[1][freq - 1], pri);
+                }
+            if (sys & SYS_GAL)
+                {
+                    strcpy(codepris[2][freq - 1], pri);
+                }
+            if (sys & SYS_QZS)
+                {
+                    strcpy(codepris[3][freq - 1], pri);
+                }
+            if (sys & SYS_SBS)
+                {
+                    strcpy(codepris[4][freq - 1], pri);
+                }
+            if (sys & SYS_BDS)
+                {
+                    strcpy(codepris[5][freq - 1], pri);
+                }
+            if (sys & SYS_IRN)
+                {
+                    strcpy(codepris[6][freq - 1], pri);
+                }
         }
     else
         {
@@ -654,7 +756,10 @@ int getcodepri(int sys, unsigned char code, const char *opt)
     /* parse code options */
     for (p = opt; p && (p = strchr(p, '-')); p++)
         {
-            if (sscanf(p, optstr, str) < 1 || str[0] != obs[0]) continue;
+            if (sscanf(p, optstr, str) < 1 || str[0] != obs[0])
+                {
+                    continue;
+                }
             return str[1] == obs[1] ? 15 : 0;
         }
     /* search code priority */
@@ -673,7 +778,10 @@ unsigned int getbitu(const unsigned char *buff, int pos, int len)
 {
     unsigned int bits = 0;
     int i;
-    for (i = pos; i < pos + len; i++) bits = (bits << 1) + ((buff[i / 8] >> (7 - i % 8)) & 1u);
+    for (i = pos; i < pos + len; i++)
+        {
+            bits = (bits << 1) + ((buff[i / 8] >> (7 - i % 8)) & 1u);
+        }
     return bits;
 }
 
@@ -681,7 +789,10 @@ unsigned int getbitu(const unsigned char *buff, int pos, int len)
 int getbits(const unsigned char *buff, int pos, int len)
 {
     unsigned int bits = getbitu(buff, pos, len);
-    if (len <= 0 || 32 <= len || !(bits & (1u << (len - 1)))) return static_cast<int>(bits);
+    if (len <= 0 || 32 <= len || !(bits & (1u << (len - 1))))
+        {
+            return static_cast<int>(bits);
+        }
     return static_cast<int>(bits | (~0u << len)); /* extend sign */
 }
 
@@ -698,13 +809,20 @@ void setbitu(unsigned char *buff, int pos, int len, unsigned int data)
 {
     unsigned int mask = 1u << (len - 1);
     int i;
-    if (len <= 0 || 32 < len) return;
+    if (len <= 0 || 32 < len)
+        {
+            return;
+        }
     for (i = pos; i < pos + len; i++, mask >>= 1)
         {
             if (data & mask)
-                buff[i / 8] |= 1u << (7 - i % 8);
+                {
+                    buff[i / 8] |= 1u << (7 - i % 8);
+                }
             else
-                buff[i / 8] &= ~(1u << (7 - i % 8));
+                {
+                    buff[i / 8] &= ~(1u << (7 - i % 8));
+                }
         }
 }
 
@@ -712,9 +830,13 @@ void setbitu(unsigned char *buff, int pos, int len, unsigned int data)
 void setbits(unsigned char *buff, int pos, int len, int data)
 {
     if (data < 0)
-        data |= 1 << (len - 1);
+        {
+            data |= 1 << (len - 1);
+        }
     else
-        data &= ~(1 << (len - 1)); /* set sign bit */
+        {
+            data &= ~(1 << (len - 1)); /* set sign bit */
+        }
     setbitu(buff, pos, len, static_cast<unsigned int>(data));
 }
 
@@ -739,9 +861,13 @@ unsigned int rtk_crc32(const unsigned char *buff, int len)
             for (j = 0; j < 8; j++)
                 {
                     if (crc & 1)
-                        crc = (crc >> 1) ^ POLYCRC32;
+                        {
+                            crc = (crc >> 1) ^ POLYCRC32;
+                        }
                     else
-                        crc >>= 1;
+                        {
+                            crc >>= 1;
+                        }
                 }
         }
     return crc;
@@ -762,7 +888,10 @@ unsigned int rtk_crc24q(const unsigned char *buff, int len)
 
     trace(4, "rtk_crc24q: len=%d\n", len);
 
-    for (i = 0; i < len; i++) crc = ((crc << 8) & 0xFFFFFF) ^ tbl_CRC24Q[(crc >> 16) ^ buff[i]];
+    for (i = 0; i < len; i++)
+        {
+            crc = ((crc << 8) & 0xFFFFFF) ^ tbl_CRC24Q[(crc >> 16) ^ buff[i]];
+        }
     return crc;
 }
 
@@ -807,16 +936,28 @@ int decode_word(unsigned int word, unsigned char *data)
 
     trace(5, "decodeword: word=%08x\n", word);
 
-    if (word & 0x40000000) word ^= 0x3FFFFFC0;
+    if (word & 0x40000000)
+        {
+            word ^= 0x3FFFFFC0;
+        }
 
     for (i = 0; i < 6; i++)
         {
             parity <<= 1;
-            for (w = (word & hamming[i]) >> 6; w; w >>= 1) parity ^= w & 1;
+            for (w = (word & hamming[i]) >> 6; w; w >>= 1)
+                {
+                    parity ^= w & 1;
+                }
+        }
+    if (parity != (word & 0x3F))
+        {
+            return 0;
         }
-    if (parity != (word & 0x3F)) return 0;
 
-    for (i = 0; i < 3; i++) data[i] = static_cast<unsigned char>(word >> (22 - i * 8));
+    for (i = 0; i < 3; i++)
+        {
+            data[i] = static_cast<unsigned char>(word >> (22 - i * 8));
+        }
     return 1;
 }
 
@@ -830,7 +971,10 @@ double *mat(int n, int m)
 {
     double *p;
 
-    if (n <= 0 || m <= 0) return nullptr;
+    if (n <= 0 || m <= 0)
+        {
+            return nullptr;
+        }
     if (!(p = static_cast<double *>(malloc(sizeof(double) * n * m))))
         {
             fatalerr("matrix memory allocation error: n=%d,m=%d\n", n, m);
@@ -848,7 +992,10 @@ int *imat(int n, int m)
 {
     int *p;
 
-    if (n <= 0 || m <= 0) return nullptr;
+    if (n <= 0 || m <= 0)
+        {
+            return nullptr;
+        }
     if (!(p = static_cast<int *>(malloc(sizeof(int) * n * m))))
         {
             fatalerr("integer matrix memory allocation error: n=%d,m=%d\n", n, m);
@@ -870,7 +1017,10 @@ double *zeros(int n, int m)
     if ((p = mat(n, m)))
         for (n = n * m - 1; n >= 0; n--) p[n] = 0.0;
 #else
-    if (n <= 0 || m <= 0) return nullptr;
+    if (n <= 0 || m <= 0)
+        {
+            return nullptr;
+        }
     if (!(p = static_cast<double *>(calloc(sizeof(double), n * m))))
         {
             fatalerr("matrix memory allocation error: n=%d,m=%d\n", n, m);
@@ -891,7 +1041,12 @@ double *eye(int n)
     int i;
 
     if ((p = zeros(n, n)))
-        for (i = 0; i < n; i++) p[i + i * n] = 1.0;
+        {
+            for (i = 0; i < n; i++)
+                {
+                    p[i + i * n] = 1.0;
+                }
+        }
     return p;
 }
 
@@ -906,7 +1061,10 @@ double dot(const double *a, const double *b, int n)
 {
     double c = 0.0;
 
-    while (--n >= 0) c += a[n] * b[n];
+    while (--n >= 0)
+        {
+            c += a[n] * b[n];
+        }
     return c;
 }
 
@@ -946,7 +1104,10 @@ void cross3(const double *a, const double *b, double *c)
 int normv3(const double *a, double *b)
 {
     double r;
-    if ((r = norm_rtk(a, 3)) <= 0.0) return 0;
+    if ((r = norm_rtk(a, 3)) <= 0.0)
+        {
+            return 0;
+        }
     b[0] = a[0] / r;
     b[1] = a[1] / r;
     b[2] = a[2] / r;
@@ -1002,7 +1163,10 @@ int matinv(double *A, int n)
 
     work = mat(lwork, 1);
     dgetrf_(&n, &n, A, &n, ipiv, &info);
-    if (!info) dgetri_(&n, A, &n, ipiv, work, &lwork, &info);
+    if (!info)
+        {
+            dgetri_(&n, A, &n, ipiv, work, &lwork, &info);
+        }
     free(ipiv);
     free(work);
     return info;
@@ -1029,7 +1193,10 @@ int solve(const char *tr, const double *A, const double *Y, int n,
     matcpy(B, A, n, n);
     matcpy(X, Y, n, m);
     dgetrf_(&n, &n, B, &n, ipiv, &info);
-    if (!info) dgetrs_(const_cast<char *>(tr), &n, &m, B, &n, ipiv, X, &n, &info);
+    if (!info)
+        {
+            dgetrs_(const_cast<char *>(tr), &n, &m, B, &n, ipiv, X, &n, &info);
+        }
     free(ipiv);
     free(B);
     return info;
@@ -1055,11 +1222,17 @@ int lsq(const double *A, const double *y, int n, int m, double *x,
     double *Ay;
     int info;
 
-    if (m < n) return -1;
+    if (m < n)
+        {
+            return -1;
+        }
     Ay = mat(n, 1);
-    matmul("NN", n, 1, m, 1.0, A, y, 0.0, Ay);                             /* Ay=A*y */
-    matmul("NT", n, n, m, 1.0, A, A, 0.0, Q);                              /* Q=A*A' */
-    if (!(info = matinv(Q, n))) matmul("NN", n, 1, n, 1.0, Q, Ay, 0.0, x); /* x=Q^-1*Ay */
+    matmul("NN", n, 1, m, 1.0, A, y, 0.0, Ay); /* Ay=A*y */
+    matmul("NT", n, n, m, 1.0, A, A, 0.0, Q);  /* Q=A*A' */
+    if (!(info = matinv(Q, n)))
+        {
+            matmul("NN", n, 1, n, 1.0, Q, Ay, 0.0, x); /* x=Q^-1*Ay */
+        }
     free(Ay);
     return info;
 }
@@ -1116,7 +1289,12 @@ int filter(double *x, double *P, const double *H, const double *v,
 
     ix = imat(n, 1);
     for (i = k = 0; i < n; i++)
-        if (x[i] != 0.0 && P[i + i * n] > 0.0) ix[k++] = i;
+        {
+            if (x[i] != 0.0 && P[i + i * n] > 0.0)
+                {
+                    ix[k++] = i;
+                }
+        }
     x_ = mat(k, 1);
     xp_ = mat(k, 1);
     P_ = mat(k, k);
@@ -1125,14 +1303,23 @@ int filter(double *x, double *P, const double *H, const double *v,
     for (i = 0; i < k; i++)
         {
             x_[i] = x[ix[i]];
-            for (j = 0; j < k; j++) P_[i + j * k] = P[ix[i] + ix[j] * n];
-            for (j = 0; j < m; j++) H_[i + j * k] = H[ix[i] + j * n];
+            for (j = 0; j < k; j++)
+                {
+                    P_[i + j * k] = P[ix[i] + ix[j] * n];
+                }
+            for (j = 0; j < m; j++)
+                {
+                    H_[i + j * k] = H[ix[i] + j * n];
+                }
         }
     info = filter_(x_, P_, H_, v, R, k, m, xp_, Pp_);
     for (i = 0; i < k; i++)
         {
             x[ix[i]] = xp_[i];
-            for (j = 0; j < k; j++) P[ix[i] + ix[j] * n] = Pp_[i + j * k];
+            for (j = 0; j < k; j++)
+                {
+                    P[ix[i] + ix[j] * n] = Pp_[i + j * k];
+                }
         }
     free(ix);
     free(x_);
@@ -1170,7 +1357,10 @@ int smoother(const double *xf, const double *Qf, const double *xb,
     matcpy(invQb, Qb, n, n);
     if (!matinv(invQf, n) && !matinv(invQb, n))
         {
-            for (i = 0; i < n * n; i++) Qs[i] = invQf[i] + invQb[i];
+            for (i = 0; i < n * n; i++)
+                {
+                    Qs[i] = invQf[i] + invQb[i];
+                }
             if (!(info = matinv(Qs, n)))
                 {
                     matmul("NN", n, 1, n, 1.0, invQf, xf, 0.0, xx);
@@ -1200,7 +1390,10 @@ void matfprint(const double A[], int n, int m, int p, int q, FILE *fp)
 
     for (i = 0; i < n; i++)
         {
-            for (j = 0; j < m; j++) fprintf(fp, " %*.*f", p, q, A[i + j * n]);
+            for (j = 0; j < m; j++)
+                {
+                    fprintf(fp, " %*.*f", p, q, A[i + j * n]);
+                }
             fprintf(fp, "\n");
         }
 }
@@ -1240,7 +1433,10 @@ double str2num(const char *s, int i, int n)
     double value;
     char str[256], *p = str;
 
-    if (i < 0 || static_cast<int>(strlen(s)) < i || static_cast<int>(sizeof(str)) - 1 < n) return 0.0;
+    if (i < 0 || static_cast<int>(strlen(s)) < i || static_cast<int>(sizeof(str)) - 1 < n)
+        {
+            return 0.0;
+        }
     for (s += i; *s && --n >= 0; s++)
         {
             *p++ = *s == 'd' || *s == 'D' ? 'E' : *s;
@@ -1262,15 +1458,23 @@ int str2time(const char *s, int i, int n, gtime_t *t)
     double ep[6];
     char str[256], *p = str;
 
-    if (i < 0 || static_cast<int>(strlen(s)) < i || static_cast<int>(sizeof(str)) - 1 < i) return -1;
+    if (i < 0 || static_cast<int>(strlen(s)) < i || static_cast<int>(sizeof(str)) - 1 < i)
+        {
+            return -1;
+        }
     for (s += i; *s && --n >= 0;)
         {
             *p++ = *s++;
         }
     *p = '\0';
     if (sscanf(str, "%lf %lf %lf %lf %lf %lf", ep, ep + 1, ep + 2, ep + 3, ep + 4, ep + 5) < 6)
-        return -1;
-    if (ep[0] < 100.0) ep[0] += ep[0] < 80.0 ? 2000.0 : 1900.0;
+        {
+            return -1;
+        }
+    if (ep[0] < 100.0)
+        {
+            ep[0] += ep[0] < 80.0 ? 2000.0 : 1900.0;
+        }
     *t = epoch2time(ep);
     return 0;
 }
@@ -1288,7 +1492,10 @@ gtime_t epoch2time(const double *ep)
     gtime_t time = {0, 0};
     int days, sec, year = static_cast<int>(ep[0]), mon = static_cast<int>(ep[1]), day = static_cast<int>(ep[2]);
 
-    if (year < 1970 || 2099 < year || mon < 1 || 12 < mon) return time;
+    if (year < 1970 || 2099 < year || mon < 1 || 12 < mon)
+        {
+            return time;
+        }
 
     /* leap year if year%4==0 in 1901-2099 */
     days = (year - 1970) * 365 + (year - 1969) / 4 + doy[mon - 1] + day - 2 + (year % 4 == 0 && mon >= 3 ? 1 : 0);
@@ -1319,9 +1526,13 @@ void time2epoch(gtime_t t, double *ep)
     for (day = days % 1461, mon = 0; mon < 48; mon++)
         {
             if (day >= mday[mon])
-                day -= mday[mon];
+                {
+                    day -= mday[mon];
+                }
             else
-                break;
+                {
+                    break;
+                }
         }
     ep[0] = 1970 + days / 1461 * 4 + mon / 12;
     ep[1] = mon % 12 + 1;
@@ -1342,7 +1553,10 @@ gtime_t gpst2time(int week, double sec)
 {
     gtime_t t = epoch2time(gpst0);
 
-    if (sec < -1e9 || 1e9 < sec) sec = 0.0;
+    if (sec < -1e9 || 1e9 < sec)
+        {
+            sec = 0.0;
+        }
     t.time += static_cast<time_t>(86400) * 7 * week + static_cast<int>(sec);
     t.sec = sec - static_cast<int>(sec);
     return t;
@@ -1361,7 +1575,10 @@ double time2gpst(gtime_t t, int *week)
     time_t sec = t.time - t0.time;
     int w = static_cast<int>(sec / 604800);
 
-    if (week) *week = w;
+    if (week)
+        {
+            *week = w;
+        }
     return (static_cast<double>(sec - static_cast<time_t>(w * 604800)) + t.sec);
 }
 
@@ -1376,7 +1593,10 @@ gtime_t gst2time(int week, double sec)
 {
     gtime_t t = epoch2time(gst0);
 
-    if (sec < -1e9 || 1e9 < sec) sec = 0.0;
+    if (sec < -1e9 || 1e9 < sec)
+        {
+            sec = 0.0;
+        }
     t.time += static_cast<time_t>(86400) * 7 * week + static_cast<int>(sec);
     t.sec = sec - static_cast<int>(sec);
     return t;
@@ -1395,7 +1615,10 @@ double time2gst(gtime_t t, int *week)
     time_t sec = t.time - t0.time;
     int w = static_cast<int>(sec / (86400 * 7));
 
-    if (week) *week = w;
+    if (week)
+        {
+            *week = w;
+        }
     return (sec - static_cast<double>(w) * 86400 * 7) + t.sec;
 }
 
@@ -1410,7 +1633,10 @@ gtime_t bdt2time(int week, double sec)
 {
     gtime_t t = epoch2time(bdt0);
 
-    if (sec < -1e9 || 1e9 < sec) sec = 0.0;
+    if (sec < -1e9 || 1e9 < sec)
+        {
+            sec = 0.0;
+        }
     t.time += static_cast<time_t>(86400) * 7 * week + static_cast<int>(sec);
     t.sec = sec - static_cast<int>(sec);
     return t;
@@ -1429,7 +1655,10 @@ double time2bdt(gtime_t t, int *week)
     time_t sec = t.time - t0.time;
     int w = static_cast<int>(sec / (86400 * 7));
 
-    if (week) *week = w;
+    if (week)
+        {
+            *week = w;
+        }
     return (sec - static_cast<double>(w) * 86400 * 7) + t.sec;
 }
 
@@ -1518,10 +1747,19 @@ int read_leaps_text(FILE *fp)
 
     while (fgets(buff, sizeof(buff), fp) && n < MAXLEAPS)
         {
-            if ((p = strchr(buff, '#'))) *p = '\0';
+            if ((p = strchr(buff, '#')))
+                {
+                    *p = '\0';
+                }
             if (sscanf(buff, "%d %d %d %d %d %d %d", ep, ep + 1, ep + 2, ep + 3, ep + 4, ep + 5,
-                    &ls) < 7) continue;
-            for (i = 0; i < 6; i++) leaps[n][i] = ep[i];
+                    &ls) < 7)
+                {
+                    continue;
+                }
+            for (i = 0; i < 6; i++)
+                {
+                    leaps[n][i] = ep[i];
+                }
             leaps[n++][6] = ls;
         }
     return n;
@@ -1542,21 +1780,37 @@ int read_leaps_usno(FILE *fp)
     while (fgets(buff, sizeof(buff), fp) && n < MAXLEAPS)
         {
             if (sscanf(buff, "%d %s %d =JD %lf TAI-UTC= %lf", &y, month, &d, &jd,
-                    &tai_utc) < 5) continue;
-            if (y < 1980) continue;
+                    &tai_utc) < 5)
+                {
+                    continue;
+                }
+            if (y < 1980)
+                {
+                    continue;
+                }
             for (m = 1; m <= 12; m++)
-                if (!strcmp(months[m - 1], month)) break;
-            if (m >= 13) continue;
+                {
+                    if (!strcmp(months[m - 1], month))
+                        {
+                            break;
+                        }
+                }
+            if (m >= 13)
+                {
+                    continue;
+                }
             ls[n][0] = y;
             ls[n][1] = m;
             ls[n][2] = d;
             ls[n++][6] = static_cast<char>(19.0 - tai_utc);
         }
     for (i = 0; i < n; i++)
-        for (j = 0; j < 7; j++)
-            {
-                leaps[i][j] = ls[n - i - 1][j];
-            }
+        {
+            for (j = 0; j < 7; j++)
+                {
+                    leaps[i][j] = ls[n - i - 1][j];
+                }
+        }
     return n;
 }
 
@@ -1577,7 +1831,10 @@ int read_leaps(const char *file)
     FILE *fp;
     int i, n;
 
-    if (!(fp = fopen(file, "re"))) return 0;
+    if (!(fp = fopen(file, "re")))
+        {
+            return 0;
+        }
 
     /* read leap seconds table by text or usno */
     if (!(n = read_leaps_text(fp)) && !(n = read_leaps_usno(fp)))
@@ -1585,7 +1842,10 @@ int read_leaps(const char *file)
             fclose(fp);
             return 0;
         }
-    for (i = 0; i < 7; i++) leaps[n][i] = 0.0;
+    for (i = 0; i < 7; i++)
+        {
+            leaps[n][i] = 0.0;
+        }
     fclose(fp);
     return 1;
 }
@@ -1605,7 +1865,10 @@ gtime_t gpst2utc(gtime_t t)
     for (i = 0; leaps[i][0] > 0; i++)
         {
             tu = timeadd(t, leaps[i][6]);
-            if (timediff(tu, epoch2time(leaps[i])) >= 0.0) return tu;
+            if (timediff(tu, epoch2time(leaps[i])) >= 0.0)
+                {
+                    return tu;
+                }
         }
     return t;
 }
@@ -1623,7 +1886,10 @@ gtime_t utc2gpst(gtime_t t)
 
     for (i = 0; leaps[i][0] > 0; i++)
         {
-            if (timediff(t, epoch2time(leaps[i])) >= 0.0) return timeadd(t, -leaps[i][6]);
+            if (timediff(t, epoch2time(leaps[i])) >= 0.0)
+                {
+                    return timeadd(t, -leaps[i][6]);
+                }
         }
     return t;
 }
@@ -1703,9 +1969,13 @@ void time2str(gtime_t t, char *s, int n)
     double ep[6];
 
     if (n < 0)
-        n = 0;
+        {
+            n = 0;
+        }
     else if (n > 12)
-        n = 12;
+        {
+            n = 12;
+        }
     if (1.0 - t.sec < 0.5 / pow(10.0, n))
         {
             t.time++;
@@ -1757,7 +2027,10 @@ int adjgpsweek(int week)
 {
     int w;
     (void)time2gpst(utc2gpst(timeget()), &w);
-    if (w < 1560) w = 1560; /* use 2009/12/1 if time is earlier than 2009/12/1 */
+    if (w < 1560)
+        {
+            w = 1560; /* use 2009/12/1 if time is earlier than 2009/12/1 */
+        }
     return week + (w - week + 512) / 1024 * 1024;
 }
 
@@ -1796,7 +2069,10 @@ unsigned int tickget(void)
 void sleepms(int ms)
 {
     struct timespec ts = {0, 0};
-    if (ms <= 0) return;
+    if (ms <= 0)
+        {
+            return;
+        }
     ts.tv_sec = static_cast<time_t>(ms / 1000);
     ts.tv_nsec = static_cast<int64_t>(ms % 1000 * 1000000);
     nanosleep(&ts, nullptr);
@@ -1998,11 +2274,17 @@ void ast_args(double t, double *f)
     double tt[4];
     int i, j;
 
-    for (tt[0] = t, i = 1; i < 4; i++) tt[i] = tt[i - 1] * t;
+    for (tt[0] = t, i = 1; i < 4; i++)
+        {
+            tt[i] = tt[i - 1] * t;
+        }
     for (i = 0; i < 5; i++)
         {
             f[i] = fc[i][0] * 3600.0;
-            for (j = 0; j < 4; j++) f[i] += fc[i][j + 1] * tt[j];
+            for (j = 0; j < 4; j++)
+                {
+                    f[i] += fc[i][j + 1] * tt[j];
+                }
             f[i] = fmod(f[i] * AS2R, 2.0 * PI);
         }
 }
@@ -2126,7 +2408,10 @@ void nut_iau1980(double t, const double *f, double *dpsi, double *deps)
     for (i = 0; i < 106; i++)
         {
             ang = 0.0;
-            for (j = 0; j < 5; j++) ang += nut[i][j] * f[j];
+            for (j = 0; j < 5; j++)
+                {
+                    ang += nut[i][j] * f[j];
+                }
             *dpsi += (nut[i][6] + nut[i][7] * t) * sin(ang);
             *deps += (nut[i][8] + nut[i][9] * t) * cos(ang);
         }
@@ -2160,8 +2445,14 @@ void eci2ecef(gtime_t tutc, const double *erpv, double *U, double *gmst)
 
     if (fabs(timediff(tutc, tutc_)) < 0.01)
         { /* read cache */
-            for (i = 0; i < 9; i++) U[i] = U_[i];
-            if (gmst) *gmst = gmst_;
+            for (i = 0; i < 9; i++)
+                {
+                    U[i] = U_[i];
+                }
+            if (gmst)
+                {
+                    *gmst = gmst_;
+                }
             return;
         }
     tutc_ = tutc;
@@ -2208,8 +2499,14 @@ void eci2ecef(gtime_t tutc, const double *erpv, double *U, double *gmst)
     matmul("NN", 3, 3, 3, 1.0, N, P, 0.0, NP);
     matmul("NN", 3, 3, 3, 1.0, R, NP, 0.0, U_); /* U=W*Rz(gast)*N*P */
 
-    for (i = 0; i < 9; i++) U[i] = U_[i];
-    if (gmst) *gmst = gmst_;
+    for (i = 0; i < 9; i++)
+        {
+            U[i] = U_[i];
+        }
+    if (gmst)
+        {
+            *gmst = gmst_;
+        }
 
     trace(5, "gmst=%.12f gast=%.12f\n", gmst_, gast);
     trace(5, "P=\n");
@@ -2228,7 +2525,10 @@ int decodef(char *p, int n, double *v)
 {
     int i;
 
-    for (i = 0; i < n; i++) v[i] = 0.0;
+    for (i = 0; i < n; i++)
+        {
+            v[i] = 0.0;
+        }
     for (i = 0, p = strtok(p, " "); p && i < n; p = strtok(nullptr, " "))
         {
             v[i++] = atof(p) * 1e-3;
@@ -2276,9 +2576,15 @@ int readngspcv(const char *file, pcvs_t *pcvs)
         }
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (strlen(buff) >= 62 && buff[61] == '|') continue;
+            if (strlen(buff) >= 62 && buff[61] == '|')
+                {
+                    continue;
+                }
 
-            if (buff[0] != ' ') n = 0; /* start line */
+            if (buff[0] != ' ')
+                {
+                    n = 0; /* start line */
+                }
             if (++n == 1)
                 {
                     pcv = pcv0;
@@ -2287,25 +2593,36 @@ int readngspcv(const char *file, pcvs_t *pcvs)
                 }
             else if (n == 2)
                 {
-                    if (decodef(buff, 3, neu) < 3) continue;
+                    if (decodef(buff, 3, neu) < 3)
+                        {
+                            continue;
+                        }
                     pcv.off[0][0] = neu[1];
                     pcv.off[0][1] = neu[0];
                     pcv.off[0][2] = neu[2];
                 }
             else if (n == 3)
-                decodef(buff, 10, pcv.var[0]);
+                {
+                    decodef(buff, 10, pcv.var[0]);
+                }
             else if (n == 4)
-                decodef(buff, 9, pcv.var[0] + 10);
+                {
+                    decodef(buff, 9, pcv.var[0] + 10);
+                }
             else if (n == 5)
                 {
-                    if (decodef(buff, 3, neu) < 3) continue;
-                    ;
+                    if (decodef(buff, 3, neu) < 3)
+                        {
+                            continue;
+                        };
                     pcv.off[1][0] = neu[1];
                     pcv.off[1][1] = neu[0];
                     pcv.off[1][2] = neu[2];
                 }
             else if (n == 6)
-                decodef(buff, 10, pcv.var[1]);
+                {
+                    decodef(buff, 10, pcv.var[1]);
+                }
             else if (n == 7)
                 {
                     decodef(buff, 9, pcv.var[1] + 10);
@@ -2337,7 +2654,10 @@ int readantex(const char *file, pcvs_t *pcvs)
         }
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (strlen(buff) < 60 || strstr(buff + 60, "COMMENT")) continue;
+            if (strlen(buff) < 60 || strstr(buff + 60, "COMMENT"))
+                {
+                    continue;
+                }
 
             if (strstr(buff + 60, "START OF ANTENNA"))
                 {
@@ -2349,7 +2669,10 @@ int readantex(const char *file, pcvs_t *pcvs)
                     addpcv(&pcv, pcvs);
                     state = 0;
                 }
-            if (!state) continue;
+            if (!state)
+                {
+                    continue;
+                }
 
             if (strstr(buff + 60, "TYPE / SERIAL NO"))
                 {
@@ -2364,18 +2687,35 @@ int readantex(const char *file, pcvs_t *pcvs)
                 }
             else if (strstr(buff + 60, "VALID FROM"))
                 {
-                    if (!str2time(buff, 0, 43, &pcv.ts)) continue;
+                    if (!str2time(buff, 0, 43, &pcv.ts))
+                        {
+                            continue;
+                        }
                 }
             else if (strstr(buff + 60, "VALID UNTIL"))
                 {
-                    if (!str2time(buff, 0, 43, &pcv.te)) continue;
+                    if (!str2time(buff, 0, 43, &pcv.te))
+                        {
+                            continue;
+                        }
                 }
             else if (strstr(buff + 60, "START OF FREQUENCY"))
                 {
-                    if (sscanf(buff + 4, "%d", &f) < 1) continue;
+                    if (sscanf(buff + 4, "%d", &f) < 1)
+                        {
+                            continue;
+                        }
                     for (i = 0; i < NFREQ; i++)
-                        if (freqs[i] == f) break;
-                    if (i < NFREQ) freq = i + 1;
+                        {
+                            if (freqs[i] == f)
+                                {
+                                    break;
+                                }
+                        }
+                    if (i < NFREQ)
+                        {
+                            freq = i + 1;
+                        }
                 }
             else if (strstr(buff + 60, "END OF FREQUENCY"))
                 {
@@ -2383,17 +2723,32 @@ int readantex(const char *file, pcvs_t *pcvs)
                 }
             else if (strstr(buff + 60, "NORTH / EAST / UP"))
                 {
-                    if (freq < 1 || NFREQ < freq) continue;
-                    if (decodef(buff, 3, neu) < 3) continue;
+                    if (freq < 1 || NFREQ < freq)
+                        {
+                            continue;
+                        }
+                    if (decodef(buff, 3, neu) < 3)
+                        {
+                            continue;
+                        }
                     pcv.off[freq - 1][0] = neu[pcv.sat ? 0 : 1]; /* x or e */
                     pcv.off[freq - 1][1] = neu[pcv.sat ? 1 : 0]; /* y or n */
                     pcv.off[freq - 1][2] = neu[2];               /* z or u */
                 }
             else if (strstr(buff, "NOAZI"))
                 {
-                    if (freq < 1 || NFREQ < freq) continue;
-                    if ((i = decodef(buff + 8, 19, pcv.var[freq - 1])) <= 0) continue;
-                    for (; i < 19; i++) pcv.var[freq - 1][i] = pcv.var[freq - 1][i - 1];
+                    if (freq < 1 || NFREQ < freq)
+                        {
+                            continue;
+                        }
+                    if ((i = decodef(buff + 8, 19, pcv.var[freq - 1])) <= 0)
+                        {
+                            continue;
+                        }
+                    for (; i < 19; i++)
+                        {
+                            pcv.var[freq - 1][i] = pcv.var[freq - 1][i - 1];
+                        }
                 }
         }
     fclose(fp);
@@ -2466,36 +2821,64 @@ pcv_t *searchpcv(int sat, const char *type, gtime_t time,
             for (i = 0; i < pcvs->n; i++)
                 {
                     pcv = pcvs->pcv + i;
-                    if (pcv->sat != sat) continue;
-                    if (pcv->ts.time != 0 && timediff(pcv->ts, time) > 0.0) continue;
-                    if (pcv->te.time != 0 && timediff(pcv->te, time) < 0.0) continue;
+                    if (pcv->sat != sat)
+                        {
+                            continue;
+                        }
+                    if (pcv->ts.time != 0 && timediff(pcv->ts, time) > 0.0)
+                        {
+                            continue;
+                        }
+                    if (pcv->te.time != 0 && timediff(pcv->te, time) < 0.0)
+                        {
+                            continue;
+                        }
                     return pcv;
                 }
         }
     else
         {
             if (strlen(type) < MAXANT + 1)
-                strcpy(buff, type);
+                {
+                    strcpy(buff, type);
+                }
             else
                 {
                     trace(1, "type array is too long");
                 }
-            for (p = strtok(buff, " "); p && n < 2; p = strtok(nullptr, " ")) types[n++] = p;
-            if (n <= 0) return nullptr;
+            for (p = strtok(buff, " "); p && n < 2; p = strtok(nullptr, " "))
+                {
+                    types[n++] = p;
+                }
+            if (n <= 0)
+                {
+                    return nullptr;
+                }
 
             /* search receiver antenna with radome at first */
             for (i = 0; i < pcvs->n; i++)
                 {
                     pcv = pcvs->pcv + i;
                     for (j = 0; j < n; j++)
-                        if (!strstr(pcv->type, types[j])) break;
-                    if (j >= n) return pcv;
+                        {
+                            if (!strstr(pcv->type, types[j]))
+                                {
+                                    break;
+                                }
+                        }
+                    if (j >= n)
+                        {
+                            return pcv;
+                        }
                 }
             /* search receiver antenna without radome */
             for (i = 0; i < pcvs->n; i++)
                 {
                     pcv = pcvs->pcv + i;
-                    if (strstr(pcv->type, types[0]) != pcv->type) continue;
+                    if (strstr(pcv->type, types[0]) != pcv->type)
+                        {
+                            continue;
+                        }
 
                     trace(2, "pcv without radome is used type=%s\n", type);
                     return pcv;
@@ -2531,9 +2914,15 @@ void readpos(const char *file, const char *rcv, double *pos)
         }
     while (np < 2048 && fgets(buff, sizeof(buff), fp))
         {
-            if (buff[0] == '%' || buff[0] == '#') continue;
+            if (buff[0] == '%' || buff[0] == '#')
+                {
+                    continue;
+                }
             if (sscanf(buff, "%lf %lf %lf %s", &poss[np][0], &poss[np][1], &poss[np][2],
-                    str) < 4) continue;
+                    str) < 4)
+                {
+                    continue;
+                }
             // strncpy(stas[np], str, 15); This line triggers a warning. Replaced by:
             memcpy(stas[np], str, 15 * sizeof(stas[np][0]));
             stas[np++][15] = '\0';
@@ -2542,8 +2931,14 @@ void readpos(const char *file, const char *rcv, double *pos)
     len = static_cast<int>(strlen(rcv));
     for (i = 0; i < np; i++)
         {
-            if (strncmp(stas[i], rcv, len) != 0) continue;
-            for (j = 0; j < 3; j++) pos[j] = poss[i][j];
+            if (strncmp(stas[i], rcv, len) != 0)
+                {
+                    continue;
+                }
+            for (j = 0; j < 3; j++)
+                {
+                    pos[j] = poss[i][j];
+                }
             pos[0] *= D2R;
             pos[1] *= D2R;
             return;
@@ -2561,11 +2956,23 @@ int readblqrecord(FILE *fp, double *odisp)
 
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (!strncmp(buff, "$$", 2)) continue;
+            if (!strncmp(buff, "$$", 2))
+                {
+                    continue;
+                }
             if (sscanf(buff, "%lf %lf %lf %lf %lf %lf %lf %lf %lf %lf %lf",
-                    v, v + 1, v + 2, v + 3, v + 4, v + 5, v + 6, v + 7, v + 8, v + 9, v + 10) < 11) continue;
-            for (i = 0; i < 11; i++) odisp[n + i * 6] = v[i];
-            if (++n == 6) return 1;
+                    v, v + 1, v + 2, v + 3, v + 4, v + 5, v + 6, v + 7, v + 8, v + 9, v + 10) < 11)
+                {
+                    continue;
+                }
+            for (i = 0; i < 11; i++)
+                {
+                    odisp[n + i * 6] = v[i];
+                }
+            if (++n == 6)
+                {
+                    return 1;
+                }
         }
     return 0;
 }
@@ -2586,7 +2993,9 @@ int readblq(const char *file, const char *sta, double *odisp)
     /* station name to upper case */
     sscanf(sta, "%16s", staname);
     for (p = staname; (*p = static_cast<char>(toupper(static_cast<int>(*p)))); p++)
-        ;
+        {
+            ;
+        }
 
     if (!(fp = fopen(file, "re")))
         {
@@ -2595,12 +3004,23 @@ int readblq(const char *file, const char *sta, double *odisp)
         }
     while (fgets(buff, sizeof(buff), fp))
         {
-            if (!strncmp(buff, "$$", 2) || strlen(buff) < 2) continue;
+            if (!strncmp(buff, "$$", 2) || strlen(buff) < 2)
+                {
+                    continue;
+                }
 
-            if (sscanf(buff + 2, "%16s", name) < 1) continue;
+            if (sscanf(buff + 2, "%16s", name) < 1)
+                {
+                    continue;
+                }
             for (p = name; (*p = static_cast<char>(toupper(static_cast<int>(*p)))); p++)
-                ;
-            if (strcmp(name, staname) != 0) continue;
+                {
+                    ;
+                }
+            if (strcmp(name, staname) != 0)
+                {
+                    continue;
+                }
 
             /* read blq record */
             if (readblqrecord(fp, odisp))
@@ -2684,7 +3104,10 @@ int geterp(const erp_t *erp, gtime_t time, double *erpv)
 
     trace(4, "geterp:\n");
 
-    if (erp->n <= 0) return 0;
+    if (erp->n <= 0)
+        {
+            return 0;
+        }
 
     mjd = 51544.5 + (timediff(gpst2utc(time), epoch2time(ep))) / 86400.0;
 
@@ -2710,9 +3133,13 @@ int geterp(const erp_t *erp, gtime_t time, double *erpv)
         {
             i = (j + k) / 2;
             if (mjd < erp->data[i].mjd)
-                k = i;
+                {
+                    k = i;
+                }
             else
-                j = i;
+                {
+                    j = i;
+                }
         }
     if (erp->data[j].mjd == erp->data[j + 1].mjd)
         {
@@ -2745,7 +3172,10 @@ void uniqeph(nav_t *nav)
 
     trace(3, "uniqeph: n=%d\n", nav->n);
 
-    if (nav->n <= 0) return;
+    if (nav->n <= 0)
+        {
+            return;
+        }
 
     qsort(nav->eph, nav->n, sizeof(eph_t), cmpeph);
 
@@ -2790,7 +3220,10 @@ void uniqgeph(nav_t *nav)
 
     trace(3, "uniqgeph: ng=%d\n", nav->ng);
 
-    if (nav->ng <= 0) return;
+    if (nav->ng <= 0)
+        {
+            return;
+        }
 
     qsort(nav->geph, nav->ng, sizeof(geph_t), cmpgeph);
 
@@ -2836,7 +3269,10 @@ void uniqseph(nav_t *nav)
 
     trace(3, "uniqseph: ns=%d\n", nav->ns);
 
-    if (nav->ns <= 0) return;
+    if (nav->ns <= 0)
+        {
+            return;
+        }
 
     qsort(nav->seph, nav->ns, sizeof(seph_t), cmpseph);
 
@@ -2883,10 +3319,12 @@ void uniqnav(nav_t *nav)
 
     /* update carrier wave length */
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < NFREQ; j++)
-            {
-                nav->lam[i][j] = satwavelen(i + 1, j, nav);
-            }
+        {
+            for (j = 0; j < NFREQ; j++)
+                {
+                    nav->lam[i][j] = satwavelen(i + 1, j, nav);
+                }
+        }
 }
 
 
@@ -2895,8 +3333,14 @@ int cmpobs(const void *p1, const void *p2)
 {
     auto *q1 = (obsd_t *)p1, *q2 = (obsd_t *)p2;
     double tt = timediff(q1->time, q2->time);
-    if (fabs(tt) > DTTOL) return tt < 0 ? -1 : 1;
-    if (q1->rcv != q2->rcv) return static_cast<int>(q1->rcv) - static_cast<int>(q2->rcv);
+    if (fabs(tt) > DTTOL)
+        {
+            return tt < 0 ? -1 : 1;
+        }
+    if (q1->rcv != q2->rcv)
+        {
+            return static_cast<int>(q1->rcv) - static_cast<int>(q2->rcv);
+        }
     return static_cast<int>(q1->sat) - static_cast<int>(q2->sat);
 }
 
@@ -2912,7 +3356,10 @@ int sortobs(obs_t *obs)
 
     trace(3, "sortobs: nobs=%d\n", obs->n);
 
-    if (obs->n <= 0) return 0;
+    if (obs->n <= 0)
+        {
+            return 0;
+        }
 
     qsort(obs->data, obs->n, sizeof(obsd_t), cmpobs);
 
@@ -2932,7 +3379,10 @@ int sortobs(obs_t *obs)
         {
             for (j = i + 1; j < obs->n; j++)
                 {
-                    if (timediff(obs->data[j].time, obs->data[i].time) > DTTOL) break;
+                    if (timediff(obs->data[j].time, obs->data[i].time) > DTTOL)
+                        {
+                            break;
+                        }
                 }
         }
     return n;
@@ -2973,14 +3423,23 @@ int readnav(const char *file, nav_t *nav)
 
     trace(3, "loadnav: file=%s\n", file);
 
-    if (!(fp = fopen(file, "re"))) return 0;
+    if (!(fp = fopen(file, "re")))
+        {
+            return 0;
+        }
 
     while (fgets(buff, sizeof(buff), fp))
         {
             if (!strncmp(buff, "IONUTC", 6))
                 {
-                    for (i = 0; i < 8; i++) nav->ion_gps[i] = 0.0;
-                    for (i = 0; i < 4; i++) nav->utc_gps[i] = 0.0;
+                    for (i = 0; i < 8; i++)
+                        {
+                            nav->ion_gps[i] = 0.0;
+                        }
+                    for (i = 0; i < 4; i++)
+                        {
+                            nav->utc_gps[i] = 0.0;
+                        }
                     nav->leaps = 0;
                     sscanf(buff, "IONUTC,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%lf,%d",
                         &nav->ion_gps[0], &nav->ion_gps[1], &nav->ion_gps[2], &nav->ion_gps[3],
@@ -2990,10 +3449,17 @@ int readnav(const char *file, nav_t *nav)
                     continue;
                 }
             if ((p = strchr(buff, ',')))
-                *p = '\0';
+                {
+                    *p = '\0';
+                }
             else
-                continue;
-            if (!(sat = satid2no(buff))) continue;
+                {
+                    continue;
+                }
+            if (!(sat = satid2no(buff)))
+                {
+                    continue;
+                }
             if (satsys(sat, &prn) == SYS_GLO)
                 {
                     nav->geph[prn - 1] = geph0;
@@ -3049,11 +3515,17 @@ int savenav(const char *file, const nav_t *nav)
 
     trace(3, "savenav: file=%s\n", file);
 
-    if (!(fp = fopen(file, "we"))) return 0;
+    if (!(fp = fopen(file, "we")))
+        {
+            return 0;
+        }
 
     for (i = 0; i < MAXSAT; i++)
         {
-            if (nav->eph[i].ttr.time == 0) continue;
+            if (nav->eph[i].ttr.time == 0)
+                {
+                    continue;
+                }
             satno2id(nav->eph[i].sat, id);
             fprintf(fp,
                 "%s,%d,%d,%d,%d,%d,%d,%d,%.14E,%.14E,%.14E,%.14E,%.14E,%.14E,"
@@ -3071,7 +3543,10 @@ int savenav(const char *file, const nav_t *nav)
         }
     for (i = 0; i < MAXPRNGLO; i++)
         {
-            if (nav->geph[i].tof.time == 0) continue;
+            if (nav->geph[i].tof.time == 0)
+                {
+                    continue;
+                }
             satno2id(nav->geph[i].sat, id);
             fprintf(fp,
                 "%s,%d,%d,%d,%d,%d,%d,%d,%.14E,%.14E,%.14E,%.14E,%.14E,%.14E,"
@@ -3203,7 +3678,10 @@ void traceswap(void)
             rtk_unlock(&lock_trace);
             return;
         }
-    if (fp_trace) fclose(fp_trace);
+    if (fp_trace)
+        {
+            fclose(fp_trace);
+        }
 
     if (!(fp_trace = fopen(path, "we")))
         {
@@ -3219,11 +3697,18 @@ void traceopen(const char *file)
     char path[1024];
 
     reppath(file, path, time, "", "");
-    if (!*path || !(fp_trace = fopen(path, "we"))) fp_trace = stderr;
+    if (!*path || !(fp_trace = fopen(path, "we")))
+        {
+            fp_trace = stderr;
+        }
     if (strlen(file) < 1025)
-        strcpy(file_trace, file);
+        {
+            strcpy(file_trace, file);
+        }
     else
-        trace(1, "file array is too long");
+        {
+            trace(1, "file array is too long");
+        }
     tick_trace = tickget();
     time_trace = time;
     initlock(&lock_trace);
@@ -3232,7 +3717,10 @@ void traceopen(const char *file)
 
 void traceclose(void)
 {
-    if (fp_trace && fp_trace != stderr) fclose(fp_trace);
+    if (fp_trace && fp_trace != stderr)
+        {
+            fclose(fp_trace);
+        }
     fp_trace = nullptr;
     file_trace[0] = '\0';
 }
@@ -3260,7 +3748,10 @@ void tracelevel(int level)
 void tracet(int level, const char *format, ...)
 {
     va_list ap;
-    if (!fp_trace || level > level_trace) return;
+    if (!fp_trace || level > level_trace)
+        {
+            return;
+        }
     traceswap();
     fprintf(fp_trace, "%d %9.3f: ", level, (tickget() - tick_trace) / 1000.0);
     va_start(ap, format);
@@ -3437,13 +3928,23 @@ void createdir(const char *path)
     //tracet(3, "createdir: path=%s\n", path);
 
     if (strlen(path) < 1025)
-        strcpy(buff, path);
+        {
+            strcpy(buff, path);
+        }
     else
-        trace(1, "path is too long");
-    if (!(p = strrchr(buff, FILEPATHSEP))) return;
+        {
+            trace(1, "path is too long");
+        }
+    if (!(p = strrchr(buff, FILEPATHSEP)))
+        {
+            return;
+        }
     *p = '\0';
 
-    if (mkdir(buff, 0777) != 0) trace(1, "Error creating folder");
+    if (mkdir(buff, 0777) != 0)
+        {
+            trace(1, "Error creating folder");
+        }
 }
 
 
@@ -3455,17 +3956,27 @@ int repstr(char *str, const char *pat, const char *rep)
 
     for (p = str, r = buff; *p; p = q + len)
         {
-            if (!(q = strstr(p, pat))) break;
+            if (!(q = strstr(p, pat)))
+                {
+                    break;
+                }
             strncpy(r, p, q - p);
             r += q - p;
             r += sprintf(r, "%s", rep);
         }
-    if (p <= str) return 0;
+    if (p <= str)
+        {
+            return 0;
+        }
 
     if (strlen(p) < 1025)
-        strcpy(r, p);
+        {
+            strcpy(r, p);
+        }
     else
-        trace(1, "pat array is too long");
+        {
+            trace(1, "pat array is too long");
+        }
     strcpy(str, buff);
     return 1;
 }
@@ -3508,9 +4019,18 @@ int reppath(const char *path, char *rpath, gtime_t time, const char *rov,
 
     strcpy(rpath, path);
 
-    if (!strstr(rpath, "%")) return 0;
-    if (*rov) stat |= repstr(rpath, "%r", rov);
-    if (*base) stat |= repstr(rpath, "%b", base);
+    if (!strstr(rpath, "%"))
+        {
+            return 0;
+        }
+    if (*rov)
+        {
+            stat |= repstr(rpath, "%r", rov);
+        }
+    if (*base)
+        {
+            stat |= repstr(rpath, "%b", base);
+        }
     if (time.time != 0)
         {
             time2epoch(time, ep);
@@ -3583,12 +4103,19 @@ int reppaths(const char *path, char *rpath[], int nmax, gtime_t ts,
 
     trace(3, "reppaths: path =%s nmax=%d rov=%s base=%s\n", path, nmax, rov, base);
 
-    if (ts.time == 0 || te.time == 0 || timediff(ts, te) > 0.0) return 0;
+    if (ts.time == 0 || te.time == 0 || timediff(ts, te) > 0.0)
+        {
+            return 0;
+        }
 
     if (strstr(path, "%S") || strstr(path, "%M") || strstr(path, "%t"))
-        tint = 900.0;
+        {
+            tint = 900.0;
+        }
     else if (strstr(path, "%h") || strstr(path, "%H"))
-        tint = 3600.0;
+        {
+            tint = 3600.0;
+        }
 
     tow = time2gpst(ts, &week);
     time = gpst2time(week, floor(tow / tint) * tint);
@@ -3596,10 +4123,16 @@ int reppaths(const char *path, char *rpath[], int nmax, gtime_t ts,
     while (timediff(time, te) <= 0.0 && n < nmax)
         {
             reppath(path, rpath[n], time, rov, base);
-            if (n == 0 || strcmp(rpath[n], rpath[n - 1]) != 0) n++;
+            if (n == 0 || strcmp(rpath[n], rpath[n - 1]) != 0)
+                {
+                    n++;
+                }
             time = timeadd(time, tint);
         }
-    for (i = 0; i < n; i++) trace(3, "reppaths: rpath=%s\n", rpath[i]);
+    for (i = 0; i < n; i++)
+        {
+            trace(3, "reppaths: rpath=%s\n", rpath[i]);
+        }
     return n;
 }
 
@@ -3623,7 +4156,10 @@ double satwavelen(int sat, int frq, const nav_t *nav)
                 {
                     for (i = 0; i < nav->ng; i++)
                         {
-                            if (nav->geph[i].sat != sat) continue;
+                            if (nav->geph[i].sat != sat)
+                                {
+                                    continue;
+                                }
                             return SPEED_OF_LIGHT / (freq_glo[frq] + dfrq_glo[frq] * nav->geph[i].frq);
                         }
                 }
@@ -3635,28 +4171,48 @@ double satwavelen(int sat, int frq, const nav_t *nav)
     else if (sys == SYS_BDS)
         {
             if (frq == 0)
-                return SPEED_OF_LIGHT / FREQ1_BDS; /* B1 */
+                {
+                    return SPEED_OF_LIGHT / FREQ1_BDS; /* B1 */
+                }
             if (frq == 1)
-                return SPEED_OF_LIGHT / FREQ2_BDS; /* B2 */
+                {
+                    return SPEED_OF_LIGHT / FREQ2_BDS; /* B2 */
+                }
             if (frq == 2)
-                return SPEED_OF_LIGHT / FREQ3_BDS; /* B3 */
+                {
+                    return SPEED_OF_LIGHT / FREQ3_BDS; /* B3 */
+                }
         }
     else
         {
             if (frq == 0)
-                return SPEED_OF_LIGHT / FREQ1; /* L1/E1 */
+                {
+                    return SPEED_OF_LIGHT / FREQ1; /* L1/E1 */
+                }
             if (frq == 1)
-                return SPEED_OF_LIGHT / FREQ2; /* L2 */
+                {
+                    return SPEED_OF_LIGHT / FREQ2; /* L2 */
+                }
             if (frq == 2)
-                return SPEED_OF_LIGHT / FREQ5; /* L5/E5a */
+                {
+                    return SPEED_OF_LIGHT / FREQ5; /* L5/E5a */
+                }
             if (frq == 3)
-                return SPEED_OF_LIGHT / FREQ6; /* L6/LEX */
+                {
+                    return SPEED_OF_LIGHT / FREQ6; /* L6/LEX */
+                }
             if (frq == 4)
-                return SPEED_OF_LIGHT / FREQ7; /* E5b */
+                {
+                    return SPEED_OF_LIGHT / FREQ7; /* E5b */
+                }
             if (frq == 5)
-                return SPEED_OF_LIGHT / FREQ8; /* E5a+b */
+                {
+                    return SPEED_OF_LIGHT / FREQ8; /* E5a+b */
+                }
             else if (frq == 6)
-                return SPEED_OF_LIGHT / FREQ9; /* S */
+                {
+                    return SPEED_OF_LIGHT / FREQ9; /* S */
+                }
         }
     return 0.0;
 }
@@ -3675,10 +4231,19 @@ double geodist(const double *rs, const double *rr, double *e)
     double r;
     int i;
 
-    if (norm_rtk(rs, 3) < RE_WGS84) return -1.0;
-    for (i = 0; i < 3; i++) e[i] = rs[i] - rr[i];
+    if (norm_rtk(rs, 3) < RE_WGS84)
+        {
+            return -1.0;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            e[i] = rs[i] - rr[i];
+        }
     r = norm_rtk(e, 3);
-    for (i = 0; i < 3; i++) e[i] /= r;
+    for (i = 0; i < 3; i++)
+        {
+            e[i] /= r;
+        }
     return r + DEFAULT_OMEGA_EARTH_DOT * (rs[0] * rr[1] - rs[1] * rr[0]) / SPEED_OF_LIGHT;
 }
 
@@ -3699,7 +4264,10 @@ double satazel(const double *pos, const double *e, double *azel)
         {
             ecef2enu(pos, e, enu);
             az = dot(enu, enu, 2) < 1e-12 ? 0.0 : atan2(enu[0], enu[1]);
-            if (az < 0.0) az += 2 * PI;
+            if (az < 0.0)
+                {
+                    az += 2 * PI;
+                }
             el = asin(enu[2]);
         }
     if (azel)
@@ -3725,10 +4293,16 @@ void dops(int ns, const double *azel, double elmin, double *dop)
     double H[4 * MAXSAT], Q[16], cosel, sinel;
     int i, n;
 
-    for (i = 0; i < 4; i++) dop[i] = 0.0;
+    for (i = 0; i < 4; i++)
+        {
+            dop[i] = 0.0;
+        }
     for (i = n = 0; i < ns && i < MAXSAT; i++)
         {
-            if (azel[1 + i * 2] < elmin || azel[1 + i * 2] <= 0.0) continue;
+            if (azel[1 + i * 2] < elmin || azel[1 + i * 2] <= 0.0)
+                {
+                    continue;
+                }
             cosel = cos(azel[1 + i * 2]);
             sinel = sin(azel[1 + i * 2]);
             H[4 * n] = cosel * sin(azel[i * 2]);
@@ -3736,7 +4310,10 @@ void dops(int ns, const double *azel, double elmin, double *dop)
             H[2 + 4 * n] = sinel;
             H[3 + 4 * n++] = 1.0;
         }
-    if (n < 4) return;
+    if (n < 4)
+        {
+            return;
+        }
 
     matmul("NT", 4, 4, n, 1.0, H, H, 0.0, Q);
     if (!matinv(Q, 4))
@@ -3766,8 +4343,14 @@ double ionmodel(gtime_t t, const double *ion, const double *pos,
     double tt, f, psi, phi, lam, amp, per, x;
     int week;
 
-    if (pos[2] < -1e3 || azel[1] <= 0) return 0.0;
-    if (norm_rtk(ion, 8) <= 0.0) ion = ion_default;
+    if (pos[2] < -1e3 || azel[1] <= 0)
+        {
+            return 0.0;
+        }
+    if (norm_rtk(ion, 8) <= 0.0)
+        {
+            ion = ion_default;
+        }
 
     /* earth centered angle (semi-circle) */
     psi = 0.0137 / (azel[1] / PI + 0.11) - 0.022;
@@ -3775,9 +4358,13 @@ double ionmodel(gtime_t t, const double *ion, const double *pos,
     /* subionospheric latitude/longitude (semi-circle) */
     phi = pos[0] / PI + psi * cos(azel[0]);
     if (phi > 0.416)
-        phi = 0.416;
+        {
+            phi = 0.416;
+        }
     else if (phi < -0.416)
-        phi = -0.416;
+        {
+            phi = -0.416;
+        }
     lam = pos[1] / PI + psi * sin(azel[0]) / cos(phi * PI);
 
     /* geomagnetic latitude (semi-circle) */
@@ -3809,7 +4396,10 @@ double ionmodel(gtime_t t, const double *ion, const double *pos,
  *-----------------------------------------------------------------------------*/
 double ionmapf(const double *pos, const double *azel)
 {
-    if (pos[2] >= HION) return 1.0;
+    if (pos[2] >= HION)
+        {
+            return 1.0;
+        }
     return 1.0 / cos(asin((RE_WGS84 + pos[2]) / (RE_WGS84 + HION) * sin(PI / 2.0 - azel[1])));
 }
 
@@ -3864,7 +4454,10 @@ double tropmodel(gtime_t time __attribute__((unused)), const double *pos, const
     const double temp0 = 15.0; /* temparature at sea level */
     double hgt, pres, temp, e, z, trph, trpw;
 
-    if (pos[2] < -100.0 || 1e4 < pos[2] || azel[1] <= 0) return 0.0;
+    if (pos[2] < -100.0 || 1e4 < pos[2] || azel[1] <= 0)
+        {
+            return 0.0;
+        }
 
     /* standard atmosphere */
     hgt = pos[2] < 0.0 ? 0.0 : pos[2];
@@ -3886,9 +4479,13 @@ double interpc(const double coef[], double lat)
 {
     int i = static_cast<int>(lat / 15.0);
     if (i < 1)
-        return coef[0];
+        {
+            return coef[0];
+        }
     if (i > 4)
-        return coef[4];
+        {
+            return coef[4];
+        }
     return coef[i - 1] * (1.0 - lat / 15.0 + i) + coef[i] * (lat / 15.0 - i);
 }
 
@@ -3924,7 +4521,10 @@ double nmf(gtime_t time, const double pos[], const double azel[],
 
     if (el <= 0.0)
         {
-            if (mapfw) *mapfw = 0.0;
+            if (mapfw)
+                {
+                    *mapfw = 0.0;
+                }
             return 0.0;
         }
     /* year from doy 28, added half a year for southern latitudes */
@@ -3941,7 +4541,10 @@ double nmf(gtime_t time, const double pos[], const double azel[],
     /* ellipsoidal height is used instead of height above sea level */
     dm = (1.0 / sin(el) - mapf(el, aht[0], aht[1], aht[2])) * hgt / 1e3;
 
-    if (mapfw) *mapfw = mapf(el, aw[0], aw[1], aw[2]);
+    if (mapfw)
+        {
+            *mapfw = mapf(el, aw[0], aw[1], aw[2]);
+        }
 
     return mapf(el, ah[0], ah[1], ah[2]) + dm;
 }
@@ -3972,7 +4575,10 @@ double tropmapf(gtime_t time, const double pos[], const double azel[],
 
     if (pos[2] < -1000.0 || pos[2] > 20000.0)
         {
-            if (mapfw) *mapfw = 0.0;
+            if (mapfw)
+                {
+                    *mapfw = 0.0;
+                }
             return 0.0;
         }
 #ifdef IERS_MODEL
@@ -3999,9 +4605,13 @@ double interpvar(double ang, const double *var)
     double a = ang / 5.0; /* ang=0-90 */
     int i = static_cast<int>(a);
     if (i < 0)
-        return var[0];
+        {
+            return var[0];
+        }
     if (i >= 18)
-        return var[18];
+        {
+            return var[18];
+        }
     return var[i] * (1.0 - a + i) + var[i + 1] * (a - i);
 }
 
@@ -4029,7 +4639,10 @@ void antmodel(const pcv_t *pcv, const double *del, const double *azel,
 
     for (i = 0; i < NFREQ; i++)
         {
-            for (j = 0; j < 3; j++) off[j] = pcv->off[i][j] + del[j];
+            for (j = 0; j < 3; j++)
+                {
+                    off[j] = pcv->off[i][j] + del[j];
+                }
 
             dant[i] = -dot(off, e, 3) + (opt ? interpvar(90.0 - azel[1] * R2D, pcv->var[i]) : 0.0);
         }
@@ -4139,9 +4752,18 @@ void sunmoonpos(gtime_t tutc, const double *erpv, double *rsun,
     eci2ecef(tutc, erpv, U, &gmst_);
 
     /* sun and moon position in ecef */
-    if (rsun) matmul("NN", 3, 1, 3, 1.0, U, rs, 0.0, rsun);
-    if (rmoon) matmul("NN", 3, 1, 3, 1.0, U, rm, 0.0, rmoon);
-    if (gmst) *gmst = gmst_;
+    if (rsun)
+        {
+            matmul("NN", 3, 1, 3, 1.0, U, rs, 0.0, rsun);
+        }
+    if (rmoon)
+        {
+            matmul("NN", 3, 1, 3, 1.0, U, rm, 0.0, rmoon);
+        }
+    if (gmst)
+        {
+            *gmst = gmst_;
+        }
 }
 
 
@@ -4166,20 +4788,35 @@ void csmooth(obs_t *obs, int ns)
             r = p->rcv;
             for (j = 0; j < NFREQ; j++)
                 {
-                    if (s <= 0 || MAXSAT < s || r <= 0 || 2 < r) continue;
-                    if (p->P[j] == 0.0 || p->L[j] == 0.0) continue;
-                    if (p->LLI[j]) n[r - 1][s - 1][j] = 0;
+                    if (s <= 0 || MAXSAT < s || r <= 0 || 2 < r)
+                        {
+                            continue;
+                        }
+                    if (p->P[j] == 0.0 || p->L[j] == 0.0)
+                        {
+                            continue;
+                        }
+                    if (p->LLI[j])
+                        {
+                            n[r - 1][s - 1][j] = 0;
+                        }
                     if (n[r - 1][s - 1][j] == 0)
-                        Ps[r - 1][s - 1][j] = p->P[j];
+                        {
+                            Ps[r - 1][s - 1][j] = p->P[j];
+                        }
                     else
                         {
                             dcp = lam_carr[j] * (p->L[j] - Lp[r - 1][s - 1][j]);
                             Ps[r - 1][s - 1][j] = p->P[j] / ns + (Ps[r - 1][s - 1][j] + dcp) * (ns - 1) / ns;
                         }
                     if (++n[r - 1][s - 1][j] < ns)
-                        p->P[j] = 0.0;
+                        {
+                            p->P[j] = 0.0;
+                        }
                     else
-                        p->P[j] = Ps[r - 1][s - 1][j];
+                        {
+                            p->P[j] = Ps[r - 1][s - 1][j];
+                        }
                     Lp[r - 1][s - 1][j] = p->L[j];
                 }
         }
@@ -4202,10 +4839,17 @@ int rtk_uncompress(const char *file, char *uncfile)
     trace(3, "rtk_uncompress: file=%s\n", file);
 
     if (strlen(file) < 1025)
-        strcpy(tmpfile, file);
+        {
+            strcpy(tmpfile, file);
+        }
     else
-        trace(1, "file array is too long");
-    if (!(p = strrchr(tmpfile, '.'))) return 0;
+        {
+            trace(1, "file array is too long");
+        }
+    if (!(p = strrchr(tmpfile, '.')))
+        {
+            return 0;
+        }
 
     /* uncompress by gzip */
     if (!strcmp(p, ".z") || !strcmp(p, ".Z") ||
@@ -4218,10 +4862,16 @@ int rtk_uncompress(const char *file, char *uncfile)
 
             if (execcmd(cmd))
                 {
-                    if (remove(uncfile) != 0) trace(1, "Error removing file");
+                    if (remove(uncfile) != 0)
+                        {
+                            trace(1, "Error removing file");
+                        }
                     return -1;
                 }
-            if (strlen(uncfile) < 1025) strcpy(tmpfile, uncfile);
+            if (strlen(uncfile) < 1025)
+                {
+                    strcpy(tmpfile, uncfile);
+                }
             stat = 1;
         }
     /* extract tar file */
@@ -4246,16 +4896,31 @@ int rtk_uncompress(const char *file, char *uncfile)
             std::string s_aux = temp.str();
             int n = s_aux.length();
             if (n < 2048)
-                for (int i = 0; i < n; i++) cmd[i] = s_aux[i];
+                {
+                    for (int i = 0; i < n; i++)
+                        {
+                            cmd[i] = s_aux[i];
+                        }
+                }
 
             if (execcmd(cmd))
                 {
                     if (stat)
-                        if (remove(tmpfile) != 0) trace(1, "Error removing file");
+                        {
+                            if (remove(tmpfile) != 0)
+                                {
+                                    trace(1, "Error removing file");
+                                }
+                        }
                     return -1;
                 }
             if (stat)
-                if (remove(tmpfile) != 0) trace(1, "Error removing file");
+                {
+                    if (remove(tmpfile) != 0)
+                        {
+                            trace(1, "Error removing file");
+                        }
+                }
             stat = 1;
         }
     /* extract hatanaka-compressed file by cnx2rnx */
@@ -4267,13 +4932,26 @@ int rtk_uncompress(const char *file, char *uncfile)
 
             if (execcmd(cmd))
                 {
-                    if (remove(uncfile) != 0) trace(1, "Error removing file");
+                    if (remove(uncfile) != 0)
+                        {
+                            trace(1, "Error removing file");
+                        }
                     if (stat)
-                        if (remove(tmpfile) != 0) trace(1, "Error removing file");
+                        {
+                            if (remove(tmpfile) != 0)
+                                {
+                                    trace(1, "Error removing file");
+                                }
+                        }
                     return -1;
                 }
             if (stat)
-                if (remove(tmpfile) != 0) trace(1, "Error removing file");
+                {
+                    if (remove(tmpfile) != 0)
+                        {
+                            trace(1, "Error removing file");
+                        }
+                }
             stat = 1;
         }
     trace(3, "rtk_uncompress: stat=%d\n", stat);
@@ -4304,23 +4982,42 @@ int expath(const char *path, char *paths[], int nmax)
     //if ((p=strrchr(path,'/')) || (p=strrchr(path,'\\'))) {
     //    file=p+1; strncpy(dir,path,p-path+1); dir[p-path+1]='\0';
     //}
-    if (!(dp = opendir(*dir ? dir : "."))) return 0;
+    if (!(dp = opendir(*dir ? dir : ".")))
+        {
+            return 0;
+        }
     while ((d = readdir(dp)))
         {
-            if (*(d->d_name) == '.') continue;
+            if (*(d->d_name) == '.')
+                {
+                    continue;
+                }
             sprintf(s1, "^%s$", d->d_name);
             sprintf(s2, "^%s$", file);
-            for (p = s1; *p; p++) *p = static_cast<char>(tolower(static_cast<int>(*p)));
-            for (p = s2; *p; p++) *p = static_cast<char>(tolower(static_cast<int>(*p)));
+            for (p = s1; *p; p++)
+                {
+                    *p = static_cast<char>(tolower(static_cast<int>(*p)));
+                }
+            for (p = s2; *p; p++)
+                {
+                    *p = static_cast<char>(tolower(static_cast<int>(*p)));
+                }
 
             for (p = s1, q = strtok_r(s2, "*", &r); q; q = strtok_r(nullptr, "*", &r))
                 {
                     if ((p = strstr(p, q)))
-                        p += strlen(q);
+                        {
+                            p += strlen(q);
+                        }
                     else
-                        break;
+                        {
+                            break;
+                        }
+                }
+            if (p && n < nmax)
+                {
+                    sprintf(paths[n++], "%s%s", dir, d->d_name);
                 }
-            if (p && n < nmax) sprintf(paths[n++], "%s%s", dir, d->d_name);
         }
     closedir(dp);
     /* sort paths in alphabetical order */
@@ -4331,7 +5028,9 @@ int expath(const char *path, char *paths[], int nmax)
                     if (strcmp(paths[i], paths[j]) > 0)
                         {
                             if (strlen(paths[i]) < 1025)
-                                strcpy(tmp, paths[i]);
+                                {
+                                    strcpy(tmp, paths[i]);
+                                }
                             else
                                 {
                                     trace(1, "Path is too long");
@@ -4341,7 +5040,10 @@ int expath(const char *path, char *paths[], int nmax)
                         }
                 }
         }
-    for (i = 0; i < n; i++) trace(3, "expath  : file=%s\n", paths[i]);
+    for (i = 0; i < n; i++)
+        {
+            trace(3, "expath  : file=%s\n", paths[i]);
+        }
 
     return n;
 }
@@ -4359,16 +5061,37 @@ void windupcorr(gtime_t time, const double *rs, const double *rr, double *phw)
     sunmoonpos(gpst2utc(time), erpv, rsun, nullptr, nullptr);
 
     /* unit vector satellite to receiver */
-    for (i = 0; i < 3; i++) r[i] = rr[i] - rs[i];
-    if (!normv3(r, ek)) return;
+    for (i = 0; i < 3; i++)
+        {
+            r[i] = rr[i] - rs[i];
+        }
+    if (!normv3(r, ek))
+        {
+            return;
+        }
 
     /* unit vectors of satellite antenna */
-    for (i = 0; i < 3; i++) r[i] = -rs[i];
-    if (!normv3(r, ezs)) return;
-    for (i = 0; i < 3; i++) r[i] = rsun[i] - rs[i];
-    if (!normv3(r, ess)) return;
+    for (i = 0; i < 3; i++)
+        {
+            r[i] = -rs[i];
+        }
+    if (!normv3(r, ezs))
+        {
+            return;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            r[i] = rsun[i] - rs[i];
+        }
+    if (!normv3(r, ess))
+        {
+            return;
+        }
     cross3(ezs, ess, r);
-    if (!normv3(r, eys)) return;
+    if (!normv3(r, eys))
+        {
+            return;
+        }
     cross3(eys, ezs, exs);
 
     /* unit vectors of receiver antenna */
@@ -4391,12 +5114,19 @@ void windupcorr(gtime_t time, const double *rs, const double *rr, double *phw)
         }
     cosp = dot(ds, dr, 3) / norm_rtk(ds, 3) / norm_rtk(dr, 3);
     if (cosp < -1.0)
-        cosp = -1.0;
+        {
+            cosp = -1.0;
+        }
     else if (cosp > 1.0)
-        cosp = 1.0;
+        {
+            cosp = 1.0;
+        }
     ph = acos(cosp) / 2.0 / PI;
     cross3(ds, dr, drs);
-    if (dot(ek, drs, 3) < 0.0) ph = -ph;
+    if (dot(ek, drs, 3) < 0.0)
+        {
+            ph = -ph;
+        }
 
     *phw = ph + floor(*phw - ph + 0.5); /* in cycle */
 }
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
index dde3e2a95..4ff70803e 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
@@ -148,7 +148,10 @@ int rtkopenstat(const char *file, int level)
 
     trace(3, "rtkopenstat: file=%s level=%d\n", file, level);
 
-    if (level <= 0) return 0;
+    if (level <= 0)
+        {
+            return 0;
+        }
 
     reppath(file, path, time, "", "");
 
@@ -158,9 +161,13 @@ int rtkopenstat(const char *file, int level)
             return 0;
         }
     if (strlen(file) < 1025)
-        strcpy(file_stat, file);
+        {
+            strcpy(file_stat, file);
+        }
     else
-        trace(1, "File name is too long");
+        {
+            trace(1, "File name is too long");
+        }
     time_stat = time;
     statlevel = level;
     return 1;
@@ -176,7 +183,10 @@ void rtkclosestat(void)
 {
     trace(3, "rtkclosestat:\n");
 
-    if (fp_stat) fclose(fp_stat);
+    if (fp_stat)
+        {
+            fclose(fp_stat);
+        }
     fp_stat = nullptr;
     file_stat[0] = '\0';
     statlevel = 0;
@@ -191,7 +201,10 @@ void rtkoutstat(rtk_t *rtk, char *buff __attribute__((unused)))
     int i, j, week, est, nfreq, nf = NF_RTK(&rtk->opt);
     char id[32];
 
-    if (statlevel <= 0 || !fp_stat) return;
+    if (statlevel <= 0 || !fp_stat)
+        {
+            return;
+        }
 
     trace(3, "outsolstat:\n");
 
@@ -205,7 +218,10 @@ void rtkoutstat(rtk_t *rtk, char *buff __attribute__((unused)))
     /* receiver position */
     if (est)
         {
-            for (i = 0; i < 3; i++) xa[i] = i < rtk->na ? rtk->xa[i] : 0.0;
+            for (i = 0; i < 3; i++)
+                {
+                    xa[i] = i < rtk->na ? rtk->xa[i] : 0.0;
+                }
             fprintf(fp_stat, "$POS,%d,%.3f,%d,%.4f,%.4f,%.4f,%.4f,%.4f,%.4f\n", week, tow,
                 rtk->sol.stat, rtk->x[0], rtk->x[1], rtk->x[2], xa[0], xa[1], xa[2]);
         }
@@ -221,8 +237,14 @@ void rtkoutstat(rtk_t *rtk, char *buff __attribute__((unused)))
             ecef2pos(rtk->sol.rr, pos);
             ecef2enu(pos, rtk->x + 3, vel);
             ecef2enu(pos, rtk->x + 6, acc);
-            if (rtk->na >= 6) ecef2enu(pos, rtk->xa + 3, vela);
-            if (rtk->na >= 9) ecef2enu(pos, rtk->xa + 6, acca);
+            if (rtk->na >= 6)
+                {
+                    ecef2enu(pos, rtk->xa + 3, vela);
+                }
+            if (rtk->na >= 9)
+                {
+                    ecef2enu(pos, rtk->xa + 6, acca);
+                }
             fprintf(fp_stat, "$VELACC,%d,%.3f,%d,%.4f,%.4f,%.4f,%.5f,%.5f,%.5f,%.4f,%.4f,%.4f,%.5f,%.5f,%.5f\n",
                 week, tow, rtk->sol.stat, vel[0], vel[1], vel[2], acc[0], acc[1], acc[2],
                 vela[0], vela[1], vela[2], acca[0], acca[1], acca[2]);
@@ -246,7 +268,10 @@ void rtkoutstat(rtk_t *rtk, char *buff __attribute__((unused)))
             for (i = 0; i < MAXSAT; i++)
                 {
                     ssat = rtk->ssat + i;
-                    if (!ssat->vs) continue;
+                    if (!ssat->vs)
+                        {
+                            continue;
+                        }
                     satno2id(i + 1, id);
                     j = II_RTK(i + 1, &rtk->opt);
                     xa[0] = j < rtk->na ? rtk->xa[j] : 0.0;
@@ -276,13 +301,19 @@ void rtkoutstat(rtk_t *rtk, char *buff __attribute__((unused)))
                         i + 1, rtk->x[j], xa[0]);
                 }
         }
-    if (rtk->sol.stat == SOLQ_NONE || statlevel <= 1) return;
+    if (rtk->sol.stat == SOLQ_NONE || statlevel <= 1)
+        {
+            return;
+        }
 
     /* residuals and status */
     for (i = 0; i < MAXSAT; i++)
         {
             ssat = rtk->ssat + i;
-            if (!ssat->vs) continue;
+            if (!ssat->vs)
+                {
+                    continue;
+                }
             satno2id(i + 1, id);
             for (j = 0; j < nfreq; j++)
                 {
@@ -313,7 +344,10 @@ void swapsolstat(void)
         {
             return;
         }
-    if (fp_stat) fclose(fp_stat);
+    if (fp_stat)
+        {
+            fclose(fp_stat);
+        }
 
     if (!(fp_stat = fopen(path, "we")))
         {
@@ -332,7 +366,10 @@ void outsolstat(rtk_t *rtk)
     int i, j, week, est, nfreq, nf = NF_RTK(&rtk->opt);
     char id[32];
 
-    if (statlevel <= 0 || !fp_stat) return;
+    if (statlevel <= 0 || !fp_stat)
+        {
+            return;
+        }
 
     trace(3, "outsolstat:\n");
 
@@ -346,7 +383,10 @@ void outsolstat(rtk_t *rtk)
     /* receiver position */
     if (est)
         {
-            for (i = 0; i < 3; i++) xa[i] = i < rtk->na ? rtk->xa[i] : 0.0;
+            for (i = 0; i < 3; i++)
+                {
+                    xa[i] = i < rtk->na ? rtk->xa[i] : 0.0;
+                }
             fprintf(fp_stat, "$POS,%d,%.3f,%d,%.4f,%.4f,%.4f,%.4f,%.4f,%.4f\n", week, tow,
                 rtk->sol.stat, rtk->x[0], rtk->x[1], rtk->x[2], xa[0], xa[1], xa[2]);
         }
@@ -362,8 +402,14 @@ void outsolstat(rtk_t *rtk)
             ecef2pos(rtk->sol.rr, pos);
             ecef2enu(pos, rtk->x + 3, vel);
             ecef2enu(pos, rtk->x + 6, acc);
-            if (rtk->na >= 6) ecef2enu(pos, rtk->xa + 3, vela);
-            if (rtk->na >= 9) ecef2enu(pos, rtk->xa + 6, acca);
+            if (rtk->na >= 6)
+                {
+                    ecef2enu(pos, rtk->xa + 3, vela);
+                }
+            if (rtk->na >= 9)
+                {
+                    ecef2enu(pos, rtk->xa + 6, acca);
+                }
             fprintf(fp_stat, "$VELACC,%d,%.3f,%d,%.4f,%.4f,%.4f,%.5f,%.5f,%.5f,%.4f,%.4f,%.4f,%.5f,%.5f,%.5f\n",
                 week, tow, rtk->sol.stat, vel[0], vel[1], vel[2], acc[0], acc[1], acc[2],
                 vela[0], vela[1], vela[2], acca[0], acca[1], acca[2]);
@@ -387,7 +433,10 @@ void outsolstat(rtk_t *rtk)
             for (i = 0; i < MAXSAT; i++)
                 {
                     ssat = rtk->ssat + i;
-                    if (!ssat->vs) continue;
+                    if (!ssat->vs)
+                        {
+                            continue;
+                        }
                     satno2id(i + 1, id);
                     j = II_RTK(i + 1, &rtk->opt);
                     xa[0] = j < rtk->na ? rtk->xa[j] : 0.0;
@@ -417,13 +466,19 @@ void outsolstat(rtk_t *rtk)
                         i + 1, rtk->x[j], xa[0]);
                 }
         }
-    if (rtk->sol.stat == SOLQ_NONE || statlevel <= 1) return;
+    if (rtk->sol.stat == SOLQ_NONE || statlevel <= 1)
+        {
+            return;
+        }
 
     /* residuals and status */
     for (i = 0; i < MAXSAT; i++)
         {
             ssat = rtk->ssat + i;
-            if (!ssat->vs) continue;
+            if (!ssat->vs)
+                {
+                    continue;
+                }
             satno2id(i + 1, id);
             for (j = 0; j < nfreq; j++)
                 {
@@ -510,8 +565,14 @@ double varerr(int sat __attribute((unused)), int sys, double el, double bl, doub
         }
     else
         { /* normal error model */
-            if (f >= nf) fact = opt->eratio[f - nf];
-            if (fact <= 0.0) fact = opt->eratio[0];
+            if (f >= nf)
+                {
+                    fact = opt->eratio[f - nf];
+                }
+            if (fact <= 0.0)
+                {
+                    fact = opt->eratio[0];
+                }
             fact *= sys == SYS_GLO ? EFACT_GLO : (sys == SYS_SBS ? EFACT_SBS : EFACT_GPS);
             a = fact * opt->err[1];
             b = fact * opt->err[2];
@@ -524,7 +585,10 @@ double varerr(int sat __attribute((unused)), int sys, double el, double bl, doub
 double baseline(const double *ru, const double *rb, double *dr)
 {
     int i;
-    for (i = 0; i < 3; i++) dr[i] = ru[i] - rb[i];
+    for (i = 0; i < 3; i++)
+        {
+            dr[i] = ru[i] - rb[i];
+        }
     return norm_rtk(dr, 3);
 }
 
@@ -552,9 +616,13 @@ int selsat(const obsd_t *obs, const double *azel, int nu, int nr,
     for (i = 0, j = nu; i < nu && j < nu + nr; i++, j++)
         {
             if (obs[i].sat < obs[j].sat)
-                j--;
+                {
+                    j--;
+                }
             else if (obs[i].sat > obs[j].sat)
-                i--;
+                {
+                    i--;
+                }
             else if (azel[1 + j * 2] >= opt->elmin)
                 { /* elevation at base station */
                     sat[k] = obs[i].sat;
@@ -578,26 +646,44 @@ void udpos(rtk_t *rtk, double tt)
     /* fixed mode */
     if (rtk->opt.mode == PMODE_FIXED)
         {
-            for (i = 0; i < 3; i++) initx_rtk(rtk, rtk->opt.ru[i], 1E-8, i);
+            for (i = 0; i < 3; i++)
+                {
+                    initx_rtk(rtk, rtk->opt.ru[i], 1E-8, i);
+                }
             return;
         }
     /* initialize position for first epoch */
     if (norm_rtk(rtk->x, 3) <= 0.0)
         {
-            for (i = 0; i < 3; i++) initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
+            for (i = 0; i < 3; i++)
+                {
+                    initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
+                }
             if (rtk->opt.dynamics)
                 {
-                    for (i = 3; i < 6; i++) initx_rtk(rtk, rtk->sol.rr[i], VAR_VEL, i);
-                    for (i = 6; i < 9; i++) initx_rtk(rtk, 1E-6, VAR_ACC, i);
+                    for (i = 3; i < 6; i++)
+                        {
+                            initx_rtk(rtk, rtk->sol.rr[i], VAR_VEL, i);
+                        }
+                    for (i = 6; i < 9; i++)
+                        {
+                            initx_rtk(rtk, 1E-6, VAR_ACC, i);
+                        }
                 }
         }
     /* static mode */
-    if (rtk->opt.mode == PMODE_STATIC) return;
+    if (rtk->opt.mode == PMODE_STATIC)
+        {
+            return;
+        }
 
     /* kinmatic mode without dynamics */
     if (!rtk->opt.dynamics)
         {
-            for (i = 0; i < 3; i++) initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
+            for (i = 0; i < 3; i++)
+                {
+                    initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
+                }
             return;
         }
     /* check variance of estimated position */
@@ -610,9 +696,18 @@ void udpos(rtk_t *rtk, double tt)
     if (var > VAR_POS)
         {
             /* reset position with large variance */
-            for (i = 0; i < 3; i++) initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
-            for (i = 3; i < 6; i++) initx_rtk(rtk, rtk->sol.rr[i], VAR_VEL, i);
-            for (i = 6; i < 9; i++) initx_rtk(rtk, 1E-6, VAR_ACC, i);
+            for (i = 0; i < 3; i++)
+                {
+                    initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
+                }
+            for (i = 3; i < 6; i++)
+                {
+                    initx_rtk(rtk, rtk->sol.rr[i], VAR_VEL, i);
+                }
+            for (i = 6; i < 9; i++)
+                {
+                    initx_rtk(rtk, 1E-6, VAR_ACC, i);
+                }
             trace(2, "reset rtk position due to large variance: var=%.3f\n", var);
             return;
         }
@@ -637,10 +732,12 @@ void udpos(rtk_t *rtk, double tt)
     ecef2pos(rtk->x, pos);
     covecef(pos, Q, Qv);
     for (i = 0; i < 3; i++)
-        for (j = 0; j < 3; j++)
-            {
-                rtk->P[i + 6 + (j + 6) * rtk->nx] += Qv[i + j * 3];
-            }
+        {
+            for (j = 0; j < 3; j++)
+                {
+                    rtk->P[i + 6 + (j + 6) * rtk->nx] += Qv[i + j * 3];
+                }
+        }
     free(F);
     free(FP);
     free(xp);
@@ -660,7 +757,9 @@ void udion(rtk_t *rtk, double tt, double bl, const int *sat, int ns)
             j = II_RTK(i, &rtk->opt);
             if (rtk->x[j] != 0.0 &&
                 rtk->ssat[i - 1].outc[0] > GAP_RESION && rtk->ssat[i - 1].outc[1] > GAP_RESION)
-                rtk->x[j] = 0.0;
+                {
+                    rtk->x[j] = 0.0;
+                }
         }
     for (i = 0; i < ns; i++)
         {
@@ -698,7 +797,10 @@ void udtrop(rtk_t *rtk, double tt, double bl __attribute((unused)))
 
                     if (rtk->opt.tropopt >= TROPOPT_ESTG)
                         {
-                            for (k = 0; k < 2; k++) initx_rtk(rtk, 1e-6, VAR_GRA, ++j);
+                            for (k = 0; k < 2; k++)
+                                {
+                                    initx_rtk(rtk, 1e-6, VAR_GRA, ++j);
+                                }
                         }
                 }
             else
@@ -755,13 +857,20 @@ void detslp_ll(rtk_t *rtk, const obsd_t *obs, int i, int rcv)
 
     for (f = 0; f < rtk->opt.nf; f++)
         {
-            if (obs[i].L[f] == 0.0) continue;
+            if (obs[i].L[f] == 0.0)
+                {
+                    continue;
+                }
 
             /* restore previous LLI */
             if (rcv == 1)
-                LLI = getbitu(&rtk->ssat[sat - 1].slip[f], 0, 2); /* rover */
+                {
+                    LLI = getbitu(&rtk->ssat[sat - 1].slip[f], 0, 2); /* rover */
+                }
             else
-                LLI = getbitu(&rtk->ssat[sat - 1].slip[f], 2, 2); /* base  */
+                {
+                    LLI = getbitu(&rtk->ssat[sat - 1].slip[f], 2, 2); /* base  */
+                }
 
             /* detect slip by cycle slip flag in LLI */
             if (rtk->tt >= 0.0)
@@ -791,9 +900,13 @@ void detslp_ll(rtk_t *rtk, const obsd_t *obs, int i, int rcv)
                 }
             /* save current LLI */
             if (rcv == 1)
-                setbitu(&rtk->ssat[sat - 1].slip[f], 0, 2, obs[i].LLI[f]);
+                {
+                    setbitu(&rtk->ssat[sat - 1].slip[f], 0, 2, obs[i].LLI[f]);
+                }
             else
-                setbitu(&rtk->ssat[sat - 1].slip[f], 2, 2, obs[i].LLI[f]);
+                {
+                    setbitu(&rtk->ssat[sat - 1].slip[f], 2, 2, obs[i].LLI[f]);
+                }
 
             /* save slip and half-cycle valid flag */
             rtk->ssat[sat - 1].slip[f] |= static_cast<unsigned char>(slip);
@@ -811,7 +924,10 @@ void detslp_gf_L1L2(rtk_t *rtk, const obsd_t *obs, int i, int j,
 
     trace(3, "detslp_gf_L1L2: i=%d j=%d\n", i, j);
 
-    if (rtk->opt.nf <= 1 || (g1 = gfobs_L1L2(obs, i, j, nav->lam[sat - 1])) == 0.0) return;
+    if (rtk->opt.nf <= 1 || (g1 = gfobs_L1L2(obs, i, j, nav->lam[sat - 1])) == 0.0)
+        {
+            return;
+        }
 
     g0 = rtk->ssat[sat - 1].gf;
     rtk->ssat[sat - 1].gf = g1;
@@ -835,7 +951,10 @@ void detslp_gf_L1L5(rtk_t *rtk, const obsd_t *obs, int i, int j,
 
     trace(3, "detslp_gf_L1L5: i=%d j=%d\n", i, j);
 
-    if (rtk->opt.nf <= 2 || (g1 = gfobs_L1L5(obs, i, j, nav->lam[sat - 1])) == 0.0) return;
+    if (rtk->opt.nf <= 2 || (g1 = gfobs_L1L5(obs, i, j, nav->lam[sat - 1])) == 0.0)
+        {
+            return;
+        }
 
     g0 = rtk->ssat[sat - 1].gf2;
     rtk->ssat[sat - 1].gf2 = g1;
@@ -900,7 +1019,10 @@ void udbias(rtk_t *rtk, double tt, const obsd_t *obs, const int *sat,
     for (i = 0; i < ns; i++)
         {
             /* detect cycle slip by LLI */
-            for (f = 0; f < rtk->opt.nf; f++) rtk->ssat[sat[i] - 1].slip[f] &= 0xFC;
+            for (f = 0; f < rtk->opt.nf; f++)
+                {
+                    rtk->ssat[sat[i] - 1].slip[f] &= 0xFC;
+                }
             detslp_ll(rtk, obs, iu[i], 1);
             detslp_ll(rtk, obs, ir[i], 2);
 
@@ -947,8 +1069,14 @@ void udbias(rtk_t *rtk, double tt, const obsd_t *obs, const int *sat,
                     j = IB_RTK(sat[i], f, &rtk->opt);
                     rtk->P[j + j * rtk->nx] += rtk->opt.prn[0] * rtk->opt.prn[0] * tt;
                     slip = rtk->ssat[sat[i] - 1].slip[f];
-                    if (rtk->opt.ionoopt == IONOOPT_IFLC) slip |= rtk->ssat[sat[i] - 1].slip[1];
-                    if (rtk->opt.modear == ARMODE_INST || !(slip & 1)) continue;
+                    if (rtk->opt.ionoopt == IONOOPT_IFLC)
+                        {
+                            slip |= rtk->ssat[sat[i] - 1].slip[1];
+                        }
+                    if (rtk->opt.modear == ARMODE_INST || !(slip & 1))
+                        {
+                            continue;
+                        }
                     rtk->x[j] = 0.0;
                     rtk->ssat[sat[i] - 1].lock[f] = -rtk->opt.minlock;
                 }
@@ -962,7 +1090,10 @@ void udbias(rtk_t *rtk, double tt, const obsd_t *obs, const int *sat,
                             cp = sdobs(obs, iu[i], ir[i], f); /* cycle */
                             pr = sdobs(obs, iu[i], ir[i], f + NFREQ);
                             lami = nav->lam[sat[i] - 1][f];
-                            if (cp == 0.0 || pr == 0.0 || lami <= 0.0) continue;
+                            if (cp == 0.0 || pr == 0.0 || lami <= 0.0)
+                                {
+                                    continue;
+                                }
 
                             bias[i] = cp - pr / lami;
                         }
@@ -974,7 +1105,10 @@ void udbias(rtk_t *rtk, double tt, const obsd_t *obs, const int *sat,
                             pr2 = sdobs(obs, iu[i], ir[i], NFREQ + 1);
                             lam1 = nav->lam[sat[i] - 1][0];
                             lam2 = nav->lam[sat[i] - 1][1];
-                            if (cp1 == 0.0 || cp2 == 0.0 || pr1 == 0.0 || pr2 == 0.0 || lam1 <= 0.0 || lam2 <= 0.0) continue;
+                            if (cp1 == 0.0 || cp2 == 0.0 || pr1 == 0.0 || pr2 == 0.0 || lam1 <= 0.0 || lam2 <= 0.0)
+                                {
+                                    continue;
+                                }
 
                             C1 = std::pow(lam2, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
                             C2 = -std::pow(lam1, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
@@ -991,13 +1125,19 @@ void udbias(rtk_t *rtk, double tt, const obsd_t *obs, const int *sat,
                 {
                     for (i = 1; i <= MAXSAT; i++)
                         {
-                            if (rtk->x[IB_RTK(i, f, &rtk->opt)] != 0.0) rtk->x[IB_RTK(i, f, &rtk->opt)] += offset / j;
+                            if (rtk->x[IB_RTK(i, f, &rtk->opt)] != 0.0)
+                                {
+                                    rtk->x[IB_RTK(i, f, &rtk->opt)] += offset / j;
+                                }
                         }
                 }
             /* set initial states of phase-bias */
             for (i = 0; i < ns; i++)
                 {
-                    if (bias[i] == 0.0 || rtk->x[IB_RTK(sat[i], f, &rtk->opt)] != 0.0) continue;
+                    if (bias[i] == 0.0 || rtk->x[IB_RTK(sat[i], f, &rtk->opt)] != 0.0)
+                        {
+                            continue;
+                        }
                     initx_rtk(rtk, bias[i], std::pow(rtk->opt.std[0], 2.0), IB_RTK(sat[i], f, &rtk->opt));
                 }
             free(bias);
@@ -1051,10 +1191,16 @@ void zdres_sat(int base, double r, const obsd_t *obs, const nav_t *nav,
 
     if (opt->ionoopt == IONOOPT_IFLC)
         { /* iono-free linear combination */
-            if (lam[0] == 0.0 || lam[1] == 0.0) return;
+            if (lam[0] == 0.0 || lam[1] == 0.0)
+                {
+                    return;
+                }
 
             if (testsnr(base, 0, azel[1], obs->SNR[0] * 0.25, &opt->snrmask) ||
-                testsnr(base, 1, azel[1], obs->SNR[1] * 0.25, &opt->snrmask)) return;
+                testsnr(base, 1, azel[1], obs->SNR[1] * 0.25, &opt->snrmask))
+                {
+                    return;
+                }
 
             f1 = SPEED_OF_LIGHT / lam[0];
             f2 = SPEED_OF_LIGHT / lam[1];
@@ -1075,7 +1221,10 @@ void zdres_sat(int base, double r, const obsd_t *obs, const nav_t *nav,
         {
             for (i = 0; i < nf; i++)
                 {
-                    if (lam[i] == 0.0) continue;
+                    if (lam[i] == 0.0)
+                        {
+                            continue;
+                        }
 
                     /* check snr mask */
                     if (testsnr(base, i, azel[1], obs->SNR[i] * 0.25, &opt->snrmask))
@@ -1083,8 +1232,14 @@ void zdres_sat(int base, double r, const obsd_t *obs, const nav_t *nav,
                             continue;
                         }
                     /* residuals = observable - pseudorange */
-                    if (obs->L[i] != 0.0) y[i] = obs->L[i] * lam[i] - r - dant[i];
-                    if (obs->P[i] != 0.0) y[i + nf] = obs->P[i] - r - dant[i];
+                    if (obs->L[i] != 0.0)
+                        {
+                            y[i] = obs->L[i] * lam[i] - r - dant[i];
+                        }
+                    if (obs->P[i] != 0.0)
+                        {
+                            y[i + nf] = obs->P[i] - r - dant[i];
+                        }
                 }
         }
 }
@@ -1102,29 +1257,50 @@ int zdres(int base, const obsd_t *obs, int n, const double *rs,
 
     trace(3, "zdres   : n=%d\n", n);
 
-    for (i = 0; i < n * nf * 2; i++) y[i] = 0.0;
+    for (i = 0; i < n * nf * 2; i++)
+        {
+            y[i] = 0.0;
+        }
 
-    if (norm_rtk(rr, 3) <= 0.0) return 0; /* no receiver position */
+    if (norm_rtk(rr, 3) <= 0.0)
+        {
+            return 0; /* no receiver position */
+        }
 
-    for (i = 0; i < 3; i++) rr_[i] = rr[i];
+    for (i = 0; i < 3; i++)
+        {
+            rr_[i] = rr[i];
+        }
 
     /* earth tide correction */
     if (opt->tidecorr)
         {
             tidedisp(gpst2utc(obs[0].time), rr_, opt->tidecorr, &nav->erp,
                 opt->odisp[base], disp);
-            for (i = 0; i < 3; i++) rr_[i] += disp[i];
+            for (i = 0; i < 3; i++)
+                {
+                    rr_[i] += disp[i];
+                }
         }
     ecef2pos(rr_, pos);
 
     for (i = 0; i < n; i++)
         {
             /* compute geometric-range and azimuth/elevation angle */
-            if ((r = geodist(rs + i * 6, rr_, e + i * 3)) <= 0.0) continue;
-            if (satazel(pos, e + i * 3, azel + i * 2) < opt->elmin) continue;
+            if ((r = geodist(rs + i * 6, rr_, e + i * 3)) <= 0.0)
+                {
+                    continue;
+                }
+            if (satazel(pos, e + i * 3, azel + i * 2) < opt->elmin)
+                {
+                    continue;
+                }
 
             /* excluded satellite? */
-            if (satexclude(obs[i].sat, svh[i], opt)) continue;
+            if (satexclude(obs[i].sat, svh[i], opt))
+                {
+                    continue;
+                }
 
             /* satellite clock-bias */
             r += -SPEED_OF_LIGHT * dts[i * 2];
@@ -1172,14 +1348,19 @@ void ddcov(const int *nb, int n, const double *Ri, const double *Rj,
 
     trace(3, "ddcov   : n=%d\n", n);
 
-    for (i = 0; i < nv * nv; i++) R[i] = 0.0;
+    for (i = 0; i < nv * nv; i++)
+        {
+            R[i] = 0.0;
+        }
     for (b = 0; b < n; k += nb[b++])
         {
             for (i = 0; i < nb[b]; i++)
-                for (j = 0; j < nb[b]; j++)
-                    {
-                        R[k + i + (k + j) * nv] = Ri[k + i] + (i == j ? Rj[k + i] : 0.0);
-                    }
+                {
+                    for (j = 0; j < nb[b]; j++)
+                        {
+                            R[k + i + (k + j) * nv] = Ri[k + i] + (i == j ? Rj[k + i] : 0.0);
+                        }
+                }
         }
     trace(5, "R=\n");
     tracemat(5, R, nv, nv, 8, 6);
@@ -1197,7 +1378,10 @@ int constbl(rtk_t *rtk, const double *x, const double *P, double *v,
     trace(3, "constbl : \n");
 
     /* no constraint */
-    if (rtk->opt.baseline[0] <= 0.0) return 0;
+    if (rtk->opt.baseline[0] <= 0.0)
+        {
+            return 0;
+        }
 
     /* time-adjusted baseline vector and length */
     for (i = 0; i < 3; i++)
@@ -1226,7 +1410,10 @@ int constbl(rtk_t *rtk, const double *x, const double *P, double *v,
     v[index] = rtk->opt.baseline[0] - bb;
     if (H)
         {
-            for (i = 0; i < 3; i++) H[i + index * rtk->nx] = b[i] / bb;
+            for (i = 0; i < 3; i++)
+                {
+                    H[i + index * rtk->nx] = b[i] / bb;
+                }
         }
     Ri[index] = 0.0;
     Rj[index] = std::pow(rtk->opt.baseline[1], 2.0);
@@ -1259,7 +1446,9 @@ double prectrop(gtime_t time, const double *pos, int r,
             dtdx[2] = grad_e * x[i];
         }
     else
-        dtdx[1] = dtdx[2] = 0.0;
+        {
+            dtdx[1] = dtdx[2] = 0.0;
+        }
     dtdx[0] = m_w;
     return m_w * x[i];
 }
@@ -1271,7 +1460,10 @@ double gloicbcorr(int sat1 __attribute((unused)), int sat2 __attribute((unused))
 {
     double dfreq;
 
-    if (f >= NFREQGLO || f >= opt->nf || !opt->exterr.ena[2]) return 0.0;
+    if (f >= NFREQGLO || f >= opt->nf || !opt->exterr.ena[2])
+        {
+            return 0.0;
+        }
 
     dfreq = (SPEED_OF_LIGHT / lam1 - SPEED_OF_LIGHT / lam2) / (f == 0 ? DFRQ1_GLO : DFRQ2_GLO);
 
@@ -1327,10 +1519,12 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x,
     dtdxr = mat(ns, 3);
 
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < NFREQ; j++)
-            {
-                rtk->ssat[i].resp[j] = rtk->ssat[i].resc[j] = 0.0;
-            }
+        {
+            for (j = 0; j < NFREQ; j++)
+                {
+                    rtk->ssat[i].resp[j] = rtk->ssat[i].resc[j] = 0.0;
+                }
+        }
     /* compute factors of ionospheric and tropospheric delay */
     for (i = 0; i < ns; i++)
         {
@@ -1344,145 +1538,186 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x,
                     tropr[i] = prectrop(rtk->sol.time, posr, 1, azel + ir[i] * 2, opt, x, dtdxr + i * 3);
                 }
         }
-    for (m = 0; m < 4; m++) /* m=0:gps/qzs/sbs, 1:glo, 2:gal, 3:bds */
+    for (m = 0; m < 4; m++)
+        { /* m=0:gps/qzs/sbs, 1:glo, 2:gal, 3:bds */
 
-        for (f = opt->mode > PMODE_DGPS ? 0 : nf; f < nf * 2; f++)
-            {
-                /* search reference satellite with highest elevation */
-                for (i = -1, j = 0; j < ns; j++)
-                    {
-                        sysi = rtk->ssat[sat[j] - 1].sys;
-                        if (!test_sys(sysi, m)) continue;
-                        if (!validobs(iu[j], ir[j], f, nf, y)) continue;
-                        if (i < 0 || azel[1 + iu[j] * 2] >= azel[1 + iu[i] * 2]) i = j;
-                    }
-                if (i < 0) continue;
+            for (f = opt->mode > PMODE_DGPS ? 0 : nf; f < nf * 2; f++)
+                {
+                    /* search reference satellite with highest elevation */
+                    for (i = -1, j = 0; j < ns; j++)
+                        {
+                            sysi = rtk->ssat[sat[j] - 1].sys;
+                            if (!test_sys(sysi, m))
+                                {
+                                    continue;
+                                }
+                            if (!validobs(iu[j], ir[j], f, nf, y))
+                                {
+                                    continue;
+                                }
+                            if (i < 0 || azel[1 + iu[j] * 2] >= azel[1 + iu[i] * 2])
+                                {
+                                    i = j;
+                                }
+                        }
+                    if (i < 0)
+                        {
+                            continue;
+                        }
 
-                /* make double difference */
-                for (j = 0; j < ns; j++)
-                    {
-                        if (i == j) continue;
-                        sysi = rtk->ssat[sat[i] - 1].sys;
-                        sysj = rtk->ssat[sat[j] - 1].sys;
-                        if (!test_sys(sysj, m)) continue;
-                        if (!validobs(iu[j], ir[j], f, nf, y)) continue;
+                    /* make double difference */
+                    for (j = 0; j < ns; j++)
+                        {
+                            if (i == j)
+                                {
+                                    continue;
+                                }
+                            sysi = rtk->ssat[sat[i] - 1].sys;
+                            sysj = rtk->ssat[sat[j] - 1].sys;
+                            if (!test_sys(sysj, m))
+                                {
+                                    continue;
+                                }
+                            if (!validobs(iu[j], ir[j], f, nf, y))
+                                {
+                                    continue;
+                                }
 
-                        ff = f % nf;
-                        lami = nav->lam[sat[i] - 1][ff];
-                        lamj = nav->lam[sat[j] - 1][ff];
-                        if (lami <= 0.0 || lamj <= 0.0) continue;
-                        if (H)
-                            {
-                                Hi = H + nv * rtk->nx;
-                                for (k = 0; k < rtk->nx; k++) Hi[k] = 0.0;
-                            }
-                        /* double-differenced residual */
-                        v[nv] = (y[f + iu[i] * nf * 2] - y[f + ir[i] * nf * 2]) -
-                                (y[f + iu[j] * nf * 2] - y[f + ir[j] * nf * 2]);
+                            ff = f % nf;
+                            lami = nav->lam[sat[i] - 1][ff];
+                            lamj = nav->lam[sat[j] - 1][ff];
+                            if (lami <= 0.0 || lamj <= 0.0)
+                                {
+                                    continue;
+                                }
+                            if (H)
+                                {
+                                    Hi = H + nv * rtk->nx;
+                                    for (k = 0; k < rtk->nx; k++)
+                                        {
+                                            Hi[k] = 0.0;
+                                        }
+                                }
+                            /* double-differenced residual */
+                            v[nv] = (y[f + iu[i] * nf * 2] - y[f + ir[i] * nf * 2]) -
+                                    (y[f + iu[j] * nf * 2] - y[f + ir[j] * nf * 2]);
 
-                        /* partial derivatives by rover position */
-                        if (H)
-                            {
-                                for (k = 0; k < 3; k++)
-                                    {
-                                        Hi[k] = -e[k + iu[i] * 3] + e[k + iu[j] * 3];
-                                    }
-                            }
-                        /* double-differenced ionospheric delay term */
-                        if (opt->ionoopt == IONOOPT_EST)
-                            {
-                                fi = lami / lam_carr[0];
-                                fj = lamj / lam_carr[0];
-                                didxi = (f < nf ? -1.0 : 1.0) * fi * fi * im[i];
-                                didxj = (f < nf ? -1.0 : 1.0) * fj * fj * im[j];
-                                v[nv] -= didxi * x[II_RTK(sat[i], opt)] - didxj * x[II_RTK(sat[j], opt)];
-                                if (H)
-                                    {
-                                        Hi[II_RTK(sat[i], opt)] = didxi;
-                                        Hi[II_RTK(sat[j], opt)] = -didxj;
-                                    }
-                            }
-                        /* double-differenced tropospheric delay term */
-                        if (opt->tropopt == TROPOPT_EST || opt->tropopt == TROPOPT_ESTG)
-                            {
-                                v[nv] -= (tropu[i] - tropu[j]) - (tropr[i] - tropr[j]);
-                                for (k = 0; k < (opt->tropopt < TROPOPT_ESTG ? 1 : 3); k++)
-                                    {
-                                        if (!H) continue;
-                                        Hi[IT_RTK(0, opt) + k] = (dtdxu[k + i * 3] - dtdxu[k + j * 3]);
-                                        Hi[IT_RTK(1, opt) + k] = -(dtdxr[k + i * 3] - dtdxr[k + j * 3]);
-                                    }
-                            }
-                        /* double-differenced phase-bias term */
-                        if (f < nf)
-                            {
-                                if (opt->ionoopt != IONOOPT_IFLC)
-                                    {
-                                        v[nv] -= lami * x[IB_RTK(sat[i], f, opt)] - lamj * x[IB_RTK(sat[j], f, opt)];
-                                        if (H)
-                                            {
-                                                Hi[IB_RTK(sat[i], f, opt)] = lami;
-                                                Hi[IB_RTK(sat[j], f, opt)] = -lamj;
-                                            }
-                                    }
-                                else
-                                    {
-                                        v[nv] -= x[IB_RTK(sat[i], f, opt)] - x[IB_RTK(sat[j], f, opt)];
-                                        if (H)
-                                            {
-                                                Hi[IB_RTK(sat[i], f, opt)] = 1.0;
-                                                Hi[IB_RTK(sat[j], f, opt)] = -1.0;
-                                            }
-                                    }
-                            }
-                        /* glonass receiver h/w bias term */
-                        if (rtk->opt.glomodear == 2 && sysi == SYS_GLO && sysj == SYS_GLO && ff < NFREQGLO)
-                            {
-                                df = (SPEED_OF_LIGHT / lami - SPEED_OF_LIGHT / lamj) / 1E6; /* freq-difference (MHz) */
-                                v[nv] -= df * x[IL_RTK(ff, opt)];
-                                if (H) Hi[IL_RTK(ff, opt)] = df;
-                            }
-                        /* glonass interchannel bias correction */
-                        else if (sysi == SYS_GLO && sysj == SYS_GLO)
-                            {
-                                v[nv] -= gloicbcorr(sat[i], sat[j], &rtk->opt, lami, lamj, f);
-                            }
-                        if (f < nf)
-                            rtk->ssat[sat[j] - 1].resc[f] = v[nv];
-                        else
-                            rtk->ssat[sat[j] - 1].resp[f - nf] = v[nv];
+                            /* partial derivatives by rover position */
+                            if (H)
+                                {
+                                    for (k = 0; k < 3; k++)
+                                        {
+                                            Hi[k] = -e[k + iu[i] * 3] + e[k + iu[j] * 3];
+                                        }
+                                }
+                            /* double-differenced ionospheric delay term */
+                            if (opt->ionoopt == IONOOPT_EST)
+                                {
+                                    fi = lami / lam_carr[0];
+                                    fj = lamj / lam_carr[0];
+                                    didxi = (f < nf ? -1.0 : 1.0) * fi * fi * im[i];
+                                    didxj = (f < nf ? -1.0 : 1.0) * fj * fj * im[j];
+                                    v[nv] -= didxi * x[II_RTK(sat[i], opt)] - didxj * x[II_RTK(sat[j], opt)];
+                                    if (H)
+                                        {
+                                            Hi[II_RTK(sat[i], opt)] = didxi;
+                                            Hi[II_RTK(sat[j], opt)] = -didxj;
+                                        }
+                                }
+                            /* double-differenced tropospheric delay term */
+                            if (opt->tropopt == TROPOPT_EST || opt->tropopt == TROPOPT_ESTG)
+                                {
+                                    v[nv] -= (tropu[i] - tropu[j]) - (tropr[i] - tropr[j]);
+                                    for (k = 0; k < (opt->tropopt < TROPOPT_ESTG ? 1 : 3); k++)
+                                        {
+                                            if (!H)
+                                                {
+                                                    continue;
+                                                }
+                                            Hi[IT_RTK(0, opt) + k] = (dtdxu[k + i * 3] - dtdxu[k + j * 3]);
+                                            Hi[IT_RTK(1, opt) + k] = -(dtdxr[k + i * 3] - dtdxr[k + j * 3]);
+                                        }
+                                }
+                            /* double-differenced phase-bias term */
+                            if (f < nf)
+                                {
+                                    if (opt->ionoopt != IONOOPT_IFLC)
+                                        {
+                                            v[nv] -= lami * x[IB_RTK(sat[i], f, opt)] - lamj * x[IB_RTK(sat[j], f, opt)];
+                                            if (H)
+                                                {
+                                                    Hi[IB_RTK(sat[i], f, opt)] = lami;
+                                                    Hi[IB_RTK(sat[j], f, opt)] = -lamj;
+                                                }
+                                        }
+                                    else
+                                        {
+                                            v[nv] -= x[IB_RTK(sat[i], f, opt)] - x[IB_RTK(sat[j], f, opt)];
+                                            if (H)
+                                                {
+                                                    Hi[IB_RTK(sat[i], f, opt)] = 1.0;
+                                                    Hi[IB_RTK(sat[j], f, opt)] = -1.0;
+                                                }
+                                        }
+                                }
+                            /* glonass receiver h/w bias term */
+                            if (rtk->opt.glomodear == 2 && sysi == SYS_GLO && sysj == SYS_GLO && ff < NFREQGLO)
+                                {
+                                    df = (SPEED_OF_LIGHT / lami - SPEED_OF_LIGHT / lamj) / 1E6; /* freq-difference (MHz) */
+                                    v[nv] -= df * x[IL_RTK(ff, opt)];
+                                    if (H)
+                                        {
+                                            Hi[IL_RTK(ff, opt)] = df;
+                                        }
+                                }
+                            /* glonass interchannel bias correction */
+                            else if (sysi == SYS_GLO && sysj == SYS_GLO)
+                                {
+                                    v[nv] -= gloicbcorr(sat[i], sat[j], &rtk->opt, lami, lamj, f);
+                                }
+                            if (f < nf)
+                                {
+                                    rtk->ssat[sat[j] - 1].resc[f] = v[nv];
+                                }
+                            else
+                                {
+                                    rtk->ssat[sat[j] - 1].resp[f - nf] = v[nv];
+                                }
 
-                        /* test innovation */
-                        if (opt->maxinno > 0.0 && fabs(v[nv]) > opt->maxinno)
-                            {
-                                if (f < nf)
-                                    {
-                                        rtk->ssat[sat[i] - 1].rejc[f]++;
-                                        rtk->ssat[sat[j] - 1].rejc[f]++;
-                                    }
-                                errmsg(rtk, "outlier rejected (sat=%3d-%3d %s%d v=%.3f)\n",
-                                    sat[i], sat[j], f < nf ? "L" : "P", f % nf + 1, v[nv]);
-                                continue;
-                            }
-                        /* single-differenced measurement error variances */
-                        Ri[nv] = varerr(sat[i], sysi, azel[1 + iu[i] * 2], bl, dt, f, opt);
-                        Rj[nv] = varerr(sat[j], sysj, azel[1 + iu[j] * 2], bl, dt, f, opt);
+                            /* test innovation */
+                            if (opt->maxinno > 0.0 && fabs(v[nv]) > opt->maxinno)
+                                {
+                                    if (f < nf)
+                                        {
+                                            rtk->ssat[sat[i] - 1].rejc[f]++;
+                                            rtk->ssat[sat[j] - 1].rejc[f]++;
+                                        }
+                                    errmsg(rtk, "outlier rejected (sat=%3d-%3d %s%d v=%.3f)\n",
+                                        sat[i], sat[j], f < nf ? "L" : "P", f % nf + 1, v[nv]);
+                                    continue;
+                                }
+                            /* single-differenced measurement error variances */
+                            Ri[nv] = varerr(sat[i], sysi, azel[1 + iu[i] * 2], bl, dt, f, opt);
+                            Rj[nv] = varerr(sat[j], sysj, azel[1 + iu[j] * 2], bl, dt, f, opt);
 
-                        /* set valid data flags */
-                        if (opt->mode > PMODE_DGPS)
-                            {
-                                if (f < nf) rtk->ssat[sat[i] - 1].vsat[f] = rtk->ssat[sat[j] - 1].vsat[f] = 1;
-                            }
-                        else
-                            {
-                                rtk->ssat[sat[i] - 1].vsat[f - nf] = rtk->ssat[sat[j] - 1].vsat[f - nf] = 1;
-                            }
-                        trace(4, "sat=%3d-%3d %s%d v=%13.3f R=%8.6f %8.6f\n", sat[i],
-                            sat[j], f < nf ? "L" : "P", f % nf + 1, v[nv], Ri[nv], Rj[nv]);
+                            /* set valid data flags */
+                            if (opt->mode > PMODE_DGPS)
+                                {
+                                    if (f < nf)
+                                        {
+                                            rtk->ssat[sat[i] - 1].vsat[f] = rtk->ssat[sat[j] - 1].vsat[f] = 1;
+                                        }
+                                }
+                            else
+                                {
+                                    rtk->ssat[sat[i] - 1].vsat[f - nf] = rtk->ssat[sat[j] - 1].vsat[f - nf] = 1;
+                                }
+                            trace(4, "sat=%3d-%3d %s%d v=%13.3f R=%8.6f %8.6f\n", sat[i],
+                                sat[j], f < nf ? "L" : "P", f % nf + 1, v[nv], Ri[nv], Rj[nv]);
 
-                        vflg[nv++] = (sat[i] << 16) | (sat[j] << 8) | ((f < nf ? 0 : 1) << 4) | (f % nf);
-                        nb[b]++;
-                    }
+                            vflg[nv++] = (sat[i] << 16) | (sat[j] << 8) | ((f < nf ? 0 : 1) << 4) | (f % nf);
+                            nb[b]++;
+                        }
 #if 0 /* residuals referenced to reference satellite (2.4.2 p11) */
                 /* restore single-differenced residuals assuming sum equal zero */
                 if (f<nf)
@@ -1505,8 +1740,9 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x,
                             }
                     }
 #endif
-                b++;
-            }
+                    b++;
+                }
+        }
     /* end of system loop */
 
     /* baseline length constraint for moving baseline */
@@ -1553,11 +1789,17 @@ double intpres(gtime_t time, const obsd_t *obs, int n, const nav_t *nav,
     if (nb == 0 || fabs(tt) < DTTOL)
         {
             nb = n;
-            for (i = 0; i < n; i++) obsb[i] = obs[i];
+            for (i = 0; i < n; i++)
+                {
+                    obsb[i] = obs[i];
+                }
             return tt;
         }
     ttb = timediff(time, obsb[0].time);
-    if (fabs(ttb) > opt->maxtdiff * 2.0 || ttb == tt) return tt;
+    if (fabs(ttb) > opt->maxtdiff * 2.0 || ttb == tt)
+        {
+            return tt;
+        }
 
     satposs(time, obsb, nb, nav, opt->sateph, rs, dts, var, svh);
 
@@ -1568,14 +1810,26 @@ double intpres(gtime_t time, const obsd_t *obs, int n, const nav_t *nav,
     for (i = 0; i < n; i++)
         {
             for (j = 0; j < nb; j++)
-                if (obsb[j].sat == obs[i].sat) break;
-            if (j >= nb) continue;
+                {
+                    if (obsb[j].sat == obs[i].sat)
+                        {
+                            break;
+                        }
+                }
+            if (j >= nb)
+                {
+                    continue;
+                }
             for (k = 0, p = y + i * nf * 2, q = yb + j * nf * 2; k < nf * 2; k++, p++, q++)
                 {
                     if (*p == 0.0 || *q == 0.0)
-                        *p = 0.0;
+                        {
+                            *p = 0.0;
+                        }
                     else
-                        *p = (ttb * (*p) - tt * (*q)) / (ttb - tt);
+                        {
+                            *p = (ttb * (*p) - tt * (*q)) / (ttb - tt);
+                        }
                 }
         }
     return fabs(ttb) > fabs(tt) ? ttb : tt;
@@ -1590,11 +1844,16 @@ int ddmat(rtk_t *rtk, double *D)
     trace(3, "ddmat   :\n");
 
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < NFREQ; j++)
-            {
-                rtk->ssat[i].fix[j] = 0;
-            }
-    for (i = 0; i < na; i++) D[i + i * nx] = 1.0;
+        {
+            for (j = 0; j < NFREQ; j++)
+                {
+                    rtk->ssat[i].fix[j] = 0;
+                }
+        }
+    for (i = 0; i < na; i++)
+        {
+            D[i + i * nx] = 1.0;
+        }
 
     for (m = 0; m < 4; m++)
         { /* m=0:gps/qzs/sbs, 1:glo, 2:gal, 3:bds */
@@ -1636,7 +1895,9 @@ int ddmat(rtk_t *rtk, double *D)
                                             rtk->ssat[j - k].fix[f] = 2; /* fix */
                                         }
                                     else
-                                        rtk->ssat[j - k].fix[f] = 1;
+                                        {
+                                            rtk->ssat[j - k].fix[f] = 1;
+                                        }
                                 }
                         }
                 }
@@ -1654,29 +1915,40 @@ void restamb(rtk_t *rtk, const double *bias, int nb __attribute((unused)), doubl
 
     trace(3, "restamb :\n");
 
-    for (i = 0; i < rtk->nx; i++) xa[i] = rtk->x[i];
-    for (i = 0; i < rtk->na; i++) xa[i] = rtk->xa[i];
+    for (i = 0; i < rtk->nx; i++)
+        {
+            xa[i] = rtk->x[i];
+        }
+    for (i = 0; i < rtk->na; i++)
+        {
+            xa[i] = rtk->xa[i];
+        }
 
     for (m = 0; m < 4; m++)
-        for (f = 0; f < nf; f++)
-            {
-                for (n = i = 0; i < MAXSAT; i++)
-                    {
-                        if (!test_sys(rtk->ssat[i].sys, m) || rtk->ssat[i].fix[f] != 2)
-                            {
-                                continue;
-                            }
-                        index[n++] = IB_RTK(i + 1, f, &rtk->opt);
-                    }
-                if (n < 2) continue;
+        {
+            for (f = 0; f < nf; f++)
+                {
+                    for (n = i = 0; i < MAXSAT; i++)
+                        {
+                            if (!test_sys(rtk->ssat[i].sys, m) || rtk->ssat[i].fix[f] != 2)
+                                {
+                                    continue;
+                                }
+                            index[n++] = IB_RTK(i + 1, f, &rtk->opt);
+                        }
+                    if (n < 2)
+                        {
+                            continue;
+                        }
 
-                xa[index[0]] = rtk->x[index[0]];
+                    xa[index[0]] = rtk->x[index[0]];
 
-                for (i = 1; i < n; i++)
-                    {
-                        xa[index[i]] = xa[index[0]] - bias[nv++];
-                    }
-            }
+                    for (i = 1; i < n; i++)
+                        {
+                            xa[index[i]] = xa[index[0]] - bias[nv++];
+                        }
+                }
+        }
 }
 
 
@@ -1692,32 +1964,37 @@ void holdamb(rtk_t *rtk, const double *xa)
     H = zeros(nb, rtk->nx);
 
     for (m = 0; m < 4; m++)
-        for (f = 0; f < nf; f++)
-            {
-                for (n = i = 0; i < MAXSAT; i++)
-                    {
-                        if (!test_sys(rtk->ssat[i].sys, m) || rtk->ssat[i].fix[f] != 2 ||
-                            rtk->ssat[i].azel[1] < rtk->opt.elmaskhold)
-                            {
-                                continue;
-                            }
-                        index[n++] = IB_RTK(i + 1, f, &rtk->opt);
-                        rtk->ssat[i].fix[f] = 3; /* hold */
-                    }
-                /* constraint to fixed ambiguity */
-                for (i = 1; i < n; i++)
-                    {
-                        v[nv] = (xa[index[0]] - xa[index[i]]) - (rtk->x[index[0]] - rtk->x[index[i]]);
+        {
+            for (f = 0; f < nf; f++)
+                {
+                    for (n = i = 0; i < MAXSAT; i++)
+                        {
+                            if (!test_sys(rtk->ssat[i].sys, m) || rtk->ssat[i].fix[f] != 2 ||
+                                rtk->ssat[i].azel[1] < rtk->opt.elmaskhold)
+                                {
+                                    continue;
+                                }
+                            index[n++] = IB_RTK(i + 1, f, &rtk->opt);
+                            rtk->ssat[i].fix[f] = 3; /* hold */
+                        }
+                    /* constraint to fixed ambiguity */
+                    for (i = 1; i < n; i++)
+                        {
+                            v[nv] = (xa[index[0]] - xa[index[i]]) - (rtk->x[index[0]] - rtk->x[index[i]]);
 
-                        H[index[0] + nv * rtk->nx] = 1.0;
-                        H[index[i] + nv * rtk->nx] = -1.0;
-                        nv++;
-                    }
-            }
+                            H[index[0] + nv * rtk->nx] = 1.0;
+                            H[index[i] + nv * rtk->nx] = -1.0;
+                            nv++;
+                        }
+                }
+        }
     if (nv > 0)
         {
             R = zeros(nv, nv);
-            for (i = 0; i < nv; i++) R[i + i * nv] = VAR_HOLDAMB;
+            for (i = 0; i < nv; i++)
+                {
+                    R[i + i * nv] = VAR_HOLDAMB;
+                }
 
             /* update states with constraints */
             if ((info = filter(rtk->x, rtk->P, H, v, R, rtk->nx, nv)))
@@ -1772,9 +2049,19 @@ int resamb_LAMBDA(rtk_t *rtk, double *bias, double *xa)
 
     /* phase-bias covariance (Qb) and real-parameters to bias covariance (Qab) */
     for (i = 0; i < nb; i++)
-        for (j = 0; j < nb; j++) Qb[i + j * nb] = Qy[na + i + (na + j) * ny];
+        {
+            for (j = 0; j < nb; j++)
+                {
+                    Qb[i + j * nb] = Qy[na + i + (na + j) * ny];
+                }
+        }
     for (i = 0; i < na; i++)
-        for (j = 0; j < nb; j++) Qab[i + j * na] = Qy[i + (na + j) * ny];
+        {
+            for (j = 0; j < nb; j++)
+                {
+                    Qab[i + j * na] = Qy[i + (na + j) * ny];
+                }
+        }
 
     trace(4, "N(0)=");
     tracemat(4, y + na, 1, nb, 10, 3);
@@ -1788,7 +2075,10 @@ int resamb_LAMBDA(rtk_t *rtk, double *bias, double *xa)
             tracemat(4, b + nb, 1, nb, 10, 3);
 
             rtk->sol.ratio = s[0] > 0 ? static_cast<float>(s[1] / s[0]) : 0.0f;
-            if (rtk->sol.ratio > 999.9) rtk->sol.ratio = 999.9f;
+            if (rtk->sol.ratio > 999.9)
+                {
+                    rtk->sol.ratio = 999.9f;
+                }
 
             /* validation by popular ratio-test */
             if (s[0] <= 0.0 || s[1] / s[0] >= opt->thresar[0])
@@ -1797,7 +2087,10 @@ int resamb_LAMBDA(rtk_t *rtk, double *bias, double *xa)
                     for (i = 0; i < na; i++)
                         {
                             rtk->xa[i] = rtk->x[i];
-                            for (j = 0; j < na; j++) rtk->Pa[i + j * na] = rtk->P[i + j * nx];
+                            for (j = 0; j < na; j++)
+                                {
+                                    rtk->Pa[i + j * na] = rtk->P[i + j * nx];
+                                }
                         }
                     for (i = 0; i < nb; i++)
                         {
@@ -1820,7 +2113,9 @@ int resamb_LAMBDA(rtk_t *rtk, double *bias, double *xa)
                             restamb(rtk, bias, nb, xa);
                         }
                     else
-                        nb = 0;
+                        {
+                            nb = 0;
+                        }
                 }
             else
                 { /* validation failed */
@@ -1864,7 +2159,10 @@ int valpos(rtk_t *rtk, const double *v, const double *R, const int *vflg,
     /* post-fit residual test */
     for (i = 0; i < nv; i++)
         {
-            if (v[i] * v[i] <= fact * R[i + i * nv]) continue;
+            if (v[i] * v[i] <= fact * R[i + i * nv])
+                {
+                    continue;
+                }
             sat1 = (vflg[i] >> 16) & 0xFF;
             sat2 = (vflg[i] >> 8) & 0xFF;
             type = (vflg[i] >> 4) & 0xF;
@@ -1922,7 +2220,10 @@ int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr,
     for (i = 0; i < MAXSAT; i++)
         {
             rtk->ssat[i].sys = satsys(i + 1, nullptr);
-            for (j = 0; j < NFREQ; j++) rtk->ssat[i].vsat[j] = rtk->ssat[i].snr[j] = 0;
+            for (j = 0; j < NFREQ; j++)
+                {
+                    rtk->ssat[i].vsat[j] = rtk->ssat[i].snr[j] = 0;
+                }
         }
     /* satellite positions/clocks */
     satposs(time, obs, n, nav, opt->sateph, rs, dts, var, svh);
@@ -2021,18 +2322,31 @@ int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr,
                     /* update ambiguity control struct */
                     rtk->sol.ns = 0;
                     for (i = 0; i < ns; i++)
-                        for (f = 0; f < nf; f++)
-                            {
-                                if (!rtk->ssat[sat[i] - 1].vsat[f]) continue;
-                                rtk->ssat[sat[i] - 1].lock[f]++;
-                                rtk->ssat[sat[i] - 1].outc[f] = 0;
-                                if (f == 0) rtk->sol.ns++; /* valid satellite count by L1 */
-                            }
+                        {
+                            for (f = 0; f < nf; f++)
+                                {
+                                    if (!rtk->ssat[sat[i] - 1].vsat[f])
+                                        {
+                                            continue;
+                                        }
+                                    rtk->ssat[sat[i] - 1].lock[f]++;
+                                    rtk->ssat[sat[i] - 1].outc[f] = 0;
+                                    if (f == 0)
+                                        {
+                                            rtk->sol.ns++; /* valid satellite count by L1 */
+                                        }
+                                }
+                        }
                     /* lack of valid satellites */
-                    if (rtk->sol.ns < 4) stat = SOLQ_NONE;
+                    if (rtk->sol.ns < 4)
+                        {
+                            stat = SOLQ_NONE;
+                        }
                 }
             else
-                stat = SOLQ_NONE;
+                {
+                    stat = SOLQ_NONE;
+                }
         }
     /* resolve integer ambiguity by WL-NL */
     if (stat != SOLQ_NONE && rtk->opt.modear == ARMODE_WLNL)
@@ -2097,24 +2411,39 @@ int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr,
             rtk->nfix = 0;
         }
     for (i = 0; i < n; i++)
-        for (j = 0; j < nf; j++)
-            {
-                if (obs[i].L[j] == 0.0) continue;
-                rtk->ssat[obs[i].sat - 1].pt[obs[i].rcv - 1][j] = obs[i].time;
-                rtk->ssat[obs[i].sat - 1].ph[obs[i].rcv - 1][j] = obs[i].L[j];
-            }
+        {
+            for (j = 0; j < nf; j++)
+                {
+                    if (obs[i].L[j] == 0.0)
+                        {
+                            continue;
+                        }
+                    rtk->ssat[obs[i].sat - 1].pt[obs[i].rcv - 1][j] = obs[i].time;
+                    rtk->ssat[obs[i].sat - 1].ph[obs[i].rcv - 1][j] = obs[i].L[j];
+                }
+        }
     for (i = 0; i < ns; i++)
-        for (j = 0; j < nf; j++)
-            {
-                /* output snr of rover receiver */
-                rtk->ssat[sat[i] - 1].snr[j] = obs[iu[i]].SNR[j];
-            }
+        {
+            for (j = 0; j < nf; j++)
+                {
+                    /* output snr of rover receiver */
+                    rtk->ssat[sat[i] - 1].snr[j] = obs[iu[i]].SNR[j];
+                }
+        }
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < nf; j++)
-            {
-                if (rtk->ssat[i].fix[j] == 2 && stat != SOLQ_FIX) rtk->ssat[i].fix[j] = 1;
-                if (rtk->ssat[i].slip[j] & 1) rtk->ssat[i].slipc[j]++;
-            }
+        {
+            for (j = 0; j < nf; j++)
+                {
+                    if (rtk->ssat[i].fix[j] == 2 && stat != SOLQ_FIX)
+                        {
+                            rtk->ssat[i].fix[j] = 1;
+                        }
+                    if (rtk->ssat[i].slip[j] & 1)
+                        {
+                            rtk->ssat[i].slipc[j]++;
+                        }
+                }
+        }
     free(rs);
     free(dts);
     free(var);
@@ -2129,7 +2458,10 @@ int relpos(rtk_t *rtk, const obsd_t *obs, int nu, int nr,
     free(R);
     free(bias);
 
-    if (stat != SOLQ_NONE) rtk->sol.stat = stat;
+    if (stat != SOLQ_NONE)
+        {
+            rtk->sol.stat = stat;
+        }
 
     return stat != SOLQ_NONE;
 }
@@ -2151,7 +2483,10 @@ void rtkinit(rtk_t *rtk, const prcopt_t *opt)
     trace(3, "rtkinit :\n");
 
     rtk->sol = sol0;
-    for (i = 0; i < 6; i++) rtk->rb[i] = 0.0;
+    for (i = 0; i < 6; i++)
+        {
+            rtk->rb[i] = 0.0;
+        }
     rtk->nx = opt->mode <= PMODE_FIXED ? NX_RTK(opt) : pppnx(opt);
     rtk->na = opt->mode <= PMODE_FIXED ? NR_RTK(opt) : pppnx(opt);
     rtk->tt = 0.0;
@@ -2165,7 +2500,10 @@ void rtkinit(rtk_t *rtk, const prcopt_t *opt)
             rtk->ambc[i] = ambc0;
             rtk->ssat[i] = ssat0;
         }
-    for (i = 0; i < MAXERRMSG; i++) rtk->errbuf[i] = 0;
+    for (i = 0; i < MAXERRMSG; i++)
+        {
+            rtk->errbuf[i] = 0;
+        }
     rtk->opt = *opt;
 }
 
@@ -2266,13 +2604,20 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
     if (opt->refpos <= POSOPT_RINEX && opt->mode != PMODE_SINGLE &&
         opt->mode != PMODE_MOVEB)
         {
-            for (i = 0; i < 6; i++) rtk->rb[i] = i < 3 ? opt->rb[i] : 0.0;
+            for (i = 0; i < 6; i++)
+                {
+                    rtk->rb[i] = i < 3 ? opt->rb[i] : 0.0;
+                }
         }
     /* count rover/base station observations */
     for (nu = 0; nu < n && obs[nu].rcv == 1; nu++)
-        ;
+        {
+            ;
+        }
     for (nr = 0; nu + nr < n && obs[nu + nr].rcv == 2; nr++)
-        ;
+        {
+            ;
+        }
 
     time = rtk->sol.time; /* previous epoch */
 
@@ -2286,7 +2631,10 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
                     return 0;
                 }
         }
-    if (time.time != 0) rtk->tt = timediff(rtk->sol.time, time);
+    if (time.time != 0)
+        {
+            rtk->tt = timediff(rtk->sol.time, time);
+        }
 
     /* single point positioning */
     if (opt->mode == PMODE_SINGLE)
@@ -2329,10 +2677,16 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
                     errmsg(rtk, "time sync error for moving-base (age=%.1f)\n", rtk->sol.age);
                     return 0;
                 }
-            for (i = 0; i < 6; i++) rtk->rb[i] = solb.rr[i];
+            for (i = 0; i < 6; i++)
+                {
+                    rtk->rb[i] = solb.rr[i];
+                }
 
             /* time-synchronized position of base station */
-            for (i = 0; i < 3; i++) rtk->rb[i] += rtk->rb[i + 3] * rtk->sol.age;
+            for (i = 0; i < 3; i++)
+                {
+                    rtk->rb[i] += rtk->rb[i + 3] * rtk->sol.age;
+                }
         }
     else
         {
diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
index ba21c3359..a86425dbb 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
@@ -78,10 +78,12 @@ void updatenav(nav_t *nav)
 {
     int i, j;
     for (i = 0; i < MAXSAT; i++)
-        for (j = 0; j < NFREQ; j++)
-            {
-                nav->lam[i][j] = satwavelen(i + 1, j, nav);
-            }
+        {
+            for (j = 0; j < NFREQ; j++)
+                {
+                    nav->lam[i][j] = satwavelen(i + 1, j, nav);
+                }
+        }
 }
 
 
@@ -96,14 +98,23 @@ void updatefcn(rtksvr_t *svr)
 
             for (j = 0, frq = -999; j < 3; j++)
                 {
-                    if (svr->raw[j].nav.geph[i].sat != sat) continue;
+                    if (svr->raw[j].nav.geph[i].sat != sat)
+                        {
+                            continue;
+                        }
                     frq = svr->raw[j].nav.geph[i].frq;
                 }
-            if (frq < -7 || frq > 6) continue;
+            if (frq < -7 || frq > 6)
+                {
+                    continue;
+                }
 
             for (j = 0; j < 3; j++)
                 {
-                    if (svr->raw[j].nav.geph[i].sat == sat) continue;
+                    if (svr->raw[j].nav.geph[i].sat == sat)
+                        {
+                            continue;
+                        }
                     svr->raw[j].nav.geph[i].sat = sat;
                     svr->raw[j].nav.geph[i].frq = frq;
                 }
@@ -130,7 +141,10 @@ void updatesvr(rtksvr_t *svr, int ret, obs_t *obs, nav_t *nav, int sat,
                     for (i = 0; i < obs->n; i++)
                         {
                             if (svr->rtk.opt.exsats[obs->data[i].sat - 1] == 1 ||
-                                !(satsys(obs->data[i].sat, nullptr) & svr->rtk.opt.navsys)) continue;
+                                !(satsys(obs->data[i].sat, nullptr) & svr->rtk.opt.navsys))
+                                {
+                                    continue;
+                                }
                             svr->obs[index][iobs].data[n] = obs->data[i];
                             svr->obs[index][iobs].data[n++].rcv = index + 1;
                         }
@@ -189,7 +203,10 @@ void updatesvr(rtksvr_t *svr, int ret, obs_t *obs, nav_t *nav, int sat,
                         }
                     else
                         {
-                            for (i = 0; i < MAXSBSMSG - 1; i++) svr->sbsmsg[i] = svr->sbsmsg[i + 1];
+                            for (i = 0; i < MAXSBSMSG - 1; i++)
+                                {
+                                    svr->sbsmsg[i] = svr->sbsmsg[i + 1];
+                                }
                             svr->sbsmsg[i] = *sbsmsg;
                         }
                     sbsupdatecorr(sbsmsg, &svr->nav);
@@ -200,12 +217,30 @@ void updatesvr(rtksvr_t *svr, int ret, obs_t *obs, nav_t *nav, int sat,
         { /* ion/utc parameters */
             if (svr->navsel == index || svr->navsel >= 3)
                 {
-                    for (i = 0; i < 8; i++) svr->nav.ion_gps[i] = nav->ion_gps[i];
-                    for (i = 0; i < 4; i++) svr->nav.utc_gps[i] = nav->utc_gps[i];
-                    for (i = 0; i < 4; i++) svr->nav.ion_gal[i] = nav->ion_gal[i];
-                    for (i = 0; i < 4; i++) svr->nav.utc_gal[i] = nav->utc_gal[i];
-                    for (i = 0; i < 8; i++) svr->nav.ion_qzs[i] = nav->ion_qzs[i];
-                    for (i = 0; i < 4; i++) svr->nav.utc_qzs[i] = nav->utc_qzs[i];
+                    for (i = 0; i < 8; i++)
+                        {
+                            svr->nav.ion_gps[i] = nav->ion_gps[i];
+                        }
+                    for (i = 0; i < 4; i++)
+                        {
+                            svr->nav.utc_gps[i] = nav->utc_gps[i];
+                        }
+                    for (i = 0; i < 4; i++)
+                        {
+                            svr->nav.ion_gal[i] = nav->ion_gal[i];
+                        }
+                    for (i = 0; i < 4; i++)
+                        {
+                            svr->nav.utc_gal[i] = nav->utc_gal[i];
+                        }
+                    for (i = 0; i < 8; i++)
+                        {
+                            svr->nav.ion_qzs[i] = nav->ion_qzs[i];
+                        }
+                    for (i = 0; i < 4; i++)
+                        {
+                            svr->nav.utc_qzs[i] = nav->utc_qzs[i];
+                        }
                     svr->nav.leaps = nav->leaps;
                 }
             svr->nmsg[index][2]++;
@@ -248,7 +283,10 @@ void updatesvr(rtksvr_t *svr, int ret, obs_t *obs, nav_t *nav, int sat,
         { /* ssr message */
             for (i = 0; i < MAXSAT; i++)
                 {
-                    if (!svr->rtcm[index].ssr[i].update) continue;
+                    if (!svr->rtcm[index].ssr[i].update)
+                        {
+                            continue;
+                        }
                     svr->rtcm[index].ssr[i].update = 0;
 
                     iode = svr->rtcm[index].ssr[i].iode;
@@ -333,15 +371,22 @@ int decoderaw(rtksvr_t *svr, int index)
                 }
 #endif
             /* update rtk server */
-            if (ret > 0) updatesvr(svr, ret, obs, nav, sat, sbsmsg, index, fobs);
+            if (ret > 0)
+                {
+                    updatesvr(svr, ret, obs, nav, sat, sbsmsg, index, fobs);
+                }
 
             /* observation data received */
             if (ret == 1)
                 {
                     if (fobs < MAXOBSBUF)
-                        fobs++;
+                        {
+                            fobs++;
+                        }
                     else
-                        svr->prcout++;
+                        {
+                            svr->prcout++;
+                        }
                 }
         }
     svr->nb[index] = 0;
@@ -360,7 +405,9 @@ void decodefile(rtksvr_t *svr, int index)
 
     // Allocate space for GLONASS frequency channels depending on availability
     for (i = 0; i < MAXPRNGLO + 1; i++)
-        glo_fcn[i] = '0';
+        {
+            glo_fcn[i] = '0';
+        }
     pcv_t pcvt0[MAXSAT] = {{0, {'0'}, {'0'}, {0, 0.0}, {0, 0.0}, {{0.0}, {0.0}}, {{0.0}, {0.0}}}};
     sbsfcorr_t sbsfcorr0 = {{0, 0.0}, 0.0, 0.0, 0.0, 0, 0, 0};
     sbslcorr_t sbslcorr0 = {{0, 0.0}, 0, {0.0}, {0.0}, 0.0, 0.0};
@@ -413,7 +460,10 @@ void decodefile(rtksvr_t *svr, int index)
             /* update precise ephemeris */
             rtksvrlock(svr);
 
-            if (svr->nav.peph) free(svr->nav.peph);
+            if (svr->nav.peph)
+                {
+                    free(svr->nav.peph);
+                }
             svr->nav.ne = svr->nav.nemax = nav.ne;
             svr->nav.peph = nav.peph;
             svr->ftime[index] = utc2gpst(timeget());
@@ -433,7 +483,10 @@ void decodefile(rtksvr_t *svr, int index)
             /* update precise clock */
             rtksvrlock(svr);
 
-            if (svr->nav.pclk) free(svr->nav.pclk);
+            if (svr->nav.pclk)
+                {
+                    free(svr->nav.pclk);
+                }
             svr->nav.nc = svr->nav.ncmax = nav.nc;
             svr->nav.pclk = nav.pclk;
             svr->ftime[index] = utc2gpst(timeget());
@@ -555,12 +608,18 @@ void *rtksvrthread(void *arg)
                         }
                     ticknmea = tick;
                 }
-            if ((cputime = static_cast<int>(tickget() - tick)) > 0) svr->cputime = cputime;
+            if ((cputime = static_cast<int>(tickget() - tick)) > 0)
+                {
+                    svr->cputime = cputime;
+                }
 
             /* sleep until next cycle */
             sleepms(svr->cycle - cputime);
         }
-    for (i = 0; i < MAXSTRRTK; i++) strclose(svr->stream + i);
+    for (i = 0; i < MAXSTRRTK; i++)
+        {
+            strclose(svr->stream + i);
+        }
     for (i = 0; i < 3; i++)
         {
             svr->nb[i] = svr->npb[i] = 0;
@@ -602,23 +661,64 @@ int rtksvrinit(rtksvr_t *svr)
     tracet(3, "rtksvrinit:\n");
 
     svr->state = svr->cycle = svr->nmeacycle = svr->nmeareq = 0;
-    for (i = 0; i < 3; i++) svr->nmeapos[i] = 0.0;
+    for (i = 0; i < 3; i++)
+        {
+            svr->nmeapos[i] = 0.0;
+        }
     svr->buffsize = 0;
-    for (i = 0; i < 3; i++) svr->format[i] = 0;
-    for (i = 0; i < 2; i++) svr->solopt[i] = solopt_default;
+    for (i = 0; i < 3; i++)
+        {
+            svr->format[i] = 0;
+        }
+    for (i = 0; i < 2; i++)
+        {
+            svr->solopt[i] = solopt_default;
+        }
     svr->navsel = svr->nsbs = svr->nsol = 0;
     rtkinit(&svr->rtk, &prcopt_default);
-    for (i = 0; i < 3; i++) svr->nb[i] = 0;
-    for (i = 0; i < 2; i++) svr->nsb[i] = 0;
-    for (i = 0; i < 3; i++) svr->npb[i] = 0;
-    for (i = 0; i < 3; i++) svr->buff[i] = nullptr;
-    for (i = 0; i < 2; i++) svr->sbuf[i] = nullptr;
-    for (i = 0; i < 3; i++) svr->pbuf[i] = nullptr;
-    for (i = 0; i < MAXSOLBUF; i++) svr->solbuf[i] = sol0;
     for (i = 0; i < 3; i++)
-        for (j = 0; j < 10; j++) svr->nmsg[i][j] = 0;
-    for (i = 0; i < 3; i++) svr->ftime[i] = time0;
-    for (i = 0; i < 3; i++) svr->files[i][0] = '\0';
+        {
+            svr->nb[i] = 0;
+        }
+    for (i = 0; i < 2; i++)
+        {
+            svr->nsb[i] = 0;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            svr->npb[i] = 0;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            svr->buff[i] = nullptr;
+        }
+    for (i = 0; i < 2; i++)
+        {
+            svr->sbuf[i] = nullptr;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            svr->pbuf[i] = nullptr;
+        }
+    for (i = 0; i < MAXSOLBUF; i++)
+        {
+            svr->solbuf[i] = sol0;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            for (j = 0; j < 10; j++)
+                {
+                    svr->nmsg[i][j] = 0;
+                }
+        }
+    for (i = 0; i < 3; i++)
+        {
+            svr->ftime[i] = time0;
+        }
+    for (i = 0; i < 3; i++)
+        {
+            svr->files[i][0] = '\0';
+        }
     svr->moni = nullptr;
     svr->tick = 0;
     svr->thread = 0;  // NOLINT
@@ -631,28 +731,42 @@ int rtksvrinit(rtksvr_t *svr)
             tracet(1, "rtksvrinit: malloc error\n");
             return 0;
         }
-    for (i = 0; i < MAXSAT * 2; i++) svr->nav.eph[i] = eph0;
-    for (i = 0; i < NSATGLO * 2; i++) svr->nav.geph[i] = geph0;
-    for (i = 0; i < NSATSBS * 2; i++) svr->nav.seph[i] = seph0;
+    for (i = 0; i < MAXSAT * 2; i++)
+        {
+            svr->nav.eph[i] = eph0;
+        }
+    for (i = 0; i < NSATGLO * 2; i++)
+        {
+            svr->nav.geph[i] = geph0;
+        }
+    for (i = 0; i < NSATSBS * 2; i++)
+        {
+            svr->nav.seph[i] = seph0;
+        }
     svr->nav.n = MAXSAT * 2;
     svr->nav.ng = NSATGLO * 2;
     svr->nav.ns = NSATSBS * 2;
 
     for (i = 0; i < 3; i++)
-        for (j = 0; j < MAXOBSBUF; j++)
-            {
-                if (!(svr->obs[i][j].data = static_cast<obsd_t *>(malloc(sizeof(obsd_t) * MAXOBS))))
-                    {
-                        tracet(1, "rtksvrinit: malloc error\n");
-                        return 0;
-                    }
-            }
+        {
+            for (j = 0; j < MAXOBSBUF; j++)
+                {
+                    if (!(svr->obs[i][j].data = static_cast<obsd_t *>(malloc(sizeof(obsd_t) * MAXOBS))))
+                        {
+                            tracet(1, "rtksvrinit: malloc error\n");
+                            return 0;
+                        }
+                }
+        }
     for (i = 0; i < 3; i++)
         {
             memset(svr->raw + i, 0, sizeof(raw_t));
             memset(svr->rtcm + i, 0, sizeof(rtcm_t));
         }
-    for (i = 0; i < MAXSTRRTK; i++) strinit(svr->stream + i);
+    for (i = 0; i < MAXSTRRTK; i++)
+        {
+            strinit(svr->stream + i);
+        }
 
     initlock(&svr->lock);
 
@@ -673,10 +787,12 @@ void rtksvrfree(rtksvr_t *svr)
     free(svr->nav.geph);
     free(svr->nav.seph);
     for (i = 0; i < 3; i++)
-        for (j = 0; j < MAXOBSBUF; j++)
-            {
-                free(svr->obs[i][j].data);
-            }
+        {
+            for (j = 0; j < MAXOBSBUF; j++)
+                {
+                    free(svr->obs[i][j].data);
+                }
+        }
 }
 
 
@@ -742,15 +858,24 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs,
     tracet(3, "rtksvrstart: cycle=%d buffsize=%d navsel=%d nmeacycle=%d nmeareq=%d\n",
         cycle, buffsize, navsel, nmeacycle, nmeareq);
 
-    if (svr->state) return 0;
+    if (svr->state)
+        {
+            return 0;
+        }
 
     strinitcom();
     svr->cycle = cycle > 1 ? cycle : 1;
     svr->nmeacycle = nmeacycle > 1000 ? nmeacycle : 1000;
     svr->nmeareq = nmeareq;
-    for (i = 0; i < 3; i++) svr->nmeapos[i] = nmeapos[i];
+    for (i = 0; i < 3; i++)
+        {
+            svr->nmeapos[i] = nmeapos[i];
+        }
     svr->buffsize = buffsize > 4096 ? buffsize : 4096;
-    for (i = 0; i < 3; i++) svr->format[i] = formats[i];
+    for (i = 0; i < 3; i++)
+        {
+            svr->format[i] = formats[i];
+        }
     svr->navsel = navsel;
     svr->nsbs = 0;
     svr->nsol = 0;
@@ -767,16 +892,28 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs,
                     tracet(1, "rtksvrstart: malloc error\n");
                     return 0;
                 }
-            for (j = 0; j < 10; j++) svr->nmsg[i][j] = 0;
-            for (j = 0; j < MAXOBSBUF; j++) svr->obs[i][j].n = 0;
+            for (j = 0; j < 10; j++)
+                {
+                    svr->nmsg[i][j] = 0;
+                }
+            for (j = 0; j < MAXOBSBUF; j++)
+                {
+                    svr->obs[i][j].n = 0;
+                }
 
             /* initialize receiver raw and rtcm control */
             //init_raw (svr->raw +i);
             init_rtcm(svr->rtcm + i);
 
             /* set receiver and rtcm option */
-            if (strlen(rcvopts[i]) < 256) strcpy(svr->raw[i].opt, rcvopts[i]);
-            if (strlen(rcvopts[i]) < 256) strcpy(svr->rtcm[i].opt, rcvopts[i]);
+            if (strlen(rcvopts[i]) < 256)
+                {
+                    strcpy(svr->raw[i].opt, rcvopts[i]);
+                }
+            if (strlen(rcvopts[i]) < 256)
+                {
+                    strcpy(svr->rtcm[i].opt, rcvopts[i]);
+                }
 
             /* connect dgps corrections */
             svr->rtcm[i].dgps = svr->nav.dgps;
@@ -800,9 +937,18 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs,
             svr->rtk.rb[i] = i < 3 ? prcopt->rb[i] : 0.0;
         }
     /* update navigation data */
-    for (i = 0; i < MAXSAT * 2; i++) svr->nav.eph[i].ttr = time0;
-    for (i = 0; i < NSATGLO * 2; i++) svr->nav.geph[i].tof = time0;
-    for (i = 0; i < NSATSBS * 2; i++) svr->nav.seph[i].tof = time0;
+    for (i = 0; i < MAXSAT * 2; i++)
+        {
+            svr->nav.eph[i].ttr = time0;
+        }
+    for (i = 0; i < NSATGLO * 2; i++)
+        {
+            svr->nav.geph[i].tof = time0;
+        }
+    for (i = 0; i < NSATSBS * 2; i++)
+        {
+            svr->nav.seph[i].tof = time0;
+        }
     updatenav(&svr->nav);
 
     /* set monitor stream */
@@ -812,10 +958,16 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs,
     for (i = 0; i < 8; i++)
         {
             rw = i < 3 ? STR_MODE_R : STR_MODE_W;
-            if (strs[i] != STR_FILE) rw |= STR_MODE_W;
+            if (strs[i] != STR_FILE)
+                {
+                    rw |= STR_MODE_W;
+                }
             if (!stropen(svr->stream + i, strs[i], rw, paths[i]))
                 {
-                    for (i--; i >= 0; i--) strclose(svr->stream + i);
+                    for (i--; i >= 0; i--)
+                        {
+                            strclose(svr->stream + i);
+                        }
                     return 0;
                 }
             /* set initial time for rtcm and raw */
@@ -833,7 +985,10 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs,
     /* write start commands to input streams */
     for (i = 0; i < 3; i++)
         {
-            if (cmds[i]) strsendcmd(svr->stream + i, cmds[i]);
+            if (cmds[i])
+                {
+                    strsendcmd(svr->stream + i, cmds[i]);
+                }
         }
     /* write solution header to solution streams */
     for (i = 3; i < 5; i++)
@@ -843,7 +998,10 @@ int rtksvrstart(rtksvr_t *svr, int cycle, int buffsize, int *strs,
     /* create rtk server thread */
     if (pthread_create(&svr->thread, nullptr, rtksvrthread, svr))
         {
-            for (i = 0; i < MAXSTRRTK; i++) strclose(svr->stream + i);
+            for (i = 0; i < MAXSTRRTK; i++)
+                {
+                    strclose(svr->stream + i);
+                }
             return 0;
         }
     return 1;
@@ -869,7 +1027,10 @@ void rtksvrstop(rtksvr_t *svr, char **cmds)
     rtksvrlock(svr);
     for (i = 0; i < 3; i++)
         {
-            if (cmds[i]) strsendcmd(svr->stream + i, cmds[i]);
+            if (cmds[i])
+                {
+                    strsendcmd(svr->stream + i, cmds[i]);
+                }
         }
     rtksvrunlock(svr);
 
@@ -897,7 +1058,10 @@ int rtksvropenstr(rtksvr_t *svr, int index, int str, const char *path,
 {
     tracet(3, "rtksvropenstr: index=%d str=%d path=%s\n", index, str, path);
 
-    if (index < 3 || index > 7 || !svr->state) return 0;
+    if (index < 3 || index > 7 || !svr->state)
+        {
+            return 0;
+        }
 
     rtksvrlock(svr);
 
@@ -936,7 +1100,10 @@ void rtksvrclosestr(rtksvr_t *svr, int index)
 {
     tracet(3, "rtksvrclosestr: index=%d\n", index);
 
-    if (index < 3 || index > 7 || !svr->state) return;
+    if (index < 3 || index > 7 || !svr->state)
+        {
+            return;
+        }
 
     rtksvrlock(svr);
 
@@ -966,7 +1133,10 @@ int rtksvrostat(rtksvr_t *svr, int rcv, gtime_t *time, int *sat,
 
     tracet(4, "rtksvrostat: rcv=%d\n", rcv);
 
-    if (!svr->state) return 0;
+    if (!svr->state)
+        {
+            return 0;
+        }
     rtksvrlock(svr);
     ns = svr->obs[rcv][0].n;
     if (ns > 0)
@@ -1014,7 +1184,10 @@ void rtksvrsstat(rtksvr_t *svr, int *sstat, char *msg)
     for (i = 0; i < MAXSTRRTK; i++)
         {
             sstat[i] = strstat(svr->stream + i, s);
-            if (*s) p += sprintf(p, "(%d) %s ", i + 1, s);
+            if (*s)
+                {
+                    p += sprintf(p, "(%d) %s ", i + 1, s);
+                }
         }
     rtksvrunlock(svr);
 }
diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.cc b/src/algorithms/libs/rtklib/rtklib_sbas.cc
index 9a780f3ac..4f63cb40a 100644
--- a/src/algorithms/libs/rtklib/rtklib_sbas.cc
+++ b/src/algorithms/libs/rtklib/rtklib_sbas.cc
@@ -67,7 +67,12 @@
 char *getfield(char *p, int pos)
 {
     for (pos--; pos > 0; pos--, p++)
-        if (!(p = strchr(p, ','))) return nullptr;
+        {
+            if (!(p = strchr(p, ',')))
+                {
+                    return nullptr;
+                }
+        }
     return p;
 }
 
@@ -114,21 +119,37 @@ int decode_sbstype1(const sbsmsg_t *msg, sbssat_t *sbssat)
             if (getbitu(msg->msg, 13 + i, 1))
                 {
                     if (i <= 37)
-                        sat = satno(SYS_GPS, i); /*   0- 37: gps */
+                        {
+                            sat = satno(SYS_GPS, i); /*   0- 37: gps */
+                        }
                     else if (i <= 61)
-                        sat = satno(SYS_GLO, i - 37); /*  38- 61: glonass */
+                        {
+                            sat = satno(SYS_GLO, i - 37); /*  38- 61: glonass */
+                        }
                     else if (i <= 119)
-                        sat = 0; /*  62-119: future gnss */
+                        {
+                            sat = 0; /*  62-119: future gnss */
+                        }
                     else if (i <= 138)
-                        sat = satno(SYS_SBS, i); /* 120-138: geo/waas */
+                        {
+                            sat = satno(SYS_SBS, i); /* 120-138: geo/waas */
+                        }
                     else if (i <= 182)
-                        sat = 0; /* 139-182: reserved */
+                        {
+                            sat = 0; /* 139-182: reserved */
+                        }
                     else if (i <= 192)
-                        sat = satno(SYS_SBS, i + 10); /* 183-192: qzss ref [2] */
+                        {
+                            sat = satno(SYS_SBS, i + 10); /* 183-192: qzss ref [2] */
+                        }
                     else if (i <= 202)
-                        sat = satno(SYS_QZS, i); /* 193-202: qzss ref [2] */
+                        {
+                            sat = satno(SYS_QZS, i); /* 193-202: qzss ref [2] */
+                        }
                     else
-                        sat = 0; /* 203-   : reserved */
+                        {
+                            sat = 0; /* 203-   : reserved */
+                        }
                     sbssat->sat[n++].sat = sat;
                 }
         }
@@ -149,14 +170,20 @@ int decode_sbstype2(const sbsmsg_t *msg, sbssat_t *sbssat)
 
     trace(4, "decode_sbstype2:\n");
 
-    if (sbssat->iodp != static_cast<int>(getbitu(msg->msg, 16, 2))) return 0;
+    if (sbssat->iodp != static_cast<int>(getbitu(msg->msg, 16, 2)))
+        {
+            return 0;
+        }
 
     type = getbitu(msg->msg, 8, 6);
     iodf = getbitu(msg->msg, 14, 2);
 
     for (i = 0; i < 13; i++)
         {
-            if ((j = 13 * ((type == 0 ? 2 : type) - 2) + i) >= sbssat->nsat) break;
+            if ((j = 13 * ((type == 0 ? 2 : type) - 2) + i) >= sbssat->nsat)
+                {
+                    break;
+                }
             udre = getbitu(msg->msg, 174 + 4 * i, 4);
             t0 = sbssat->sat[j].fcorr.t0;
             prc = sbssat->sat[j].fcorr.prc;
@@ -194,7 +221,10 @@ int decode_sbstype6(const sbsmsg_t *msg, sbssat_t *sbssat)
         }
     for (i = 0; i < sbssat->nsat && i < MAXSAT; i++)
         {
-            if (sbssat->sat[i].fcorr.iodf != iodf[i / 28]) continue;
+            if (sbssat->sat[i].fcorr.iodf != iodf[i / 28])
+                {
+                    continue;
+                }
             udre = getbitu(msg->msg, 22 + i * 4, 4);
             sbssat->sat[i].fcorr.udre = udre + 1;
         }
@@ -210,7 +240,10 @@ int decode_sbstype7(const sbsmsg_t *msg, sbssat_t *sbssat)
 
     trace(4, "decode_sbstype7\n");
 
-    if (sbssat->iodp != static_cast<int>(getbitu(msg->msg, 18, 2))) return 0;
+    if (sbssat->iodp != static_cast<int>(getbitu(msg->msg, 18, 2)))
+        {
+            return 0;
+        }
 
     sbssat->tlat = getbitu(msg->msg, 14, 4);
 
@@ -237,9 +270,13 @@ int decode_sbstype9(const sbsmsg_t *msg, nav_t *nav)
         }
     t = static_cast<int>(getbitu(msg->msg, 22, 13)) * 16 - msg->tow % 86400;
     if (t <= -43200)
-        t += 86400;
+        {
+            t += 86400;
+        }
     else if (t > 43200)
-        t -= 86400;
+        {
+            t -= 86400;
+        }
     seph.sat = sat;
     seph.t0 = gpst2time(msg->week, msg->tow + t);
     seph.tof = gpst2time(msg->week, msg->tow);
@@ -291,16 +328,24 @@ int decode_sbstype18(const sbsmsg_t *msg, sbsion_t *sbsion)
             m = 5;
         }
     else
-        return 0;
+        {
+            return 0;
+        }
 
     sbsion[band].iodi = static_cast<int16_t>(getbitu(msg->msg, 22, 2));
 
     for (i = 1, n = 0; i <= 201; i++)
         {
-            if (!getbitu(msg->msg, 23 + i, 1)) continue;
+            if (!getbitu(msg->msg, 23 + i, 1))
+                {
+                    continue;
+                }
             for (j = 0; j < m; j++)
                 {
-                    if (i < p[j].bits || p[j].bite < i) continue;
+                    if (i < p[j].bits || p[j].bite < i)
+                        {
+                            continue;
+                        }
                     sbsion[band].igp[n].lat = band <= 8 ? p[j].y[i - p[j].bits] : p[j].x;
                     sbsion[band].igp[n++].lon = band <= 8 ? p[j].x : p[j].y[i - p[j].bits];
                     break;
@@ -320,7 +365,10 @@ int decode_longcorr0(const sbsmsg_t *msg, int p, sbssat_t *sbssat)
 
     trace(4, "decode_longcorr0:\n");
 
-    if (n == 0 || n > MAXSAT) return 0;
+    if (n == 0 || n > MAXSAT)
+        {
+            return 0;
+        }
 
     sbssat->sat[n - 1].lcorr.iode = getbitu(msg->msg, p + 6, 8);
 
@@ -345,7 +393,10 @@ int decode_longcorr1(const sbsmsg_t *msg, int p, sbssat_t *sbssat)
 
     trace(4, "decode_longcorr1:\n");
 
-    if (n == 0 || n > MAXSAT) return 0;
+    if (n == 0 || n > MAXSAT)
+        {
+            return 0;
+        }
 
     sbssat->sat[n - 1].lcorr.iode = getbitu(msg->msg, p + 6, 8);
 
@@ -358,9 +409,13 @@ int decode_longcorr1(const sbsmsg_t *msg, int p, sbssat_t *sbssat)
     sbssat->sat[n - 1].lcorr.daf1 = getbits(msg->msg, p + 82, 8) * TWO_N39;
     t = static_cast<int>(getbitu(msg->msg, p + 90, 13)) * 16 - msg->tow % 86400;
     if (t <= -43200)
-        t += 86400;
+        {
+            t += 86400;
+        }
     else if (t > 43200)
-        t -= 86400;
+        {
+            t -= 86400;
+        }
     sbssat->sat[n - 1].lcorr.t0 = gpst2time(msg->week, msg->tow + t);
 
     trace(5, "decode_longcorr1: sat=%2d\n", sbssat->sat[n - 1].sat);
@@ -396,14 +451,20 @@ int decode_sbstype24(const sbsmsg_t *msg, sbssat_t *sbssat)
 
     trace(4, "decode_sbstype24:\n");
 
-    if (sbssat->iodp != static_cast<int>(getbitu(msg->msg, 110, 2))) return 0; /* check IODP */
+    if (sbssat->iodp != static_cast<int>(getbitu(msg->msg, 110, 2)))
+        {
+            return 0; /* check IODP */
+        }
 
     blk = getbitu(msg->msg, 112, 2);
     iodf = getbitu(msg->msg, 114, 2);
 
     for (i = 0; i < 6; i++)
         {
-            if ((j = 13 * blk + i) >= sbssat->nsat) break;
+            if ((j = 13 * blk + i) >= sbssat->nsat)
+                {
+                    break;
+                }
             udre = getbitu(msg->msg, 86 + 4 * i, 4);
 
             sbssat->sat[j].fcorr.t0 = gpst2time(msg->week, msg->tow);
@@ -431,13 +492,19 @@ int decode_sbstype26(const sbsmsg_t *msg, sbsion_t *sbsion)
 
     trace(4, "decode_sbstype26:\n");
 
-    if (band > MAXBAND || sbsion[band].iodi != static_cast<int>(getbitu(msg->msg, 217, 2))) return 0;
+    if (band > MAXBAND || sbsion[band].iodi != static_cast<int>(getbitu(msg->msg, 217, 2)))
+        {
+            return 0;
+        }
 
     block = getbitu(msg->msg, 18, 4);
 
     for (i = 0; i < 15; i++)
         {
-            if ((j = block * 15 + i) >= sbsion[band].nigp) continue;
+            if ((j = block * 15 + i) >= sbsion[band].nigp)
+                {
+                    continue;
+                }
             give = getbitu(msg->msg, 22 + i * 13 + 9, 4);
 
             delay = getbitu(msg->msg, 22 + i * 13, 9);
@@ -470,7 +537,10 @@ int sbsupdatecorr(const sbsmsg_t *msg, nav_t *nav)
 
     trace(3, "sbsupdatecorr: type=%d\n", type);
 
-    if (msg->week == 0) return -1;
+    if (msg->week == 0)
+        {
+            return -1;
+        }
 
     switch (type)
         {
@@ -551,27 +621,62 @@ void readmsgs(const char *file, int sel, gtime_t ts, gtime_t te,
                 }
             else if (!strncmp(buff, "#RAWWAASFRAMEA", 14))
                 { /* NovAtel OEM4/V */
-                    if (!(p = getfield(buff, 6))) continue;
-                    if (sscanf(p, "%d,%lf", &week, &tow) < 2) continue;
-                    if (!(p = strchr(++p, ';'))) continue;
-                    if (sscanf(++p, "%d,%d", &ch, &prn) < 2) continue;
-                    if (!(p = getfield(p, 4))) continue;
+                    if (!(p = getfield(buff, 6)))
+                        {
+                            continue;
+                        }
+                    if (sscanf(p, "%d,%lf", &week, &tow) < 2)
+                        {
+                            continue;
+                        }
+                    if (!(p = strchr(++p, ';')))
+                        {
+                            continue;
+                        }
+                    if (sscanf(++p, "%d,%d", &ch, &prn) < 2)
+                        {
+                            continue;
+                        }
+                    if (!(p = getfield(p, 4)))
+                        {
+                            continue;
+                        }
                 }
             else if (!strncmp(buff, "$FRMA", 5))
                 { /* NovAtel OEM3 */
-                    if (!(p = getfield(buff, 2))) continue;
-                    if (sscanf(p, "%d,%lf,%d", &week, &tow, &prn) < 3) continue;
-                    if (!(p = getfield(p, 6))) continue;
-                    if (week < WEEKOFFSET) week += WEEKOFFSET;
+                    if (!(p = getfield(buff, 2)))
+                        {
+                            continue;
+                        }
+                    if (sscanf(p, "%d,%lf,%d", &week, &tow, &prn) < 3)
+                        {
+                            continue;
+                        }
+                    if (!(p = getfield(p, 6)))
+                        {
+                            continue;
+                        }
+                    if (week < WEEKOFFSET)
+                        {
+                            week += WEEKOFFSET;
+                        }
                 }
             else
-                continue;
+                {
+                    continue;
+                }
 
-            if (sel != 0 && sel != prn) continue;
+            if (sel != 0 && sel != prn)
+                {
+                    continue;
+                }
 
             time = gpst2time(week, tow);
 
-            if (!screent(time, ts, te, 0.0)) continue;
+            if (!screent(time, ts, te, 0.0))
+                {
+                    continue;
+                }
 
             if (sbs->n >= sbs->nmax)
                 {
@@ -590,10 +695,16 @@ void readmsgs(const char *file, int sel, gtime_t ts, gtime_t te,
             sbs->msgs[sbs->n].week = week;
             sbs->msgs[sbs->n].tow = static_cast<int>(tow + 0.5);
             sbs->msgs[sbs->n].prn = prn;
-            for (i = 0; i < 29; i++) sbs->msgs[sbs->n].msg[i] = 0;
+            for (i = 0; i < 29; i++)
+                {
+                    sbs->msgs[sbs->n].msg[i] = 0;
+                }
             for (i = 0; *(p - 1) && *p && i < 29; p += 2, i++)
                 {
-                    if (sscanf(p, "%2X", &b) == 1) sbs->msgs[sbs->n].msg[i] = static_cast<unsigned char>(b);
+                    if (sscanf(p, "%2X", &b) == 1)
+                        {
+                            sbs->msgs[sbs->n].msg[i] = static_cast<unsigned char>(b);
+                        }
                 }
             sbs->msgs[sbs->n++].msg[28] &= 0xC0;
         }
@@ -636,7 +747,10 @@ int sbsreadmsgt(const char *file, int sel, gtime_t ts, gtime_t te,
         {
             if (!(efiles[i] = static_cast<char *>(malloc(1024))))
                 {
-                    for (i--; i >= 0; i--) free(efiles[i]);
+                    for (i--; i >= 0; i--)
+                        {
+                            free(efiles[i]);
+                        }
                     return 0;
                 }
         }
@@ -645,13 +759,22 @@ int sbsreadmsgt(const char *file, int sel, gtime_t ts, gtime_t te,
 
     for (i = 0; i < n; i++)
         {
-            if (!(ext = strrchr(efiles[i], '.'))) continue;
+            if (!(ext = strrchr(efiles[i], '.')))
+                {
+                    continue;
+                }
             if (strcmp(ext, ".sbs") != 0 && strcmp(ext, ".SBS") != 0 &&
-                strcmp(ext, ".ems") != 0 && strcmp(ext, ".EMS") != 0) continue;
+                strcmp(ext, ".ems") != 0 && strcmp(ext, ".EMS") != 0)
+                {
+                    continue;
+                }
 
             readmsgs(efiles[i], sel, ts, te, sbs);
         }
-    for (i = 0; i < MAXEXFILE; i++) free(efiles[i]);
+    for (i = 0; i < MAXEXFILE; i++)
+        {
+            free(efiles[i]);
+        }
 
     /* sort messages */
     if (sbs->n > 0)
@@ -685,7 +808,10 @@ void sbsoutmsg(FILE *fp, sbsmsg_t *sbsmsg)
     trace(4, "sbsoutmsg:\n");
 
     fprintf(fp, "%4d %6d %3d %2d : ", sbsmsg->week, sbsmsg->tow, sbsmsg->prn, type);
-    for (i = 0; i < 29; i++) fprintf(fp, "%02X", sbsmsg->msg[i]);
+    for (i = 0; i < 29; i++)
+        {
+            fprintf(fp, "%02X", sbsmsg->msg[i]);
+        }
     fprintf(fp, "\n");
 }
 
@@ -700,7 +826,10 @@ void searchigp(gtime_t time __attribute__((unused)), const double *pos, const sb
 
     trace(4, "searchigp: pos=%.3f %.3f\n", pos[0] * R2D, pos[1] * R2D);
 
-    if (lon >= 180.0) lon -= 360.0;
+    if (lon >= 180.0)
+        {
+            lon -= 360.0;
+        }
     if (-55.0 <= lat && lat < 55.0)
         {
             latp[0] = static_cast<int>(floor(lat / 5.0)) * 5;
@@ -730,29 +859,54 @@ void searchigp(gtime_t time __attribute__((unused)), const double *pos, const sb
                 }
             else if (lat >= 85.0)
                 {
-                    for (i = 0; i < 4; i++) lonp[i] = static_cast<int>(floor(lon / 90.0)) * 90;
+                    for (i = 0; i < 4; i++)
+                        {
+                            lonp[i] = static_cast<int>(floor(lon / 90.0)) * 90;
+                        }
                 }
             else if (lat < -85.0)
                 {
-                    for (i = 0; i < 4; i++) lonp[i] = static_cast<int>(floor((lon - 50.0) / 90.0)) * 90 + 40;
+                    for (i = 0; i < 4; i++)
+                        {
+                            lonp[i] = static_cast<int>(floor((lon - 50.0) / 90.0)) * 90 + 40;
+                        }
                 }
         }
     for (i = 0; i < 4; i++)
-        if (lonp[i] == 180) lonp[i] = -180;
+        {
+            if (lonp[i] == 180)
+                {
+                    lonp[i] = -180;
+                }
+        }
     for (i = 0; i <= MAXBAND; i++)
         {
             for (p = ion[i].igp; p < ion[i].igp + ion[i].nigp; p++)
                 {
-                    if (p->t0.time == 0) continue;
+                    if (p->t0.time == 0)
+                        {
+                            continue;
+                        }
                     if (p->lat == latp[0] && p->lon == lonp[0] && p->give > 0)
-                        igp[0] = p;
+                        {
+                            igp[0] = p;
+                        }
                     else if (p->lat == latp[1] && p->lon == lonp[1] && p->give > 0)
-                        igp[1] = p;
+                        {
+                            igp[1] = p;
+                        }
                     else if (p->lat == latp[0] && p->lon == lonp[2] && p->give > 0)
-                        igp[2] = p;
+                        {
+                            igp[2] = p;
+                        }
                     else if (p->lat == latp[1] && p->lon == lonp[3] && p->give > 0)
-                        igp[3] = p;
-                    if (igp[0] && igp[1] && igp[2] && igp[3]) return;
+                        {
+                            igp[3] = p;
+                        }
+                    if (igp[0] && igp[1] && igp[2] && igp[3])
+                        {
+                            return;
+                        }
                 }
         }
 }
@@ -783,7 +937,10 @@ int sbsioncorr(gtime_t time, const nav_t *nav, const double *pos,
         azel[0] * R2D, azel[1] * R2D);
 
     *delay = *var = 0.0;
-    if (pos[2] < -100.0 || azel[1] <= 0) return 1;
+    if (pos[2] < -100.0 || azel[1] <= 0)
+        {
+            return 1;
+        }
 
     /* ipp (ionospheric pierce point) position */
     fp = ionppp(pos, azel, re, hion, posp);
@@ -803,28 +960,42 @@ int sbsioncorr(gtime_t time, const nav_t *nav, const double *pos,
         {
             w[1] = y;
             w[2] = x;
-            if ((w[0] = 1.0 - w[1] - w[2]) < 0.0) err = 1;
+            if ((w[0] = 1.0 - w[1] - w[2]) < 0.0)
+                {
+                    err = 1;
+                }
         }
     else if (igp[0] && igp[2] && igp[3])
         {
             w[0] = 1.0 - x;
             w[3] = y;
-            if ((w[2] = 1.0 - w[0] - w[3]) < 0.0) err = 1;
+            if ((w[2] = 1.0 - w[0] - w[3]) < 0.0)
+                {
+                    err = 1;
+                }
         }
     else if (igp[0] && igp[1] && igp[3])
         {
             w[0] = 1.0 - y;
             w[3] = x;
-            if ((w[1] = 1.0 - w[0] - w[3]) < 0.0) err = 1;
+            if ((w[1] = 1.0 - w[0] - w[3]) < 0.0)
+                {
+                    err = 1;
+                }
         }
     else if (igp[1] && igp[2] && igp[3])
         {
             w[1] = 1.0 - x;
             w[2] = 1.0 - y;
-            if ((w[3] = 1.0 - w[1] - w[2]) < 0.0) err = 1;
+            if ((w[3] = 1.0 - w[1] - w[2]) < 0.0)
+                {
+                    err = 1;
+                }
         }
     else
-        err = 1;
+        {
+            err = 1;
+        }
 
     if (err)
         {
@@ -834,7 +1005,10 @@ int sbsioncorr(gtime_t time, const nav_t *nav, const double *pos,
         }
     for (i = 0; i < 4; i++)
         {
-            if (!igp[i]) continue;
+            if (!igp[i])
+                {
+                    continue;
+                }
             t = timediff(time, igp[i]->t0);
             *delay += w[i] * igp[i]->delay;
             *var += w[i] * varicorr(igp[i]->give) * 9e-8 * fabs(t);
@@ -860,14 +1034,27 @@ void getmet(double lat, double *met)
     double a;
     lat = fabs(lat);
     if (lat <= 15.0)
-        for (i = 0; i < 10; i++) met[i] = metprm[0][i];
+        {
+            for (i = 0; i < 10; i++)
+                {
+                    met[i] = metprm[0][i];
+                }
+        }
     else if (lat >= 75.0)
-        for (i = 0; i < 10; i++) met[i] = metprm[4][i];
+        {
+            for (i = 0; i < 10; i++)
+                {
+                    met[i] = metprm[4][i];
+                }
+        }
     else
         {
             j = static_cast<int>(lat / 15.0);
             a = (lat - j * 15.0) / 15.0;
-            for (i = 0; i < 10; i++) met[i] = (1.0 - a) * metprm[j - 1][i] + a * metprm[j][i];
+            for (i = 0; i < 10; i++)
+                {
+                    met[i] = (1.0 - a) * metprm[j - 1][i] + a * metprm[j][i];
+                }
         }
 }
 
@@ -901,12 +1088,18 @@ double sbstropcorr(gtime_t time, const double *pos, const double *azel,
         {
             getmet(pos[0] * R2D, met);
             c = cos(2.0 * PI * (time2doy(time) - (pos[0] >= 0.0 ? 28.0 : 211.0)) / 365.25);
-            for (i = 0; i < 5; i++) met[i] -= met[i + 5] * c;
+            for (i = 0; i < 5; i++)
+                {
+                    met[i] -= met[i + 5] * c;
+                }
             zh = 1e-6 * k1 * rd * met[0] / gm;
             zw = 1e-6 * k2 * rd / (gm * (met[4] + 1.0) - met[3] * rd) * met[2] / met[1];
             zh *= pow(1.0 - met[3] * h / met[1], g / (rd * met[3]));
             zw *= pow(1.0 - met[3] * h / met[1], (met[4] + 1.0) * g / (rd * met[3]) - 1.0);
-            for (i = 0; i < 3; i++) pos_[i] = pos[i];
+            for (i = 0; i < 3; i++)
+                {
+                    pos_[i] = pos[i];
+                }
         }
     m = 1.001 / sqrt(0.002001 + sinel * sinel);
     *var = 0.12 * 0.12 * m * m;
@@ -926,7 +1119,10 @@ int sbslongcorr(gtime_t time, int sat, const sbssat_t *sbssat,
 
     for (p = sbssat->sat; p < sbssat->sat + sbssat->nsat; p++)
         {
-            if (p->sat != sat || p->lcorr.t0.time == 0) continue;
+            if (p->sat != sat || p->lcorr.t0.time == 0)
+                {
+                    continue;
+                }
             t = timediff(time, p->lcorr.t0);
             if (fabs(t) > MAXSBSAGEL)
                 {
@@ -934,7 +1130,10 @@ int sbslongcorr(gtime_t time, int sat, const sbssat_t *sbssat,
                         time_str(time, 0), sat, t);
                     return 0;
                 }
-            for (i = 0; i < 3; i++) drs[i] = p->lcorr.dpos[i] + p->lcorr.dvel[i] * t;
+            for (i = 0; i < 3; i++)
+                {
+                    drs[i] = p->lcorr.dpos[i] + p->lcorr.dvel[i] * t;
+                }
             *ddts = p->lcorr.daf0 + p->lcorr.daf1 * t;
 
             trace(5, "sbslongcorr: sat=%2d drs=%7.2f%7.2f%7.2f ddts=%7.2f\n",
@@ -943,7 +1142,10 @@ int sbslongcorr(gtime_t time, int sat, const sbssat_t *sbssat,
             return 1;
         }
     /* if sbas satellite without correction, no correction applied */
-    if (satsys(sat, nullptr) == SYS_SBS) return 1;
+    if (satsys(sat, nullptr) == SYS_SBS)
+        {
+            return 1;
+        }
 
     trace(2, "no sbas long-term correction: %s sat=%2d\n", time_str(time, 0), sat);
     return 0;
@@ -961,12 +1163,21 @@ int sbsfastcorr(gtime_t time, int sat, const sbssat_t *sbssat,
 
     for (p = sbssat->sat; p < sbssat->sat + sbssat->nsat; p++)
         {
-            if (p->sat != sat) continue;
-            if (p->fcorr.t0.time == 0) break;
+            if (p->sat != sat)
+                {
+                    continue;
+                }
+            if (p->fcorr.t0.time == 0)
+                {
+                    break;
+                }
             t = timediff(time, p->fcorr.t0) + sbssat->tlat;
 
             /* expire age of correction or UDRE==14 (not monitored) */
-            if (fabs(t) > MAXSBSAGEF || p->fcorr.udre >= 15) continue;
+            if (fabs(t) > MAXSBSAGEF || p->fcorr.udre >= 15)
+                {
+                    continue;
+                }
             *prc = p->fcorr.prc;
 #ifdef RRCENA
             if (p->fcorr.ai > 0 && fabs(t) <= 8.0 * p->fcorr.dt)
@@ -1020,7 +1231,10 @@ int sbssatcorr(gtime_t time, int sat, const nav_t *nav, double *rs,
         {
             return 0;
         }
-    for (i = 0; i < 3; i++) rs[i] += drs[i];
+    for (i = 0; i < 3; i++)
+        {
+            rs[i] += drs[i];
+        }
 
     dts[0] += dclk + prc / SPEED_OF_LIGHT;
 
@@ -1048,17 +1262,25 @@ int sbsdecodemsg(gtime_t time, int prn, const unsigned int *words,
 
     trace(5, "sbsdecodemsg: prn=%d\n", prn);
 
-    if (time.time == 0) return 0;
+    if (time.time == 0)
+        {
+            return 0;
+        }
     tow = time2gpst(time, &sbsmsg->week);
     sbsmsg->tow = static_cast<int>(tow + DTTOL);
     sbsmsg->prn = prn;
     for (i = 0; i < 7; i++)
-        for (j = 0; j < 4; j++)
-            {
-                sbsmsg->msg[i * 4 + j] = static_cast<unsigned char>(words[i] >> ((3 - j) * 8));
-            }
+        {
+            for (j = 0; j < 4; j++)
+                {
+                    sbsmsg->msg[i * 4 + j] = static_cast<unsigned char>(words[i] >> ((3 - j) * 8));
+                }
+        }
     sbsmsg->msg[28] = static_cast<unsigned char>(words[7] >> 18) & 0xC0;
-    for (i = 28; i > 0; i--) f[i] = (sbsmsg->msg[i] >> 6) + (sbsmsg->msg[i - 1] << 2);
+    for (i = 28; i > 0; i--)
+        {
+            f[i] = (sbsmsg->msg[i] >> 6) + (sbsmsg->msg[i - 1] << 2);
+        }
     f[0] = sbsmsg->msg[0] >> 6;
 
     return rtk_crc24q(f, 29) == (words[7] & 0xFFFFFF); /* check crc */
diff --git a/src/algorithms/libs/rtklib/rtklib_solution.cc b/src/algorithms/libs/rtklib/rtklib_solution.cc
index 965166b01..96ba51b1e 100644
--- a/src/algorithms/libs/rtklib/rtklib_solution.cc
+++ b/src/algorithms/libs/rtklib/rtklib_solution.cc
@@ -79,9 +79,13 @@ static const int solq_nmea[] = {/* nmea quality flags to rtklib sol quality */
 const char *opt2sep(const solopt_t *opt)
 {
     if (!*opt->sep)
-        return " ";
+        {
+            return " ";
+        }
     if (!strcmp(opt->sep, "\\t"))
-        return "\t";
+        {
+            return "\t";
+        }
     return opt->sep;
 }
 
@@ -94,9 +98,18 @@ int tonum(char *buff, const char *sep, double *v)
 
     for (p = buff, n = 0; n < MAXFIELD; p = q + len)
         {
-            if ((q = strstr(p, sep))) *q = '\0';
-            if (*p) v[n++] = atof(p);
-            if (!q) break;
+            if ((q = strstr(p, sep)))
+                {
+                    *q = '\0';
+                }
+            if (*p)
+                {
+                    v[n++] = atof(p);
+                }
+            if (!q)
+                {
+                    break;
+                }
         }
     return n;
 }
@@ -301,11 +314,17 @@ int decode_nmeagga(char **val, int n, sol_t *sol)
     time = utc2gpst(epoch2time(ep));
     tt = timediff(time, sol->time);
     if (tt < -43200.0)
-        sol->time = timeadd(time, 86400.0);
+        {
+            sol->time = timeadd(time, 86400.0);
+        }
     else if (tt > 43200.0)
-        sol->time = timeadd(time, -86400.0);
+        {
+            sol->time = timeadd(time, -86400.0);
+        }
     else
-        sol->time = time;
+        {
+            sol->time = time;
+        }
     pos2ecef(pos, sol->rr);
     sol->stat = 0 <= solq && solq <= 8 ? solq_nmea[solq] : SOLQ_NONE;
     sol->ns = nrcv;
@@ -337,7 +356,9 @@ int decode_nmea(char *buff, sol_t *sol)
                     *q = '\0';
                 }
             else
-                break;
+                {
+                    break;
+                }
         }
     /* decode nmea sentence */
     if (!strcmp(val[0], "$GPRMC"))
@@ -362,9 +383,13 @@ char *decode_soltime(char *buff, const solopt_t *opt, gtime_t *time)
     trace(4, "decode_soltime:\n");
 
     if (!strcmp(opt->sep, "\\t"))
-        strcpy(s, "\t");
+        {
+            strcpy(s, "\t");
+        }
     else if (*opt->sep)
-        strcpy(s, opt->sep);
+        {
+            strcpy(s, opt->sep);
+        }
     len = static_cast<int>(strlen(s));
 
     /* yyyy/mm/dd hh:mm:ss or yyyy mm dd hh:mm:ss */
@@ -383,8 +408,14 @@ char *decode_soltime(char *buff, const solopt_t *opt, gtime_t *time)
                 {
                     *time = utc2gpst(timeadd(*time, -9 * 3600.0));
                 }
-            if (!(p = strchr(buff, ':')) || !(p = strchr(p + 1, ':'))) return nullptr;
-            for (p++; isdigit(static_cast<int>(*p)) || *p == '.';) p++;
+            if (!(p = strchr(buff, ':')) || !(p = strchr(p + 1, ':')))
+                {
+                    return nullptr;
+                }
+            for (p++; isdigit(static_cast<int>(*p)) || *p == '.';)
+                {
+                    p++;
+                }
             return p + len;
         }
     if (opt->posf == SOLF_GSIF)
@@ -394,16 +425,31 @@ char *decode_soltime(char *buff, const solopt_t *opt, gtime_t *time)
                     return nullptr;
                 }
             *time = timeadd(epoch2time(v), -12.0 * 3600.0);
-            if (!(p = strchr(buff, ':')) || !(p = strchr(p + 1, ':'))) return nullptr;
-            for (p++; isdigit(static_cast<int>(*p)) || *p == '.';) p++;
+            if (!(p = strchr(buff, ':')) || !(p = strchr(p + 1, ':')))
+                {
+                    return nullptr;
+                }
+            for (p++; isdigit(static_cast<int>(*p)) || *p == '.';)
+                {
+                    p++;
+                }
             return p + len;
         }
     /* wwww ssss */
     for (p = buff, n = 0; n < 2; p = q + len)
         {
-            if ((q = strstr(p, s))) *q = '\0';
-            if (*p) v[n++] = atof(p);
-            if (!q) break;
+            if ((q = strstr(p, s)))
+                {
+                    *q = '\0';
+                }
+            if (*p)
+                {
+                    v[n++] = atof(p);
+                }
+            if (!q)
+                {
+                    break;
+                }
         }
     if (n >= 2 && 0.0 <= v[0] && v[0] <= 3000.0 && 0.0 <= v[1] && v[1] < 604800.0)
         {
@@ -423,14 +469,23 @@ int decode_solxyz(char *buff, const solopt_t *opt, sol_t *sol)
 
     trace(4, "decode_solxyz:\n");
 
-    if ((n = tonum(buff, sep, val)) < 3) return 0;
+    if ((n = tonum(buff, sep, val)) < 3)
+        {
+            return 0;
+        }
 
     for (j = 0; j < 3; j++)
         {
             sol->rr[j] = val[i++]; /* xyz */
         }
-    if (i < n) sol->stat = static_cast<unsigned char>(val[i++]);
-    if (i < n) sol->ns = static_cast<unsigned char>(val[i++]);
+    if (i < n)
+        {
+            sol->stat = static_cast<unsigned char>(val[i++]);
+        }
+    if (i < n)
+        {
+            sol->ns = static_cast<unsigned char>(val[i++]);
+        }
     if (i + 3 < n)
         {
             P[0] = val[i] * val[i];
@@ -450,12 +505,21 @@ int decode_solxyz(char *buff, const solopt_t *opt, sol_t *sol)
                 }
             covtosol(P, sol);
         }
-    if (i < n) sol->age = static_cast<float>(val[i++]);
-    if (i < n) sol->ratio = static_cast<float>(val[i]);
+    if (i < n)
+        {
+            sol->age = static_cast<float>(val[i++]);
+        }
+    if (i < n)
+        {
+            sol->ratio = static_cast<float>(val[i]);
+        }
 
     sol->type = 0; /* position type = xyz */
 
-    if (MAXSOLQ < sol->stat) sol->stat = SOLQ_NONE;
+    if (MAXSOLQ < sol->stat)
+        {
+            sol->stat = SOLQ_NONE;
+        }
     return 1;
 }
 
@@ -473,22 +537,34 @@ int decode_solllh(char *buff, const solopt_t *opt, sol_t *sol)
 
     if (!opt->degf)
         {
-            if (n < 3) return 0;
+            if (n < 3)
+                {
+                    return 0;
+                }
             pos[0] = val[i++] * D2R; /* lat/lon/hgt (ddd.ddd) */
             pos[1] = val[i++] * D2R;
             pos[2] = val[i++];
         }
     else
         {
-            if (n < 7) return 0;
+            if (n < 7)
+                {
+                    return 0;
+                }
             pos[0] = dms2deg(val) * D2R; /* lat/lon/hgt (ddd mm ss) */
             pos[1] = dms2deg(val + 3) * D2R;
             pos[2] = val[6];
             i += 7;
         }
     pos2ecef(pos, sol->rr);
-    if (i < n) sol->stat = static_cast<unsigned char>(val[i++]);
-    if (i < n) sol->ns = static_cast<unsigned char>(val[i++]);
+    if (i < n)
+        {
+            sol->stat = static_cast<unsigned char>(val[i++]);
+        }
+    if (i < n)
+        {
+            sol->ns = static_cast<unsigned char>(val[i++]);
+        }
     if (i + 3 < n)
         {
             Q[4] = val[i] * val[i];
@@ -509,12 +585,21 @@ int decode_solllh(char *buff, const solopt_t *opt, sol_t *sol)
             covecef(pos, Q, P);
             covtosol(P, sol);
         }
-    if (i < n) sol->age = static_cast<float>(val[i++]);
-    if (i < n) sol->ratio = static_cast<float>(val[i]);
+    if (i < n)
+        {
+            sol->age = static_cast<float>(val[i++]);
+        }
+    if (i < n)
+        {
+            sol->ratio = static_cast<float>(val[i]);
+        }
 
     sol->type = 0; /* position type = xyz */
 
-    if (MAXSOLQ < sol->stat) sol->stat = SOLQ_NONE;
+    if (MAXSOLQ < sol->stat)
+        {
+            sol->stat = SOLQ_NONE;
+        }
     return 1;
 }
 
@@ -528,14 +613,23 @@ int decode_solenu(char *buff, const solopt_t *opt, sol_t *sol)
 
     trace(4, "decode_solenu:\n");
 
-    if ((n = tonum(buff, sep, val)) < 3) return 0;
+    if ((n = tonum(buff, sep, val)) < 3)
+        {
+            return 0;
+        }
 
     for (j = 0; j < 3; j++)
         {
             sol->rr[j] = val[i++]; /* enu */
         }
-    if (i < n) sol->stat = static_cast<unsigned char>(val[i++]);
-    if (i < n) sol->ns = static_cast<unsigned char>(val[i++]);
+    if (i < n)
+        {
+            sol->stat = static_cast<unsigned char>(val[i++]);
+        }
+    if (i < n)
+        {
+            sol->ns = static_cast<unsigned char>(val[i++]);
+        }
     if (i + 3 < n)
         {
             Q[0] = val[i] * val[i];
@@ -555,12 +649,21 @@ int decode_solenu(char *buff, const solopt_t *opt, sol_t *sol)
                 }
             covtosol(Q, sol);
         }
-    if (i < n) sol->age = static_cast<float>(val[i++]);
-    if (i < n) sol->ratio = static_cast<float>(val[i]);
+    if (i < n)
+        {
+            sol->age = static_cast<float>(val[i++]);
+        }
+    if (i < n)
+        {
+            sol->ratio = static_cast<float>(val[i]);
+        }
 
     sol->type = 1; /* position type = enu */
 
-    if (MAXSOLQ < sol->stat) sol->stat = SOLQ_NONE;
+    if (MAXSOLQ < sol->stat)
+        {
+            sol->stat = SOLQ_NONE;
+        }
     return 1;
 }
 
@@ -573,7 +676,10 @@ int decode_solgsi(char *buff, const solopt_t *opt __attribute((unused)), sol_t *
 
     trace(4, "decode_solgsi:\n");
 
-    if (tonum(buff, " ", val) < 3) return 0;
+    if (tonum(buff, " ", val) < 3)
+        {
+            return 0;
+        }
 
     for (j = 0; j < 3; j++)
         {
@@ -624,11 +730,17 @@ void decode_refpos(char *buff, const solopt_t *opt, double *rb)
 
     trace(3, "decode_refpos: buff=%s\n", buff);
 
-    if ((n = tonum(buff, sep, val)) < 3) return;
+    if ((n = tonum(buff, sep, val)) < 3)
+        {
+            return;
+        }
 
     if (opt->posf == SOLF_XYZ)
         { /* xyz */
-            for (i = 0; i < 3; i++) rb[i] = val[i];
+            for (i = 0; i < 3; i++)
+                {
+                    rb[i] = val[i];
+                }
         }
     else if (opt->degf == 0)
         { /* lat/lon/hgt (ddd.ddd) */
@@ -656,21 +768,36 @@ int decode_sol(char *buff, const solopt_t *opt, sol_t *sol, double *rb)
 
     if (!strncmp(buff, COMMENTH, 1))
         { /* reference position */
-            if (!strstr(buff, "ref pos") && !strstr(buff, "slave pos")) return 0;
-            if (!(p = strchr(buff, ':'))) return 0;
+            if (!strstr(buff, "ref pos") && !strstr(buff, "slave pos"))
+                {
+                    return 0;
+                }
+            if (!(p = strchr(buff, ':')))
+                {
+                    return 0;
+                }
             decode_refpos(p + 1, opt, rb);
             return 0;
         }
     if (!strncmp(buff, "$GP", 3))
         { /* decode nmea */
-            if (!decode_nmea(buff, sol)) return 0;
+            if (!decode_nmea(buff, sol))
+                {
+                    return 0;
+                }
 
             /* for time update only */
-            if (opt->posf != SOLF_NMEA && !strncmp(buff, "$GPRMC", 6)) return 2;
+            if (opt->posf != SOLF_NMEA && !strncmp(buff, "$GPRMC", 6))
+                {
+                    return 2;
+                }
         }
     else
         { /* decode position record */
-            if (!decode_solpos(buff, opt, sol)) return 0;
+            if (!decode_solpos(buff, opt, sol))
+                {
+                    return 0;
+                }
         }
     return 1;
 }
@@ -683,14 +810,23 @@ void decode_solopt(char *buff, solopt_t *opt)
 
     trace(4, "decode_solhead: buff=%s\n", buff);
 
-    if (strncmp(buff, COMMENTH, 1) != 0 && strncmp(buff, "+", 1) != 0) return;
+    if (strncmp(buff, COMMENTH, 1) != 0 && strncmp(buff, "+", 1) != 0)
+        {
+            return;
+        }
 
     if (strstr(buff, "GPST"))
-        opt->times = TIMES_GPST;
+        {
+            opt->times = TIMES_GPST;
+        }
     else if (strstr(buff, "UTC"))
-        opt->times = TIMES_UTC;
+        {
+            opt->times = TIMES_UTC;
+        }
     else if (strstr(buff, "JST"))
-        opt->times = TIMES_JST;
+        {
+            opt->times = TIMES_JST;
+        }
 
     if ((p = strstr(buff, "x-ecef(m)")))
         {
@@ -771,7 +907,10 @@ int inputsol(unsigned char data, gtime_t ts, gtime_t te, double tint,
             solbuf->nb = 0;
         }
     solbuf->buff[solbuf->nb++] = data;
-    if (data != '\n' && solbuf->nb < MAXSOLMSG) return 0; /* sync trailer */
+    if (data != '\n' && solbuf->nb < MAXSOLMSG)
+        {
+            return 0; /* sync trailer */
+        }
 
     solbuf->buff[solbuf->nb] = '\0';
     solbuf->nb = 0;
@@ -829,7 +968,10 @@ int sort_solbuf(solbuf_t *solbuf)
 
     trace(4, "sort_solbuf: n=%d\n", solbuf->n);
 
-    if (solbuf->n <= 0) return 0;
+    if (solbuf->n <= 0)
+        {
+            return 0;
+        }
 
     if (!(solbuf_data = static_cast<sol_t *>(realloc(solbuf->data, sizeof(sol_t) * solbuf->n))))
         {
@@ -916,15 +1058,26 @@ int addsol(solbuf_t *solbuf, const sol_t *sol)
 
     if (solbuf->cyclic)
         { /* ring buffer */
-            if (solbuf->nmax <= 1) return 0;
+            if (solbuf->nmax <= 1)
+                {
+                    return 0;
+                }
             solbuf->data[solbuf->end] = *sol;
-            if (++solbuf->end >= solbuf->nmax) solbuf->end = 0;
+            if (++solbuf->end >= solbuf->nmax)
+                {
+                    solbuf->end = 0;
+                }
             if (solbuf->start == solbuf->end)
                 {
-                    if (++solbuf->start >= solbuf->nmax) solbuf->start = 0;
+                    if (++solbuf->start >= solbuf->nmax)
+                        {
+                            solbuf->start = 0;
+                        }
                 }
             else
-                solbuf->n++;
+                {
+                    solbuf->n++;
+                }
 
             return 1;
         }
@@ -957,7 +1110,10 @@ sol_t *getsol(solbuf_t *solbuf, int index)
 {
     trace(4, "getsol: index=%d\n", index);
 
-    if (index < 0 || solbuf->n <= index) return nullptr;
+    if (index < 0 || solbuf->n <= index)
+        {
+            return nullptr;
+        }
     if ((index = solbuf->start + index) >= solbuf->nmax)
         {
             index -= solbuf->nmax;
@@ -985,7 +1141,10 @@ void initsolbuf(solbuf_t *solbuf, int cyclic, int nmax)
     solbuf->data = nullptr;
     if (cyclic)
         {
-            if (nmax <= 2) nmax = 2;
+            if (nmax <= 2)
+                {
+                    nmax = 2;
+                }
             if (!(solbuf->data = static_cast<sol_t *>(malloc(sizeof(sol_t) * nmax))))
                 {
                     trace(1, "initsolbuf: memory allocation error\n");
@@ -1037,7 +1196,10 @@ int sort_solstat(solstatbuf_t *statbuf)
 
     trace(4, "sort_solstat: n=%d\n", statbuf->n);
 
-    if (statbuf->n <= 0) return 0;
+    if (statbuf->n <= 0)
+        {
+            return 0;
+        }
 
     if (!(statbuf_data = static_cast<solstat_t *>(realloc(statbuf->data, sizeof(solstat_t) * statbuf->n))))
         {
@@ -1064,10 +1226,18 @@ int decode_solstat(char *buff, solstat_t *stat)
 
     trace(4, "decode_solstat: buff=%s\n", buff);
 
-    if (strstr(buff, "$SAT") != buff) return 0;
+    if (strstr(buff, "$SAT") != buff)
+        {
+            return 0;
+        }
 
     for (p = buff; *p; p++)
-        if (*p == ',') *p = ' ';
+        {
+            if (*p == ',')
+                {
+                    *p = ' ';
+                }
+        }
 
     n = sscanf(buff, "$SAT%d%lf%s%d%lf%lf%lf%lf%d%d%d%d%d%d%d%d",
         &week, &tow, id, &frq, &az, &el, &resp, &resc, &vsat, &snr, &fix, &slip,
@@ -1138,7 +1308,10 @@ int readsolstatdata(FILE *fp, gtime_t ts, gtime_t te, double tint,
     while (fgets(buff, sizeof(buff), fp))
         {
             /* decode solution status */
-            if (!decode_solstat(buff, &stat)) continue;
+            if (!decode_solstat(buff, &stat))
+                {
+                    continue;
+                }
 
             /* add solution to solution buffer */
             if (screent(stat.time, ts, te, tint))
@@ -1245,7 +1418,9 @@ int outpos(unsigned char *buff, const char *s, const sol_t *sol,
                 dms2[2]);
         }
     else
-        p += sprintf(p, "%s%s%14.9f%s%14.9f", s, sep, pos[0] * R2D, sep, pos[1] * R2D);
+        {
+            p += sprintf(p, "%s%s%14.9f%s%14.9f", s, sep, pos[0] * R2D, sep, pos[1] * R2D);
+        }
     p += sprintf(p, "%s%10.4f%s%3d%s%3d%s%8.4f%s%8.4f%s%8.4f%s%8.4f%s%8.4f%s%8.4f%s%6.2f%s%6.1f\n",
         sep, pos[2], sep, sol->stat, sep, sol->ns, sep, SQRT_SOL(Q[4]), sep,
         SQRT_SOL(Q[0]), sep, SQRT_SOL(Q[8]), sep, sqvar(Q[1]), sep, sqvar(Q[2]),
@@ -1265,7 +1440,10 @@ int outenu(unsigned char *buff, const char *s, const sol_t *sol,
 
     trace(3, "outenu  :\n");
 
-    for (i = 0; i < 3; i++) rr[i] = sol->rr[i] - rb[i];
+    for (i = 0; i < 3; i++)
+        {
+            rr[i] = sol->rr[i] - rb[i];
+        }
     ecef2pos(rb, pos);
     soltocov(sol, P);
     covenu(pos, P, Q);
@@ -1291,7 +1469,10 @@ int outnmea_rmc(unsigned char *buff, const sol_t *sol)
     if (sol->stat <= SOLQ_NONE)
         {
             p += sprintf(p, "$GPRMC,,,,,,,,,,,,");
-            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++) sum ^= *q;
+            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q;
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
             return p - reinterpret_cast<char *>(buff);
         }
@@ -1308,11 +1489,16 @@ int outnmea_rmc(unsigned char *buff, const sol_t *sol)
     if (vel >= 1.0)
         {
             dir = atan2(enuv[0], enuv[1]) * R2D;
-            if (dir < 0.0) dir += 360.0;
+            if (dir < 0.0)
+                {
+                    dir += 360.0;
+                }
             dirp = dir;
         }
     else
-        dir = dirp;
+        {
+            dir = dirp;
+        }
     deg2dms(fabs(pos[0]) * R2D, dms1);
     deg2dms(fabs(pos[1]) * R2D, dms2);
     p += sprintf(p, "$GPRMC,%02.0f%02.0f%05.2f,A,%02.0f%010.7f,%s,%03.0f%010.7f,%s,%4.2f,%4.2f,%02.0f%02.0f%02d,%.1f,%s,%s",
@@ -1320,7 +1506,10 @@ int outnmea_rmc(unsigned char *buff, const sol_t *sol)
         dms2[0], dms2[1] + dms2[2] / 60.0, pos[1] >= 0 ? "E" : "W", vel / KNOT2M, dir,
         ep[2], ep[1], static_cast<int>(ep[0]) % 100, amag, emag,
         sol->stat == SOLQ_DGPS || sol->stat == SOLQ_FLOAT || sol->stat == SOLQ_FIX ? "D" : "A");
-    for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
+    for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++)
+        {
+            sum ^= *q; /* check-sum */
+        }
     p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
     return p - reinterpret_cast<char *>(buff);
 }
@@ -1339,13 +1528,24 @@ int outnmea_gga(unsigned char *buff, const sol_t *sol)
     if (sol->stat <= SOLQ_NONE)
         {
             p += sprintf(p, "$GPGGA,,,,,,,,,,,,,,");
-            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++) sum ^= *q;
+            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q;
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
             return p - reinterpret_cast<char *>(buff);
         }
     for (solq = 0; solq < 8; solq++)
-        if (solq_nmea[solq] == sol->stat) break;
-    if (solq >= 8) solq = 0;
+        {
+            if (solq_nmea[solq] == sol->stat)
+                {
+                    break;
+                }
+        }
+    if (solq >= 8)
+        {
+            solq = 0;
+        }
     time = gpst2utc(sol->time);
     if (time.sec >= 0.995)
         {
@@ -1361,7 +1561,10 @@ int outnmea_gga(unsigned char *buff, const sol_t *sol)
         ep[3], ep[4], ep[5], dms1[0], dms1[1] + dms1[2] / 60.0, pos[0] >= 0 ? "N" : "S",
         dms2[0], dms2[1] + dms2[2] / 60.0, pos[1] >= 0 ? "E" : "W", solq,
         sol->ns, dop, pos[2] - h, h, sol->age);
-    for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
+    for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++)
+        {
+            sum ^= *q; /* check-sum */
+        }
     p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
     return p - reinterpret_cast<char *>(buff);
 }
@@ -1380,7 +1583,10 @@ int outnmea_gsa(unsigned char *buff, const sol_t *sol,
     if (sol->stat <= SOLQ_NONE)
         {
             p += sprintf(p, "$GPGSA,A,1,,,,,,,,,,,,,,,");
-            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++) sum ^= *q;
+            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q;
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
             return p - reinterpret_cast<char *>(buff);
         }
@@ -1388,11 +1594,23 @@ int outnmea_gsa(unsigned char *buff, const sol_t *sol,
     /* GPGSA: gps/sbas */
     for (sat = 1, nsat = 0; sat <= MAXSAT && nsat < 12; sat++)
         {
-            if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0) continue;
+            if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0)
+                {
+                    continue;
+                }
             sys = satsys(sat, prn + nsat);
-            if (sys != SYS_GPS && sys != SYS_SBS) continue;
-            if (sys == SYS_SBS) prn[nsat] += 33 - MINPRNSBS;
-            for (i = 0; i < 2; i++) azel[i + nsat * 2] = ssat[sat - 1].azel[i];
+            if (sys != SYS_GPS && sys != SYS_SBS)
+                {
+                    continue;
+                }
+            if (sys == SYS_SBS)
+                {
+                    prn[nsat] += 33 - MINPRNSBS;
+                }
+            for (i = 0; i < 2; i++)
+                {
+                    azel[i + nsat * 2] = ssat[sat - 1].azel[i];
+                }
             nsat++;
         }
     if (nsat > 0)
@@ -1402,21 +1620,37 @@ int outnmea_gsa(unsigned char *buff, const sol_t *sol,
             for (i = 0; i < 12; i++)
                 {
                     if (i < nsat)
-                        p += sprintf(p, ",%02d", prn[i]);
+                        {
+                            p += sprintf(p, ",%02d", prn[i]);
+                        }
                     else
-                        p += sprintf(p, ",");
+                        {
+                            p += sprintf(p, ",");
+                        }
                 }
             dops(nsat, azel, 0.0, dop);
             p += sprintf(p, ",%3.1f,%3.1f,%3.1f,1", dop[1], dop[2], dop[3]);
-            for (q = s + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
+            for (q = s + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q; /* check-sum */
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
         }
     /* GLGSA: glonass */
     for (sat = 1, nsat = 0; sat <= MAXSAT && nsat < 12; sat++)
         {
-            if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0) continue;
-            if (satsys(sat, prn + nsat) != SYS_GLO) continue;
-            for (i = 0; i < 2; i++) azel[i + nsat * 2] = ssat[sat - 1].azel[i];
+            if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0)
+                {
+                    continue;
+                }
+            if (satsys(sat, prn + nsat) != SYS_GLO)
+                {
+                    continue;
+                }
+            for (i = 0; i < 2; i++)
+                {
+                    azel[i + nsat * 2] = ssat[sat - 1].azel[i];
+                }
             nsat++;
         }
     if (nsat > 0)
@@ -1426,21 +1660,37 @@ int outnmea_gsa(unsigned char *buff, const sol_t *sol,
             for (i = 0; i < 12; i++)
                 {
                     if (i < nsat)
-                        p += sprintf(p, ",%02d", prn[i] + 64);
+                        {
+                            p += sprintf(p, ",%02d", prn[i] + 64);
+                        }
                     else
-                        p += sprintf(p, ",");
+                        {
+                            p += sprintf(p, ",");
+                        }
                 }
             dops(nsat, azel, 0.0, dop);
             p += sprintf(p, ",%3.1f,%3.1f,%3.1f,2", dop[1], dop[2], dop[3]);
-            for (q = s + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
+            for (q = s + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q; /* check-sum */
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
         }
     /* GAGSA: galileo */
     for (sat = 1, nsat = 0; sat <= MAXSAT && nsat < 12; sat++)
         {
-            if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0) continue;
-            if (satsys(sat, prn + nsat) != SYS_GAL) continue;
-            for (i = 0; i < 2; i++) azel[i + nsat * 2] = ssat[sat - 1].azel[i];
+            if (!ssat[sat - 1].vs || ssat[sat - 1].azel[1] <= 0.0)
+                {
+                    continue;
+                }
+            if (satsys(sat, prn + nsat) != SYS_GAL)
+                {
+                    continue;
+                }
+            for (i = 0; i < 2; i++)
+                {
+                    azel[i + nsat * 2] = ssat[sat - 1].azel[i];
+                }
             nsat++;
         }
     if (nsat > 0)
@@ -1450,13 +1700,20 @@ int outnmea_gsa(unsigned char *buff, const sol_t *sol,
             for (i = 0; i < 12; i++)
                 {
                     if (i < nsat)
-                        p += sprintf(p, ",%02d", prn[i]);
+                        {
+                            p += sprintf(p, ",%02d", prn[i]);
+                        }
                     else
-                        p += sprintf(p, ",");
+                        {
+                            p += sprintf(p, ",");
+                        }
                 }
             dops(nsat, azel, 0.0, dop);
             p += sprintf(p, ",%3.1f,%3.1f,%3.1f,3", dop[1], dop[2], dop[3]);
-            for (q = s + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
+            for (q = s + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q; /* check-sum */
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
         }
     return p - reinterpret_cast<char *>(buff);
@@ -1476,7 +1733,10 @@ int outnmea_gsv(unsigned char *buff, const sol_t *sol,
     if (sol->stat <= SOLQ_NONE)
         {
             p += sprintf(p, "$GPGSV,1,1,0,,,,,,,,,,,,,,,,");
-            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++) sum ^= *q;
+            for (q = reinterpret_cast<char *>(buff) + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q;
+                }
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
             return p - reinterpret_cast<char *>(buff);
         }
@@ -1484,8 +1744,14 @@ int outnmea_gsv(unsigned char *buff, const sol_t *sol,
     for (sat = 1, n = 0; sat < MAXSAT && n < 12; sat++)
         {
             sys = satsys(sat, &prn);
-            if (sys != SYS_GPS && sys != SYS_SBS) continue;
-            if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0) sats[n++] = sat;
+            if (sys != SYS_GPS && sys != SYS_SBS)
+                {
+                    continue;
+                }
+            if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0)
+                {
+                    sats[n++] = sat;
+                }
         }
     nmsg = n <= 0 ? 0 : (n - 1) / 4 + 1;
 
@@ -1498,25 +1764,42 @@ int outnmea_gsv(unsigned char *buff, const sol_t *sol,
                 {
                     if (k < n)
                         {
-                            if (satsys(sats[k], &prn) == SYS_SBS) prn += 33 - MINPRNSBS;
+                            if (satsys(sats[k], &prn) == SYS_SBS)
+                                {
+                                    prn += 33 - MINPRNSBS;
+                                }
                             az = ssat[sats[k] - 1].azel[0] * R2D;
-                            if (az < 0.0) az += 360.0;
+                            if (az < 0.0)
+                                {
+                                    az += 360.0;
+                                }
                             el = ssat[sats[k] - 1].azel[1] * R2D;
                             snr = ssat[sats[k] - 1].snr[0] * 0.25;
                             p += sprintf(p, ",%02d,%02.0f,%03.0f,%02.0f", prn, el, az, snr);
                         }
                     else
-                        p += sprintf(p, ",,,,");
+                        {
+                            p += sprintf(p, ",,,,");
+                        }
+                }
+            p += sprintf(p, ",1"); /* L1C/A */
+            for (q = s + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q; /* check-sum */
                 }
-            p += sprintf(p, ",1");                       /* L1C/A */
-            for (q = s + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
         }
     /* GLGSV: glonass */
     for (sat = 1, n = 0; sat < MAXSAT && n < 12; sat++)
         {
-            if (satsys(sat, &prn) != SYS_GLO) continue;
-            if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0) sats[n++] = sat;
+            if (satsys(sat, &prn) != SYS_GLO)
+                {
+                    continue;
+                }
+            if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0)
+                {
+                    sats[n++] = sat;
+                }
         }
     nmsg = n <= 0 ? 0 : (n - 1) / 4 + 1;
 
@@ -1532,23 +1815,37 @@ int outnmea_gsv(unsigned char *buff, const sol_t *sol,
                             satsys(sats[k], &prn);
                             prn += 64; /* 65-99 */
                             az = ssat[sats[k] - 1].azel[0] * R2D;
-                            if (az < 0.0) az += 360.0;
+                            if (az < 0.0)
+                                {
+                                    az += 360.0;
+                                }
                             el = ssat[sats[k] - 1].azel[1] * R2D;
                             snr = ssat[sats[k] - 1].snr[0] * 0.25;
                             p += sprintf(p, ",%02d,%02.0f,%03.0f,%02.0f", prn, el, az, snr);
                         }
                     else
-                        p += sprintf(p, ",,,,");
+                        {
+                            p += sprintf(p, ",,,,");
+                        }
+                }
+            p += sprintf(p, ",1"); /* L1C/A */
+            for (q = s + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q; /* check-sum */
                 }
-            p += sprintf(p, ",1");                       /* L1C/A */
-            for (q = s + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
         }
     /* GAGSV: galileo */
     for (sat = 1, n = 0; sat < MAXSAT && n < 12; sat++)
         {
-            if (satsys(sat, &prn) != SYS_GAL) continue;
-            if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0) sats[n++] = sat;
+            if (satsys(sat, &prn) != SYS_GAL)
+                {
+                    continue;
+                }
+            if (ssat[sat - 1].vs && ssat[sat - 1].azel[1] > 0.0)
+                {
+                    sats[n++] = sat;
+                }
         }
     nmsg = n <= 0 ? 0 : (n - 1) / 4 + 1;
 
@@ -1563,16 +1860,24 @@ int outnmea_gsv(unsigned char *buff, const sol_t *sol,
                         {
                             satsys(sats[k], &prn); /* 1-36 */
                             az = ssat[sats[k] - 1].azel[0] * R2D;
-                            if (az < 0.0) az += 360.0;
+                            if (az < 0.0)
+                                {
+                                    az += 360.0;
+                                }
                             el = ssat[sats[k] - 1].azel[1] * R2D;
                             snr = ssat[sats[k] - 1].snr[0] * 0.25;
                             p += sprintf(p, ",%02d,%02.0f,%03.0f,%02.0f", prn, el, az, snr);
                         }
                     else
-                        p += sprintf(p, ",,,,");
+                        {
+                            p += sprintf(p, ",,,,");
+                        }
+                }
+            p += sprintf(p, ",7"); /* L1BC */
+            for (q = s + 1, sum = 0; *q; q++)
+                {
+                    sum ^= *q; /* check-sum */
                 }
-            p += sprintf(p, ",7");                       /* L1BC */
-            for (q = s + 1, sum = 0; *q; q++) sum ^= *q; /* check-sum */
             p += sprintf(p, "*%02X%c%c", sum, 0x0D, 0x0A);
         }
     return p - reinterpret_cast<char *>(buff);
@@ -1633,7 +1938,10 @@ int outprcopts(unsigned char *buff, const prcopt_t *opt)
             p += sprintf(p, "%s navi sys  :", COMMENTH);
             for (i = 0; sys[i]; i++)
                 {
-                    if (opt->navsys & sys[i]) p += sprintf(p, " %s", s7[i]);
+                    if (opt->navsys & sys[i])
+                        {
+                            p += sprintf(p, " %s", s7[i]);
+                        }
                 }
             p += sprintf(p, "\n");
         }
@@ -1656,7 +1964,10 @@ int outprcopts(unsigned char *buff, const prcopt_t *opt)
         }
     for (i = 0; i < 2; i++)
         {
-            if (opt->mode == PMODE_SINGLE || (i >= 1 && opt->mode > PMODE_FIXED)) continue;
+            if (opt->mode == PMODE_SINGLE || (i >= 1 && opt->mode > PMODE_FIXED))
+                {
+                    continue;
+                }
             p += sprintf(p, "%s antenna%d  : %-21s (%7.4f %7.4f %7.4f)\n", COMMENTH,
                 i + 1, opt->anttype[i], opt->antdel[i][0], opt->antdel[i][1],
                 opt->antdel[i][2]);
@@ -1680,17 +1991,26 @@ int outsolheads(unsigned char *buff, const solopt_t *opt)
 
     trace(3, "outsolheads:\n");
 
-    if (opt->posf == SOLF_NMEA) return 0;
+    if (opt->posf == SOLF_NMEA)
+        {
+            return 0;
+        }
 
     if (opt->outhead)
         {
             p += sprintf(p, "%s (", COMMENTH);
             if (opt->posf == SOLF_XYZ)
-                p += sprintf(p, "x/y/z-ecef=WGS84");
+                {
+                    p += sprintf(p, "x/y/z-ecef=WGS84");
+                }
             else if (opt->posf == SOLF_ENU)
-                p += sprintf(p, "e/n/u-baseline=WGS84");
+                {
+                    p += sprintf(p, "e/n/u-baseline=WGS84");
+                }
             else
-                p += sprintf(p, "lat/lon/height=%s/%s", s1[opt->datum], s2[opt->height]);
+                {
+                    p += sprintf(p, "lat/lon/height=%s/%s", s1[opt->datum], s2[opt->height]);
+                }
             p += sprintf(p, ",Q=1:fix,2:float,3:sbas,4:dgps,5:single,6:ppp,ns=# of satellites)\n");
         }
     p += sprintf(p, "%s  %-*s%s", COMMENTH, (opt->timef ? 16 : 8) + timeu + 1, s3[opt->times], sep);
@@ -1752,8 +2072,14 @@ int outsols(unsigned char *buff, const sol_t *sol, const double *rb,
 
     if (opt->posf == SOLF_NMEA)
         {
-            if (opt->nmeaintv[0] < 0.0) return 0;
-            if (!screent(sol->time, ts, ts, opt->nmeaintv[0])) return 0;
+            if (opt->nmeaintv[0] < 0.0)
+                {
+                    return 0;
+                }
+            if (!screent(sol->time, ts, ts, opt->nmeaintv[0]))
+                {
+                    return 0;
+                }
         }
     if (sol->stat <= SOLQ_NONE || (opt->posf == SOLF_ENU && norm_rtk(rb, 3) <= 0.0))
         {
@@ -1762,11 +2088,19 @@ int outsols(unsigned char *buff, const sol_t *sol, const double *rb,
     timeu = opt->timeu < 0 ? 0 : (opt->timeu > 20 ? 20 : opt->timeu);
 
     time = sol->time;
-    if (opt->times >= TIMES_UTC) time = gpst2utc(time);
-    if (opt->times == TIMES_JST) time = timeadd(time, 9 * 3600.0);
+    if (opt->times >= TIMES_UTC)
+        {
+            time = gpst2utc(time);
+        }
+    if (opt->times == TIMES_JST)
+        {
+            time = timeadd(time, 9 * 3600.0);
+        }
 
     if (opt->timef)
-        time2str(time, s, timeu);
+        {
+            time2str(time, s, timeu);
+        }
     else
         {
             gpst = time2gpst(time, &week);
@@ -1816,8 +2150,14 @@ int outsolexs(unsigned char *buff, const sol_t *sol, const ssat_t *ssat,
 
     if (opt->posf == SOLF_NMEA)
         {
-            if (opt->nmeaintv[1] < 0.0) return 0;
-            if (!screent(sol->time, ts, ts, opt->nmeaintv[1])) return 0;
+            if (opt->nmeaintv[1] < 0.0)
+                {
+                    return 0;
+                }
+            if (!screent(sol->time, ts, ts, opt->nmeaintv[1]))
+                {
+                    return 0;
+                }
         }
     if (opt->posf == SOLF_NMEA)
         {
diff --git a/src/algorithms/libs/rtklib/rtklib_stream.cc b/src/algorithms/libs/rtklib/rtklib_stream.cc
index 53635b2ea..48a1564e6 100644
--- a/src/algorithms/libs/rtklib/rtklib_stream.cc
+++ b/src/algorithms/libs/rtklib/rtklib_stream.cc
@@ -97,7 +97,10 @@ serial_t *openserial(const char *path, int mode, char *msg)
     int rw = 0;
     tracet(3, "openserial: path=%s mode=%d\n", path, mode);
 
-    if (!(serial = static_cast<serial_t *>(malloc(sizeof(serial_t))))) return nullptr;
+    if (!(serial = static_cast<serial_t *>(malloc(sizeof(serial_t)))))
+        {
+            return nullptr;
+        }
 
     if ((p = strchr(const_cast<char *>(path), ':')))
         {
@@ -106,10 +109,17 @@ serial_t *openserial(const char *path, int mode, char *msg)
             sscanf(p, ":%d:%d:%c:%d:%s", &brate, &bsize, &parity, &stopb, fctr);
         }
     else if (strlen(path) < 128)
-        strcpy(port, path);
+        {
+            strcpy(port, path);
+        }
 
     for (i = 0; i < 10; i++)
-        if (br[i] == brate) break;
+        {
+            if (br[i] == brate)
+                {
+                    break;
+                }
+        }
     if (i >= 11)
         {
             sprintf(msg, "bitrate error (%d)", brate);
@@ -123,15 +133,27 @@ serial_t *openserial(const char *path, int mode, char *msg)
     std::string s_aux = "/dev/" + std::string(port);
     s_aux.resize(128, '\0');
     int n = s_aux.length();
-    for (int i = 0; i < n; i++) dev[i] = s_aux[i];
-    if (n == 0) dev[0] = '\0';
+    for (int i = 0; i < n; i++)
+        {
+            dev[i] = s_aux[i];
+        }
+    if (n == 0)
+        {
+            dev[0] = '\0';
+        }
 
     if ((mode & STR_MODE_R) && (mode & STR_MODE_W))
-        rw = O_RDWR;
+        {
+            rw = O_RDWR;
+        }
     else if (mode & STR_MODE_R)
-        rw = O_RDONLY;
+        {
+            rw = O_RDONLY;
+        }
     else if (mode & STR_MODE_W)
-        rw = O_WRONLY;
+        {
+            rw = O_WRONLY;
+        }
 
     if ((serial->dev = open(dev, rw | O_NOCTTY | O_NONBLOCK)) < 0)
         {
@@ -161,7 +183,10 @@ serial_t *openserial(const char *path, int mode, char *msg)
 /* close serial --------------------------------------------------------------*/
 void closeserial(serial_t *serial)
 {
-    if (!serial) return;
+    if (!serial)
+        {
+            return;
+        }
     tracet(3, "closeserial: dev=%d\n", serial->dev);
     close(serial->dev);
     free(serial);
@@ -172,9 +197,15 @@ void closeserial(serial_t *serial)
 int readserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribute__((unused)))
 {
     int nr;
-    if (!serial) return 0;
+    if (!serial)
+        {
+            return 0;
+        }
     tracet(4, "readserial: dev=%d n=%d\n", serial->dev, n);
-    if ((nr = read(serial->dev, buff, n)) < 0) return 0;
+    if ((nr = read(serial->dev, buff, n)) < 0)
+        {
+            return 0;
+        }
     tracet(5, "readserial: exit dev=%d nr=%d\n", serial->dev, nr);
     return nr;
 }
@@ -184,9 +215,15 @@ int readserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribu
 int writeserial(serial_t *serial, unsigned char *buff, int n, char *msg __attribute__((unused)))
 {
     int ns;
-    if (!serial) return 0;
+    if (!serial)
+        {
+            return 0;
+        }
     tracet(3, "writeserial: dev=%d n=%d\n", serial->dev, n);
-    if ((ns = write(serial->dev, buff, n)) < 0) return 0;
+    if ((ns = write(serial->dev, buff, n)) < 0)
+        {
+            return 0;
+        }
     tracet(5, "writeserial: exit dev=%d ns=%d\n", serial->dev, ns);
     return ns;
 }
@@ -227,9 +264,13 @@ int openfile_(file_t *file, gtime_t time, char *msg)
             createdir(file->openpath);
         }
     if (file->mode & STR_MODE_R)
-        rw = (char *)"rb";
+        {
+            rw = (char *)"rb";
+        }
     else
-        rw = (char *)"wb";
+        {
+            rw = (char *)"wb";
+        }
 
     if (!(file->fp = fopen(file->openpath, rw)))
         {
@@ -283,7 +324,10 @@ int openfile_(file_t *file, gtime_t time, char *msg)
             if ((fp = fopen(tagpath, "rbe")))
                 {
                     fclose(fp);
-                    if (remove(tagpath) != 0) trace(1, "Error removing file");
+                    if (remove(tagpath) != 0)
+                        {
+                            trace(1, "Error removing file");
+                        }
                 }
         }
     return 1;
@@ -294,10 +338,22 @@ int openfile_(file_t *file, gtime_t time, char *msg)
 void closefile_(file_t *file)
 {
     tracet(3, "closefile_: path=%s\n", file->path);
-    if (file->fp) fclose(file->fp);
-    if (file->fp_tag) fclose(file->fp_tag);
-    if (file->fp_tmp) fclose(file->fp_tmp);
-    if (file->fp_tag_tmp) fclose(file->fp_tag_tmp);
+    if (file->fp)
+        {
+            fclose(file->fp);
+        }
+    if (file->fp_tag)
+        {
+            fclose(file->fp_tag);
+        }
+    if (file->fp_tmp)
+        {
+            fclose(file->fp_tmp);
+        }
+    if (file->fp_tag_tmp)
+        {
+            fclose(file->fp_tag_tmp);
+        }
     file->fp = file->fp_tag = file->fp_tmp = file->fp_tag_tmp = nullptr;
 }
 
@@ -313,28 +369,54 @@ file_t *openfile(const char *path, int mode, char *msg)
 
     tracet(3, "openfile: path=%s mode=%d\n", path, mode);
 
-    if (!(mode & (STR_MODE_R | STR_MODE_W))) return nullptr;
+    if (!(mode & (STR_MODE_R | STR_MODE_W)))
+        {
+            return nullptr;
+        }
 
     /* file options */
     for (p = const_cast<char *>(path); (p = strstr(p, "::")); p += 2)
         { /* file options */
             if (*(p + 2) == 'T')
-                timetag = 1;
+                {
+                    timetag = 1;
+                }
             else if (*(p + 2) == '+')
-                sscanf(p + 2, "+%lf", &start);
+                {
+                    sscanf(p + 2, "+%lf", &start);
+                }
             else if (*(p + 2) == 'x')
-                sscanf(p + 2, "x%lf", &speed);
+                {
+                    sscanf(p + 2, "x%lf", &speed);
+                }
             else if (*(p + 2) == 'S')
-                sscanf(p + 2, "S=%lf", &swapintv);
+                {
+                    sscanf(p + 2, "S=%lf", &swapintv);
+                }
+        }
+    if (start <= 0.0)
+        {
+            start = 0.0;
+        }
+    if (swapintv <= 0.0)
+        {
+            swapintv = 0.0;
         }
-    if (start <= 0.0) start = 0.0;
-    if (swapintv <= 0.0) swapintv = 0.0;
 
-    if (!(file = static_cast<file_t *>(malloc(sizeof(file_t))))) return nullptr;
+    if (!(file = static_cast<file_t *>(malloc(sizeof(file_t)))))
+        {
+            return nullptr;
+        }
 
     file->fp = file->fp_tag = file->fp_tmp = file->fp_tag_tmp = nullptr;
-    if (strlen(path) < MAXSTRPATH) strcpy(file->path, path);
-    if ((p = strstr(file->path, "::"))) *p = '\0';
+    if (strlen(path) < MAXSTRPATH)
+        {
+            strcpy(file->path, path);
+        }
+    if ((p = strstr(file->path, "::")))
+        {
+            *p = '\0';
+        }
     file->openpath[0] = '\0';
     file->mode = mode;
     file->timetag = timetag;
@@ -362,7 +444,10 @@ file_t *openfile(const char *path, int mode, char *msg)
 /* close file ----------------------------------------------------------------*/
 void closefile(file_t *file)
 {
-    if (!file) return;
+    if (!file)
+        {
+            return;
+        }
     tracet(3, "closefile: fp=%d\n", file->fp);
     closefile_(file);
     free(file);
@@ -377,7 +462,10 @@ void swapfile(file_t *file, gtime_t time, char *msg)
     tracet(3, "swapfile: fp=%d time=%s\n", file->fp, time_str(time, 0));
 
     /* return if old swap file open */
-    if (file->fp_tmp || file->fp_tag_tmp) return;
+    if (file->fp_tmp || file->fp_tag_tmp)
+        {
+            return;
+        }
 
     /* check path of new swap file */
     reppath(file->path, openpath, time, "", "");
@@ -400,8 +488,14 @@ void swapfile(file_t *file, gtime_t time, char *msg)
 void swapclose(file_t *file)
 {
     tracet(3, "swapclose: fp_tmp=%d\n", file->fp_tmp);
-    if (file->fp_tmp) fclose(file->fp_tmp);
-    if (file->fp_tag_tmp) fclose(file->fp_tag_tmp);
+    if (file->fp_tmp)
+        {
+            fclose(file->fp_tmp);
+        }
+    if (file->fp_tag_tmp)
+        {
+            fclose(file->fp_tag_tmp);
+        }
     file->fp_tmp = file->fp_tag_tmp = nullptr;
 }
 
@@ -422,7 +516,10 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
     int nr = 0;
     size_t fpos;
 
-    if (!file) return 0;
+    if (!file)
+        {
+            return 0;
+        }
     tracet(4, "readfile: fp=%d nmax=%d\n", file->fp, nmax);
 
     if (file->fp == stdin)
@@ -430,8 +527,14 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
             /* input from stdin */
             FD_ZERO(&rs);
             FD_SET(0, &rs);
-            if (!select(1, &rs, nullptr, nullptr, &tv)) return 0;
-            if ((nr = read(0, buff, nmax)) < 0) return 0;
+            if (!select(1, &rs, nullptr, nullptr, &tv))
+                {
+                    return 0;
+                }
+            if ((nr = read(0, buff, nmax)) < 0)
+                {
+                    return 0;
+                }
             return nr;
         }
     if (file->fp_tag)
@@ -449,21 +552,33 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
                     if (fread(&tick, sizeof(tick), 1, file->fp_tag) < 1 ||
                         fread(&fpos, sizeof(fpos), 1, file->fp_tag) < 1)
                         {
-                            if (fseek(file->fp, 0, SEEK_END) != 0) trace(1, "fseek error");
+                            if (fseek(file->fp, 0, SEEK_END) != 0)
+                                {
+                                    trace(1, "fseek error");
+                                }
                             sprintf(msg, "end");
                             break;
                         }
                     if (file->repmode || file->speed > 0.0)
                         {
-                            if (static_cast<int>(tick - t) < 1) continue;
+                            if (static_cast<int>(tick - t) < 1)
+                                {
+                                    continue;
+                                }
+                        }
+                    if (!file->repmode)
+                        {
+                            tick_master = tick;
                         }
-                    if (!file->repmode) tick_master = tick;
 
                     sprintf(msg, "T%+.1fs", static_cast<int>(tick) < 0 ? 0.0 : static_cast<int>(tick) / 1000.0);
 
                     if (static_cast<int>(fpos - file->fpos) >= nmax)
                         {
-                            if (fseek(file->fp, fpos, SEEK_SET) != 0) trace(1, "Error fseek");
+                            if (fseek(file->fp, fpos, SEEK_SET) != 0)
+                                {
+                                    trace(1, "Error fseek");
+                                }
                             file->fpos = fpos;
                             return 0;
                         }
@@ -471,7 +586,10 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
 
                     if (file->repmode || file->speed > 0.0)
                         {
-                            if (fseek(file->fp_tag, -static_cast<int64_t>(sizeof(tick) + sizeof(fpos)), SEEK_CUR) != 0) trace(1, "Error fseek");
+                            if (fseek(file->fp_tag, -static_cast<int64_t>(sizeof(tick) + sizeof(fpos)), SEEK_CUR) != 0)
+                                {
+                                    trace(1, "Error fseek");
+                                }
                         }
                     break;
                 }
@@ -480,7 +598,10 @@ int readfile(file_t *file, unsigned char *buff, int nmax, char *msg)
         {
             nr = fread(buff, 1, nmax, file->fp);
             file->fpos += nr;
-            if (nr <= 0) sprintf(msg, "end");
+            if (nr <= 0)
+                {
+                    sprintf(msg, "end");
+                }
         }
     tracet(5, "readfile: fp=%d nr=%d fpos=%d\n", file->fp, nr, file->fpos);
     return nr;
@@ -496,7 +617,10 @@ int writefile(file_t *file, unsigned char *buff, int n, char *msg)
     double tow1, tow2, intv;
     size_t fpos, fpos_tmp;
 
-    if (!file) return 0;
+    if (!file)
+        {
+            return 0;
+        }
     tracet(3, "writefile: fp=%d n=%d\n", file->fp, n);
 
     wtime = utc2gpst(timeget()); /* write time in gpst */
@@ -520,7 +644,10 @@ int writefile(file_t *file, unsigned char *buff, int n, char *msg)
                     swapclose(file);
                 }
         }
-    if (!file->fp) return 0;
+    if (!file->fp)
+        {
+            return 0;
+        }
 
     ns = fwrite(buff, 1, n, file->fp);
     fpos = ftell(file->fp);
@@ -556,7 +683,10 @@ int writefile(file_t *file, unsigned char *buff, int n, char *msg)
 /* sync files by time-tag ----------------------------------------------------*/
 void syncfile(file_t *file1, file_t *file2)
 {
-    if (!file1->fp_tag || !file2->fp_tag) return;
+    if (!file1->fp_tag || !file2->fp_tag)
+        {
+            return;
+        }
     file1->repmode = 0;
     file2->repmode = 1;
     file2->offset = static_cast<int>(file1->tick_f - file2->tick_f);
@@ -571,25 +701,52 @@ void decodetcppath(const char *path, char *addr, char *port, char *user,
 
     tracet(4, "decodetcpepath: path=%s\n", path);
 
-    if (port) *port = '\0';
-    if (user) *user = '\0';
-    if (passwd) *passwd = '\0';
-    if (mntpnt) *mntpnt = '\0';
-    if (str) *str = '\0';
+    if (port)
+        {
+            *port = '\0';
+        }
+    if (user)
+        {
+            *user = '\0';
+        }
+    if (passwd)
+        {
+            *passwd = '\0';
+        }
+    if (mntpnt)
+        {
+            *mntpnt = '\0';
+        }
+    if (str)
+        {
+            *str = '\0';
+        }
 
-    if (strlen(path) < MAXSTRPATH) strcpy(buff, path);
+    if (strlen(path) < MAXSTRPATH)
+        {
+            strcpy(buff, path);
+        }
 
-    if (!(p = strrchr(buff, '@'))) p = buff;
+    if (!(p = strrchr(buff, '@')))
+        {
+            p = buff;
+        }
 
     if ((p = strchr(p, '/')))
         {
             if ((q = strchr(p + 1, ':')))
                 {
                     *q = '\0';
-                    if (str) strcpy(str, q + 1);
+                    if (str)
+                        {
+                            strcpy(str, q + 1);
+                        }
                 }
             *p = '\0';
-            if (mntpnt) strcpy(mntpnt, p + 1);
+            if (mntpnt)
+                {
+                    strcpy(mntpnt, p + 1);
+                }
         }
     if ((p = strrchr(buff, '@')))
         {
@@ -597,19 +754,33 @@ void decodetcppath(const char *path, char *addr, char *port, char *user,
             if ((q = strchr(buff, ':')))
                 {
                     *q = '\0';
-                    if (passwd) strcpy(passwd, q + 1);
+                    if (passwd)
+                        {
+                            strcpy(passwd, q + 1);
+                        }
+                }
+            if (user)
+                {
+                    strcpy(user, buff);
                 }
-            if (user) strcpy(user, buff);
         }
     else
-        p = buff;
+        {
+            p = buff;
+        }
 
     if ((q = strchr(p, ':')))
         {
             *q = '\0';
-            if (port) strcpy(port, q + 1);
+            if (port)
+                {
+                    strcpy(port, q + 1);
+                }
+        }
+    if (addr)
+        {
+            strcpy(addr, p);
         }
-    if (addr) strcpy(addr, p);
 }
 
 
@@ -655,7 +826,10 @@ socket_t accept_nb(socket_t sock, struct sockaddr *addr, socklen_t *len)
     fd_set rs;
     FD_ZERO(&rs);
     FD_SET(sock, &rs);
-    if (!select(sock + 1, &rs, nullptr, nullptr, &tv)) return 0;
+    if (!select(sock + 1, &rs, nullptr, nullptr, &tv))
+        {
+            return 0;
+        }
     return accept(sock, addr, len);
 }
 
@@ -668,15 +842,24 @@ int connect_nb(socket_t sock, struct sockaddr *addr, socklen_t len)
     int err, flag;
 
     flag = fcntl(sock, F_GETFL, 0);
-    if (fcntl(sock, F_SETFL, flag | O_NONBLOCK) == -1) trace(1, "fcntl error");
+    if (fcntl(sock, F_SETFL, flag | O_NONBLOCK) == -1)
+        {
+            trace(1, "fcntl error");
+        }
     if (connect(sock, addr, len) == -1)
         {
             err = errsock();
-            if (err != EISCONN && err != EINPROGRESS && err != EALREADY) return -1;
+            if (err != EISCONN && err != EINPROGRESS && err != EALREADY)
+                {
+                    return -1;
+                }
             FD_ZERO(&rs);
             FD_SET(sock, &rs);
             ws = rs;
-            if (select(sock + 1, &rs, &ws, nullptr, &tv) == 0) return 0;
+            if (select(sock + 1, &rs, &ws, nullptr, &tv) == 0)
+                {
+                    return 0;
+                }
         }
     return 1;
 }
@@ -689,7 +872,10 @@ int recv_nb(socket_t sock, unsigned char *buff, int n)
     fd_set rs;
     FD_ZERO(&rs);
     FD_SET(sock, &rs);
-    if (!select(sock + 1, &rs, nullptr, nullptr, &tv)) return 0;
+    if (!select(sock + 1, &rs, nullptr, nullptr, &tv))
+        {
+            return 0;
+        }
     return recv(sock, reinterpret_cast<char *>(buff), n, 0);
 }
 
@@ -701,7 +887,10 @@ int send_nb(socket_t sock, unsigned char *buff, int n)
     fd_set ws;
     FD_ZERO(&ws);
     FD_SET(sock, &ws);
-    if (!select(sock + 1, nullptr, &ws, nullptr, &tv)) return 0;
+    if (!select(sock + 1, nullptr, &ws, nullptr, &tv))
+        {
+            return 0;
+        }
     return send(sock, reinterpret_cast<char *>(buff), n, 0);
 }
 
@@ -791,7 +980,10 @@ tcpsvr_t *opentcpsvr(const char *path, char *msg)
     tcpsvr0 = {{0, {0}, 0, {0, 0, 0, {0}}, 0, 0, 0, 0}, {{0, {0}, 0, {0, 0, 0, {0}}, 0, 0, 0, 0}}};
     tracet(3, "opentcpsvr: path=%s\n", path);
 
-    if (!(tcpsvr = static_cast<tcpsvr_t *>(malloc(sizeof(tcpsvr_t))))) return nullptr;
+    if (!(tcpsvr = static_cast<tcpsvr_t *>(malloc(sizeof(tcpsvr_t)))))
+        {
+            return nullptr;
+        }
     *tcpsvr = tcpsvr0;
     decodetcppath(path, tcpsvr->svr.saddr, port, nullptr, nullptr, nullptr, nullptr);
     if (sscanf(port, "%d", &tcpsvr->svr.port) < 1)
@@ -818,7 +1010,10 @@ void closetcpsvr(tcpsvr_t *tcpsvr)
     tracet(3, "closetcpsvr:\n");
     for (i = 0; i < MAXCLI; i++)
         {
-            if (tcpsvr->cli[i].state) closesocket(tcpsvr->cli[i].sock);
+            if (tcpsvr->cli[i].state)
+                {
+                    closesocket(tcpsvr->cli[i].sock);
+                }
         }
     closesocket(tcpsvr->svr.sock);
     free(tcpsvr);
@@ -833,14 +1028,23 @@ void updatetcpsvr(tcpsvr_t *tcpsvr, char *msg)
 
     tracet(3, "updatetcpsvr: state=%d\n", tcpsvr->svr.state);
 
-    if (tcpsvr->svr.state == 0) return;
+    if (tcpsvr->svr.state == 0)
+        {
+            return;
+        }
 
     for (i = 0; i < MAXCLI; i++)
         {
-            if (tcpsvr->cli[i].state) continue;
+            if (tcpsvr->cli[i].state)
+                {
+                    continue;
+                }
             for (j = i + 1; j < MAXCLI; j++)
                 {
-                    if (!tcpsvr->cli[j].state) continue;
+                    if (!tcpsvr->cli[j].state)
+                        {
+                            continue;
+                        }
                     tcpsvr->cli[i] = tcpsvr->cli[j];
                     tcpsvr->cli[j].state = 0;
                     break;
@@ -848,7 +1052,10 @@ void updatetcpsvr(tcpsvr_t *tcpsvr, char *msg)
         }
     for (i = 0; i < MAXCLI; i++)
         {
-            if (!tcpsvr->cli[i].state) continue;
+            if (!tcpsvr->cli[i].state)
+                {
+                    continue;
+                }
             strcpy(saddr, tcpsvr->cli[i].saddr);
             n++;
         }
@@ -860,9 +1067,13 @@ void updatetcpsvr(tcpsvr_t *tcpsvr, char *msg)
         }
     tcpsvr->svr.state = 2;
     if (n == 1)
-        sprintf(msg, "%s", saddr);
+        {
+            sprintf(msg, "%s", saddr);
+        }
     else
-        sprintf(msg, "%d clients", n);
+        {
+            sprintf(msg, "%d clients", n);
+        }
 }
 
 
@@ -879,8 +1090,16 @@ int accsock(tcpsvr_t *tcpsvr, char *msg)
     tracet(3, "accsock: sock=%d\n", tcpsvr->svr.sock);
 
     for (i = 0; i < MAXCLI; i++)
-        if (tcpsvr->cli[i].state == 0) break;
-    if (i >= MAXCLI) return 0; /* too many client */
+        {
+            if (tcpsvr->cli[i].state == 0)
+                {
+                    break;
+                }
+        }
+    if (i >= MAXCLI)
+        {
+            return 0; /* too many client */
+        }
 
     if ((sock = accept_nb(tcpsvr->svr.sock, reinterpret_cast<struct sockaddr *>(&addr), &len)) == -1)
         {
@@ -891,12 +1110,21 @@ int accsock(tcpsvr_t *tcpsvr, char *msg)
             tcpsvr->svr.state = 0;
             return 0;
         }
-    if (sock == 0) return 0;
+    if (sock == 0)
+        {
+            return 0;
+        }
 
     tcpsvr->cli[i].sock = sock;
-    if (!setsock(tcpsvr->cli[i].sock, msg)) return 0;
+    if (!setsock(tcpsvr->cli[i].sock, msg))
+        {
+            return 0;
+        }
     memcpy(&tcpsvr->cli[i].addr, &addr, sizeof(addr));
-    if (strlen(inet_ntoa(addr.sin_addr)) < 256) strcpy(tcpsvr->cli[i].saddr, inet_ntoa(addr.sin_addr));
+    if (strlen(inet_ntoa(addr.sin_addr)) < 256)
+        {
+            strcpy(tcpsvr->cli[i].saddr, inet_ntoa(addr.sin_addr));
+        }
     sprintf(msg, "%s", tcpsvr->cli[i].saddr);
     tracet(2, "accsock: connected sock=%d addr=%s\n", tcpsvr->cli[i].sock, tcpsvr->cli[i].saddr);
     tcpsvr->cli[i].state = 2;
@@ -909,9 +1137,14 @@ int accsock(tcpsvr_t *tcpsvr, char *msg)
 int waittcpsvr(tcpsvr_t *tcpsvr, char *msg)
 {
     tracet(4, "waittcpsvr: sock=%d state=%d\n", tcpsvr->svr.sock, tcpsvr->svr.state);
-    if (tcpsvr->svr.state <= 0) return 0;
+    if (tcpsvr->svr.state <= 0)
+        {
+            return 0;
+        }
     while (accsock(tcpsvr, msg))
-        ;
+        {
+            ;
+        }
     updatetcpsvr(tcpsvr, msg);
     return tcpsvr->svr.state == 2;
 }
@@ -924,7 +1157,10 @@ int readtcpsvr(tcpsvr_t *tcpsvr, unsigned char *buff, int n, char *msg)
 
     tracet(4, "readtcpsvr: state=%d n=%d\n", tcpsvr->svr.state, n);
 
-    if (!waittcpsvr(tcpsvr, msg) || tcpsvr->cli[0].state != 2) return 0;
+    if (!waittcpsvr(tcpsvr, msg) || tcpsvr->cli[0].state != 2)
+        {
+            return 0;
+        }
 
     if ((nr = recv_nb(tcpsvr->cli[0].sock, buff, n)) == -1)
         {
@@ -935,7 +1171,10 @@ int readtcpsvr(tcpsvr_t *tcpsvr, unsigned char *buff, int n, char *msg)
             updatetcpsvr(tcpsvr, msg);
             return 0;
         }
-    if (nr > 0) tcpsvr->cli[0].tact = tickget();
+    if (nr > 0)
+        {
+            tcpsvr->cli[0].tact = tickget();
+        }
     tracet(5, "readtcpsvr: exit sock=%d nr=%d\n", tcpsvr->cli[0].sock, nr);
     return nr;
 }
@@ -948,11 +1187,17 @@ int writetcpsvr(tcpsvr_t *tcpsvr, unsigned char *buff, int n, char *msg)
 
     tracet(3, "writetcpsvr: state=%d n=%d\n", tcpsvr->svr.state, n);
 
-    if (!waittcpsvr(tcpsvr, msg)) return 0;
+    if (!waittcpsvr(tcpsvr, msg))
+        {
+            return 0;
+        }
 
     for (i = 0; i < MAXCLI; i++)
         {
-            if (tcpsvr->cli[i].state != 2) continue;
+            if (tcpsvr->cli[i].state != 2)
+                {
+                    continue;
+                }
 
             if ((ns = send_nb(tcpsvr->cli[i].sock, buff, n)) == -1)
                 {
@@ -963,7 +1208,10 @@ int writetcpsvr(tcpsvr_t *tcpsvr, unsigned char *buff, int n, char *msg)
                     updatetcpsvr(tcpsvr, msg);
                     return 0;
                 }
-            if (ns > 0) tcpsvr->cli[i].tact = tickget();
+            if (ns > 0)
+                {
+                    tcpsvr->cli[i].tact = tickget();
+                }
             tracet(5, "writetcpsvr: send i=%d ns=%d\n", i, ns);
         }
     return ns;
@@ -1023,7 +1271,10 @@ tcpcli_t *opentcpcli(const char *path, char *msg)
 
     tracet(3, "opentcpcli: path=%s\n", path);
 
-    if (!(tcpcli = static_cast<tcpcli_t *>(malloc(sizeof(tcpcli_t))))) return nullptr;
+    if (!(tcpcli = static_cast<tcpcli_t *>(malloc(sizeof(tcpcli_t)))))
+        {
+            return nullptr;
+        }
     *tcpcli = tcpcli0;
     decodetcppath(path, tcpcli->svr.saddr, port, nullptr, nullptr, nullptr, nullptr);
     if (sscanf(port, "%d", &tcpcli->svr.port) < 1)
@@ -1054,15 +1305,24 @@ int waittcpcli(tcpcli_t *tcpcli, char *msg)
 {
     tracet(4, "waittcpcli: sock=%d state=%d\n", tcpcli->svr.sock, tcpcli->svr.state);
 
-    if (tcpcli->svr.state < 0) return 0;
+    if (tcpcli->svr.state < 0)
+        {
+            return 0;
+        }
 
     if (tcpcli->svr.state == 0)
         { /* close */
-            if (!gentcp(&tcpcli->svr, 1, msg)) return 0;
+            if (!gentcp(&tcpcli->svr, 1, msg))
+                {
+                    return 0;
+                }
         }
     if (tcpcli->svr.state == 1)
         { /* wait */
-            if (!consock(tcpcli, msg)) return 0;
+            if (!consock(tcpcli, msg))
+                {
+                    return 0;
+                }
         }
     if (tcpcli->svr.state == 2)
         { /* connect */
@@ -1086,7 +1346,10 @@ int readtcpcli(tcpcli_t *tcpcli, unsigned char *buff, int n, char *msg)
 
     tracet(4, "readtcpcli: sock=%d state=%d n=%d\n", tcpcli->svr.sock, tcpcli->svr.state, n);
 
-    if (!waittcpcli(tcpcli, msg)) return 0;
+    if (!waittcpcli(tcpcli, msg))
+        {
+            return 0;
+        }
 
     if ((nr = recv_nb(tcpcli->svr.sock, buff, n)) == -1)
         {
@@ -1096,7 +1359,10 @@ int readtcpcli(tcpcli_t *tcpcli, unsigned char *buff, int n, char *msg)
             discontcp(&tcpcli->svr, tcpcli->tirecon);
             return 0;
         }
-    if (nr > 0) tcpcli->svr.tact = tickget();
+    if (nr > 0)
+        {
+            tcpcli->svr.tact = tickget();
+        }
     tracet(5, "readtcpcli: exit sock=%d nr=%d\n", tcpcli->svr.sock, nr);
     return nr;
 }
@@ -1109,7 +1375,10 @@ int writetcpcli(tcpcli_t *tcpcli, unsigned char *buff, int n, char *msg)
 
     tracet(3, "writetcpcli: sock=%d state=%d n=%d\n", tcpcli->svr.sock, tcpcli->svr.state, n);
 
-    if (!waittcpcli(tcpcli, msg)) return 0;
+    if (!waittcpcli(tcpcli, msg))
+        {
+            return 0;
+        }
 
     if ((ns = send_nb(tcpcli->svr.sock, buff, n)) == -1)
         {
@@ -1119,7 +1388,10 @@ int writetcpcli(tcpcli_t *tcpcli, unsigned char *buff, int n, char *msg)
             discontcp(&tcpcli->svr, tcpcli->tirecon);
             return 0;
         }
-    if (ns > 0) tcpcli->svr.tact = tickget();
+    if (ns > 0)
+        {
+            tcpcli->svr.tact = tickget();
+        }
     tracet(5, "writetcpcli: exit sock=%d ns=%d\n", tcpcli->svr.sock, ns);
     return ns;
 }
@@ -1146,11 +1418,17 @@ int encbase64(char *str, const unsigned char *byte, int n)
             for (k = b = 0; k < 6; k++, i++)
                 {
                     b <<= 1;
-                    if (i / 8 < n) b |= (byte[i / 8] >> (7 - i % 8)) & 0x1;
+                    if (i / 8 < n)
+                        {
+                            b |= (byte[i / 8] >> (7 - i % 8)) & 0x1;
+                        }
                 }
             str[j++] = table[b];
         }
-    while (j & 0x3) str[j++] = '=';
+    while (j & 0x3)
+        {
+            str[j++] = '=';
+        }
     str[j] = '\0';
     tracet(5, "encbase64: str=%s\n", str);
     return j;
@@ -1169,7 +1447,10 @@ int reqntrip_s(ntrip_t *ntrip, char *msg)
     p += sprintf(p, "STR: %s\r\n", ntrip->str);
     p += sprintf(p, "\r\n");
 
-    if (writetcpcli(ntrip->tcp, reinterpret_cast<unsigned char *>(buff), p - buff, msg) != p - buff) return 0;
+    if (writetcpcli(ntrip->tcp, reinterpret_cast<unsigned char *>(buff), p - buff, msg) != p - buff)
+        {
+            return 0;
+        }
 
     tracet(2, "reqntrip_s: send request state=%d ns=%d\n", ntrip->state, p - buff);
     tracet(5, "reqntrip_s: n=%d buff=\n%s\n", p - buff, buff);
@@ -1202,7 +1483,10 @@ int reqntrip_c(ntrip_t *ntrip, char *msg)
         }
     p += sprintf(p, "\r\n");
 
-    if (writetcpcli(ntrip->tcp, reinterpret_cast<unsigned char *>(buff), p - buff, msg) != p - buff) return 0;
+    if (writetcpcli(ntrip->tcp, reinterpret_cast<unsigned char *>(buff), p - buff, msg) != p - buff)
+        {
+            return 0;
+        }
 
     tracet(2, "reqntrip_c: send request state=%d ns=%d\n", ntrip->state, p - buff);
     tracet(5, "reqntrip_c: n=%d buff=\n%s\n", p - buff, buff);
@@ -1226,7 +1510,10 @@ int rspntrip_s(ntrip_t *ntrip, char *msg)
             q = reinterpret_cast<char *>(ntrip->buff);
             p += strlen(NTRIP_RSP_OK_SVR);
             ntrip->nb -= p - q;
-            for (i = 0; i < ntrip->nb; i++) *q++ = *p++;
+            for (i = 0; i < ntrip->nb; i++)
+                {
+                    *q++ = *p++;
+                }
             ntrip->state = 2;
             sprintf(msg, "%s/%s", ntrip->tcp->svr.saddr, ntrip->mntpnt);
             tracet(2, "rspntrip_s: response ok nb=%d\n", ntrip->nb);
@@ -1238,7 +1525,10 @@ int rspntrip_s(ntrip_t *ntrip, char *msg)
             // strncpy(msg, (char *)ntrip->buff, nb); This line triggers a warning. Replaced by;
             std::string s_aux(reinterpret_cast<char *>(ntrip->buff));
             s_aux.resize(nb, '\0');
-            for (int i = 0; i < nb; i++) msg[i] = s_aux[i];
+            for (int i = 0; i < nb; i++)
+                {
+                    msg[i] = s_aux[i];
+                }
 
             msg[nb] = 0;
             tracet(1, "rspntrip_s: %s nb=%d\n", msg, ntrip->nb);
@@ -1276,7 +1566,10 @@ int rspntrip_c(ntrip_t *ntrip, char *msg)
             q = reinterpret_cast<char *>(ntrip->buff);
             p += strlen(NTRIP_RSP_OK_CLI);
             ntrip->nb -= p - q;
-            for (i = 0; i < ntrip->nb; i++) *q++ = *p++;
+            for (i = 0; i < ntrip->nb; i++)
+                {
+                    *q++ = *p++;
+                }
             ntrip->state = 2;
             sprintf(msg, "%s/%s", ntrip->tcp->svr.saddr, ntrip->mntpnt);
             tracet(2, "rspntrip_c: response ok nb=%d\n", ntrip->nb);
@@ -1301,9 +1594,13 @@ int rspntrip_c(ntrip_t *ntrip, char *msg)
     else if ((p = strstr(reinterpret_cast<char *>(ntrip->buff), NTRIP_RSP_HTTP)))
         { /* http response */
             if ((q = strchr(p, '\r')))
-                *q = '\0';
+                {
+                    *q = '\0';
+                }
             else
-                ntrip->buff[128] = '\0';
+                {
+                    ntrip->buff[128] = '\0';
+                }
             strcpy(msg, p);
             tracet(1, "rspntrip_s: %s nb=%d\n", msg, ntrip->nb);
             ntrip->nb = 0;
@@ -1333,9 +1630,15 @@ int waitntrip(ntrip_t *ntrip, char *msg)
 
     tracet(4, "waitntrip: state=%d nb=%d\n", ntrip->state, ntrip->nb);
 
-    if (ntrip->state < 0) return 0; /* error */
+    if (ntrip->state < 0)
+        {
+            return 0; /* error */
+        }
 
-    if (ntrip->tcp->svr.state < 2) ntrip->state = 0; /* tcp disconnected */
+    if (ntrip->tcp->svr.state < 2)
+        {
+            ntrip->state = 0; /* tcp disconnected */
+        }
 
     if (ntrip->state == 0)
         { /* send request */
@@ -1372,14 +1675,20 @@ ntrip_t *openntrip(const char *path, int type, char *msg)
 
     tracet(3, "openntrip: path=%s type=%d\n", path, type);
 
-    if (!(ntrip = static_cast<ntrip_t *>(malloc(sizeof(ntrip_t))))) return nullptr;
+    if (!(ntrip = static_cast<ntrip_t *>(malloc(sizeof(ntrip_t)))))
+        {
+            return nullptr;
+        }
 
     ntrip->state = 0;
     ntrip->type = type; /* 0:server, 1:client */
     ntrip->nb = 0;
     ntrip->url[0] = '\0';
     ntrip->mntpnt[0] = ntrip->user[0] = ntrip->passwd[0] = ntrip->str[0] = '\0';
-    for (i = 0; i < NTRIP_MAXRSP; i++) ntrip->buff[i] = 0;
+    for (i = 0; i < NTRIP_MAXRSP; i++)
+        {
+            ntrip->buff[i] = 0;
+        }
 
     /* decode tcp/ntrip path */
     decodetcppath(path, addr, port, ntrip->user, ntrip->passwd, ntrip->mntpnt,
@@ -1399,7 +1708,12 @@ ntrip_t *openntrip(const char *path, int type, char *msg)
             std::string s_aux = "http://" + std::string(tpath);
             int n = s_aux.length();
             if (n < 256)
-                for (int k = 0; k < n; k++) ntrip->url[k] = s_aux[k];
+                {
+                    for (int k = 0; k < n; k++)
+                        {
+                            ntrip->url[k] = s_aux[k];
+                        }
+                }
             strcpy(tpath, proxyaddr);
         }
     /* open tcp client stream */
@@ -1429,7 +1743,10 @@ int readntrip(ntrip_t *ntrip, unsigned char *buff, int n, char *msg)
 
     tracet(4, "readntrip: n=%d\n", n);
 
-    if (!waitntrip(ntrip, msg)) return 0;
+    if (!waitntrip(ntrip, msg))
+        {
+            return 0;
+        }
     if (ntrip->nb > 0)
         { /* read response buffer first */
             nb = ntrip->nb <= n ? ntrip->nb : n;
@@ -1446,7 +1763,10 @@ int writentrip(ntrip_t *ntrip, unsigned char *buff, int n, char *msg)
 {
     tracet(3, "writentrip: n=%d\n", n);
 
-    if (!waitntrip(ntrip, msg)) return 0;
+    if (!waitntrip(ntrip, msg))
+        {
+            return 0;
+        }
     return writetcpcli(ntrip->tcp, buff, n, msg);
 }
 
@@ -1466,8 +1786,14 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
 
     tracet(4, "decodeftpath: path=%s\n", path);
 
-    if (user) *user = '\0';
-    if (passwd) *passwd = '\0';
+    if (user)
+        {
+            *user = '\0';
+        }
+    if (passwd)
+        {
+            *passwd = '\0';
+        }
     if (topts)
         {
             topts[0] = 0;    /* time offset in path (s) */
@@ -1475,20 +1801,28 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
             topts[2] = 0;    /* download time offset (s) */
             topts[3] = 0;    /* retry interval (s) (0: no retry) */
         }
-    if (strlen(path) < MAXSTRPATH) strcpy(buff, path);
+    if (strlen(path) < MAXSTRPATH)
+        {
+            strcpy(buff, path);
+        }
 
     if ((p = strchr(buff, '/')))
         {
             if ((q = strstr(p + 1, "::")))
                 {
                     *q = '\0';
-                    if (topts) sscanf(q + 2, "T=%d, %d, %d, %d", topts, topts + 1, topts + 2, topts + 3);
+                    if (topts)
+                        {
+                            sscanf(q + 2, "T=%d, %d, %d, %d", topts, topts + 1, topts + 2, topts + 3);
+                        }
                 }
             strcpy(file, p + 1);
             *p = '\0';
         }
     else
-        file[0] = '\0';
+        {
+            file[0] = '\0';
+        }
 
     if ((p = strrchr(buff, '@')))
         {
@@ -1496,12 +1830,20 @@ void decodeftppath(const char *path, char *addr, char *file, char *user,
             if ((q = strchr(buff, ':')))
                 {
                     *q = '\0';
-                    if (passwd) strcpy(passwd, q + 1);
+                    if (passwd)
+                        {
+                            strcpy(passwd, q + 1);
+                        }
+                }
+            if (user)
+                {
+                    strcpy(user, buff);
                 }
-            if (user) strcpy(user, buff);
         }
     else
-        p = buff;
+        {
+            p = buff;
+        }
 
     strcpy(addr, p);
 }
@@ -1560,20 +1902,34 @@ void *ftpthread(void *arg)
     reppath(ftp->file, remote, time, "", "");
 
     if ((p = strrchr(remote, '/')))
-        p++;
+        {
+            p++;
+        }
     else
-        p = remote;
+        {
+            p = remote;
+        }
     // sprintf(local, "%s%c%s", localdir, FILEPATHSEP, p);  This line triggers a warning. Replaced by:
     std::string s_aux = std::string(localdir) + std::to_string(FILEPATHSEP) + std::string(p);
     int n = s_aux.length();
     if (n < 1024)
-        for (int i = 0; i < n; i++) local[i] = s_aux[i];
+        {
+            for (int i = 0; i < n; i++)
+                {
+                    local[i] = s_aux[i];
+                }
+        }
 
     // sprintf(errfile, "%s.err", local);  This line triggers a warning. Replaced by:
     std::string s_aux2 = std::string(local) + ".err";
     n = s_aux2.length();
     if (n < 1024)
-        for (int i = 0; i < n; i++) errfile[i] = s_aux2[i];
+        {
+            for (int i = 0; i < n; i++)
+                {
+                    errfile[i] = s_aux2[i];
+                }
+        }
 
     /* if local file exist, skip download */
     strcpy(tmpfile, local);
@@ -1608,39 +1964,59 @@ void *ftpthread(void *arg)
                                 " -O \"" + std::string(local) + "\"";
             int k = s_aux.length();
             if (k < 1024)
-                for (int i = 0; i < k; i++) opt[i] = s_aux[i];
+                {
+                    for (int i = 0; i < k; i++)
+                        {
+                            opt[i] = s_aux[i];
+                        }
+                }
 
             // sprintf(cmd, "%s%s %s \"ftp://%s/%s\" 2> \"%s\"\n", env, FTP_CMD, opt, ftp->addr,
             //    remote, errfile); This line triggers a warning. Replaced by:
             std::string s_aux2 = std::string(env) + std::string(FTP_CMD) + " " + std::string(opt) + " " +
                                  "\"ftp://" + std::string(ftp->addr) + "/" + std::string(remote) + "\" 2> \"" + std::string(errfile) + "\"\n";
             k = s_aux2.length();
-            for (int i = 0; (i < k) && (i < 1024); i++) cmd[i] = s_aux2[i];
+            for (int i = 0; (i < k) && (i < 1024); i++)
+                {
+                    cmd[i] = s_aux2[i];
+                }
         }
     else
         { /* http */
             // sprintf(opt, "%s-t 1 -T %d -O \"%s\"", proxyopt, FTP_TIMEOUT, local); This line triggers a warning. Replaced by:
             std::string s_aux = std::string(proxyopt) + " -t 1 -T " + std::to_string(FTP_TIMEOUT) + " -O \"" + std::string(local) + "\"";
             int l = s_aux.length();
-            for (int i = 0; (i < l) && (i < 1024); i++) opt[i] = s_aux[i];
+            for (int i = 0; (i < l) && (i < 1024); i++)
+                {
+                    opt[i] = s_aux[i];
+                }
 
             // sprintf(cmd, "%s%s %s \"http://%s/%s\" 2> \"%s\"\n", env, FTP_CMD, opt, ftp->addr,
             //    remote, errfile); This line triggers a warning. Replaced by:
             std::string s_aux2 = std::string(env) + std::string(FTP_CMD) + " " + std::string(opt) + " " +
                                  "\"http://" + std::string(ftp->addr) + "/" + std::string(remote) + "\" 2> \"" + std::string(errfile) + "\"\n";
             l = s_aux2.length();
-            for (int i = 0; (i < l) && (i < 1024); i++) cmd[i] = s_aux2[i];
+            for (int i = 0; (i < l) && (i < 1024); i++)
+                {
+                    cmd[i] = s_aux2[i];
+                }
         }
     /* execute download command */
     if ((ret = execcmd(cmd)))
         {
-            if (remove(local) != 0) trace(1, "Error removing file");
+            if (remove(local) != 0)
+                {
+                    trace(1, "Error removing file");
+                }
             tracet(1, "execcmd error: cmd=%s ret=%d\n", cmd, ret);
             ftp->error = ret;
             ftp->state = 3;
             return nullptr;
         }
-    if (remove(errfile) != 0) trace(1, "Error removing file");
+    if (remove(errfile) != 0)
+        {
+            trace(1, "Error removing file");
+        }
 
     /* uncompress downloaded file */
     if ((p = strrchr(local, '.')) &&
@@ -1649,8 +2025,14 @@ void *ftpthread(void *arg)
         {
             if (rtk_uncompress(local, tmpfile))
                 {
-                    if (remove(local) != 0) trace(1, "Error removing file");
-                    if (strlen(tmpfile) < 1024) strcpy(local, tmpfile);
+                    if (remove(local) != 0)
+                        {
+                            trace(1, "Error removing file");
+                        }
+                    if (strlen(tmpfile) < 1024)
+                        {
+                            strcpy(local, tmpfile);
+                        }
                 }
             else
                 {
@@ -1660,7 +2042,10 @@ void *ftpthread(void *arg)
                     return nullptr;
                 }
         }
-    if (strlen(local) < 1024) strcpy(ftp->local, local);
+    if (strlen(local) < 1024)
+        {
+            strcpy(ftp->local, local);
+        }
     ftp->state = 2; /* ftp completed */
 
     tracet(3, "ftpthread: complete cmd=%s\n", cmd);
@@ -1677,7 +2062,10 @@ ftp_t *openftp(const char *path, int type, char *msg)
 
     msg[0] = '\0';
 
-    if (!(ftp = static_cast<ftp_t *>(malloc(sizeof(ftp_t))))) return nullptr;
+    if (!(ftp = static_cast<ftp_t *>(malloc(sizeof(ftp_t)))))
+        {
+            return nullptr;
+        }
 
     ftp->state = 0;
     ftp->proto = type;
@@ -1700,7 +2088,10 @@ void closeftp(ftp_t *ftp)
 {
     tracet(3, "closeftp: state=%d\n", ftp->state);
 
-    if (ftp->state != 1) free(ftp);
+    if (ftp->state != 1)
+        {
+            free(ftp);
+        }
 }
 
 
@@ -1731,7 +2122,10 @@ int readftp(ftp_t *ftp, unsigned char *buff, int n, char *msg)
                     return 0;
                 }
         }
-    if (ftp->state <= 1) return 0; /* ftp/http on going? */
+    if (ftp->state <= 1)
+        {
+            return 0; /* ftp/http on going? */
+        }
 
     if (ftp->state == 3)
         { /* ftp error */
@@ -1745,7 +2139,10 @@ int readftp(ftp_t *ftp, unsigned char *buff, int n, char *msg)
     /* return local file path if ftp completed */
     p = buff;
     q = reinterpret_cast<unsigned char *>(ftp->local);
-    while (*q && static_cast<int>(p - buff) < n) *p++ = *q++;
+    while (*q && static_cast<int>(p - buff) < n)
+        {
+            *p++ = *q++;
+        }
     p += sprintf(reinterpret_cast<char *>(p), "\r\n");
 
     /* set next download time */
@@ -1838,7 +2235,10 @@ int stropen(stream_t *stream, int type, int mode, const char *path)
 
     stream->type = type;
     stream->mode = mode;
-    if (strlen(path) < MAXSTRPATH) strcpy(stream->path, path);
+    if (strlen(path) < MAXSTRPATH)
+        {
+            strcpy(stream->path, path);
+        }
     stream->inb = stream->inr = stream->outb = stream->outr = 0;
     stream->tick = tickget();
     stream->inbt = stream->outbt = 0;
@@ -1942,10 +2342,16 @@ void strclose(stream_t *stream)
 void strsync(stream_t *stream1, stream_t *stream2)
 {
     file_t *file1, *file2;
-    if (stream1->type != STR_FILE || stream2->type != STR_FILE) return;
+    if (stream1->type != STR_FILE || stream2->type != STR_FILE)
+        {
+            return;
+        }
     file1 = static_cast<file_t *>(stream1->port);
     file2 = static_cast<file_t *>(stream2->port);
-    if (file1 && file2) syncfile(file1, file2);
+    if (file1 && file2)
+        {
+            syncfile(file1, file2);
+        }
 }
 
 
@@ -1975,7 +2381,10 @@ int strread(stream_t *stream, unsigned char *buff, int n)
 
     tracet(4, "strread: n=%d\n", n);
 
-    if (!(stream->mode & STR_MODE_R) || !stream->port) return 0;
+    if (!(stream->mode & STR_MODE_R) || !stream->port)
+        {
+            return 0;
+        }
 
     strlock(stream);
 
@@ -2008,7 +2417,10 @@ int strread(stream_t *stream, unsigned char *buff, int n)
         }
     stream->inb += nr;
     tick = tickget();
-    if (nr > 0) stream->tact = tick;
+    if (nr > 0)
+        {
+            stream->tact = tick;
+        }
 
     if (static_cast<int>(tick - stream->tick) >= tirate)
         {
@@ -2037,7 +2449,10 @@ int strwrite(stream_t *stream, unsigned char *buff, int n)
 
     tracet(3, "strwrite: n=%d\n", n);
 
-    if (!(stream->mode & STR_MODE_W) || !stream->port) return 0;
+    if (!(stream->mode & STR_MODE_W) || !stream->port)
+        {
+            return 0;
+        }
 
     strlock(stream);
 
@@ -2067,7 +2482,10 @@ int strwrite(stream_t *stream, unsigned char *buff, int n)
         }
     stream->outb += ns;
     tick = tickget();
-    if (ns > 0) stream->tact = tick;
+    if (ns > 0)
+        {
+            stream->tact = tick;
+        }
 
     if (static_cast<int>(tick - stream->tick) > tirate)
         {
@@ -2098,7 +2516,10 @@ int strstat(stream_t *stream, char *msg)
             // strncpy(msg, stream->msg, MAXSTRMSG - 1); This line triggers a warning. Replaced by:
             std::string aux_s(stream->msg);
             aux_s.resize(MAXSTRMSG - 1, '0');
-            for (int i = 0; i < MAXSTRMSG - 1; i++) msg[i] = aux_s[i];
+            for (int i = 0; i < MAXSTRMSG - 1; i++)
+                {
+                    msg[i] = aux_s[i];
+                }
             msg[MAXSTRMSG - 1] = '\0';
         }
     if (!stream->port)
@@ -2134,7 +2555,10 @@ int strstat(stream_t *stream, char *msg)
             strunlock(stream);
             return 0;
         }
-    if (state == 2 && static_cast<int>(tickget() - stream->tact) <= TINTACT) state = 3;
+    if (state == 2 && static_cast<int>(tickget() - stream->tact) <= TINTACT)
+        {
+            state = 3;
+        }
     strunlock(stream);
     return state;
 }
@@ -2154,10 +2578,22 @@ void strsum(stream_t *stream, int *inb, int *inr, int *outb, int *outr)
     tracet(4, "strsum:\n");
 
     strlock(stream);
-    if (inb) *inb = stream->inb;
-    if (inr) *inr = stream->inr;
-    if (outb) *outb = stream->outb;
-    if (outr) *outr = stream->outr;
+    if (inb)
+        {
+            *inb = stream->inb;
+        }
+    if (inr)
+        {
+            *inr = stream->inr;
+        }
+    if (outb)
+        {
+            *outb = stream->outb;
+        }
+    if (outr)
+        {
+            *outr = stream->outr;
+        }
     strunlock(stream);
 }
 
@@ -2210,7 +2646,9 @@ void strsettimeout(stream_t *stream, int toinact, int tirecon)
             tcpcli = (static_cast<ntrip_t *>(stream->port))->tcp;
         }
     else
-        return;
+        {
+            return;
+        }
 
     tcpcli->toinact = toinact;
     tcpcli->tirecon = tirecon;
@@ -2225,7 +2663,10 @@ void strsettimeout(stream_t *stream, int toinact, int tirecon)
 void strsetdir(const char *dir)
 {
     tracet(3, "strsetdir: dir=%s\n", dir);
-    if (strlen(dir) < 1024) strcpy(localdir, dir);
+    if (strlen(dir) < 1024)
+        {
+            strcpy(localdir, dir);
+        }
 }
 
 
@@ -2237,7 +2678,10 @@ void strsetdir(const char *dir)
 void strsetproxy(const char *addr)
 {
     tracet(3, "strsetproxy: addr=%s\n", addr);
-    if (strlen(addr) < 256) strcpy(proxyaddr, addr);
+    if (strlen(addr) < 256)
+        {
+            strcpy(proxyaddr, addr);
+        }
 }
 
 
@@ -2274,7 +2718,10 @@ void strsendnmea(stream_t *stream, const double *pos)
 
     sol.stat = SOLQ_SINGLE;
     sol.time = utc2gpst(timeget());
-    for (i = 0; i < 3; i++) sol.rr[i] = pos[i];
+    for (i = 0; i < 3; i++)
+        {
+            sol.rr[i] = pos[i];
+        }
     n = outnmea_gga(buff, &sol);
     strwrite(stream, buff, n);
 }
@@ -2297,7 +2744,10 @@ int gen_hex(const char *msg, unsigned char *buff)
         }
     for (i = 0; i < narg; i++)
         {
-            if (sscanf(args[i], "%x", &byte)) *q++ = static_cast<unsigned char>(byte);
+            if (sscanf(args[i], "%x", &byte))
+                {
+                    *q++ = static_cast<unsigned char>(byte);
+                }
         }
     return static_cast<int>(q - buff);
 }
@@ -2321,7 +2771,12 @@ void strsendcmd(stream_t *str, const char *cmd)
     for (;;)
         {
             for (q = p;; q++)
-                if (*q == '\r' || *q == '\n' || *q == '\0') break;
+                {
+                    if (*q == '\r' || *q == '\n' || *q == '\0')
+                        {
+                            break;
+                        }
+                }
             n = static_cast<int>(q - p);
             strncpy(msg, p, n);
             msg[n] = '\0';
@@ -2334,8 +2789,14 @@ void strsendcmd(stream_t *str, const char *cmd)
                 { /* binary escape */
                     if (!strncmp(msg + 1, "WAIT", 4))
                         { /* wait */
-                            if (sscanf(msg + 5, "%d", &ms) < 1) ms = 100;
-                            if (ms > 3000) ms = 3000; /* max 3 s */
+                            if (sscanf(msg + 5, "%d", &ms) < 1)
+                                {
+                                    ms = 100;
+                                }
+                            if (ms > 3000)
+                                {
+                                    ms = 3000; /* max 3 s */
+                                }
                             sleepms(ms);
                         }
 
@@ -2357,7 +2818,10 @@ void strsendcmd(stream_t *str, const char *cmd)
                     //}
                     else if (!strncmp(msg + 1, "HEX", 3))
                         { /* general hex message */
-                            if ((m = gen_hex(msg + 4, buff)) > 0) strwrite(str, buff, m);
+                            if ((m = gen_hex(msg + 4, buff)) > 0)
+                                {
+                                    strwrite(str, buff, m);
+                                }
                         }
                 }
             else
@@ -2366,7 +2830,9 @@ void strsendcmd(stream_t *str, const char *cmd)
                     strwrite(str, reinterpret_cast<unsigned char *>(cmdend), 2);
                 }
             if (*q == '\0')
-                break;
+                {
+                    break;
+                }
 
             p = q + 1;
         }
diff --git a/src/algorithms/libs/rtklib/rtklib_tides.cc b/src/algorithms/libs/rtklib/rtklib_tides.cc
index c53d5cd98..eb5355a61 100644
--- a/src/algorithms/libs/rtklib/rtklib_tides.cc
+++ b/src/algorithms/libs/rtklib/rtklib_tides.cc
@@ -65,9 +65,15 @@ void tide_pl(const double *eu, const double *rp, double GMp,
 
     trace(4, "tide_pl : pos=%.3f %.3f\n", pos[0] * R2D, pos[1] * R2D);
 
-    if ((r = norm_rtk(rp, 3)) <= 0.0) return;
+    if ((r = norm_rtk(rp, 3)) <= 0.0)
+        {
+            return;
+        }
 
-    for (i = 0; i < 3; i++) ep[i] = rp[i] / r;
+    for (i = 0; i < 3; i++)
+        {
+            ep[i] = rp[i] / r;
+        }
 
     K2 = GMp / GME * std::pow(RE_WGS84, 2.04) * std::pow(RE_WGS84, 2.0) / (r * r * r);
     K3 = K2 * RE_WGS84 / r;
@@ -181,8 +187,14 @@ void tide_oload(gtime_t tut, const double *odisp, double *denu)
     for (i = 0; i < 11; i++)
         {
             ang = 0.0;
-            for (j = 0; j < 5; j++) ang += a[j] * args[i][j];
-            for (j = 0; j < 3; j++) dp[j] += odisp[j + i * 6] * cos(ang - odisp[j + 3 + i * 6] * D2R);
+            for (j = 0; j < 5; j++)
+                {
+                    ang += a[j] * args[i][j];
+                }
+            for (j = 0; j < 3; j++)
+                {
+                    dp[j] += odisp[j + i * 6] * cos(ang - odisp[j + 3 + i * 6] * D2R);
+                }
         }
     denu[0] = -dp[1];
     denu[1] = -dp[2];
@@ -279,13 +291,19 @@ void tidedisp(gtime_t tutc, const double *rr, int opt, const erp_t *erp,
 
     trace(3, "tidedisp: tutc=%s\n", time_str(tutc, 0));
 
-    if (erp) geterp(erp, tutc, erpv);
+    if (erp)
+        {
+            geterp(erp, tutc, erpv);
+        }
 
     tut = timeadd(tutc, erpv[2]);
 
     dr[0] = dr[1] = dr[2] = 0.0;
 
-    if (norm_rtk(rr, 3) <= 0.0) return;
+    if (norm_rtk(rr, 3) <= 0.0)
+        {
+            return;
+        }
 
     pos[0] = asin(rr[2] / norm_rtk(rr, 3));
     pos[1] = atan2(rr[1], rr[0]);
@@ -309,19 +327,28 @@ void tidedisp(gtime_t tutc, const double *rr, int opt, const erp_t *erp,
 #else
             tide_solid(rs, rm, pos, E, gmst, opt, drt);
 #endif
-            for (i = 0; i < 3; i++) dr[i] += drt[i];
+            for (i = 0; i < 3; i++)
+                {
+                    dr[i] += drt[i];
+                }
         }
     if ((opt & 2) && odisp)
         { /* ocean tide loading */
             tide_oload(tut, odisp, denu);
             matmul("TN", 3, 1, 3, 1.0, E, denu, 0.0, drt);
-            for (i = 0; i < 3; i++) dr[i] += drt[i];
+            for (i = 0; i < 3; i++)
+                {
+                    dr[i] += drt[i];
+                }
         }
     if ((opt & 4) && erp)
         { /* pole tide */
             tide_pole(tut, pos, erpv, denu);
             matmul("TN", 3, 1, 3, 1.0, E, denu, 0.0, drt);
-            for (i = 0; i < 3; i++) dr[i] += drt[i];
+            for (i = 0; i < 3; i++)
+                {
+                    dr[i] += drt[i];
+                }
         }
     trace(5, "tidedisp: dr=%.3f %.3f %.3f\n", dr[0], dr[1], dr[2]);
 }
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index d542235a9..f90982965 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -576,7 +576,10 @@ int hybrid_observables_cc::general_work(int noutput_items __attribute__((unused)
                         }
                 }
 
-            if (n_valid > 0) compute_pranges(epoch_data);
+            if (n_valid > 0)
+                {
+                    compute_pranges(epoch_data);
+                }
 
             for (uint32_t n = 0; n < d_nchannels_out; n++)
                 {
diff --git a/src/algorithms/signal_source/adapters/file_signal_source.cc b/src/algorithms/signal_source/adapters/file_signal_source.cc
index bc4fb6329..d7856ee57 100644
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@@ -60,8 +60,14 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_signal_source != "-") filename_ = FLAGS_signal_source;
-    if (FLAGS_s != "-") filename_ = FLAGS_s;
+    if (FLAGS_signal_source != "-")
+        {
+            filename_ = FLAGS_signal_source;
+        }
+    if (FLAGS_s != "-")
+        {
+            filename_ = FLAGS_s;
+        }
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);
diff --git a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
index 60566ed5e..2ceeca528 100644
--- a/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/nsr_file_signal_source.cc
@@ -58,8 +58,14 @@ NsrFileSignalSource::NsrFileSignalSource(ConfigurationInterface* configuration,
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_signal_source != "-") filename_ = FLAGS_signal_source;
-    if (FLAGS_s != "-") filename_ = FLAGS_s;
+    if (FLAGS_signal_source != "-")
+        {
+            filename_ = FLAGS_signal_source;
+        }
+    if (FLAGS_s != "-")
+        {
+            filename_ = FLAGS_s;
+        }
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);
diff --git a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
index d5692e434..58675e527 100644
--- a/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/spir_file_signal_source.cc
@@ -57,8 +57,14 @@ SpirFileSignalSource::SpirFileSignalSource(ConfigurationInterface* configuration
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_signal_source != "-") filename_ = FLAGS_signal_source;
-    if (FLAGS_s != "-") filename_ = FLAGS_s;
+    if (FLAGS_signal_source != "-")
+        {
+            filename_ = FLAGS_signal_source;
+        }
+    if (FLAGS_s != "-")
+        {
+            filename_ = FLAGS_s;
+        }
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);
diff --git a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
index 7115771e9..b1e578b1b 100644
--- a/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/two_bit_cpx_file_signal_source.cc
@@ -62,8 +62,14 @@ TwoBitCpxFileSignalSource::TwoBitCpxFileSignalSource(ConfigurationInterface* con
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_signal_source != "-") filename_ = FLAGS_signal_source;
-    if (FLAGS_s != "-") filename_ = FLAGS_s;
+    if (FLAGS_signal_source != "-")
+        {
+            filename_ = FLAGS_signal_source;
+        }
+    if (FLAGS_s != "-")
+        {
+            filename_ = FLAGS_s;
+        }
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     repeat_ = configuration->property(role + ".repeat", false);
diff --git a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
index 9355537ce..00a50257e 100644
--- a/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/two_bit_packed_file_signal_source.cc
@@ -66,8 +66,14 @@ TwoBitPackedFileSignalSource::TwoBitPackedFileSignalSource(ConfigurationInterfac
     filename_ = configuration->property(role + ".filename", default_filename);
 
     // override value with commandline flag, if present
-    if (FLAGS_signal_source != "-") filename_ = FLAGS_signal_source;
-    if (FLAGS_s != "-") filename_ = FLAGS_s;
+    if (FLAGS_signal_source != "-")
+        {
+            filename_ = FLAGS_signal_source;
+        }
+    if (FLAGS_s != "-")
+        {
+            filename_ = FLAGS_s;
+        }
 
     item_type_ = configuration->property(role + ".item_type", default_item_type);
     big_endian_items_ = configuration->property(role + ".big_endian_items", true);
diff --git a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
index efc866de8..bc636f23c 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/labsat23_source.cc
@@ -198,7 +198,10 @@ int labsat23_source::general_work(int noutput_items,
                     bool preamble_ok = true;
                     for (int i = 0; i < 8; i++)
                         {
-                            if (memblock[byte_counter] != 0x00) preamble_ok = false;
+                            if (memblock[byte_counter] != 0x00)
+                                {
+                                    preamble_ok = false;
+                                }
                             //std::cout << "H[" << i << "]:" << (int)memblock[byte_counter] << std::endl;
                             byte_counter++;
                         }
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
index 1fd5c2032..db56ff0b2 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
@@ -65,7 +65,9 @@ bool systemBytesAreBigEndian()
     byte_and_samples b{};
     b.byte = static_cast<int8_t>(0x01);
     if (*reinterpret_cast<char *>(&b.byte) == 1)
-        return false;
+        {
+            return false;
+        }
 
     return true;
 }
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
index b613f3e2b..992507cd7 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
@@ -94,7 +94,10 @@ int gnss_sdr_valve::work(int noutput_items,
                     return 0;  // do not produce or consume
                 }
             uint64_t n = std::min(d_nitems - d_ncopied_items, static_cast<uint64_t>(noutput_items));
-            if (n == 0) return 0;
+            if (n == 0)
+                {
+                    return 0;
+                }
             memcpy(output_items[0], input_items[0], n * input_signature()->sizeof_stream_item(0));
             d_ncopied_items += n;
             return n;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index 8dec53b5a..658397b46 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -203,7 +203,10 @@ bool gps_l1_ca_telemetry_decoder_cc::decode_subframe()
             if (symbol_accumulator_counter == 20)
                 {
                     // symbol to bit
-                    if (symbol_accumulator > 0) GPS_frame_4bytes += 1;  // insert the telemetry bit in LSB
+                    if (symbol_accumulator > 0)
+                        {
+                            GPS_frame_4bytes += 1;  // insert the telemetry bit in LSB
+                        }
                     symbol_accumulator = 0;
                     symbol_accumulator_counter = 0;
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
index 75b18caef..552a0f398 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
@@ -299,13 +299,17 @@ void sbas_l1_telemetry_decoder_cc::frame_detector::get_frame_candidates(const st
                                 {
                                     // invert bits
                                     for (int &candidate_bit_it : candidate)
-                                        candidate_bit_it = candidate_bit_it == 0 ? 1 : 0;
+                                        {
+                                            candidate_bit_it = candidate_bit_it == 0 ? 1 : 0;
+                                        }
                                 }
                             msg_candidates.emplace_back(relative_preamble_start, candidate);
                             ss.str("");
                             ss << "preamble " << preample_it - preambles.begin() << (inv_preamble_detected ? " inverted" : " normal") << " detected! candidate=";
                             for (auto bit_it = candidate.begin(); bit_it < candidate.end(); ++bit_it)
-                                ss << *bit_it;
+                                {
+                                    ss << *bit_it;
+                                }
                             VLOG(EVENT) << ss.str();
                         }
                 }
diff --git a/src/algorithms/telemetry_decoder/libs/convolutional.h b/src/algorithms/telemetry_decoder/libs/convolutional.h
index 23b9976b9..cc775110b 100644
--- a/src/algorithms/telemetry_decoder/libs/convolutional.h
+++ b/src/algorithms/telemetry_decoder/libs/convolutional.h
@@ -155,7 +155,9 @@ inline static float Gamma(const float rec_array[],
     for (i = 0; i < nn; i++)
         {
             if (symbol & mask)
-                rm += rec_array[nn - i - 1];
+                {
+                    rm += rec_array[nn - i - 1];
+                }
             mask = mask << 1;
         }
     return (rm);
@@ -219,11 +221,15 @@ inline static void Viterbi(int output_u_int[],
     for (t = 0; t < LL + mm; t++)
         {
             for (i = 0; i < nn; i++)
-                rec_array[i] = static_cast<float>(input_c[nn * t + i]);
+                {
+                    rec_array[i] = static_cast<float>(input_c[nn * t + i]);
+                }
 
             /* precompute all possible branch metrics */
             for (i = 0; i < number_symbols; i++)
-                metric_c[i] = Gamma(rec_array, i, nn);
+                {
+                    metric_c[i] = Gamma(rec_array, i, nn);
+                }
 
             /* step through all states */
             for (state = 0; state < states; state++)
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
index 866b822fb..207c7fb94 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
@@ -30,7 +30,6 @@
  */
 
 #include "bits.h"
-
 #include <limits.h>
 #include <string.h>
 
@@ -72,11 +71,11 @@ u8 parity(u32 x)
 u32 getbitu(const u8 *buff, u32 pos, u8 len)
 {
     u32 bits = 0;
-    u32 i=0;
+    u32 i = 0;
     for (i = pos; i < pos + len; i++)
         {
             bits = (bits << 1) +
-                    ((buff[i/8] >> (7 - i%8)) & 1u);
+                   ((buff[i / 8] >> (7 - i % 8)) & 1u);
         }
 
     return bits;
@@ -118,14 +117,20 @@ void setbitu(u8 *buff, u32 pos, u32 len, u32 data)
     u32 mask = 1u << (len - 1);
 
     if (len <= 0 || 32 < len)
-        return;
+        {
+            return;
+        }
     u32 i = 0;
     for (i = pos; i < pos + len; i++, mask >>= 1)
         {
             if (data & mask)
-                buff[i/8] |= 1u << (7 - i % 8);
+                {
+                    buff[i / 8] |= 1u << (7 - i % 8);
+                }
             else
-                buff[i/8] &= ~(1u << (7 - i % 8));
+                {
+                    buff[i / 8] &= ~(1u << (7 - i % 8));
+                }
         }
 }
 
@@ -162,12 +167,12 @@ void bitshl(void *buf, u32 size, u32 shift)
             return;
         }
 
-    unsigned char       *dst = buf;                /* Destination byte. */
+    unsigned char *dst = buf;                          /* Destination byte. */
     const unsigned char *src = dst + shift / CHAR_BIT; /* First source byte, possibly incomplete. */
 
-    u32 copy_bits  = size * CHAR_BIT - shift; /* Number of bits to move */
-    u32 byte_shift = copy_bits % CHAR_BIT;    /* Shift of data */
-    u32 full_bytes = copy_bits / CHAR_BIT;    /* Number of bytes to move */
+    u32 copy_bits = size * CHAR_BIT - shift; /* Number of bits to move */
+    u32 byte_shift = copy_bits % CHAR_BIT;   /* Shift of data */
+    u32 full_bytes = copy_bits / CHAR_BIT;   /* Number of bytes to move */
 
     if (0 == byte_shift)
         {
@@ -211,7 +216,7 @@ void bitshl(void *buf, u32 size, u32 shift)
  *       proper native type like long.
  */
 void bitcopy(void *dst, u32 dst_index, const void *src, u32 src_index,
-              u32 count)
+    u32 count)
 {
     u32 limit1 = count / 32;
     u32 limit2 = count % 32;
@@ -243,7 +248,9 @@ u8 count_bits_u64(u64 v, u8 bv)
     u8 r = 0;
     int i = 0;
     for (i = 0; i < 16; i++)
-        r += bitn[(v >> (i*4)) & 0xf];
+        {
+            r += bitn[(v >> (i * 4)) & 0xf];
+        }
     return bv == 1 ? r : 64 - r;
 }
 
@@ -260,7 +267,9 @@ u8 count_bits_u32(u32 v, u8 bv)
     u8 r = 0;
     int i = 0;
     for (i = 0; i < 8; i++)
-        r += bitn[(v >> (i*4)) & 0xf];
+        {
+            r += bitn[(v >> (i * 4)) & 0xf];
+        }
     return bv == 1 ? r : 32 - r;
 }
 
@@ -276,8 +285,10 @@ u8 count_bits_u16(u16 v, u8 bv)
 {
     u8 r = 0;
     int i = 0;
-    for (i= 0; i < 4; i++)
-        r += bitn[(v >> (i*4)) & 0xf];
+    for (i = 0; i < 4; i++)
+        {
+            r += bitn[(v >> (i * 4)) & 0xf];
+        }
     return bv == 1 ? r : 16 - r;
 }
 
@@ -294,7 +305,9 @@ u8 count_bits_u8(u8 v, u8 bv)
     u8 r = 0;
     int i = 0;
     for (i = 0; i < 2; i++)
-        r += bitn[(v >> (i*4)) & 0xf];
+        {
+            r += bitn[(v >> (i * 4)) & 0xf];
+        }
     return bv == 1 ? r : 8 - r;
 }
 
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
index c89bae64d..b5f3623a2 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
@@ -40,39 +40,38 @@
  * \{ */
 
 static const u32 crc24qtab[256] = {
-        0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
-        0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
-        0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
-        0x64CFB0, 0xE2834B, 0xEE1ABD, 0x685646, 0xF72951, 0x7165AA, 0x7DFC5C, 0xFBB0A7,
-        0x0CD1E9, 0x8A9D12, 0x8604E4, 0x00481F, 0x9F3708, 0x197BF3, 0x15E205, 0x93AEFE,
-        0xAD50D0, 0x2B1C2B, 0x2785DD, 0xA1C926, 0x3EB631, 0xB8FACA, 0xB4633C, 0x322FC7,
-        0xC99F60, 0x4FD39B, 0x434A6D, 0xC50696, 0x5A7981, 0xDC357A, 0xD0AC8C, 0x56E077,
-        0x681E59, 0xEE52A2, 0xE2CB54, 0x6487AF, 0xFBF8B8, 0x7DB443, 0x712DB5, 0xF7614E,
-        0x19A3D2, 0x9FEF29, 0x9376DF, 0x153A24, 0x8A4533, 0x0C09C8, 0x00903E, 0x86DCC5,
-        0xB822EB, 0x3E6E10, 0x32F7E6, 0xB4BB1D, 0x2BC40A, 0xAD88F1, 0xA11107, 0x275DFC,
-        0xDCED5B, 0x5AA1A0, 0x563856, 0xD074AD, 0x4F0BBA, 0xC94741, 0xC5DEB7, 0x43924C,
-        0x7D6C62, 0xFB2099, 0xF7B96F, 0x71F594, 0xEE8A83, 0x68C678, 0x645F8E, 0xE21375,
-        0x15723B, 0x933EC0, 0x9FA736, 0x19EBCD, 0x8694DA, 0x00D821, 0x0C41D7, 0x8A0D2C,
-        0xB4F302, 0x32BFF9, 0x3E260F, 0xB86AF4, 0x2715E3, 0xA15918, 0xADC0EE, 0x2B8C15,
-        0xD03CB2, 0x567049, 0x5AE9BF, 0xDCA544, 0x43DA53, 0xC596A8, 0xC90F5E, 0x4F43A5,
-        0x71BD8B, 0xF7F170, 0xFB6886, 0x7D247D, 0xE25B6A, 0x641791, 0x688E67, 0xEEC29C,
-        0x3347A4, 0xB50B5F, 0xB992A9, 0x3FDE52, 0xA0A145, 0x26EDBE, 0x2A7448, 0xAC38B3,
-        0x92C69D, 0x148A66, 0x181390, 0x9E5F6B, 0x01207C, 0x876C87, 0x8BF571, 0x0DB98A,
-        0xF6092D, 0x7045D6, 0x7CDC20, 0xFA90DB, 0x65EFCC, 0xE3A337, 0xEF3AC1, 0x69763A,
-        0x578814, 0xD1C4EF, 0xDD5D19, 0x5B11E2, 0xC46EF5, 0x42220E, 0x4EBBF8, 0xC8F703,
-        0x3F964D, 0xB9DAB6, 0xB54340, 0x330FBB, 0xAC70AC, 0x2A3C57, 0x26A5A1, 0xA0E95A,
-        0x9E1774, 0x185B8F, 0x14C279, 0x928E82, 0x0DF195, 0x8BBD6E, 0x872498, 0x016863,
-        0xFAD8C4, 0x7C943F, 0x700DC9, 0xF64132, 0x693E25, 0xEF72DE, 0xE3EB28, 0x65A7D3,
-        0x5B59FD, 0xDD1506, 0xD18CF0, 0x57C00B, 0xC8BF1C, 0x4EF3E7, 0x426A11, 0xC426EA,
-        0x2AE476, 0xACA88D, 0xA0317B, 0x267D80, 0xB90297, 0x3F4E6C, 0x33D79A, 0xB59B61,
-        0x8B654F, 0x0D29B4, 0x01B042, 0x87FCB9, 0x1883AE, 0x9ECF55, 0x9256A3, 0x141A58,
-        0xEFAAFF, 0x69E604, 0x657FF2, 0xE33309, 0x7C4C1E, 0xFA00E5, 0xF69913, 0x70D5E8,
-        0x4E2BC6, 0xC8673D, 0xC4FECB, 0x42B230, 0xDDCD27, 0x5B81DC, 0x57182A, 0xD154D1,
-        0x26359F, 0xA07964, 0xACE092, 0x2AAC69, 0xB5D37E, 0x339F85, 0x3F0673, 0xB94A88,
-        0x87B4A6, 0x01F85D, 0x0D61AB, 0x8B2D50, 0x145247, 0x921EBC, 0x9E874A, 0x18CBB1,
-        0xE37B16, 0x6537ED, 0x69AE1B, 0xEFE2E0, 0x709DF7, 0xF6D10C, 0xFA48FA, 0x7C0401,
-        0x42FA2F, 0xC4B6D4, 0xC82F22, 0x4E63D9, 0xD11CCE, 0x575035, 0x5BC9C3, 0xDD8538
-};
+    0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
+    0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
+    0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
+    0x64CFB0, 0xE2834B, 0xEE1ABD, 0x685646, 0xF72951, 0x7165AA, 0x7DFC5C, 0xFBB0A7,
+    0x0CD1E9, 0x8A9D12, 0x8604E4, 0x00481F, 0x9F3708, 0x197BF3, 0x15E205, 0x93AEFE,
+    0xAD50D0, 0x2B1C2B, 0x2785DD, 0xA1C926, 0x3EB631, 0xB8FACA, 0xB4633C, 0x322FC7,
+    0xC99F60, 0x4FD39B, 0x434A6D, 0xC50696, 0x5A7981, 0xDC357A, 0xD0AC8C, 0x56E077,
+    0x681E59, 0xEE52A2, 0xE2CB54, 0x6487AF, 0xFBF8B8, 0x7DB443, 0x712DB5, 0xF7614E,
+    0x19A3D2, 0x9FEF29, 0x9376DF, 0x153A24, 0x8A4533, 0x0C09C8, 0x00903E, 0x86DCC5,
+    0xB822EB, 0x3E6E10, 0x32F7E6, 0xB4BB1D, 0x2BC40A, 0xAD88F1, 0xA11107, 0x275DFC,
+    0xDCED5B, 0x5AA1A0, 0x563856, 0xD074AD, 0x4F0BBA, 0xC94741, 0xC5DEB7, 0x43924C,
+    0x7D6C62, 0xFB2099, 0xF7B96F, 0x71F594, 0xEE8A83, 0x68C678, 0x645F8E, 0xE21375,
+    0x15723B, 0x933EC0, 0x9FA736, 0x19EBCD, 0x8694DA, 0x00D821, 0x0C41D7, 0x8A0D2C,
+    0xB4F302, 0x32BFF9, 0x3E260F, 0xB86AF4, 0x2715E3, 0xA15918, 0xADC0EE, 0x2B8C15,
+    0xD03CB2, 0x567049, 0x5AE9BF, 0xDCA544, 0x43DA53, 0xC596A8, 0xC90F5E, 0x4F43A5,
+    0x71BD8B, 0xF7F170, 0xFB6886, 0x7D247D, 0xE25B6A, 0x641791, 0x688E67, 0xEEC29C,
+    0x3347A4, 0xB50B5F, 0xB992A9, 0x3FDE52, 0xA0A145, 0x26EDBE, 0x2A7448, 0xAC38B3,
+    0x92C69D, 0x148A66, 0x181390, 0x9E5F6B, 0x01207C, 0x876C87, 0x8BF571, 0x0DB98A,
+    0xF6092D, 0x7045D6, 0x7CDC20, 0xFA90DB, 0x65EFCC, 0xE3A337, 0xEF3AC1, 0x69763A,
+    0x578814, 0xD1C4EF, 0xDD5D19, 0x5B11E2, 0xC46EF5, 0x42220E, 0x4EBBF8, 0xC8F703,
+    0x3F964D, 0xB9DAB6, 0xB54340, 0x330FBB, 0xAC70AC, 0x2A3C57, 0x26A5A1, 0xA0E95A,
+    0x9E1774, 0x185B8F, 0x14C279, 0x928E82, 0x0DF195, 0x8BBD6E, 0x872498, 0x016863,
+    0xFAD8C4, 0x7C943F, 0x700DC9, 0xF64132, 0x693E25, 0xEF72DE, 0xE3EB28, 0x65A7D3,
+    0x5B59FD, 0xDD1506, 0xD18CF0, 0x57C00B, 0xC8BF1C, 0x4EF3E7, 0x426A11, 0xC426EA,
+    0x2AE476, 0xACA88D, 0xA0317B, 0x267D80, 0xB90297, 0x3F4E6C, 0x33D79A, 0xB59B61,
+    0x8B654F, 0x0D29B4, 0x01B042, 0x87FCB9, 0x1883AE, 0x9ECF55, 0x9256A3, 0x141A58,
+    0xEFAAFF, 0x69E604, 0x657FF2, 0xE33309, 0x7C4C1E, 0xFA00E5, 0xF69913, 0x70D5E8,
+    0x4E2BC6, 0xC8673D, 0xC4FECB, 0x42B230, 0xDDCD27, 0x5B81DC, 0x57182A, 0xD154D1,
+    0x26359F, 0xA07964, 0xACE092, 0x2AAC69, 0xB5D37E, 0x339F85, 0x3F0673, 0xB94A88,
+    0x87B4A6, 0x01F85D, 0x0D61AB, 0x8B2D50, 0x145247, 0x921EBC, 0x9E874A, 0x18CBB1,
+    0xE37B16, 0x6537ED, 0x69AE1B, 0xEFE2E0, 0x709DF7, 0xF6D10C, 0xFA48FA, 0x7C0401,
+    0x42FA2F, 0xC4B6D4, 0xC82F22, 0x4E63D9, 0xD11CCE, 0x575035, 0x5BC9C3, 0xDD8538};
 
 /** Calculate Qualcomm 24-bit Cyclical Redundancy Check (CRC-24Q).
  *
@@ -93,7 +92,9 @@ u32 crc24q(const u8 *buf, u32 len, u32 crc)
 {
     u32 i = 0;
     for (i = 0; i < len; i++)
-        crc = ((crc << 8) & 0xFFFFFF) ^ crc24qtab[((crc >> 16) ^ buf[i]) & 0xff];
+        {
+            crc = ((crc << 8) & 0xFFFFFF) ^ crc24qtab[((crc >> 16) ^ buf[i]) & 0xff];
+        }
     return crc;
 }
 
@@ -114,28 +115,28 @@ u32 crc24q(const u8 *buf, u32 len, u32 crc)
  */
 u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
 {
-    u16 acc   = 0;
-    u8  b     = 0;
+    u16 acc = 0;
+    u8 b = 0;
     u32 shift = 8 - n_bits % 8;
 
     u32 i = 0;
     for (i = 0; i < n_bits / 8; ++i)
         {
-            acc  = (acc << 8) | *buf++;
+            acc = (acc << 8) | *buf++;
             if (invert)
                 {
                     acc ^= 0xFFu;
                 }
-            b    = (acc >> shift) & 0xFFu;
-            crc  = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
+            b = (acc >> shift) & 0xFFu;
+            crc = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
         }
-    acc  = (acc << 8) | *buf;
+    acc = (acc << 8) | *buf;
     if (invert)
         {
             acc ^= 0xFFu;
         }
-    b    = (acc >> shift) & 0xFFu;
-    crc  = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
+    b = (acc >> shift) & 0xFFu;
+    crc = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
 
     return crc;
 }
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c
index 9739c2ab3..c6486412a 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/viterbi27.c
@@ -30,8 +30,8 @@
  */
 
 
-#include <stdlib.h>
 #include "fec.h"
+#include <stdlib.h>
 
 static inline int parity(int x)
 {
@@ -52,10 +52,10 @@ void v27_poly_init(v27_poly_t *poly, const signed char polynomial[2])
 {
     int state;
 
-    for(state = 0; state < 32; state++)
+    for (state = 0; state < 32; state++)
         {
-            poly->c0[state] = (polynomial[0] < 0) ^ parity((2*state) & abs(polynomial[0])) ? 255 : 0;
-            poly->c1[state] = (polynomial[1] < 0) ^ parity((2*state) & abs(polynomial[1])) ? 255 : 0;
+            poly->c0[state] = (polynomial[0] < 0) ^ parity((2 * state) & abs(polynomial[0])) ? 255 : 0;
+            poly->c1[state] = (polynomial[1] < 0) ^ parity((2 * state) & abs(polynomial[1])) ? 255 : 0;
         }
 }
 
@@ -72,7 +72,7 @@ void v27_poly_init(v27_poly_t *poly, const signed char polynomial[2])
  * \param initial_state Initial state of the decoder shift register. Usually zero.
  */
 void v27_init(v27_t *v, v27_decision_t *decisions, unsigned int decisions_count,
-              const v27_poly_t *poly, unsigned char initial_state)
+    const v27_poly_t *poly, unsigned char initial_state)
 {
     int i;
 
@@ -83,28 +83,31 @@ void v27_init(v27_t *v, v27_decision_t *decisions, unsigned int decisions_count,
     v->decisions_index = 0;
     v->decisions_count = decisions_count;
 
-    for(i = 0; i < 64; i++)
-        v->old_metrics[i] = 63;
+    for (i = 0; i < 64; i++)
+        {
+            v->old_metrics[i] = 63;
+        }
 
     v->old_metrics[initial_state & 63] = 0; /* Bias known start state */
 }
 
 
 /* C-language butterfly */
-#define BFLY(i) {\
-        unsigned int metric,m0,m1,decision;\
-        metric = (v->poly->c0[i] ^ sym0) + (v->poly->c1[i] ^ sym1);\
-        m0 = v->old_metrics[i] + metric;\
-        m1 = v->old_metrics[(i)+32] + (510 - metric);\
-        decision = (signed int)(m0-m1) > 0;\
-        v->new_metrics[2*(i)] = decision ? m1 : m0;\
-        d->w[(i)/16] |= decision << ((2*(i))&31);\
-        m0 -= (metric+metric-510);\
-        m1 += (metric+metric-510);\
-        decision = (signed int)(m0-m1) > 0;\
-        v->new_metrics[2*(i)+1] = decision ? m1 : m0;\
-        d->w[(i)/16] |= decision << ((2*(i)+1)&31);\
-}
+#define BFLY(i)                                                     \
+    {                                                               \
+        unsigned int metric, m0, m1, decision;                      \
+        metric = (v->poly->c0[i] ^ sym0) + (v->poly->c1[i] ^ sym1); \
+        m0 = v->old_metrics[i] + metric;                            \
+        m1 = v->old_metrics[(i) + 32] + (510 - metric);             \
+        decision = (signed int)(m0 - m1) > 0;                       \
+        v->new_metrics[2 * (i)] = decision ? m1 : m0;               \
+        d->w[(i) / 16] |= decision << ((2 * (i)) & 31);             \
+        m0 -= (metric + metric - 510);                              \
+        m1 += (metric + metric - 510);                              \
+        decision = (signed int)(m0 - m1) > 0;                       \
+        v->new_metrics[2 * (i) + 1] = decision ? m1 : m0;           \
+        d->w[(i) / 16] |= decision << ((2 * (i) + 1) & 31);         \
+    }
 
 /** Update a v27_t decoder with a block of symbols.
  *
@@ -119,7 +122,7 @@ void v27_update(v27_t *v, const unsigned char *syms, int nbits)
     unsigned int *tmp;
     int normalize = 0;
 
-    while(nbits--)
+    while (nbits--)
         {
             v27_decision_t *d = &v->decisions[v->decisions_index];
 
@@ -161,26 +164,32 @@ void v27_update(v27_t *v, const unsigned char *syms, int nbits)
             BFLY(31);
 
             /* Normalize metrics if they are nearing overflow */
-            if(v->new_metrics[0] > (1 << 30))
+            if (v->new_metrics[0] > (1 << 30))
                 {
                     int i;
                     unsigned int minmetric = 1 << 31;
 
-                    for(i = 0; i < 64; i++)
+                    for (i = 0; i < 64; i++)
                         {
-                            if(v->new_metrics[i] < minmetric)
-                                minmetric = v->new_metrics[i];
+                            if (v->new_metrics[i] < minmetric)
+                                {
+                                    minmetric = v->new_metrics[i];
+                                }
                         }
 
-                    for(i = 0; i < 64; i++)
-                        v->new_metrics[i] -= minmetric;
+                    for (i = 0; i < 64; i++)
+                        {
+                            v->new_metrics[i] -= minmetric;
+                        }
 
                     normalize += minmetric;
                 }
 
             /* Advance decision index */
-            if(++v->decisions_index >= v->decisions_count)
-                v->decisions_index = 0;
+            if (++v->decisions_index >= v->decisions_count)
+                {
+                    v->decisions_index = 0;
+                }
 
             /* Swap pointers to old and new metrics */
             tmp = v->old_metrics;
@@ -199,7 +208,7 @@ void v27_update(v27_t *v, const unsigned char *syms, int nbits)
  * \param final_state Known final state of the decoder shift register.
  */
 void v27_chainback_fixed(v27_t *v, unsigned char *data, unsigned int nbits,
-                         unsigned char final_state)
+    unsigned char final_state)
 {
     int k;
     unsigned int decisions_index = v->decisions_index;
@@ -207,12 +216,10 @@ void v27_chainback_fixed(v27_t *v, unsigned char *data, unsigned int nbits,
     final_state %= 64;
     final_state <<= 2;
 
-    while(nbits-- != 0)
+    while (nbits-- != 0)
         {
-
             /* Decrement decision index */
-            decisions_index = (decisions_index == 0) ?
-                    v->decisions_count-1 : decisions_index-1;
+            decisions_index = (decisions_index == 0) ? v->decisions_count - 1 : decisions_index - 1;
 
             v27_decision_t *d = &v->decisions[decisions_index];
             k = (d->w[(final_state >> 2) / 32] >> ((final_state >> 2) % 32)) & 1;
@@ -239,9 +246,9 @@ void v27_chainback_likely(v27_t *v, unsigned char *data, unsigned int nbits)
     int i;
     unsigned int best_metric = 0xffffffff;
     unsigned char best_state = 0;
-    for(i = 0; i < 64; i++)
+    for (i = 0; i < 64; i++)
         {
-            if(v->new_metrics[i] < best_metric)
+            if (v->new_metrics[i] < best_metric)
                 {
                     best_metric = v->new_metrics[i];
                     best_state = i;
diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
index 957efa9a6..febb18294 100644
--- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
+++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.cc
@@ -199,7 +199,9 @@ int Viterbi_Decoder::do_acs(const double sym[], int nbits)
         {
             /* Temporarily store the received symbols current decoding step */
             for (i = 0; i < d_nn; i++)
-                d_rec_array[i] = static_cast<float>(sym[d_nn * t + i]);
+                {
+                    d_rec_array[i] = static_cast<float>(sym[d_nn * t + i]);
+                }
 
             /* precompute all possible branch metrics */
             for (i = 0; i < d_number_symbols; i++)
diff --git a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc
index e860da87b..d74732151 100644
--- a/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/beidou_b1i_dll_pll_tracking.cc
@@ -59,14 +59,20 @@ BeidouB1iDllPllTracking::BeidouB1iDllPllTracking(
     bool dump = configuration->property(role + ".dump", false);
     trk_param.dump = dump;
     float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     trk_param.pll_bw_hz = pll_bw_hz;
     float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0);
     trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz;
     float dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0);
     trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
     float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     trk_param.dll_bw_hz = dll_bw_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param.early_late_space_chips = early_late_space_chips;
@@ -105,16 +111,28 @@ BeidouB1iDllPllTracking::BeidouB1iDllPllTracking(
     char sig_[3] = "B1";
     std::memcpy(trk_param.signal, sig_, 3);
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
-    if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
+    if (FLAGS_cn0_samples != 20)
+        {
+            cn0_samples = FLAGS_cn0_samples;
+        }
     trk_param.cn0_samples = cn0_samples;
     int cn0_min = configuration->property(role + ".cn0_min", 25);
-    if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
+    if (FLAGS_cn0_min != 25)
+        {
+            cn0_min = FLAGS_cn0_min;
+        }
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
-    if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
+    if (FLAGS_max_lock_fail != 50)
+        {
+            max_lock_fail = FLAGS_max_lock_fail;
+        }
     trk_param.max_lock_fail = max_lock_fail;
     double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.85);
-    if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
+    if (FLAGS_carrier_lock_th != 0.85)
+        {
+            carrier_lock_th = FLAGS_carrier_lock_th;
+        }
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index 3bb059dc2..4912bd093 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -76,10 +76,16 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
             trk_param.smoother_length = configuration->property(role + ".smoother_length", 10);
         }
     float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 5.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     trk_param.pll_bw_hz = pll_bw_hz;
     float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 0.5);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     trk_param.dll_bw_hz = dll_bw_hz;
     float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 2.0);
     trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz;
@@ -117,16 +123,28 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
     char sig_[3] = "1B";
     std::memcpy(trk_param.signal, sig_, 3);
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
-    if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
+    if (FLAGS_cn0_samples != 20)
+        {
+            cn0_samples = FLAGS_cn0_samples;
+        }
     trk_param.cn0_samples = cn0_samples;
     int cn0_min = configuration->property(role + ".cn0_min", 25);
-    if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
+    if (FLAGS_cn0_min != 25)
+        {
+            cn0_min = FLAGS_cn0_min;
+        }
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
-    if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
+    if (FLAGS_max_lock_fail != 50)
+        {
+            max_lock_fail = FLAGS_max_lock_fail;
+        }
     trk_param.max_lock_fail = max_lock_fail;
     double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.85);
-    if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
+    if (FLAGS_carrier_lock_th != 0.85)
+        {
+            carrier_lock_th = FLAGS_carrier_lock_th;
+        }
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index f95f76200..358e952c9 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -68,9 +68,15 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
     fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump = configuration->property(role + ".dump", false);
     pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.15);
     very_early_late_space_chips = configuration->property(role + ".very_early_late_space_chips", 0.6);
     port_ch0 = configuration->property(role + ".port_ch0", 2060);
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index b0e0a0730..78a497755 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -76,10 +76,16 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
             trk_param.smoother_length = configuration->property(role + ".smoother_length", 10);
         }
     float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 20.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     trk_param.pll_bw_hz = pll_bw_hz;
     float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 20.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     trk_param.dll_bw_hz = dll_bw_hz;
     float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 5.0);
     trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz;
@@ -115,16 +121,28 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
     char sig_[3] = "5X";
     std::memcpy(trk_param.signal, sig_, 3);
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
-    if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
+    if (FLAGS_cn0_samples != 20)
+        {
+            cn0_samples = FLAGS_cn0_samples;
+        }
     trk_param.cn0_samples = cn0_samples;
     int cn0_min = configuration->property(role + ".cn0_min", 25);
-    if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
+    if (FLAGS_cn0_min != 25)
+        {
+            cn0_min = FLAGS_cn0_min;
+        }
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
-    if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
+    if (FLAGS_max_lock_fail != 50)
+        {
+            max_lock_fail = FLAGS_max_lock_fail;
+        }
     trk_param.max_lock_fail = max_lock_fail;
     double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.85);
-    if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
+    if (FLAGS_carrier_lock_th != 0.85)
+        {
+            carrier_lock_th = FLAGS_carrier_lock_th;
+        }
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
index 30101a0ff..e3ca80dbe 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
@@ -69,9 +69,15 @@ GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
     fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump = configuration->property(role + ".dump", false);
     pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0);
     dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0);
     int extend_correlation_ms;
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
index a96165d47..406271643 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_tracking.cc
@@ -66,9 +66,15 @@ GlonassL1CaDllPllTracking::GlonassL1CaDllPllTracking(
     fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump = configuration->property(role + ".dump", false);
     pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     std::string default_dump_filename = "./track_ch";
     dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
index 4ddff7163..419ccc462 100644
--- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
@@ -67,9 +67,15 @@ GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
     fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump = configuration->property(role + ".dump", false);
     pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0);
     dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0);
     int extend_correlation_ms;
diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc
index 3c39300af..1e7ded9da 100644
--- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_tracking.cc
@@ -64,9 +64,15 @@ GlonassL2CaDllPllTracking::GlonassL2CaDllPllTracking(
     fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump = configuration->property(role + ".dump", false);
     pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     std::string default_dump_filename = "./track_ch";
     dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
index 899e878e2..5531be4e0 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
@@ -68,9 +68,15 @@ GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
     fs_in = configuration->property("GNSS-SDR.internal_fs_sps", fs_in_deprecated);
     dump = configuration->property(role + ".dump", false);
     pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0);
     dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0);
     int extend_correlation_ms;
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
index 394574667..83a60b49a 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
@@ -76,14 +76,20 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     bool dump_mat = configuration->property(role + ".dump_mat", true);
     trk_param.dump_mat = dump_mat;
     float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     trk_param.pll_bw_hz = pll_bw_hz;
     float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 20.0);
     trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz;
     float dll_bw_narrow_hz = configuration->property(role + ".dll_bw_narrow_hz", 2.0);
     trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
     float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     trk_param.dll_bw_hz = dll_bw_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param.early_late_space_chips = early_late_space_chips;
@@ -119,16 +125,28 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
     char sig_[3] = "1C";
     std::memcpy(trk_param.signal, sig_, 3);
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
-    if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
+    if (FLAGS_cn0_samples != 20)
+        {
+            cn0_samples = FLAGS_cn0_samples;
+        }
     trk_param.cn0_samples = cn0_samples;
     int cn0_min = configuration->property(role + ".cn0_min", 30);
-    if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
+    if (FLAGS_cn0_min != 25)
+        {
+            cn0_min = FLAGS_cn0_min;
+        }
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
-    if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
+    if (FLAGS_max_lock_fail != 50)
+        {
+            max_lock_fail = FLAGS_max_lock_fail;
+        }
     trk_param.max_lock_fail = max_lock_fail;
     double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.80);
-    if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
+    if (FLAGS_carrier_lock_th != 0.85)
+        {
+            carrier_lock_th = FLAGS_carrier_lock_th;
+        }
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc
index e0960758f..b10cecafd 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_kf_tracking.cc
@@ -77,7 +77,10 @@ GpsL1CaKfTracking::GpsL1CaKfTracking(
     f_if = configuration->property(role + ".if", 0);
     dump = configuration->property(role + ".dump", false);
     dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     std::string default_dump_filename = "./track_ch";
     dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
index 332b7b9c2..c55191bd2 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
@@ -66,10 +66,16 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
     bool dump_mat = configuration->property(role + ".dump_mat", true);
     trk_param.dump_mat = dump_mat;
     float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 2.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     trk_param.pll_bw_hz = pll_bw_hz;
     float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 0.75);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     trk_param.dll_bw_hz = dll_bw_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param.early_late_space_chips = early_late_space_chips;
@@ -96,16 +102,28 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
     char sig_[3] = "2S";
     std::memcpy(trk_param.signal, sig_, 3);
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
-    if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
+    if (FLAGS_cn0_samples != 20)
+        {
+            cn0_samples = FLAGS_cn0_samples;
+        }
     trk_param.cn0_samples = cn0_samples;
     int cn0_min = configuration->property(role + ".cn0_min", 25);
-    if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
+    if (FLAGS_cn0_min != 25)
+        {
+            cn0_min = FLAGS_cn0_min;
+        }
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
-    if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
+    if (FLAGS_max_lock_fail != 50)
+        {
+            max_lock_fail = FLAGS_max_lock_fail;
+        }
     trk_param.max_lock_fail = max_lock_fail;
     double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.85);
-    if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
+    if (FLAGS_carrier_lock_th != 0.85)
+        {
+            carrier_lock_th = FLAGS_carrier_lock_th;
+        }
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
index c471f98b8..f0fbcd37a 100644
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
@@ -76,10 +76,16 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
             trk_param.smoother_length = configuration->property(role + ".smoother_length", 10);
         }
     float pll_bw_hz = configuration->property(role + ".pll_bw_hz", 50.0);
-    if (FLAGS_pll_bw_hz != 0.0) pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+    if (FLAGS_pll_bw_hz != 0.0)
+        {
+            pll_bw_hz = static_cast<float>(FLAGS_pll_bw_hz);
+        }
     trk_param.pll_bw_hz = pll_bw_hz;
     float dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
-    if (FLAGS_dll_bw_hz != 0.0) dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+    if (FLAGS_dll_bw_hz != 0.0)
+        {
+            dll_bw_hz = static_cast<float>(FLAGS_dll_bw_hz);
+        }
     trk_param.dll_bw_hz = dll_bw_hz;
     float pll_bw_narrow_hz = configuration->property(role + ".pll_bw_narrow_hz", 2.0);
     trk_param.pll_bw_narrow_hz = pll_bw_narrow_hz;
@@ -115,16 +121,28 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
     char sig_[3] = "L5";
     std::memcpy(trk_param.signal, sig_, 3);
     int cn0_samples = configuration->property(role + ".cn0_samples", 20);
-    if (FLAGS_cn0_samples != 20) cn0_samples = FLAGS_cn0_samples;
+    if (FLAGS_cn0_samples != 20)
+        {
+            cn0_samples = FLAGS_cn0_samples;
+        }
     trk_param.cn0_samples = cn0_samples;
     int cn0_min = configuration->property(role + ".cn0_min", 25);
-    if (FLAGS_cn0_min != 25) cn0_min = FLAGS_cn0_min;
+    if (FLAGS_cn0_min != 25)
+        {
+            cn0_min = FLAGS_cn0_min;
+        }
     trk_param.cn0_min = cn0_min;
     int max_lock_fail = configuration->property(role + ".max_lock_fail", 50);
-    if (FLAGS_max_lock_fail != 50) max_lock_fail = FLAGS_max_lock_fail;
+    if (FLAGS_max_lock_fail != 50)
+        {
+            max_lock_fail = FLAGS_max_lock_fail;
+        }
     trk_param.max_lock_fail = max_lock_fail;
     double carrier_lock_th = configuration->property(role + ".carrier_lock_th", 0.75);
-    if (FLAGS_carrier_lock_th != 0.85) carrier_lock_th = FLAGS_carrier_lock_th;
+    if (FLAGS_carrier_lock_th != 0.85)
+        {
+            carrier_lock_th = FLAGS_carrier_lock_th;
+        }
     trk_param.carrier_lock_th = carrier_lock_th;
 
     //################# MAKE TRACKING GNURadio object ###################
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index a42e85d15..518e5dfda 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -764,7 +764,10 @@ bool dll_pll_veml_tracking::cn0_and_tracking_lock_status(double coh_integration_
         }
     else
         {
-            if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+            if (d_carrier_lock_fail_counter > 0)
+                {
+                    d_carrier_lock_fail_counter--;
+                }
         }
     if (d_carrier_lock_fail_counter > trk_parameters.max_lock_fail)
         {
@@ -853,7 +856,10 @@ void dll_pll_veml_tracking::run_dll_pll()
 void dll_pll_veml_tracking::clear_tracking_vars()
 {
     std::fill_n(d_correlator_outs, d_n_correlator_taps, gr_complex(0.0, 0.0));
-    if (trk_parameters.track_pilot) d_Prompt_Data[0] = gr_complex(0.0, 0.0);
+    if (trk_parameters.track_pilot)
+        {
+            d_Prompt_Data[0] = gr_complex(0.0, 0.0);
+        }
     d_carr_error_hz = 0.0;
     d_carr_error_filt_hz = 0.0;
     d_code_error_chips = 0.0;
@@ -989,9 +995,13 @@ void dll_pll_veml_tracking::save_correlation_results()
         }
     // If tracking pilot, disable Costas loop
     if (trk_parameters.track_pilot)
-        d_cloop = false;
+        {
+            d_cloop = false;
+        }
     else
-        d_cloop = true;
+        {
+            d_cloop = true;
+        }
 }
 
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index 6d410efe1..641dcf248 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -425,7 +425,10 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
                         }
                     else
                         {
-                            if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                            if (d_carrier_lock_fail_counter > 0)
+                                {
+                                    d_carrier_lock_fail_counter--;
+                                }
                         }
                     if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                         {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 73a5f8604..21a040646 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -808,7 +808,10 @@ int glonass_l1_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
                                 }
                             else
                                 {
-                                    if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                                    if (d_carrier_lock_fail_counter > 0)
+                                        {
+                                            d_carrier_lock_fail_counter--;
+                                        }
                                 }
                             if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                                 {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
index a9f9402b8..3e0338be2 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -798,7 +798,10 @@ int glonass_l1_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __at
                                 }
                             else
                                 {
-                                    if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                                    if (d_carrier_lock_fail_counter > 0)
+                                        {
+                                            d_carrier_lock_fail_counter--;
+                                        }
                                 }
                             if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                                 {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 0bd9553c6..68d94e82f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -667,7 +667,10 @@ int Glonass_L1_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
                         }
                     else
                         {
-                            if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                            if (d_carrier_lock_fail_counter > 0)
+                                {
+                                    d_carrier_lock_fail_counter--;
+                                }
                         }
                     if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                         {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index ac85df763..ae689ab8a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -806,7 +806,10 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __at
                                 }
                             else
                                 {
-                                    if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                                    if (d_carrier_lock_fail_counter > 0)
+                                        {
+                                            d_carrier_lock_fail_counter--;
+                                        }
                                 }
                             if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                                 {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
index b60aabb3a..aebdf3db7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc
@@ -797,7 +797,10 @@ int glonass_l2_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __at
                                 }
                             else
                                 {
-                                    if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                                    if (d_carrier_lock_fail_counter > 0)
+                                        {
+                                            d_carrier_lock_fail_counter--;
+                                        }
                                 }
                             if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                                 {
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index 8b3492978..8156ea09b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -667,7 +667,10 @@ int Glonass_L2_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
                         }
                     else
                         {
-                            if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                            if (d_carrier_lock_fail_counter > 0)
+                                {
+                                    d_carrier_lock_fail_counter--;
+                                }
                         }
                     if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                         {
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index eea588de4..45a890cbe 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -787,7 +787,10 @@ int gps_l1_ca_dll_pll_c_aid_tracking_cc::general_work(int noutput_items __attrib
                                 }
                             else
                                 {
-                                    if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                                    if (d_carrier_lock_fail_counter > 0)
+                                        {
+                                            d_carrier_lock_fail_counter--;
+                                        }
                                 }
                             if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                                 {
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
index 6ba84d855..8a3dd9a7d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc
@@ -788,7 +788,10 @@ int gps_l1_ca_dll_pll_c_aid_tracking_sc::general_work(int noutput_items __attrib
                                 }
                             else
                                 {
-                                    if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                                    if (d_carrier_lock_fail_counter > 0)
+                                        {
+                                            d_carrier_lock_fail_counter--;
+                                        }
                                 }
                             if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                                 {
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index d5a6cb62f..96c478a3f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -850,7 +850,10 @@ int Gps_L1_Ca_Kf_Tracking_cc::general_work(int noutput_items __attribute__((unus
                         }
                     else
                         {
-                            if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                            if (d_carrier_lock_fail_counter > 0)
+                                {
+                                    d_carrier_lock_fail_counter--;
+                                }
                         }
                     if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                         {
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index cf5cb96a2..2912e8e2c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -461,7 +461,10 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
                         }
                     else
                         {
-                            if (d_carrier_lock_fail_counter > 0) d_carrier_lock_fail_counter--;
+                            if (d_carrier_lock_fail_counter > 0)
+                                {
+                                    d_carrier_lock_fail_counter--;
+                                }
                         }
                     if (d_carrier_lock_fail_counter > FLAGS_max_lock_fail)
                         {
diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc
index 9ca9dd039..63c076b82 100644
--- a/src/core/libs/INIReader.cc
+++ b/src/core/libs/INIReader.cc
@@ -87,7 +87,9 @@ std::string INIReader::MakeKey(const std::string& section, const std::string& na
     std::string key = section + "." + name;
     // Convert to lower case to make lookups case-insensitive
     for (char& i : key)
-        i = tolower(i);
+        {
+            i = tolower(i);
+        }
     return key;
 }
 
diff --git a/src/core/libs/ini.cc b/src/core/libs/ini.cc
index 49991e57f..17506e56e 100644
--- a/src/core/libs/ini.cc
+++ b/src/core/libs/ini.cc
@@ -68,7 +68,9 @@ static char* rstrip(char* s)
 {
     char* p = s + std::char_traits<char>::length(s);
     while (p > s && isspace(*--p))
-        *p = '\0';
+        {
+            *p = '\0';
+        }
     return s;
 }
 
@@ -76,7 +78,9 @@ static char* rstrip(char* s)
 static char* lskip(char* s)
 {
     while (*s && isspace(*s))
-        s++;
+        {
+            s++;
+        }
     return static_cast<char*>(s);
 }
 
@@ -85,7 +89,9 @@ static char* lskip(char* s)
 static char* find_char_or_comment(char* s, char c)
 {
     while (*s && *s != c && *s != ';')
-        s++;
+        {
+            s++;
+        }
     return static_cast<char*>(s);
 }
 
@@ -121,7 +127,9 @@ int ini_parse(const char* filename,
 
     file.open(filename, std::fstream::in);
     if (!file.is_open())
-        return -1;
+        {
+            return -1;
+        }
 
     /* Scan through file line by line */
     while (std::getline(file, line_str))
@@ -129,7 +137,10 @@ int ini_parse(const char* filename,
             lineno++;
             int len_str = line_str.length();
             const char* read_line = line_str.data();
-            if (len_str > (MAX_LINE - 1)) len_str = MAX_LINE - 1;
+            if (len_str > (MAX_LINE - 1))
+                {
+                    len_str = MAX_LINE - 1;
+                }
             int i;
             for (i = 0; i < len_str; i++)
                 {
@@ -144,7 +155,9 @@ int ini_parse(const char* filename,
                     /* Non-black line with leading whitespace, treat as continuation
                 of previous name's value (as per Python ConfigParser). */
                     if (!handler(user, section, prev_name, start) && !error)
-                        error = lineno;
+                        {
+                            error = lineno;
+                        }
                 }
             else
 #endif
@@ -175,13 +188,17 @@ int ini_parse(const char* filename,
                             value = lskip(end + 1);
                             end = find_char_or_comment(value, ';');
                             if (*end == ';')
-                                *end = '\0';
+                                {
+                                    *end = '\0';
+                                }
                             rstrip(value);
 
                             /* Valid name=value pair found, call handler */
                             strncpy0(prev_name, name, sizeof(prev_name));
                             if (!handler(user, section, name, value) && !error)
-                                error = lineno;
+                                {
+                                    error = lineno;
+                                }
                         }
                     else if (!error)
                         {
diff --git a/src/core/libs/supl/supl.c b/src/core/libs/supl/supl.c
index 3722d1af0..0184f35ac 100644
--- a/src/core/libs/supl/supl.c
+++ b/src/core/libs/supl/supl.c
@@ -9,29 +9,29 @@
 */
 
 #include "supl.h"
-#include <stdio.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
-#include <errno.h>
+#include <stdio.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/time.h>
-
 
 
 #define PARAM_GSM_CELL_CURRENT 1
 #define PARAM_GSM_CELL_KNOWN 2
 #define PARAM_WCDMA_CELL_CURRENT 4
 
-#define OPTIONAL_MISSING ((void*)0)
+#define OPTIONAL_MISSING ((void *)0)
 
 #ifdef SUPL_DEBUG
-static struct supl_debug_s {
-  FILE *log;
-  int verbose_rrlp, verbose_supl, debug;
-  int sent,recv, out_msg, in_msg;
+static struct supl_debug_s
+{
+    FILE *log;
+    int verbose_rrlp, verbose_supl, debug;
+    int sent, recv, out_msg, in_msg;
 } debug;
 #endif
 
@@ -42,201 +42,242 @@ static int pdu_make_ulp_rrlp_ack(supl_ctx_t *ctx, supl_ulp_t *pdu, PDU_t *rrlp);
 static int supl_more_rrlp(PDU_t *rrlp);
 static int supl_response_harvest(supl_ctx_t *ctx, supl_ulp_t *pdu);
 
-int EXPORT supl_ulp_decode(supl_ulp_t *pdu) {
-  ULP_PDU_t *ulp;
-  asn_codec_ctx_t ctx;
-  asn_dec_rval_t rval;
+int EXPORT supl_ulp_decode(supl_ulp_t *pdu)
+{
+    ULP_PDU_t *ulp;
+    asn_codec_ctx_t ctx;
+    asn_dec_rval_t rval;
 
-  ulp = calloc(1, sizeof(ULP_PDU_t));
-  pdu->pdu = ulp;
+    ulp = calloc(1, sizeof(ULP_PDU_t));
+    pdu->pdu = ulp;
 
-  ctx.max_stack_size = 0;
-  rval = uper_decode_complete(&ctx, &asn_DEF_ULP_PDU, (void **)&ulp, pdu->buffer, pdu->size);
-  if (rval.code == RC_OK) {
-    return 0;
-  }
+    ctx.max_stack_size = 0;
+    rval = uper_decode_complete(&ctx, &asn_DEF_ULP_PDU, (void **)&ulp, pdu->buffer, pdu->size);
+    if (rval.code == RC_OK)
+        {
+            return 0;
+        }
 
-  free(ulp);
-  pdu->pdu = 0;
+    free(ulp);
+    pdu->pdu = 0;
 
-  return E_SUPL_DECODE;
+    return E_SUPL_DECODE;
 }
 
-int EXPORT supl_ulp_encode(supl_ulp_t *pdu) {
-  asn_enc_rval_t ret;
-  int pdu_len;
 
-  ret = uper_encode_to_buffer(&asn_DEF_ULP_PDU, pdu->pdu, pdu->buffer, sizeof(pdu->buffer));
-  if (ret.encoded != -1) {
-    memset(pdu->buffer, 0, sizeof(pdu->buffer));
-
-    pdu_len = (ret.encoded + 7) >> 3;
-    ((ULP_PDU_t *)pdu->pdu)->length = pdu_len;
+int EXPORT supl_ulp_encode(supl_ulp_t *pdu)
+{
+    asn_enc_rval_t ret;
+    int pdu_len;
 
     ret = uper_encode_to_buffer(&asn_DEF_ULP_PDU, pdu->pdu, pdu->buffer, sizeof(pdu->buffer));
-    if (ret.encoded > 0) {
-      int len = (ret.encoded + 7) >> 3;
+    if (ret.encoded != -1)
+        {
+            memset(pdu->buffer, 0, sizeof(pdu->buffer));
 
-      if (len == pdu_len) {
-	pdu->size = pdu_len;
-	return 0;
-      }
-    }
-  }
+            pdu_len = (ret.encoded + 7) >> 3;
+            ((ULP_PDU_t *)pdu->pdu)->length = pdu_len;
 
-  return E_SUPL_ENCODE;
+            ret = uper_encode_to_buffer(&asn_DEF_ULP_PDU, pdu->pdu, pdu->buffer, sizeof(pdu->buffer));
+            if (ret.encoded > 0)
+                {
+                    int len = (ret.encoded + 7) >> 3;
+
+                    if (len == pdu_len)
+                        {
+                            pdu->size = pdu_len;
+                            return 0;
+                        }
+                }
+        }
+
+    return E_SUPL_ENCODE;
 }
 
-void EXPORT supl_ulp_free(supl_ulp_t *pdu) {
-  asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, pdu->pdu, 0);
+
+void EXPORT supl_ulp_free(supl_ulp_t *pdu)
+{
+    asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, pdu->pdu, 0);
 }
 
-int EXPORT supl_ulp_send(supl_ctx_t *ctx, supl_ulp_t *pdu) {
-  int err;
+
+int EXPORT supl_ulp_send(supl_ctx_t *ctx, supl_ulp_t *pdu)
+{
+    int err;
 
 #if SUPL_DEBUG
-  if (debug.verbose_supl) {
-    fprintf(debug.log, "Send %lu bytes\n", pdu->size);
-    xer_fprint(debug.log, &asn_DEF_ULP_PDU, pdu->pdu);
-  }
+    if (debug.verbose_supl)
+        {
+            fprintf(debug.log, "Send %lu bytes\n", pdu->size);
+            xer_fprint(debug.log, &asn_DEF_ULP_PDU, pdu->pdu);
+        }
 #endif
 
-  err = SSL_write(ctx->ssl, pdu->buffer, pdu->size);
-  if (err <= 0) {
+    err = SSL_write(ctx->ssl, pdu->buffer, pdu->size);
+    if (err <= 0)
+        {
 #if SUPL_DEBUG
-    if (debug.debug) fprintf(debug.log, "Error: SSL_write error: %s\n", strerror(errno));
+            if (debug.debug) fprintf(debug.log, "Error: SSL_write error: %s\n", strerror(errno));
 #endif
-    return E_SUPL_WRITE;
-  }
+            return E_SUPL_WRITE;
+        }
 
 #ifdef SUPL_DEBUG
-  debug.sent += pdu->size;
-  debug.out_msg++;
+    debug.sent += pdu->size;
+    debug.out_msg++;
 #endif
 
-  return 0;
-}
-
-int EXPORT supl_ulp_recv(supl_ctx_t *ctx, supl_ulp_t *pdu) {
-  int err;
-  int n;
-  asn_dec_rval_t rval;
-  ULP_PDU_t *length;
-
-  err = SSL_read(ctx->ssl, pdu->buffer, sizeof(pdu->buffer));
-  if (err <= 0) {
-#ifdef SUPL_DEBUG
-    if (debug.debug) fprintf(debug.log, "Error: SSL_read error: %s\n", strerror(errno));
-#endif
-    return E_SUPL_READ;
-  }
-  n = err;
-
-  length = calloc(1, sizeof(ULP_PDU_t));
-  // decode the very first bytes of the ULP_PDU message, just enough to the get message length
-  rval = uper_decode_complete(0, &asn_DEF_ULP_PDU, (void **)&length, pdu->buffer, n < 6 ? n : 6);
-  if (rval.code == RC_WMORE) {
-    // read the missing data
-    for (n = err; n < length->length; n += err) {
-#ifdef SUPL_DEBUG
-      if (debug.debug) fprintf(debug.log, "SSL_read got %u bytes (total %lu)\n", n, length->length);
-#endif
-      err = SSL_read(ctx->ssl, &pdu->buffer[n], sizeof(pdu->buffer)-n);
-      if (err <= 0) {
-#ifdef SUPL_DEBUG
-	if (debug.debug) fprintf(debug.log, "Error: SSL_read (again) error: %s\n", strerror(errno));
-#endif
-	return E_SUPL_READ;
-      }
-    }
-  }
-
-  asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, length, 0);
-
-  pdu->size = n;
-
-  if (supl_ulp_decode(pdu)) {
-    return E_SUPL_DECODE;
-  }
-
-#ifdef SUPL_DEBUG
-  if (debug.verbose_supl) {
-    fprintf(debug.log, "Recv %lu bytes\n", pdu->size);
-    xer_fprint(debug.log, &asn_DEF_ULP_PDU, pdu->pdu);
-  }
-#endif
-
-#ifdef SUPL_DEBUG
-  debug.recv += err;
-  debug.in_msg++;
-#endif
-
-  return 0;
-}
-
-int EXPORT supl_decode_rrlp(supl_ulp_t *ulp_pdu, PDU_t **ret_rrlp) {
-  asn_dec_rval_t rval;
-  OCTET_STRING_t *rrlp_pdu;
-  PDU_t *rrlp;
-  ULP_PDU_t *ulp;
-
-  ulp = ulp_pdu->pdu;
-
-  if (!(ulp->message.present == UlpMessage_PR_msSUPLPOS &&
-	ulp->message.choice.msSUPLPOS.posPayLoad.present == PosPayLoad_PR_rrlpPayload)) {
     return 0;
-  }
-  rrlp_pdu = &ulp->message.choice.msSUPLPOS.posPayLoad.choice.rrlpPayload;
-
-  rrlp = calloc(1, sizeof(PDU_t));
-  rval = uper_decode_complete(0, &asn_DEF_PDU, (void **)&rrlp, rrlp_pdu->buf, rrlp_pdu->size);
-  switch (rval.code) {
-  case RC_OK:
-#ifdef SUPL_DEBUG
-    if (rval.consumed != rrlp_pdu->size) {
-      if (debug.debug) fprintf(debug.log, "Warning: %lu bytes left over in RRLP decoding\n", rval.consumed);
-    }
-#endif
-
-    *ret_rrlp = rrlp;
-    return 0;
-
-  case RC_WMORE:
-    asn_DEF_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
-    ret_rrlp = 0;
-    return E_SUPL_DECODE_RRLP;
-
-  default:
-    asn_DEF_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
-    ret_rrlp = 0;
-    return E_SUPL_DECODE_RRLP;
-  }
-
-  return E_SUPL_INTERNAL;
 }
 
-int EXPORT supl_server_connect(supl_ctx_t *ctx, char *server) {
-  int err;
-  SSL_METHOD *meth;
 
-  SSLeay_add_ssl_algorithms();
-  // meth = TLSv1_client_method();
-  meth = (SSL_METHOD*)SSLv23_client_method();
-  SSL_load_error_strings();
-  ctx->ssl_ctx = SSL_CTX_new(meth);
-  if (!ctx->ssl_ctx) return E_SUPL_CONNECT;
+int EXPORT supl_ulp_recv(supl_ctx_t *ctx, supl_ulp_t *pdu)
+{
+    int err;
+    int n;
+    asn_dec_rval_t rval;
+    ULP_PDU_t *length;
 
-  ctx->ssl = SSL_new(ctx->ssl_ctx);
-  if (!ctx->ssl) return E_SUPL_CONNECT;
+    err = SSL_read(ctx->ssl, pdu->buffer, sizeof(pdu->buffer));
+    if (err <= 0)
+        {
+#ifdef SUPL_DEBUG
+            if (debug.debug) fprintf(debug.log, "Error: SSL_read error: %s\n", strerror(errno));
+#endif
+            return E_SUPL_READ;
+        }
+    n = err;
 
-  if (server) {
-    ctx->fd = server_connect(server);
-    if (ctx->fd == -1) return E_SUPL_CONNECT;
-  }
+    length = calloc(1, sizeof(ULP_PDU_t));
+    // decode the very first bytes of the ULP_PDU message, just enough to the get message length
+    rval = uper_decode_complete(0, &asn_DEF_ULP_PDU, (void **)&length, pdu->buffer, n < 6 ? n : 6);
+    if (rval.code == RC_WMORE)
+        {
+            // read the missing data
+            for (n = err; n < length->length; n += err)
+                {
+#ifdef SUPL_DEBUG
+                    if (debug.debug) fprintf(debug.log, "SSL_read got %u bytes (total %lu)\n", n, length->length);
+#endif
+                    err = SSL_read(ctx->ssl, &pdu->buffer[n], sizeof(pdu->buffer) - n);
+                    if (err <= 0)
+                        {
+#ifdef SUPL_DEBUG
+                            if (debug.debug) fprintf(debug.log, "Error: SSL_read (again) error: %s\n", strerror(errno));
+#endif
+                            return E_SUPL_READ;
+                        }
+                }
+        }
 
-  SSL_set_fd(ctx->ssl, ctx->fd);
-  err = SSL_connect(ctx->ssl);
-  if (err == -1) return E_SUPL_CONNECT;
+    asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, length, 0);
+
+    pdu->size = n;
+
+    if (supl_ulp_decode(pdu))
+        {
+            return E_SUPL_DECODE;
+        }
+
+#ifdef SUPL_DEBUG
+    if (debug.verbose_supl)
+        {
+            fprintf(debug.log, "Recv %lu bytes\n", pdu->size);
+            xer_fprint(debug.log, &asn_DEF_ULP_PDU, pdu->pdu);
+        }
+#endif
+
+#ifdef SUPL_DEBUG
+    debug.recv += err;
+    debug.in_msg++;
+#endif
+
+    return 0;
+}
+
+
+int EXPORT supl_decode_rrlp(supl_ulp_t *ulp_pdu, PDU_t **ret_rrlp)
+{
+    asn_dec_rval_t rval;
+    OCTET_STRING_t *rrlp_pdu;
+    PDU_t *rrlp;
+    ULP_PDU_t *ulp;
+
+    ulp = ulp_pdu->pdu;
+
+    if (!(ulp->message.present == UlpMessage_PR_msSUPLPOS &&
+            ulp->message.choice.msSUPLPOS.posPayLoad.present == PosPayLoad_PR_rrlpPayload))
+        {
+            return 0;
+        }
+    rrlp_pdu = &ulp->message.choice.msSUPLPOS.posPayLoad.choice.rrlpPayload;
+
+    rrlp = calloc(1, sizeof(PDU_t));
+    rval = uper_decode_complete(0, &asn_DEF_PDU, (void **)&rrlp, rrlp_pdu->buf, rrlp_pdu->size);
+    switch (rval.code)
+        {
+        case RC_OK:
+#ifdef SUPL_DEBUG
+            if (rval.consumed != rrlp_pdu->size)
+                {
+                    if (debug.debug) fprintf(debug.log, "Warning: %lu bytes left over in RRLP decoding\n", rval.consumed);
+                }
+#endif
+
+            *ret_rrlp = rrlp;
+            return 0;
+
+        case RC_WMORE:
+            asn_DEF_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
+            ret_rrlp = 0;
+            return E_SUPL_DECODE_RRLP;
+
+        default:
+            asn_DEF_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
+            ret_rrlp = 0;
+            return E_SUPL_DECODE_RRLP;
+        }
+
+    return E_SUPL_INTERNAL;
+}
+
+
+int EXPORT supl_server_connect(supl_ctx_t *ctx, char *server)
+{
+    int err;
+    SSL_METHOD *meth;
+
+    SSLeay_add_ssl_algorithms();
+    // meth = TLSv1_client_method();
+    meth = (SSL_METHOD *)SSLv23_client_method();
+    SSL_load_error_strings();
+    ctx->ssl_ctx = SSL_CTX_new(meth);
+    if (!ctx->ssl_ctx)
+        {
+            return E_SUPL_CONNECT;
+        }
+
+    ctx->ssl = SSL_new(ctx->ssl_ctx);
+    if (!ctx->ssl)
+        {
+            return E_SUPL_CONNECT;
+        }
+
+    if (server)
+        {
+            ctx->fd = server_connect(server);
+            if (ctx->fd == -1)
+                {
+                    return E_SUPL_CONNECT;
+                }
+        }
+
+    SSL_set_fd(ctx->ssl, ctx->fd);
+    err = SSL_connect(ctx->ssl);
+    if (err == -1)
+        {
+            return E_SUPL_CONNECT;
+        }
 
 #if 0
   {
@@ -249,314 +290,351 @@ int EXPORT supl_server_connect(supl_ctx_t *ctx, char *server) {
   }
 #endif
 
-  return 0;
-}
-
-void EXPORT supl_close(supl_ctx_t *ctx) {
-  SSL_shutdown(ctx->ssl);
-  SSL_free(ctx->ssl);
-  SSL_CTX_free(ctx->ssl_ctx);
-  close(ctx->fd);
+    return 0;
 }
 
 
-static int server_connect(char *server) {
-  int fd = -1;
-  struct addrinfo *ailist, *aip;
-  struct addrinfo hint;
-  int err;
-
-  memset(&hint, 0, sizeof(struct addrinfo));
-  hint.ai_socktype = SOCK_STREAM;
-  err = getaddrinfo(server, SUPL_PORT, &hint, &ailist);
-  if (err != 0) {
-    return -1;
-  }
-
-  for (aip = ailist; aip; aip = aip->ai_next) {
-    if ((fd = socket(aip->ai_family, SOCK_STREAM, 0)) < 0) {
-      err = errno;
-    }
-    if (connect(fd, aip->ai_addr, aip->ai_addrlen) != 0) {
-      return -1;
-    }
-    break;
-  }
-
-  return fd;
+void EXPORT supl_close(supl_ctx_t *ctx)
+{
+    SSL_shutdown(ctx->ssl);
+    SSL_free(ctx->ssl);
+    SSL_CTX_free(ctx->ssl_ctx);
+    close(ctx->fd);
 }
 
-static int pdu_make_ulp_start(supl_ctx_t *ctx, supl_ulp_t *pdu) {
-  ULP_PDU_t *ulp;
-  SetSessionID_t *session_id;
-  int err;
 
-  ulp = calloc(1, sizeof(ULP_PDU_t));
-  session_id = calloc(1, sizeof(SetSessionID_t));
+static int server_connect(char *server)
+{
+    int fd = -1;
+    struct addrinfo *ailist, *aip;
+    struct addrinfo hint;
+    int err;
 
-  ulp->length = 0;
-  ulp->version.maj = 1;
-  ulp->version.min = 0;
-  ulp->version.servind = 0;
+    memset(&hint, 0, sizeof(struct addrinfo));
+    hint.ai_socktype = SOCK_STREAM;
+    err = getaddrinfo(server, SUPL_PORT, &hint, &ailist);
+    if (err != 0)
+        {
+            return -1;
+        }
 
-  session_id->sessionId = 1;
-  // session_id->setId.present = SETId_PR_msisdn;
-  // (void)OCTET_STRING_fromBuf(&session_id->setId.choice.msisdn, ctx->p.msisdn, 8);
-  session_id->setId.present = SETId_PR_imsi;
-  (void)OCTET_STRING_fromBuf(&session_id->setId.choice.imsi, ctx->p.msisdn, 8);
+    for (aip = ailist; aip; aip = aip->ai_next)
+        {
+            if ((fd = socket(aip->ai_family, SOCK_STREAM, 0)) < 0)
+                {
+                    err = errno;
+                }
+            if (connect(fd, aip->ai_addr, aip->ai_addrlen) != 0)
+                {
+                    return -1;
+                }
+            break;
+        }
 
-  ulp->sessionID.setSessionID = session_id;
-  ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
-
-  ulp->message.present = UlpMessage_PR_msSUPLSTART;
-  ulp->message.choice.msSUPLSTART.sETCapabilities.posTechnology.agpsSETBased = 1;
-  // (void)asn_long2INTEGER(&ulp->message.choice.msSUPLSTART.sETCapabilities.prefMethod, PrefMethod_noPreference);
-  (void)asn_long2INTEGER(&ulp->message.choice.msSUPLSTART.sETCapabilities.prefMethod, PrefMethod_agpsSETBasedPreferred);
-  ulp->message.choice.msSUPLSTART.sETCapabilities.posProtocol.rrlp = 1;
-
-  if (ctx->p.set & PARAM_GSM_CELL_CURRENT) {
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.present = CellInfo_PR_gsmCell;
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refMCC = ctx->p.gsm.mcc;
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refMNC = ctx->p.gsm.mnc;
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refLAC = ctx->p.gsm.lac;
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refCI = ctx->p.gsm.ci;
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.nMR = OPTIONAL_MISSING;
-  ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.tA = OPTIONAL_MISSING;
-  } else if (ctx->p.set & PARAM_WCDMA_CELL_CURRENT) {
-    ulp->message.choice.msSUPLSTART.locationId.cellInfo.present = CellInfo_PR_wcdmaCell;
-    ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.wcdmaCell.refMCC = ctx->p.wcdma.mcc;
-    ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.wcdmaCell.refMNC = ctx->p.wcdma.mnc;
-    ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.wcdmaCell.refUC = ctx->p.wcdma.uc;
-  }
-
-  (void)asn_long2INTEGER(&ulp->message.choice.msSUPLSTART.locationId.status, Status_current);
-
-  ulp->message.choice.msSUPLSTART.qoP = OPTIONAL_MISSING;
-
-  pdu->pdu = ulp;
-
-  err = supl_ulp_encode(pdu);
-  if (err < 0) {
-    asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, ulp, 0);
-    return err;
-  }
-
-  return 0;
+    return fd;
 }
 
+
+static int pdu_make_ulp_start(supl_ctx_t *ctx, supl_ulp_t *pdu)
+{
+    ULP_PDU_t *ulp;
+    SetSessionID_t *session_id;
+    int err;
+
+    ulp = calloc(1, sizeof(ULP_PDU_t));
+    session_id = calloc(1, sizeof(SetSessionID_t));
+
+    ulp->length = 0;
+    ulp->version.maj = 1;
+    ulp->version.min = 0;
+    ulp->version.servind = 0;
+
+    session_id->sessionId = 1;
+    // session_id->setId.present = SETId_PR_msisdn;
+    // (void)OCTET_STRING_fromBuf(&session_id->setId.choice.msisdn, ctx->p.msisdn, 8);
+    session_id->setId.present = SETId_PR_imsi;
+    (void)OCTET_STRING_fromBuf(&session_id->setId.choice.imsi, ctx->p.msisdn, 8);
+
+    ulp->sessionID.setSessionID = session_id;
+    ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
+
+    ulp->message.present = UlpMessage_PR_msSUPLSTART;
+    ulp->message.choice.msSUPLSTART.sETCapabilities.posTechnology.agpsSETBased = 1;
+    // (void)asn_long2INTEGER(&ulp->message.choice.msSUPLSTART.sETCapabilities.prefMethod, PrefMethod_noPreference);
+    (void)asn_long2INTEGER(&ulp->message.choice.msSUPLSTART.sETCapabilities.prefMethod, PrefMethod_agpsSETBasedPreferred);
+    ulp->message.choice.msSUPLSTART.sETCapabilities.posProtocol.rrlp = 1;
+
+    if (ctx->p.set & PARAM_GSM_CELL_CURRENT)
+        {
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.present = CellInfo_PR_gsmCell;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refMCC = ctx->p.gsm.mcc;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refMNC = ctx->p.gsm.mnc;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refLAC = ctx->p.gsm.lac;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.refCI = ctx->p.gsm.ci;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.nMR = OPTIONAL_MISSING;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.gsmCell.tA = OPTIONAL_MISSING;
+        }
+    else if (ctx->p.set & PARAM_WCDMA_CELL_CURRENT)
+        {
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.present = CellInfo_PR_wcdmaCell;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.wcdmaCell.refMCC = ctx->p.wcdma.mcc;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.wcdmaCell.refMNC = ctx->p.wcdma.mnc;
+            ulp->message.choice.msSUPLSTART.locationId.cellInfo.choice.wcdmaCell.refUC = ctx->p.wcdma.uc;
+        }
+
+    (void)asn_long2INTEGER(&ulp->message.choice.msSUPLSTART.locationId.status, Status_current);
+
+    ulp->message.choice.msSUPLSTART.qoP = OPTIONAL_MISSING;
+
+    pdu->pdu = ulp;
+
+    err = supl_ulp_encode(pdu);
+    if (err < 0)
+        {
+            asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, ulp, 0);
+            return err;
+        }
+
+    return 0;
+}
+
+
 // get slpSessionID from SUPLRESPONSE pdu if preset
-static int supl_response_harvest(supl_ctx_t *ctx, supl_ulp_t *pdu) {
-  int ret;
-  ULP_PDU_t *ulp = pdu->pdu;
-  void *buf;
+static int supl_response_harvest(supl_ctx_t *ctx, supl_ulp_t *pdu)
+{
+    int ret;
+    ULP_PDU_t *ulp = pdu->pdu;
+    void *buf;
 
-  ctx->slp_session_id.buf = 0;
+    ctx->slp_session_id.buf = 0;
 
-  ret = uper_encode_to_new_buffer(&asn_DEF_SlpSessionID, 0, (void *)ulp->sessionID.slpSessionID, &buf);
-  if (ret == -1) return -1;
+    ret = uper_encode_to_new_buffer(&asn_DEF_SlpSessionID, 0, (void *)ulp->sessionID.slpSessionID, &buf);
+    if (ret == -1)
+        {
+            return -1;
+        }
 
-  ctx->slp_session_id.buf = buf;
-  ctx->slp_session_id.size = ret;
+    ctx->slp_session_id.buf = buf;
+    ctx->slp_session_id.size = ret;
 
-  return 0;
+    return 0;
 }
 
-static int pdu_make_ulp_pos_init(supl_ctx_t *ctx, supl_ulp_t *pdu) {
-  int err;
-  ULP_PDU_t *ulp;
-  SetSessionID_t *session_id;
-  RequestedAssistData_t *req_adata;
 
-  ulp = calloc(1, sizeof(ULP_PDU_t));
-  session_id = calloc(1, sizeof(SetSessionID_t));
-  req_adata = calloc(1, sizeof(RequestedAssistData_t));
+static int pdu_make_ulp_pos_init(supl_ctx_t *ctx, supl_ulp_t *pdu)
+{
+    int err;
+    ULP_PDU_t *ulp;
+    SetSessionID_t *session_id;
+    RequestedAssistData_t *req_adata;
 
-  ulp->length = 0;
-  ulp->version.maj = 1;
-  ulp->version.min = 0;
-  ulp->version.servind = 0;
+    ulp = calloc(1, sizeof(ULP_PDU_t));
+    session_id = calloc(1, sizeof(SetSessionID_t));
+    req_adata = calloc(1, sizeof(RequestedAssistData_t));
 
-  session_id->sessionId = 1;
-  // session_id->setId.present = SETId_PR_msisdn;
-  // (void)OCTET_STRING_fromBuf(&session_id->setId.choice.msisdn, ctx->p.msisdn, 8);
-  session_id->setId.present = SETId_PR_imsi;
-  (void)OCTET_STRING_fromBuf(&session_id->setId.choice.imsi, ctx->p.msisdn, 8);
+    ulp->length = 0;
+    ulp->version.maj = 1;
+    ulp->version.min = 0;
+    ulp->version.servind = 0;
 
-  ulp->sessionID.setSessionID = session_id;
-  // ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
-  if (ctx->slp_session_id.buf) {
-    (void)uper_decode_complete(0, &asn_DEF_SlpSessionID, (void **)&ulp->sessionID.slpSessionID, ctx->slp_session_id.buf, ctx->slp_session_id.size);
-  } else {
-  ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
-  }
+    session_id->sessionId = 1;
+    // session_id->setId.present = SETId_PR_msisdn;
+    // (void)OCTET_STRING_fromBuf(&session_id->setId.choice.msisdn, ctx->p.msisdn, 8);
+    session_id->setId.present = SETId_PR_imsi;
+    (void)OCTET_STRING_fromBuf(&session_id->setId.choice.imsi, ctx->p.msisdn, 8);
 
-  ulp->message.present = UlpMessage_PR_msSUPLPOSINIT;
-  ulp->message.choice.msSUPLPOSINIT.sETCapabilities.posTechnology.agpsSETBased = 1;
-  // (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.sETCapabilities.prefMethod, PrefMethod_noPreference);
-  (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.sETCapabilities.prefMethod, PrefMethod_agpsSETBasedPreferred);
-  ulp->message.choice.msSUPLPOSINIT.sETCapabilities.posProtocol.rrlp = 1;
+    ulp->sessionID.setSessionID = session_id;
+    // ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
+    if (ctx->slp_session_id.buf)
+        {
+            (void)uper_decode_complete(0, &asn_DEF_SlpSessionID, (void **)&ulp->sessionID.slpSessionID, ctx->slp_session_id.buf, ctx->slp_session_id.size);
+        }
+    else
+        {
+            ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
+        }
 
-  //GNSS-SDR mod
-  // Use ctx->p.request to swith between a pre-defined set of assistence data request
-  // reason: Some SUPL servers do not respond to Acquisition assistance depending on the status of other assistance flags
+    ulp->message.present = UlpMessage_PR_msSUPLPOSINIT;
+    ulp->message.choice.msSUPLPOSINIT.sETCapabilities.posTechnology.agpsSETBased = 1;
+    // (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.sETCapabilities.prefMethod, PrefMethod_noPreference);
+    (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.sETCapabilities.prefMethod, PrefMethod_agpsSETBasedPreferred);
+    ulp->message.choice.msSUPLPOSINIT.sETCapabilities.posProtocol.rrlp = 1;
 
-  switch (ctx->p.request)
-  {
-  case 0: //request almanac, time, and cell positions
-	  req_adata->acquisitionAssistanceRequested = 0; // 1
-	  req_adata->navigationModelRequested = 0; // 1
-	  req_adata->referenceTimeRequested = 1;
-	  req_adata->utcModelRequested = 1; //1
-	  req_adata->ionosphericModelRequested = 1; // 1
-	  req_adata->referenceLocationRequested = 1;
-	  req_adata->almanacRequested = 1;
-	  req_adata->realTimeIntegrityRequested = 1; // 1
-	  break;
-  case 1: // request Navigation Model (Ephemeris)
-	  req_adata->acquisitionAssistanceRequested = 0; // 1
-	  req_adata->navigationModelRequested = 1; // 1
-	  req_adata->referenceTimeRequested = 1;
-	  req_adata->utcModelRequested = 0; //1
-	  req_adata->ionosphericModelRequested = 0; // 1
-	  req_adata->referenceLocationRequested = 0;
-	  req_adata->almanacRequested = 0;
-	  req_adata->realTimeIntegrityRequested = 0; // 1
-	  break;
-  case 2: //request Acquisition assistance (Doppler assistance)
-	  req_adata->acquisitionAssistanceRequested = 1; // 1
-	  req_adata->navigationModelRequested = 0; // 1
-	  req_adata->referenceTimeRequested = 1;
-	  req_adata->utcModelRequested = 1; //1
-	  req_adata->ionosphericModelRequested = 1; // 1
-	  req_adata->referenceLocationRequested = 1;
-	  req_adata->almanacRequested = 1;
-	  req_adata->realTimeIntegrityRequested = 1; // 1
-	  break;
-  default:
-	  req_adata->acquisitionAssistanceRequested = 0; // 1
-	  req_adata->navigationModelRequested = 0; // 1
-	  req_adata->referenceTimeRequested = 1;
-	  req_adata->utcModelRequested = 1; //1
-	  req_adata->ionosphericModelRequested = 1; // 1
-	  req_adata->referenceLocationRequested = 1;
-	  req_adata->almanacRequested = 1;
-	  req_adata->realTimeIntegrityRequested = 1; // 1
-  break;
-  }
+    //GNSS-SDR mod
+    // Use ctx->p.request to swith between a pre-defined set of assistence data request
+    // reason: Some SUPL servers do not respond to Acquisition assistance depending on the status of other assistance flags
 
-  ulp->message.choice.msSUPLPOSINIT.requestedAssistData = req_adata;
+    switch (ctx->p.request)
+        {
+        case 0:                                             //request almanac, time, and cell positions
+            req_adata->acquisitionAssistanceRequested = 0;  // 1
+            req_adata->navigationModelRequested = 0;        // 1
+            req_adata->referenceTimeRequested = 1;
+            req_adata->utcModelRequested = 1;          //1
+            req_adata->ionosphericModelRequested = 1;  // 1
+            req_adata->referenceLocationRequested = 1;
+            req_adata->almanacRequested = 1;
+            req_adata->realTimeIntegrityRequested = 1;  // 1
+            break;
+        case 1:                                             // request Navigation Model (Ephemeris)
+            req_adata->acquisitionAssistanceRequested = 0;  // 1
+            req_adata->navigationModelRequested = 1;        // 1
+            req_adata->referenceTimeRequested = 1;
+            req_adata->utcModelRequested = 0;          //1
+            req_adata->ionosphericModelRequested = 0;  // 1
+            req_adata->referenceLocationRequested = 0;
+            req_adata->almanacRequested = 0;
+            req_adata->realTimeIntegrityRequested = 0;  // 1
+            break;
+        case 2:                                             //request Acquisition assistance (Doppler assistance)
+            req_adata->acquisitionAssistanceRequested = 1;  // 1
+            req_adata->navigationModelRequested = 0;        // 1
+            req_adata->referenceTimeRequested = 1;
+            req_adata->utcModelRequested = 1;          //1
+            req_adata->ionosphericModelRequested = 1;  // 1
+            req_adata->referenceLocationRequested = 1;
+            req_adata->almanacRequested = 1;
+            req_adata->realTimeIntegrityRequested = 1;  // 1
+            break;
+        default:
+            req_adata->acquisitionAssistanceRequested = 0;  // 1
+            req_adata->navigationModelRequested = 0;        // 1
+            req_adata->referenceTimeRequested = 1;
+            req_adata->utcModelRequested = 1;          //1
+            req_adata->ionosphericModelRequested = 1;  // 1
+            req_adata->referenceLocationRequested = 1;
+            req_adata->almanacRequested = 1;
+            req_adata->realTimeIntegrityRequested = 1;  // 1
+            break;
+        }
 
-  if (ctx->p.set & PARAM_GSM_CELL_CURRENT) {
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.present = CellInfo_PR_gsmCell;
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refMCC = ctx->p.gsm.mcc;
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refMNC = ctx->p.gsm.mnc;
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refLAC = ctx->p.gsm.lac;
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refCI = ctx->p.gsm.ci;
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.nMR = OPTIONAL_MISSING;
-  ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.tA = OPTIONAL_MISSING;
-  } else if (ctx->p.set & PARAM_WCDMA_CELL_CURRENT) {
-    ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.present = CellInfo_PR_wcdmaCell;
-    ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.wcdmaCell.refMCC = ctx->p.wcdma.mcc;
-    ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.wcdmaCell.refMNC = ctx->p.wcdma.mnc;
-    ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.wcdmaCell.refUC = ctx->p.wcdma.uc;
-  }
+    ulp->message.choice.msSUPLPOSINIT.requestedAssistData = req_adata;
 
-  if (ctx->p.set & PARAM_GSM_CELL_KNOWN) {
-    Position_t *pos = calloc(1, sizeof(Position_t));
-    struct tm *tm;
-    time_t t;
+    if (ctx->p.set & PARAM_GSM_CELL_CURRENT)
+        {
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.present = CellInfo_PR_gsmCell;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refMCC = ctx->p.gsm.mcc;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refMNC = ctx->p.gsm.mnc;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refLAC = ctx->p.gsm.lac;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.refCI = ctx->p.gsm.ci;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.nMR = OPTIONAL_MISSING;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.gsmCell.tA = OPTIONAL_MISSING;
+        }
+    else if (ctx->p.set & PARAM_WCDMA_CELL_CURRENT)
+        {
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.present = CellInfo_PR_wcdmaCell;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.wcdmaCell.refMCC = ctx->p.wcdma.mcc;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.wcdmaCell.refMNC = ctx->p.wcdma.mnc;
+            ulp->message.choice.msSUPLPOSINIT.locationId.cellInfo.choice.wcdmaCell.refUC = ctx->p.wcdma.uc;
+        }
 
-    (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.locationId.status, Status_stale);
+    if (ctx->p.set & PARAM_GSM_CELL_KNOWN)
+        {
+            Position_t *pos = calloc(1, sizeof(Position_t));
+            struct tm *tm;
+            time_t t;
 
-    t = time(0);
-    tm = gmtime(&t);
-    asn_UT2time(&pos->timestamp, tm ,1);
-    (void)asn_long2INTEGER(&pos->positionEstimate.latitudeSign, latitudeSign_north);
-    pos->positionEstimate.latitude = (1 << 23) / 90.0 * ctx->p.known.lat;
-    pos->positionEstimate.longitude = (1 << 24) / 360.0 * ctx->p.known.lon;
-    // TODO: set position estimate
+            (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.locationId.status, Status_stale);
 
-    ulp->message.choice.msSUPLPOSINIT.position = pos;
-  } else {
-    (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.locationId.status, Status_current);
-    ulp->message.choice.msSUPLPOSINIT.position = OPTIONAL_MISSING;
-  }
+            t = time(0);
+            tm = gmtime(&t);
+            asn_UT2time(&pos->timestamp, tm, 1);
+            (void)asn_long2INTEGER(&pos->positionEstimate.latitudeSign, latitudeSign_north);
+            pos->positionEstimate.latitude = (1 << 23) / 90.0 * ctx->p.known.lat;
+            pos->positionEstimate.longitude = (1 << 24) / 360.0 * ctx->p.known.lon;
+            // TODO: set position estimate
 
-  ulp->message.choice.msSUPLPOSINIT.sUPLPOS = OPTIONAL_MISSING;
+            ulp->message.choice.msSUPLPOSINIT.position = pos;
+        }
+    else
+        {
+            (void)asn_long2INTEGER(&ulp->message.choice.msSUPLPOSINIT.locationId.status, Status_current);
+            ulp->message.choice.msSUPLPOSINIT.position = OPTIONAL_MISSING;
+        }
 
-  ulp->message.choice.msSUPLPOSINIT.ver = OPTIONAL_MISSING;
+    ulp->message.choice.msSUPLPOSINIT.sUPLPOS = OPTIONAL_MISSING;
 
-  pdu->pdu = ulp;
+    ulp->message.choice.msSUPLPOSINIT.ver = OPTIONAL_MISSING;
 
-  err = supl_ulp_encode(pdu);
-  if (err < 0) {
-    asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, ulp, 0);
-    return err;
-  }
+    pdu->pdu = ulp;
 
-  return 0;
+    err = supl_ulp_encode(pdu);
+    if (err < 0)
+        {
+            asn_DEF_ULP_PDU.free_struct(&asn_DEF_ULP_PDU, ulp, 0);
+            return err;
+        }
+
+    return 0;
 }
 
-static int pdu_make_ulp_rrlp_ack(supl_ctx_t *ctx, supl_ulp_t *pdu, PDU_t *rrlp) {
-  int err;
-  PDU_t *rrlp_ack;
-  ULP_PDU_t *ulp;
-  SetSessionID_t *session_id;
-  asn_enc_rval_t ret;
-  int pdu_len;
-  char buffer[1024];
 
-  rrlp_ack = calloc(1, sizeof(PDU_t));
+static int pdu_make_ulp_rrlp_ack(supl_ctx_t *ctx, supl_ulp_t *pdu, PDU_t *rrlp)
+{
+    int err;
+    PDU_t *rrlp_ack;
+    ULP_PDU_t *ulp;
+    SetSessionID_t *session_id;
+    asn_enc_rval_t ret;
+    int pdu_len;
+    char buffer[1024];
 
-  /* create RRLP assistanceDataAck */
+    rrlp_ack = calloc(1, sizeof(PDU_t));
 
-  rrlp_ack->referenceNumber = rrlp->referenceNumber;
-  rrlp_ack->component.present = RRLP_Component_PR_assistanceDataAck;
+    /* create RRLP assistanceDataAck */
 
-  ret = uper_encode_to_buffer(&asn_DEF_PDU, rrlp_ack, buffer, sizeof(buffer));
-  asn_DEF_ULP_PDU.free_struct(&asn_DEF_PDU, rrlp_ack, 0);
-  if (ret.encoded == -1) {
-    return E_SUPL_ENCODE_RRLP;
-  }
-  pdu_len = (ret.encoded + 7) >> 3;
+    rrlp_ack->referenceNumber = rrlp->referenceNumber;
+    rrlp_ack->component.present = RRLP_Component_PR_assistanceDataAck;
 
-  /* embedded it in SUPLPOS */
+    ret = uper_encode_to_buffer(&asn_DEF_PDU, rrlp_ack, buffer, sizeof(buffer));
+    asn_DEF_ULP_PDU.free_struct(&asn_DEF_PDU, rrlp_ack, 0);
+    if (ret.encoded == -1)
+        {
+            return E_SUPL_ENCODE_RRLP;
+        }
+    pdu_len = (ret.encoded + 7) >> 3;
 
-  ulp = calloc(1, sizeof(ULP_PDU_t));
-  session_id = calloc(1, sizeof(SetSessionID_t));
+    /* embedded it in SUPLPOS */
 
-  ulp->length = 0;
-  ulp->version.maj = 1;
-  ulp->version.min = 0;
-  ulp->version.servind = 0;
+    ulp = calloc(1, sizeof(ULP_PDU_t));
+    session_id = calloc(1, sizeof(SetSessionID_t));
 
-  session_id->sessionId = 1;
-  //  session_id->setId.present = SETId_PR_msisdn;
-  // (void)OCTET_STRING_fromBuf(&session_id->setId.choice.msisdn, ctx->p.msisdn, 8);
-  session_id->setId.present = SETId_PR_imsi;
-  (void)OCTET_STRING_fromBuf(&session_id->setId.choice.imsi, ctx->p.msisdn, 8);
+    ulp->length = 0;
+    ulp->version.maj = 1;
+    ulp->version.min = 0;
+    ulp->version.servind = 0;
 
-  ulp->sessionID.setSessionID = session_id;
-  // ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
-  if (ctx->slp_session_id.buf) {
-    (void)uper_decode_complete(0, &asn_DEF_SlpSessionID, (void **)&ulp->sessionID.slpSessionID, ctx->slp_session_id.buf, ctx->slp_session_id.size);
-  } else {
-  ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
-  }
+    session_id->sessionId = 1;
+    //  session_id->setId.present = SETId_PR_msisdn;
+    // (void)OCTET_STRING_fromBuf(&session_id->setId.choice.msisdn, ctx->p.msisdn, 8);
+    session_id->setId.present = SETId_PR_imsi;
+    (void)OCTET_STRING_fromBuf(&session_id->setId.choice.imsi, ctx->p.msisdn, 8);
 
-  ulp->message.present = UlpMessage_PR_msSUPLPOS;
-  ulp->message.choice.msSUPLPOS.posPayLoad.present = PosPayLoad_PR_rrlpPayload;
-  (void)OCTET_STRING_fromBuf(&ulp->message.choice.msSUPLPOS.posPayLoad.choice.rrlpPayload, buffer, pdu_len);
+    ulp->sessionID.setSessionID = session_id;
+    // ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
+    if (ctx->slp_session_id.buf)
+        {
+            (void)uper_decode_complete(0, &asn_DEF_SlpSessionID, (void **)&ulp->sessionID.slpSessionID, ctx->slp_session_id.buf, ctx->slp_session_id.size);
+        }
+    else
+        {
+            ulp->sessionID.slpSessionID = OPTIONAL_MISSING;
+        }
 
-  pdu->pdu = ulp;
+    ulp->message.present = UlpMessage_PR_msSUPLPOS;
+    ulp->message.choice.msSUPLPOS.posPayLoad.present = PosPayLoad_PR_rrlpPayload;
+    (void)OCTET_STRING_fromBuf(&ulp->message.choice.msSUPLPOS.posPayLoad.choice.rrlpPayload, buffer, pdu_len);
 
-  err = supl_ulp_encode(pdu);
-  if (err < 0) {
-    supl_ulp_free(pdu);
-    return err;
-  }
+    pdu->pdu = ulp;
 
-  return 0;
+    err = supl_ulp_encode(pdu);
+    if (err < 0)
+        {
+            supl_ulp_free(pdu);
+            return err;
+        }
+
+    return 0;
 }
 
 /*
@@ -564,132 +642,161 @@ static int pdu_make_ulp_rrlp_ack(supl_ctx_t *ctx, supl_ulp_t *pdu, PDU_t *rrlp)
 **
 */
 
-int EXPORT supl_collect_rrlp(supl_assist_t *assist, PDU_t *rrlp, struct timeval *t) {
-  ControlHeader_t *hdr;
+int EXPORT supl_collect_rrlp(supl_assist_t *assist, PDU_t *rrlp, struct timeval *t)
+{
+    ControlHeader_t *hdr;
 
-  if (rrlp->component.present != RRLP_Component_PR_assistanceData) return 0;
-  if (!rrlp->component.choice.assistanceData.gps_AssistData) return 0;
+    if (rrlp->component.present != RRLP_Component_PR_assistanceData)
+        {
+            return 0;
+        }
+    if (!rrlp->component.choice.assistanceData.gps_AssistData)
+        {
+            return 0;
+        }
 
-  hdr = &rrlp->component.choice.assistanceData.gps_AssistData->controlHeader;
+    hdr = &rrlp->component.choice.assistanceData.gps_AssistData->controlHeader;
 
-  if (hdr->referenceTime) {
-    assist->set |= SUPL_RRLP_ASSIST_REFTIME;
-    assist->time.gps_tow = hdr->referenceTime->gpsTime.gpsTOW23b;
-    assist->time.gps_week = hdr->referenceTime->gpsTime.gpsWeek;
-    memcpy(&assist->time.stamp, t, sizeof(struct timeval));
-  }
+    if (hdr->referenceTime)
+        {
+            assist->set |= SUPL_RRLP_ASSIST_REFTIME;
+            assist->time.gps_tow = hdr->referenceTime->gpsTime.gpsTOW23b;
+            assist->time.gps_week = hdr->referenceTime->gpsTime.gpsWeek;
+            memcpy(&assist->time.stamp, t, sizeof(struct timeval));
+        }
 
-  if (hdr->refLocation) {
-    OCTET_STRING_t *loc;
+    if (hdr->refLocation)
+        {
+            OCTET_STRING_t *loc;
 
-    loc = &hdr->refLocation->threeDLocation;
-    if (loc->size == 14 && loc->buf[0] == 0x90) {
-      double lat, lon;
-      long l;
+            loc = &hdr->refLocation->threeDLocation;
+            if (loc->size == 14 && loc->buf[0] == 0x90)
+                {
+                    double lat, lon;
+                    long l;
 
-      /* from 3GPP TS 23.032 V4.0.0 (2001-04) */
+                    /* from 3GPP TS 23.032 V4.0.0 (2001-04) */
 
-      l = (loc->buf[1] & 0x7f) << 16 |
-	  (loc->buf[2] << 8) |
-	  loc->buf[3];
-      if (loc->buf[1] & 0x80) l *= -1;
-      lat = 90.0 / (1 << 23) * l;
+                    l = (loc->buf[1] & 0x7f) << 16 |
+                        (loc->buf[2] << 8) |
+                        loc->buf[3];
+                    if (loc->buf[1] & 0x80)
+                        {
+                            l *= -1;
+                        }
+                    lat = 90.0 / (1 << 23) * l;
 
-      l = (loc->buf[4] << 16) |
-	  (loc->buf[5] << 8) |
-	  loc->buf[6];
-      lon = 360.0 / (1 << 24) * l;
+                    l = (loc->buf[4] << 16) |
+                        (loc->buf[5] << 8) |
+                        loc->buf[6];
+                    lon = 360.0 / (1 << 24) * l;
 
-      /* max of uncertainty ellipsoid axis */
-      /* uncert in meters = 10 * (1.1 ^ l - 1) */
-      /* l == 96 => 100 km uncertainty => not usable */
-      l = loc->buf[9];
-      if (loc->buf[10] > l) l = loc->buf[10];
+                    /* max of uncertainty ellipsoid axis */
+                    /* uncert in meters = 10 * (1.1 ^ l - 1) */
+                    /* l == 96 => 100 km uncertainty => not usable */
+                    l = loc->buf[9];
+                    if (loc->buf[10] > l)
+                        {
+                            l = loc->buf[10];
+                        }
 
-      assist->set |= SUPL_RRLP_ASSIST_REFLOC;
-      assist->pos.lat = lat;
-      assist->pos.lon = lon;
-      assist->pos.uncertainty = l;
-    }
-  }
+                    assist->set |= SUPL_RRLP_ASSIST_REFLOC;
+                    assist->pos.lat = lat;
+                    assist->pos.lon = lon;
+                    assist->pos.uncertainty = l;
+                }
+        }
 
-  if (hdr->acquisAssist) {
-    int n;
+    if (hdr->acquisAssist)
+        {
+            int n;
 
-    assist->acq_time = hdr->acquisAssist->timeRelation.gpsTOW;
+            assist->acq_time = hdr->acquisAssist->timeRelation.gpsTOW;
 
-    for (n = 0; n < hdr->acquisAssist->acquisList.list.count; n++) {
-      struct AcquisElement *e = hdr->acquisAssist->acquisList.list.array[n];
-      int i = assist->cnt_acq++;
+            for (n = 0; n < hdr->acquisAssist->acquisList.list.count; n++)
+                {
+                    struct AcquisElement *e = hdr->acquisAssist->acquisList.list.array[n];
+                    int i = assist->cnt_acq++;
 
-      assist->acq[i].prn = e->svid + 1;
-      assist->acq[i].parts = 0;
-      assist->acq[i].doppler0 = e->doppler0;
+                    assist->acq[i].prn = e->svid + 1;
+                    assist->acq[i].parts = 0;
+                    assist->acq[i].doppler0 = e->doppler0;
 
-      if (e->addionalDoppler) {
-	assist->acq[i].parts |= SUPL_ACQUIS_DOPPLER;
-	assist->acq[i].doppler1 = e->addionalDoppler->doppler1;
-	assist->acq[i].d_win = e->addionalDoppler->dopplerUncertainty;
-      }
+                    if (e->addionalDoppler)
+                        {
+                            assist->acq[i].parts |= SUPL_ACQUIS_DOPPLER;
+                            assist->acq[i].doppler1 = e->addionalDoppler->doppler1;
+                            assist->acq[i].d_win = e->addionalDoppler->dopplerUncertainty;
+                        }
 
-      assist->acq[i].code_ph = e->codePhase;
-      assist->acq[i].code_ph_int = e->intCodePhase;
-      assist->acq[i].bit_num = e->gpsBitNumber;
-      assist->acq[i].code_ph_win = e->codePhaseSearchWindow;
+                    assist->acq[i].code_ph = e->codePhase;
+                    assist->acq[i].code_ph_int = e->intCodePhase;
+                    assist->acq[i].bit_num = e->gpsBitNumber;
+                    assist->acq[i].code_ph_win = e->codePhaseSearchWindow;
 
-      if (e->addionalAngle) {
-	assist->acq[i].parts |= SUPL_ACQUIS_ANGLE;
-	assist->acq[i].az = e->addionalAngle->azimuth;
-	assist->acq[i].el = e->addionalAngle->elevation;
-      }
-    }
-  }
+                    if (e->addionalAngle)
+                        {
+                            assist->acq[i].parts |= SUPL_ACQUIS_ANGLE;
+                            assist->acq[i].az = e->addionalAngle->azimuth;
+                            assist->acq[i].el = e->addionalAngle->elevation;
+                        }
+                }
+        }
 
-  if (hdr->almanac) {
-    int n;
+    if (hdr->almanac)
+        {
+            int n;
 
-    for (n = 0; n < hdr->almanac->almanacList.list.count; n++) {
-      struct AlmanacElement *e = hdr->almanac->almanacList.list.array[n];
-      int i = assist->cnt_alm++;
+            for (n = 0; n < hdr->almanac->almanacList.list.count; n++)
+                {
+                    struct AlmanacElement *e = hdr->almanac->almanacList.list.array[n];
+                    int i = assist->cnt_alm++;
 
-      assist->alm[i].prn = e->satelliteID + 1;
-      assist->alm[i].e = e->almanacE;
-      assist->alm[i].toa = e->alamanacToa; // nice touch 3gpp
-      assist->alm[i].Ksii = e->almanacKsii;
-      assist->alm[i].OMEGA_dot = e->almanacOmegaDot;
-      assist->alm[i].A_sqrt = e->almanacAPowerHalf;
-      assist->alm[i].OMEGA_0 = e->almanacOmega0;
-      assist->alm[i].w = e->almanacW;
-      assist->alm[i].M0 = e->almanacM0;
-      assist->alm[i].AF0 = e->almanacAF0;
-      assist->alm[i].AF1 = e->almanacAF1;
-    }
-  }
+                    assist->alm[i].prn = e->satelliteID + 1;
+                    assist->alm[i].e = e->almanacE;
+                    assist->alm[i].toa = e->alamanacToa;  // nice touch 3gpp
+                    assist->alm[i].Ksii = e->almanacKsii;
+                    assist->alm[i].OMEGA_dot = e->almanacOmegaDot;
+                    assist->alm[i].A_sqrt = e->almanacAPowerHalf;
+                    assist->alm[i].OMEGA_0 = e->almanacOmega0;
+                    assist->alm[i].w = e->almanacW;
+                    assist->alm[i].M0 = e->almanacM0;
+                    assist->alm[i].AF0 = e->almanacAF0;
+                    assist->alm[i].AF1 = e->almanacAF1;
+                }
+        }
 
-  if (hdr->navigationModel) {
-    UncompressedEphemeris_t *ue;
-    int n;
+    if (hdr->navigationModel)
+        {
+            UncompressedEphemeris_t *ue;
+            int n;
 
-    for (n = 0; n < hdr->navigationModel->navModelList.list.count; n++) {
-      struct NavModelElement *e = hdr->navigationModel->navModelList.list.array[n];
-      int i = assist->cnt_eph++;
+            for (n = 0; n < hdr->navigationModel->navModelList.list.count; n++)
+                {
+                    struct NavModelElement *e = hdr->navigationModel->navModelList.list.array[n];
+                    int i = assist->cnt_eph++;
 
-      assist->eph[i].prn = e->satelliteID + 1;
+                    assist->eph[i].prn = e->satelliteID + 1;
 
-      /* what is the difference between these two */
-      ue = 0;
-      if (e->satStatus.present == SatStatus_PR_newNaviModelUC)
-	ue = &e->satStatus.choice.newNaviModelUC;
-      if (e->satStatus.present == SatStatus_PR_newSatelliteAndModelUC)
-	ue = &e->satStatus.choice.newSatelliteAndModelUC;
+                    /* what is the difference between these two */
+                    ue = 0;
+                    if (e->satStatus.present == SatStatus_PR_newNaviModelUC)
+                        {
+                            ue = &e->satStatus.choice.newNaviModelUC;
+                        }
+                    if (e->satStatus.present == SatStatus_PR_newSatelliteAndModelUC)
+                        {
+                            ue = &e->satStatus.choice.newSatelliteAndModelUC;
+                        }
 
-      if (ue) {
+                    if (ue)
+                        {
 #if 0
 	assist->eph_x[i].L2P = ue->ephemL2Pflag;
 	assist->eph_x[i].fit = ue->ephemFitFlag;
 #endif
-	assist->eph[i].delta_n = ue->ephemDeltaN;
-	assist->eph[i].M0 = ue->ephemM0;
+                            assist->eph[i].delta_n = ue->ephemDeltaN;
+                            assist->eph[i].M0 = ue->ephemM0;
 #if 0
 	// this is needed for asn1c version 0.9.22
 	{
@@ -700,252 +807,288 @@ int EXPORT supl_collect_rrlp(supl_assist_t *assist, PDU_t *rrlp, struct timeval
 	  assist->eph[i].e = v;
 	}
 #else
-	assist->eph[i].e = ue->ephemE;
-	assist->eph[i].A_sqrt = ue->ephemAPowerHalf;
+                            assist->eph[i].e = ue->ephemE;
+                            assist->eph[i].A_sqrt = ue->ephemAPowerHalf;
 #endif
-	assist->eph[i].OMEGA_0 = ue->ephemOmegaA0;
-	assist->eph[i].i0 = ue->ephemI0;
-	assist->eph[i].w = ue->ephemW;
-	assist->eph[i].OMEGA_dot = ue->ephemOmegaADot;
-	assist->eph[i].i_dot = ue->ephemIDot;
-	assist->eph[i].Cuc = ue->ephemCuc;
-	assist->eph[i].Cus = ue->ephemCus;
-	assist->eph[i].Crc = ue->ephemCrc;
-	assist->eph[i].Crs = ue->ephemCrs;
-	assist->eph[i].Cic = ue->ephemCic;
-	assist->eph[i].Cis = ue->ephemCis;
-	assist->eph[i].toe = ue->ephemToe;
-	assist->eph[i].IODC = ue->ephemIODC;
-	assist->eph[i].toc = ue->ephemToc;
-	assist->eph[i].AF0 = ue->ephemAF0;
-	assist->eph[i].AF1 = ue->ephemAF1;
-	assist->eph[i].AF2 = ue->ephemAF2;
+                            assist->eph[i].OMEGA_0 = ue->ephemOmegaA0;
+                            assist->eph[i].i0 = ue->ephemI0;
+                            assist->eph[i].w = ue->ephemW;
+                            assist->eph[i].OMEGA_dot = ue->ephemOmegaADot;
+                            assist->eph[i].i_dot = ue->ephemIDot;
+                            assist->eph[i].Cuc = ue->ephemCuc;
+                            assist->eph[i].Cus = ue->ephemCus;
+                            assist->eph[i].Crc = ue->ephemCrc;
+                            assist->eph[i].Crs = ue->ephemCrs;
+                            assist->eph[i].Cic = ue->ephemCic;
+                            assist->eph[i].Cis = ue->ephemCis;
+                            assist->eph[i].toe = ue->ephemToe;
+                            assist->eph[i].IODC = ue->ephemIODC;
+                            assist->eph[i].toc = ue->ephemToc;
+                            assist->eph[i].AF0 = ue->ephemAF0;
+                            assist->eph[i].AF1 = ue->ephemAF1;
+                            assist->eph[i].AF2 = ue->ephemAF2;
 
-	assist->eph[i].nav_model = 1;
-	assist->eph[i].bits = ue->ephemCodeOnL2;
-	assist->eph[i].ura = ue->ephemURA;
-	assist->eph[i].health = ue->ephemSVhealth;
-	assist->eph[i].AODA = ue->ephemAODA;
-	assist->eph[i].tgd = ue->ephemTgd;
-      }
-    }
-  }
+                            assist->eph[i].nav_model = 1;
+                            assist->eph[i].bits = ue->ephemCodeOnL2;
+                            assist->eph[i].ura = ue->ephemURA;
+                            assist->eph[i].health = ue->ephemSVhealth;
+                            assist->eph[i].AODA = ue->ephemAODA;
+                            assist->eph[i].tgd = ue->ephemTgd;
+                        }
+                }
+        }
 
-  if (hdr->ionosphericModel) {
-    assist->set |= SUPL_RRLP_ASSIST_IONO;
-    assist->iono.a0 = hdr->ionosphericModel->alfa0;
-    assist->iono.a1 = hdr->ionosphericModel->alfa1;
-    assist->iono.a2 = hdr->ionosphericModel->alfa2;
-    assist->iono.a3 = hdr->ionosphericModel->alfa3; //missed in original supl client
-    assist->iono.b0 = hdr->ionosphericModel->beta0;
-    assist->iono.b1 = hdr->ionosphericModel->beta1;
-    assist->iono.b2 = hdr->ionosphericModel->beta2;
-    assist->iono.b3 = hdr->ionosphericModel->beta3;
-  }
+    if (hdr->ionosphericModel)
+        {
+            assist->set |= SUPL_RRLP_ASSIST_IONO;
+            assist->iono.a0 = hdr->ionosphericModel->alfa0;
+            assist->iono.a1 = hdr->ionosphericModel->alfa1;
+            assist->iono.a2 = hdr->ionosphericModel->alfa2;
+            assist->iono.a3 = hdr->ionosphericModel->alfa3;  //missed in original supl client
+            assist->iono.b0 = hdr->ionosphericModel->beta0;
+            assist->iono.b1 = hdr->ionosphericModel->beta1;
+            assist->iono.b2 = hdr->ionosphericModel->beta2;
+            assist->iono.b3 = hdr->ionosphericModel->beta3;
+        }
 
-  if (hdr->utcModel) {
-    assist->set |= SUPL_RRLP_ASSIST_UTC;
-    assist->utc.a0 = hdr->utcModel->utcA0;
-    assist->utc.a1 = hdr->utcModel->utcA1;
-    assist->utc.tot = hdr->utcModel->utcTot;
-    assist->utc.wnt = hdr->utcModel->utcWNt;
-    assist->utc.delta_tls = hdr->utcModel->utcDeltaTls;
-    assist->utc.wnlsf = hdr->utcModel->utcWNlsf;
-    assist->utc.dn = hdr->utcModel->utcDN;
-    assist->utc.delta_tlsf = hdr->utcModel->utcDeltaTlsf;
-  }
+    if (hdr->utcModel)
+        {
+            assist->set |= SUPL_RRLP_ASSIST_UTC;
+            assist->utc.a0 = hdr->utcModel->utcA0;
+            assist->utc.a1 = hdr->utcModel->utcA1;
+            assist->utc.tot = hdr->utcModel->utcTot;
+            assist->utc.wnt = hdr->utcModel->utcWNt;
+            assist->utc.delta_tls = hdr->utcModel->utcDeltaTls;
+            assist->utc.wnlsf = hdr->utcModel->utcWNlsf;
+            assist->utc.dn = hdr->utcModel->utcDN;
+            assist->utc.delta_tlsf = hdr->utcModel->utcDeltaTlsf;
+        }
 
-  return 1;
+    return 1;
 }
 
-int EXPORT supl_ctx_new(supl_ctx_t *ctx) {
-  memset(ctx, 0, sizeof(supl_ctx_t));
+
+int EXPORT supl_ctx_new(supl_ctx_t *ctx)
+{
+    memset(ctx, 0, sizeof(supl_ctx_t));
 #ifdef SUPL_DEBUG
-  memset(&debug, 0, sizeof(struct supl_debug_s));
+    memset(&debug, 0, sizeof(struct supl_debug_s));
 #endif
 
-  return 0;
+    return 0;
 }
 
-int EXPORT supl_ctx_free(supl_ctx_t *ctx) {
-  if (ctx->slp_session_id.buf) {
-    free(ctx->slp_session_id.buf);
-    ctx->slp_session_id.buf = 0;
-  }
 
-  return 0;
+int EXPORT supl_ctx_free(supl_ctx_t *ctx)
+{
+    if (ctx->slp_session_id.buf)
+        {
+            free(ctx->slp_session_id.buf);
+            ctx->slp_session_id.buf = 0;
+        }
+
+    return 0;
 }
 
-static int supl_more_rrlp(PDU_t *rrlp) {
-  long value;
 
-  return (rrlp->component.present == RRLP_Component_PR_assistanceData &&
-	  rrlp->component.choice.assistanceData.moreAssDataToBeSent &&
-	  asn_INTEGER2long((INTEGER_t *)rrlp->component.choice.assistanceData.moreAssDataToBeSent, &value) == 0 &&
-	  value == MoreAssDataToBeSent_moreMessagesOnTheWay);
+static int supl_more_rrlp(PDU_t *rrlp)
+{
+    long value;
+
+    return (rrlp->component.present == RRLP_Component_PR_assistanceData &&
+            rrlp->component.choice.assistanceData.moreAssDataToBeSent &&
+            asn_INTEGER2long((INTEGER_t *)rrlp->component.choice.assistanceData.moreAssDataToBeSent, &value) == 0 &&
+            value == MoreAssDataToBeSent_moreMessagesOnTheWay);
 }
 
-int EXPORT supl_get_assist(supl_ctx_t *ctx, char *server, supl_assist_t *assist) {
-  supl_ulp_t ulp;
 
-  //  memcpy(ctx->p.msisdn, "\xde\xad\xbe\xef\xf0\x0b\xaa\x42", 8);
-  memcpy(ctx->p.msisdn, "\xFF\xFF\x91\x94\x48\x45\x83\x98", 8);
+int EXPORT supl_get_assist(supl_ctx_t *ctx, char *server, supl_assist_t *assist)
+{
+    supl_ulp_t ulp;
 
-  /*
+    //  memcpy(ctx->p.msisdn, "\xde\xad\xbe\xef\xf0\x0b\xaa\x42", 8);
+    memcpy(ctx->p.msisdn, "\xFF\xFF\x91\x94\x48\x45\x83\x98", 8);
+
+    /*
   ** connect to server
   */
 
-  if (supl_server_connect(ctx, server) < 0) return E_SUPL_CONNECT;
+    if (supl_server_connect(ctx, server) < 0)
+        {
+            return E_SUPL_CONNECT;
+        }
 
-  /*
+    /*
   ** send SUPL_START
   */
 
-  if (pdu_make_ulp_start(ctx, &ulp) < 0) {
-    return E_SUPL_ENCODE_START;
-  }
+    if (pdu_make_ulp_start(ctx, &ulp) < 0)
+        {
+            return E_SUPL_ENCODE_START;
+        }
 
-  (void)supl_ulp_send(ctx, &ulp);
-  supl_ulp_free(&ulp);
+    (void)supl_ulp_send(ctx, &ulp);
+    supl_ulp_free(&ulp);
 
-  /*
+    /*
   ** should receive SUPL_RESPONSE back
   */
 
-  if (supl_ulp_recv(ctx, &ulp) < 0) {
-    return E_SUPL_RECV_RESPONSE;
-  }
+    if (supl_ulp_recv(ctx, &ulp) < 0)
+        {
+            return E_SUPL_RECV_RESPONSE;
+        }
+
+    if (ulp.pdu->message.present != UlpMessage_PR_msSUPLRESPONSE)
+        {
+            supl_ulp_free(&ulp);
+            return E_SUPL_SUPLRESPONSE;
+        }
+
+    // get and copy slpSessionID if present
+    supl_response_harvest(ctx, &ulp);
 
-  if (ulp.pdu->message.present != UlpMessage_PR_msSUPLRESPONSE) {
     supl_ulp_free(&ulp);
-    return E_SUPL_SUPLRESPONSE;
-  }
 
-  // get and copy slpSessionID if present
-  supl_response_harvest(ctx, &ulp);
-
-  supl_ulp_free(&ulp);
-
-  /*
+    /*
   ** send SUPL_POS_INIT
   */
 
-  if (pdu_make_ulp_pos_init(ctx, &ulp) < 0) {
-    return E_SUPL_ENCODE_POSINIT;
-  }
+    if (pdu_make_ulp_pos_init(ctx, &ulp) < 0)
+        {
+            return E_SUPL_ENCODE_POSINIT;
+        }
 
-  (void)supl_ulp_send(ctx, &ulp);
+    (void)supl_ulp_send(ctx, &ulp);
 
-  /*
+    /*
   ** should get SUPLPOS back - bounce back and forth until all messages have arrived
   */
 
-  memset(assist, 0, sizeof(supl_assist_t));
+    memset(assist, 0, sizeof(supl_assist_t));
 
-  while (1) {
-    struct timeval t;
-    PDU_t *rrlp;
+    while (1)
+        {
+            struct timeval t;
+            PDU_t *rrlp;
+
+            supl_ulp_free(&ulp);
+
+            /* record packet recv time */
+            gettimeofday(&t, 0);
+
+            if (supl_ulp_recv(ctx, &ulp) < 0)
+                {
+                    return E_SUPL_RECV_SUPLPOS;
+                }
+
+            if (ulp.pdu->message.present == UlpMessage_PR_msSUPLEND)
+                {
+                    break;
+                }
+
+            if (ulp.pdu->message.present != UlpMessage_PR_msSUPLPOS)
+                {
+                    supl_ulp_free(&ulp);
+                    return E_SUPL_SUPLPOS;
+                }
+
+            /* get the beef, the RRLP payload */
+
+            if (supl_decode_rrlp(&ulp, &rrlp) < 0)
+                {
+                    supl_ulp_free(&ulp);
+                    return E_SUPL_DECODE_RRLP;
+                }
+
+#ifdef SUPL_DEBUG
+            if (debug.verbose_rrlp)
+                {
+                    fprintf(debug.log, "Embedded RRLP message\n");
+                    xer_fprint(debug.log, &asn_DEF_PDU, rrlp);
+                }
+#endif
+
+            /* remember important stuff from it */
+
+            supl_collect_rrlp(assist, rrlp, &t);
+
+            if (!supl_more_rrlp(rrlp))
+                {
+                    asn_DEF_ULP_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
+                    break;
+                }
+
+            /* More data coming in, send SUPLPOS + RRLP ACK */
+
+            if (pdu_make_ulp_rrlp_ack(ctx, &ulp, rrlp) < 0)
+                {
+                    return E_SUPL_RRLP_ACK;
+                }
+
+            supl_ulp_send(ctx, &ulp);
+            asn_DEF_ULP_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
+        }
 
     supl_ulp_free(&ulp);
 
-    /* record packet recv time */
-    gettimeofday(&t, 0);
-
-    if (supl_ulp_recv(ctx, &ulp) < 0) {
-      return E_SUPL_RECV_SUPLPOS;
-    }
-
-    if (ulp.pdu->message.present == UlpMessage_PR_msSUPLEND) {
-      break;
-    }
-
-    if (ulp.pdu->message.present != UlpMessage_PR_msSUPLPOS) {
-      supl_ulp_free(&ulp);
-      return E_SUPL_SUPLPOS;
-    }
-
-    /* get the beef, the RRLP payload */
-
-    if (supl_decode_rrlp(&ulp, &rrlp) < 0) {
-      supl_ulp_free(&ulp);
-      return E_SUPL_DECODE_RRLP;
-    }
-
-#ifdef SUPL_DEBUG
-    if (debug.verbose_rrlp) {
-      fprintf(debug.log, "Embedded RRLP message\n");
-      xer_fprint(debug.log, &asn_DEF_PDU, rrlp);
-    }
-#endif
-
-    /* remember important stuff from it */
-
-    supl_collect_rrlp(assist, rrlp, &t);
-
-    if (!supl_more_rrlp(rrlp)) {
-      asn_DEF_ULP_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
-      break;
-    }
-
-    /* More data coming in, send SUPLPOS + RRLP ACK */
-
-    if (pdu_make_ulp_rrlp_ack(ctx, &ulp, rrlp) < 0) {
-      return E_SUPL_RRLP_ACK;
-    }
-
-    supl_ulp_send(ctx, &ulp);
-    asn_DEF_ULP_PDU.free_struct(&asn_DEF_PDU, rrlp, 0);
-  }
-
-  supl_ulp_free(&ulp);
-
-  /*
+    /*
   ** send SUPL_END (but who really cares)
   */
 
-  supl_close(ctx);
+    supl_close(ctx);
 
-  return 0;
+    return 0;
 }
 
-void EXPORT supl_set_gsm_cell(supl_ctx_t *ctx, int mcc, int mns, int lac, int ci) {
-  ctx->p.set |= PARAM_GSM_CELL_CURRENT;
 
-  ctx->p.gsm.mcc = mcc;
-  ctx->p.gsm.mnc = mns;
-  ctx->p.gsm.lac = lac;
-  ctx->p.gsm.ci = ci;
+void EXPORT supl_set_gsm_cell(supl_ctx_t *ctx, int mcc, int mns, int lac, int ci)
+{
+    ctx->p.set |= PARAM_GSM_CELL_CURRENT;
+
+    ctx->p.gsm.mcc = mcc;
+    ctx->p.gsm.mnc = mns;
+    ctx->p.gsm.lac = lac;
+    ctx->p.gsm.ci = ci;
 }
 
-void EXPORT supl_set_gsm_cell_known(supl_ctx_t *ctx, int mcc, int mns, int lac, int ci, double lat, double lon, int uncert) {
-  ctx->p.set |= PARAM_GSM_CELL_KNOWN;
 
-  ctx->p.known.mcc = mcc;
-  ctx->p.known.mnc = mns;
-  ctx->p.known.lac = lac;
-  ctx->p.known.ci = ci;
-  ctx->p.known.lat = lat;
-  ctx->p.known.lon = lon;
-  ctx->p.known.uncert = uncert;
+void EXPORT supl_set_gsm_cell_known(supl_ctx_t *ctx, int mcc, int mns, int lac, int ci, double lat, double lon, int uncert)
+{
+    ctx->p.set |= PARAM_GSM_CELL_KNOWN;
+
+    ctx->p.known.mcc = mcc;
+    ctx->p.known.mnc = mns;
+    ctx->p.known.lac = lac;
+    ctx->p.known.ci = ci;
+    ctx->p.known.lat = lat;
+    ctx->p.known.lon = lon;
+    ctx->p.known.uncert = uncert;
 }
 
-void EXPORT supl_set_wcdma_cell(supl_ctx_t *ctx, int mcc, int mns, int uc) {
-  ctx->p.set |= PARAM_WCDMA_CELL_CURRENT;
 
-  ctx->p.wcdma.mcc = mcc;
-  ctx->p.wcdma.mnc = mns;
-  ctx->p.wcdma.uc = uc;
+void EXPORT supl_set_wcdma_cell(supl_ctx_t *ctx, int mcc, int mns, int uc)
+{
+    ctx->p.set |= PARAM_WCDMA_CELL_CURRENT;
+
+    ctx->p.wcdma.mcc = mcc;
+    ctx->p.wcdma.mnc = mns;
+    ctx->p.wcdma.uc = uc;
 }
 
-void EXPORT supl_request(supl_ctx_t *ctx, int request) {
-  ctx->p.request = request;
+
+void EXPORT supl_request(supl_ctx_t *ctx, int request)
+{
+    ctx->p.request = request;
 }
 
-void EXPORT supl_set_debug(FILE *log, int flags) {
+
+void EXPORT supl_set_debug(FILE *log, int flags)
+{
 #ifdef SUPL_DEBUG
-  debug.log = log;
-  if (flags & SUPL_DEBUG_RRLP) debug.verbose_rrlp = 1;
-  if (flags & SUPL_DEBUG_SUPL) debug.verbose_supl = 1;
-  if (flags & SUPL_DEBUG_DEBUG) debug.debug = 1;
+    debug.log = log;
+    if (flags & SUPL_DEBUG_RRLP) debug.verbose_rrlp = 1;
+    if (flags & SUPL_DEBUG_SUPL) debug.verbose_supl = 1;
+    if (flags & SUPL_DEBUG_DEBUG) debug.debug = 1;
 #endif
 }
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 57907e079..71e789778 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -138,7 +138,9 @@ void ControlThread::init()
                 {
                     vect.push_back(d);
                     if ((ss.peek() == ',') or (ss.peek() == ' '))
-                        ss.ignore();
+                        {
+                            ss.ignore();
+                        }
                 }
             // fill agnss_ref_location_
             if (vect.size() >= 2)
@@ -191,7 +193,10 @@ void ControlThread::init()
 
 ControlThread::~ControlThread()  // NOLINT(modernize-use-equals-default)
 {
-    if (msqid != -1) msgctl(msqid, IPC_RMID, nullptr);
+    if (msqid != -1)
+        {
+            msgctl(msqid, IPC_RMID, nullptr);
+        }
 }
 
 
@@ -269,7 +274,10 @@ int ControlThread::run()
         {
             //TODO re-enable the blocking read messages functions and fork the process
             read_control_messages();
-            if (control_messages_ != nullptr) process_control_messages();
+            if (control_messages_ != nullptr)
+                {
+                    process_control_messages();
+                }
         }
     std::cout << "Stopping GNSS-SDR, please wait!" << std::endl;
     flowgraph_->stop();
@@ -778,7 +786,10 @@ void ControlThread::process_control_messages()
 {
     for (auto &i : *control_messages_)
         {
-            if (stop_) break;
+            if (stop_)
+                {
+                    break;
+                }
             if (i->who == 200)
                 {
                     apply_action(i->what);
@@ -998,7 +1009,10 @@ void ControlThread::gps_acq_assist_data_collector()
     while (stop_ == false)
         {
             global_gps_acq_assist_queue.wait_and_pop(gps_acq);
-            if (gps_acq.i_satellite_PRN == 0) break;
+            if (gps_acq.i_satellite_PRN == 0)
+                {
+                    break;
+                }
 
             // DEBUG MESSAGE
             std::cout << "Acquisition assistance record has arrived from SAT ID "
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index d4c1acd56..82cc49e09 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -1344,7 +1344,7 @@ void GNSSFlowgraph::priorize_satellites(std::vector<std::pair<int, Gnss_Satellit
 {
     size_t old_size;
     Gnss_Signal gs;
-    for (auto & visible_satellite : visible_satellites)
+    for (auto& visible_satellite : visible_satellites)
         {
             if (visible_satellite.second.get_system() == "GPS")
                 {
@@ -1812,7 +1812,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "1C")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "1C"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite and configuration_->property("Channels_2S.count", 0) > 0)
                                 {
@@ -1843,7 +1846,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2S")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2S"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite and configuration_->property("Channels_1C.count", 0) > 0)
                                 {
@@ -1874,7 +1880,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "L5")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "L5"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite and configuration_->property("Channels_1C.count", 0) > 0)
                                 {
@@ -1905,7 +1914,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "1B")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "1B"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite)
                                 {
@@ -1930,7 +1942,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "5X")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "5X"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite)
                                 {
@@ -1955,7 +1970,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "1G")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "1G"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite)
                                 {
@@ -1980,7 +1998,10 @@ Gnss_Signal GNSSFlowgraph::search_next_signal(const std::string& searched_signal
                         {
                             for (unsigned int ch = 0; ch < channels_count_; ch++)
                                 {
-                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G")) untracked_satellite = false;
+                                    if ((channels_[ch]->get_signal().get_satellite() == result.get_satellite()) and (channels_[ch]->get_signal().get_signal_str() != "2G"))
+                                        {
+                                            untracked_satellite = false;
+                                        }
                                 }
                             if (untracked_satellite)
                                 {
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h
index 7212447cd..44d83ca39 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.h
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.h
@@ -129,7 +129,7 @@ public:
     double d_OMEGA;      //!< Argument of Perigee [semi-cicles]
     double d_OMEGA_DOT;  //!< Rate of Right Ascension [semi-circles/s]
     //broadcast orbit 5
-    double d_IDOT;      //!< Rate of Inclination Angle [semi-circles/s]
+    double d_IDOT;          //!< Rate of Inclination Angle [semi-circles/s]
     int32_t i_BEIDOU_week;  //!< BeiDou week number, aka WN [week]
     //broadcast orbit 6
     int32_t i_SV_accuracy;  //!< User Range Accuracy (URA) index of the SV
@@ -167,8 +167,8 @@ public:
     uint64_t d_OMEGA_DOT_lsb_bits;  //!< Rate of Right Ascension [semi-circles/s]
 
     // Almanac
-    double d_Toa;                      //!< Almanac reference time [s]
-    int32_t i_WN_A;                        //!< Modulo 256 of the GPS week number to which the almanac reference time (d_Toa) is referenced
+    double d_Toa;                              //!< Almanac reference time [s]
+    int32_t i_WN_A;                            //!< Modulo 256 of the GPS week number to which the almanac reference time (d_Toa) is referenced
     std::map<int32_t, int32_t> almanacHealth;  //!< Map that stores the health information stored in the almanac
 
     std::map<int32_t, std::string> satelliteBlock;  //!< Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus
@@ -221,8 +221,8 @@ public:
     double d_A1UTC;       //!< 1st order term of a model that relates GPS and UTC time (ref. 20.3.3.5.2.4 IS-GPS-200E) [s/s]
     double d_A0UTC;       //!< Constant of a model that relates GPS and UTC time (ref. 20.3.3.5.2.4 IS-GPS-200E) [s]
     double d_DeltaT_LS;   //!< delta time due to leap seconds [s]. Number of leap seconds since 6-Jan-1980 as transmitted by the GPS almanac.
-    int32_t i_WN_LSF;         //!< Week number at the end of which the leap second becomes effective [weeks]
-    int32_t i_DN;             //!< Day number (DN) at the end of which the leap second becomes effective [days]
+    int32_t i_WN_LSF;     //!< Week number at the end of which the leap second becomes effective [weeks]
+    int32_t i_DN;         //!< Day number (DN) at the end of which the leap second becomes effective [days]
     double d_DeltaT_LSF;  //!< Scheduled future or recent past (relative to NAV message upload) value of the delta time due to leap seconds [s]
     double d_A1GPS;
     double d_A0GPS;
diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc
index b2a825894..5685b34a4 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.cc
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc
@@ -84,7 +84,9 @@ void Glonass_Gnav_Navigation_Message::reset()
     // Data update information
     d_previous_tb = 0.0;
     for (double& i : d_previous_Na)
-        i = 0.0;
+        {
+            i = 0.0;
+        }
 
     std::map<int, std::string> satelliteBlock;  // Map that stores to which block the PRN belongs http://www.navcen.uscg.gov/?Do=constellationStatus
 
@@ -320,7 +322,9 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
     // Perform data verification and exit code if error in bit sequence
     flag_CRC_test = CRC_test(string_bits);
     if (flag_CRC_test == false)
-        return 0;
+        {
+            return 0;
+        }
 
     // Decode all 15 string messages
     d_string_ID = static_cast<uint32_t>(read_navigation_unsigned(string_bits, STRING_ID));
@@ -451,7 +455,9 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
-                return 0;
+                {
+                    return 0;
+                }
 
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
@@ -499,7 +505,9 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
-                return 0;
+                {
+                    return 0;
+                }
 
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
@@ -542,7 +550,9 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
-                return 0;
+                {
+                    return 0;
+                }
 
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
@@ -585,7 +595,9 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
-                return 0;
+                {
+                    return 0;
+                }
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
@@ -634,7 +646,9 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
                     d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
                     // Make sure a valid frame_ID or satellite slot number is returned
                     if (d_frame_ID == 0)
-                        return 0;
+                        {
+                            return 0;
+                        }
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
diff --git a/src/core/system_parameters/gnss_satellite.cc b/src/core/system_parameters/gnss_satellite.cc
index 6ff824868..0252ef8f8 100644
--- a/src/core/system_parameters/gnss_satellite.cc
+++ b/src/core/system_parameters/gnss_satellite.cc
@@ -69,8 +69,14 @@ std::ostream& operator<<(std::ostream& out, const Gnss_Satellite& sat)  // outpu
 {
     std::string tag;
     std::string tag2;
-    if (sat.get_system() == "Galileo") tag = "E";
-    if (sat.get_PRN() < 10) tag2 = "0";
+    if (sat.get_system() == "Galileo")
+        {
+            tag = "E";
+        }
+    if (sat.get_PRN() < 10)
+        {
+            tag2 = "0";
+        }
     out << sat.get_system() << " PRN " << tag << tag2 << sat.get_PRN() << " (Block " << sat.get_block() << ")";
     return out;
 }
diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 5944d01c3..983ca0870 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -651,7 +651,10 @@ public:
     //----------------------------------------------------------------------------------
     inline Gnuplot &replot(void)
     {
-        if (nplots > 0) cmd("replot");
+        if (nplots > 0)
+            {
+                cmd("replot");
+            }
         return *this;
     };
 
@@ -795,13 +798,17 @@ Gnuplot &Gnuplot::plot_x(const X &x, const std::string &title)
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
     if (name.empty())
-        return *this;
+        {
+            return *this;
+        }
 
     //
     // write the data to file
     //
     for (unsigned int i = 0; i < x.size(); i++)
-        tmp << x[i] << std::endl;
+        {
+            tmp << x[i] << std::endl;
+        }
 
     tmp.flush();
     tmp.close();
@@ -834,13 +841,17 @@ Gnuplot &Gnuplot::plot_xy(const X &x, const Y &y, const std::string &title, cons
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
     if (name.empty())
-        return *this;
+        {
+            return *this;
+        }
 
     //
     // write the data to file
     //
     for (unsigned int i = 0; i < x.size(); i++)
-        tmp << x[i] << " " << y[i] << std::endl;
+        {
+            tmp << x[i] << " " << y[i] << std::endl;
+        }
 
     tmp.flush();
     tmp.close();
@@ -876,13 +887,17 @@ Gnuplot &Gnuplot::plot_xy_err(const X &x,
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
     if (name.empty())
-        return *this;
+        {
+            return *this;
+        }
 
     //
     // write the data to file
     //
     for (unsigned int i = 0; i < x.size(); i++)
-        tmp << x[i] << " " << y[i] << " " << dy[i] << std::endl;
+        {
+            tmp << x[i] << " " << y[i] << " " << dy[i] << std::endl;
+        }
 
     tmp.flush();
     tmp.close();
@@ -912,7 +927,9 @@ Gnuplot &Gnuplot::plot_grid3d(const X &x,
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
     if (name.empty())
-        return *this;
+        {
+            return *this;
+        }
 
     //
     // write the data to file
@@ -938,9 +955,13 @@ Gnuplot &Gnuplot::plot_grid3d(const X &x,
     cmdstr << " splot \"" << name << "\" u 1:2:3";
 
     if (title.empty())
-        cmdstr << " notitle with " << pstyle << " palette";
+        {
+            cmdstr << " notitle with " << pstyle << " palette";
+        }
     else
-        cmdstr << " title \"" << title << "\" with " << pstyle << " palette";
+        {
+            cmdstr << " title \"" << title << "\" with " << pstyle << " palette";
+        }
     cmdstr << "\n";
 
     //
@@ -976,13 +997,17 @@ Gnuplot &Gnuplot::plot_xyz(const X &x,
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
     if (name.empty())
-        return *this;
+        {
+            return *this;
+        }
 
     //
     // write the data to file
     //
     for (unsigned int i = 0; i < x.size(); i++)
-        tmp << x[i] << " " << y[i] << " " << z[i] << std::endl;
+        {
+            tmp << x[i] << " " << y[i] << " " << z[i] << std::endl;
+        }
 
     tmp.flush();
     tmp.close();
@@ -1055,7 +1080,9 @@ void stringtok(Container &container,
             i = in.find_first_not_of(delimiters, i);
 
             if (i == std::string::npos)
-                return;  // nothing left but white space
+                {
+                    return;  // nothing left but white space
+                }
 
             // find the end of the token
             std::string::size_type j = in.find_first_of(delimiters, i);
@@ -1084,18 +1111,19 @@ void stringtok(Container &container,
 Gnuplot::~Gnuplot()
 {
 //  remove_tmpfiles();
-
 // A stream opened by popen() should be closed by pclose()
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__)
     if (_pclose(gnucmd) == -1)
+        {
 #elif defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__)
     if (pclose(gnucmd) == -1)
+        {
 #endif
-        // throw GnuplotException("Problem closing communication to gnuplot");
-        std::cout << "Gnuplot window left open." << std::endl;
+            // throw GnuplotException("Problem closing communication to gnuplot");
+            std::cout << "Gnuplot window left open." << std::endl;
+        }
 }
 
-
 //------------------------------------------------------------------------------
 //
 // Resets a gnuplot session (next plot will erase previous ones)
@@ -1108,7 +1136,6 @@ Gnuplot &Gnuplot::reset_plot()
     return *this;
 }
 
-
 //------------------------------------------------------------------------------
 //
 // resets a gnuplot session and sets all variables to default
@@ -1126,7 +1153,6 @@ Gnuplot &Gnuplot::reset_all()
     return *this;
 }
 
-
 //------------------------------------------------------------------------------
 //
 // Change the plotting style of a gnuplot session
@@ -1172,7 +1198,6 @@ Gnuplot &Gnuplot::set_style(const std::string &stylestr)
     return *this;
 }
 
-
 //------------------------------------------------------------------------------
 //
 // smooth: interpolation and approximation of data
@@ -1501,16 +1526,24 @@ Gnuplot &Gnuplot::plot_slope(const double a,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == true)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     cmdstr << a << " * x + " << b << " title \"";
 
     if (title.empty())
-        cmdstr << "f(x) = " << a << " * x + " << b;
+        {
+            cmdstr << "f(x) = " << a << " * x + " << b;
+        }
     else
-        cmdstr << title;
+        {
+            cmdstr << title;
+        }
 
     cmdstr << "\" with " << pstyle;
 
@@ -1535,16 +1568,24 @@ Gnuplot &Gnuplot::plot_equation(const std::string &equation,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == true)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     cmdstr << equation << " title \"";
 
     if (title.empty())
-        cmdstr << "f(x) = " << equation;
+        {
+            cmdstr << "f(x) = " << equation;
+        }
     else
-        cmdstr << title;
+        {
+            cmdstr << title;
+        }
 
     cmdstr << "\" with " << pstyle;
 
@@ -1569,16 +1610,24 @@ Gnuplot &Gnuplot::plot_equation3d(const std::string &equation,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == false)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "splot ";
+        {
+            cmdstr << "splot ";
+        }
 
     cmdstr << equation << " title \"";
 
     if (title.empty())
-        cmdstr << "f(x,y) = " << equation;
+        {
+            cmdstr << "f(x,y) = " << equation;
+        }
     else
-        cmdstr << title;
+        {
+            cmdstr << title;
+        }
 
     cmdstr << "\" with " << pstyle;
 
@@ -1609,21 +1658,33 @@ Gnuplot &Gnuplot::plotfile_x(const std::string &filename,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == true)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     cmdstr << "\"" << filename << "\" using " << column;
 
     if (title.empty())
-        cmdstr << " notitle ";
+        {
+            cmdstr << " notitle ";
+        }
     else
-        cmdstr << " title \"" << title << "\" ";
+        {
+            cmdstr << " title \"" << title << "\" ";
+        }
 
     if (smooth.empty())
-        cmdstr << "with " << pstyle;
+        {
+            cmdstr << "with " << pstyle;
+        }
     else
-        cmdstr << "smooth " << smooth;
+        {
+            cmdstr << "smooth " << smooth;
+        }
 
     //
     // Do the actual plot
@@ -1654,21 +1715,33 @@ Gnuplot &Gnuplot::plotfile_xy(const std::string &filename,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == true)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     cmdstr << "\"" << filename << "\" using " << column_x << ":" << column_y << " every " << std::to_string(decimate);
 
     if (title.empty())
-        cmdstr << " notitle ";
+        {
+            cmdstr << " notitle ";
+        }
     else
-        cmdstr << " title \"" << title << "\" ";
+        {
+            cmdstr << " title \"" << title << "\" ";
+        }
 
     if (smooth.empty())
-        cmdstr << "with " << pstyle;
+        {
+            cmdstr << "with " << pstyle;
+        }
     else
-        cmdstr << "smooth " << smooth;
+        {
+            cmdstr << "smooth " << smooth;
+        }
 
     //
     // Do the actual plot
@@ -1699,18 +1772,26 @@ Gnuplot &Gnuplot::plotfile_xy_err(const std::string &filename,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == true)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     cmdstr << "\"" << filename << "\" using "
            << column_x << ":" << column_y << ":" << column_dy
            << " with errorbars ";
 
     if (title.empty())
-        cmdstr << " notitle ";
+        {
+            cmdstr << " notitle ";
+        }
     else
-        cmdstr << " title \"" << title << "\" ";
+        {
+            cmdstr << " title \"" << title << "\" ";
+        }
 
     //
     // Do the actual plot
@@ -1741,17 +1822,25 @@ Gnuplot &Gnuplot::plotfile_xyz(const std::string &filename,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == false)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "splot ";
+        {
+            cmdstr << "splot ";
+        }
 
     cmdstr << "\"" << filename << "\" using " << column_x << ":" << column_y
            << ":" << column_z;
 
     if (title.empty())
-        cmdstr << " notitle with " << pstyle;
+        {
+            cmdstr << " notitle with " << pstyle;
+        }
     else
-        cmdstr << " title \"" << title << "\" with " << pstyle;
+        {
+            cmdstr << " title \"" << title << "\" with " << pstyle;
+        }
 
     //
     // Do the actual plot
@@ -1774,7 +1863,9 @@ Gnuplot &Gnuplot::plot_image(const unsigned char *ucPicBuf,
     std::ofstream tmp;
     std::string name = create_tmpfile(tmp);
     if (name.empty())
-        return *this;
+        {
+            return *this;
+        }
 
     //
     // write the data to file
@@ -1797,14 +1888,22 @@ Gnuplot &Gnuplot::plot_image(const unsigned char *ucPicBuf,
     // command to be sent to gnuplot
     //
     if (nplots > 0 && two_dim == true)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     if (title.empty())
-        cmdstr << "\"" << name << "\" with image";
+        {
+            cmdstr << "\"" << name << "\" with image";
+        }
     else
-        cmdstr << "\"" << name << "\" title \"" << title << "\" with image";
+        {
+            cmdstr << "\"" << name << "\" title \"" << title << "\" with image";
+        }
 
     //
     // Do the actual plot
@@ -1832,9 +1931,13 @@ Gnuplot &Gnuplot::plot_circle(double east, double north, double radius, const st
                           ", " + std::to_string(north_label) + " norotate back nopoint offset 0,0\n";
         }
     if (nplots > 0)
-        cmdstr << "replot ";
+        {
+            cmdstr << "replot ";
+        }
     else
-        cmdstr << "plot ";
+        {
+            cmdstr << "plot ";
+        }
 
     //
     // Do the actual plot
@@ -2154,8 +2257,12 @@ void Gnuplot::remove_tmpfiles()
     if (!(tmpfile_list).empty())
         {
             for (auto &i : tmpfile_list)
-                if (remove(i.c_str()) != 0)
-                    std::cout << "Problem closing files" << std::endl;
+                {
+                    if (remove(i.c_str()) != 0)
+                        {
+                            std::cout << "Problem closing files" << std::endl;
+                        }
+                }
 
             Gnuplot::tmpfile_num -= tmpfile_list.size();
         }
diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc
index e1ac453be..cb8f8975b 100644
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@@ -104,7 +104,10 @@ int PositionSystemTest::configure_generator()
     if (FLAGS_dynamic_position.empty())
         {
             p2 = std::string("-static_position=") + FLAGS_static_position + std::string(",") + std::to_string(std::min(FLAGS_duration * 10, 3000));
-            if (FLAGS_duration > 300) std::cout << "WARNING: Duration has been set to its maximum value of 300 s" << std::endl;
+            if (FLAGS_duration > 300)
+                {
+                    std::cout << "WARNING: Duration has been set to its maximum value of 300 s" << std::endl;
+                }
         }
     else
         {
@@ -126,7 +129,9 @@ int PositionSystemTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork error");
+        {
+            perror("fork error");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
@@ -135,7 +140,10 @@ int PositionSystemTest::generate_signal()
         }
 
     wait_result = waitpid(pid, &child_status, 0);
-    if (wait_result == -1) perror("waitpid error");
+    if (wait_result == -1)
+        {
+            perror("waitpid error");
+        }
     return 0;
 }
 
diff --git a/src/tests/system-tests/ttff.cc b/src/tests/system-tests/ttff.cc
index c5a7ca707..c9186a05f 100644
--- a/src/tests/system-tests/ttff.cc
+++ b/src/tests/system-tests/ttff.cc
@@ -79,7 +79,7 @@ class TtffTest : public ::testing::Test
 public:
     void config_1();
     void config_2();
-    void print_TTFF_report(const std::vector<double> &ttff_v, const std::shared_ptr<ConfigurationInterface>& config_);
+    void print_TTFF_report(const std::vector<double> &ttff_v, const std::shared_ptr<ConfigurationInterface> &config_);
 
     std::shared_ptr<InMemoryConfiguration> config;
     std::shared_ptr<FileConfiguration> config2;
@@ -297,7 +297,7 @@ void receive_msg()
 }
 
 
-void TtffTest::print_TTFF_report(const std::vector<double> &ttff_v, const std::shared_ptr<ConfigurationInterface>& config_)
+void TtffTest::print_TTFF_report(const std::vector<double> &ttff_v, const std::shared_ptr<ConfigurationInterface> &config_)
 {
     std::ofstream ttff_report_file;
     std::string filename = "ttff_report";
@@ -385,7 +385,10 @@ void TtffTest::print_TTFF_report(const std::vector<double> &ttff_v, const std::s
             stm << "Disabled." << std::endl;
         }
     stm << "Valid measurements (" << ttff.size() << "/" << FLAGS_num_measurements << "): ";
-    for (double ttff_ : ttff) stm << ttff_ << " ";
+    for (double ttff_ : ttff)
+        {
+            stm << ttff_ << " ";
+        }
     stm << std::endl;
     stm << "TTFF mean: " << mean << " [s]" << std::endl;
     if (!ttff.empty())
diff --git a/src/tests/unit-tests/arithmetic/fft_length_test.cc b/src/tests/unit-tests/arithmetic/fft_length_test.cc
index ff5d2fdb6..c8eb8354d 100644
--- a/src/tests/unit-tests/arithmetic/fft_length_test.cc
+++ b/src/tests/unit-tests/arithmetic/fft_length_test.cc
@@ -151,7 +151,10 @@ TEST(FFTLengthTest, MeasureExecutionTime)
                             g2.set_style("points").plot_xy(powers_of_two, execution_times_powers_of_two, "Power of 2");
                             g2.savetops("FFT_execution_times");
                             g2.savetopdf("FFT_execution_times", 18);
-                            if (FLAGS_show_plots) g2.showonscreen();  // window output
+                            if (FLAGS_show_plots)
+                                {
+                                    g2.showonscreen();  // window output
+                                }
                         }
                     catch (const GnuplotException& ge)
                         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
index 63368b59d..74508dc3c 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -141,8 +141,7 @@ AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(concurrent_queue<int>& queue) : gr::block
 }
 
 
-AcqPerfTest_msg_rx::~AcqPerfTest_msg_rx()
-= default;
+AcqPerfTest_msg_rx::~AcqPerfTest_msg_rx() = default;
 
 // -----------------------------------------
 
@@ -288,15 +287,23 @@ protected:
             }
 
         Pd.resize(cn0_vector.size());
-        for (int i = 0; i < static_cast<int>(cn0_vector.size()); i++) Pd[i].reserve(num_thresholds);
+        for (int i = 0; i < static_cast<int>(cn0_vector.size()); i++)
+            {
+                Pd[i].reserve(num_thresholds);
+            }
         Pfa.resize(cn0_vector.size());
-        for (int i = 0; i < static_cast<int>(cn0_vector.size()); i++) Pfa[i].reserve(num_thresholds);
+        for (int i = 0; i < static_cast<int>(cn0_vector.size()); i++)
+            {
+                Pfa[i].reserve(num_thresholds);
+            }
         Pd_correct.resize(cn0_vector.size());
-        for (int i = 0; i < static_cast<int>(cn0_vector.size()); i++) Pd_correct[i].reserve(num_thresholds);
+        for (int i = 0; i < static_cast<int>(cn0_vector.size()); i++)
+            {
+                Pd_correct[i].reserve(num_thresholds);
+            }
     }
 
-    ~AcquisitionPerformanceTest()
-    = default;
+    ~AcquisitionPerformanceTest() = default;
 
     std::vector<double> cn0_vector;
     std::vector<float> pfa_vector;
@@ -453,7 +460,9 @@ int AcquisitionPerformanceTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork error");
+        {
+            perror("fork error");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
@@ -462,7 +471,10 @@ int AcquisitionPerformanceTest::generate_signal()
         }
 
     wait_result = waitpid(pid, &child_status, 0);
-    if (wait_result == -1) perror("waitpid error");
+    if (wait_result == -1)
+        {
+            perror("waitpid error");
+        }
     return 0;
 }
 
@@ -783,7 +795,10 @@ TEST_F(AcquisitionPerformanceTest, ROC)
             std::vector<double> meas_Pd_correct_;
             std::vector<double> meas_Pfa_;
 
-            if (FLAGS_acq_test_input_file.empty()) std::cout << "Execution for CN0 = " << it << " dB-Hz" << std::endl;
+            if (FLAGS_acq_test_input_file.empty())
+                {
+                    std::cout << "Execution for CN0 = " << it << " dB-Hz" << std::endl;
+                }
 
             // Do N_iterations of the experiment
             for (int pfa_iter = 0; pfa_iter < static_cast<int>(pfa_vector.size()); pfa_iter++)
@@ -798,12 +813,18 @@ TEST_F(AcquisitionPerformanceTest, ROC)
                         }
 
                     // Configure the signal generator
-                    if (FLAGS_acq_test_input_file.empty()) configure_generator(it);
+                    if (FLAGS_acq_test_input_file.empty())
+                        {
+                            configure_generator(it);
+                        }
 
                     for (int iter = 0; iter < N_iterations; iter++)
                         {
                             // Generate signal raw signal samples and observations RINEX file
-                            if (FLAGS_acq_test_input_file.empty()) generate_signal();
+                            if (FLAGS_acq_test_input_file.empty())
+                                {
+                                    generate_signal();
+                                }
 
                             for (unsigned k = 0; k < 2; k++)
                                 {
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index 8c1b365e9..a62f21079 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -104,8 +104,7 @@ GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguo
     rx_message = 0;
 }
 
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx()
-= default;
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -123,8 +122,7 @@ protected:
         init();
     }
 
-    ~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test()
-    = default;
+    ~GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 493e8f56f..54910c30f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -105,8 +105,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcqu
     rx_message = 0;
 }
 
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx()
-= default;
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -124,8 +123,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test()
-    = default;
+    ~GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index ad9332cc3..6e83b6df6 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -113,8 +113,7 @@ GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisit
     rx_message = 0;
 }
 
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx()
-= default;
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -133,8 +132,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GalileoE1PcpsAmbiguousAcquisitionGSoCTest()
-    = default;
+    ~GalileoE1PcpsAmbiguousAcquisitionGSoCTest() = default;
 
     void init();
     void start_queue();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index ac68a9229..5e369c576 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -107,8 +107,7 @@ GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionT
 }
 
 
-GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx()
-= default;
+GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -126,8 +125,7 @@ protected:
         doppler_step = 250;
     }
 
-    ~GalileoE1PcpsAmbiguousAcquisitionTest()
-    = default;
+    ~GalileoE1PcpsAmbiguousAcquisitionTest() = default;
 
     void init();
     void plot_grid();
@@ -180,7 +178,10 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid()
     auto samples_per_code = static_cast<unsigned int>(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));  // !!
     acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code);
 
-    if (!acq_dump.read_binary_acq()) std::cout << "Error reading files" << std::endl;
+    if (!acq_dump.read_binary_acq())
+        {
+            std::cout << "Error reading files" << std::endl;
+        }
 
     std::vector<int>* doppler = &acq_dump.doppler;
     std::vector<unsigned int>* samples = &acq_dump.samples;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index c87ebc536..40dbccb66 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -105,8 +105,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguous
     rx_message = 0;
 }
 
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx()
-= default;
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -124,8 +123,7 @@ protected:
         init();
     }
 
-    ~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest()
-    = default;
+    ~GalileoE1PcpsCccwsrAmbiguousAcquisitionTest() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index bc94b1f04..1b3a50e84 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -114,8 +114,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuic
 }
 
 
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx()
-= default;
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -132,8 +131,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
         init();
     }
-    ~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test()
-    = default;
+    ~GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 578cccf6a..100bae463 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -108,8 +108,7 @@ GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbig
 }
 
 
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx()
-= default;
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx() = default;
 
 
 class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test : public ::testing::Test
@@ -125,8 +124,7 @@ protected:
         init();
     }
 
-    ~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test()
-    = default;
+    ~GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 76f5b5d29..2c2eed08e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -105,8 +105,7 @@ GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisition
 }
 
 
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx()
-= default;
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx() = default;
 
 
 class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest : public ::testing::Test
@@ -121,8 +120,7 @@ protected:
         init();
     }
 
-    ~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest()
-    = default;
+    ~GalileoE5aPcpsAcquisitionGSoC2014GensourceTest() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index 29cfd0068..88ef46af5 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -110,8 +110,7 @@ GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC201
 }
 
 
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::~GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx()
-= default;
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::~GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -129,8 +128,7 @@ protected:
         init();
     }
 
-    ~GlonassL1CaPcpsAcquisitionGSoC2017Test()
-    = default;
+    ~GlonassL1CaPcpsAcquisitionGSoC2017Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
index c1d5bd419..3ed69a462 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
@@ -104,8 +104,7 @@ GlonassL1CaPcpsAcquisitionTest_msg_rx::GlonassL1CaPcpsAcquisitionTest_msg_rx() :
 }
 
 
-GlonassL1CaPcpsAcquisitionTest_msg_rx::~GlonassL1CaPcpsAcquisitionTest_msg_rx()
-= default;
+GlonassL1CaPcpsAcquisitionTest_msg_rx::~GlonassL1CaPcpsAcquisitionTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -121,8 +120,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GlonassL1CaPcpsAcquisitionTest()
-    = default;
+    ~GlonassL1CaPcpsAcquisitionTest() = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 0e82f6f03..9a6ee1c8e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -109,8 +109,7 @@ GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_ms
     rx_message = 0;
 }
 
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx()
-= default;
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -128,8 +127,7 @@ protected:
         init();
     }
 
-    ~GpsL1CaPcpsAcquisitionGSoC2013Test()
-    = default;
+    ~GpsL1CaPcpsAcquisitionGSoC2013Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index d93f11918..5cc30eeb1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -179,7 +179,10 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid()
     auto samples_per_code = static_cast<unsigned int>(round(4000000 / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)));  // !!
     acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
 
-    if (!acq_dump.read_binary_acq()) std::cout << "Error reading files" << std::endl;
+    if (!acq_dump.read_binary_acq())
+        {
+            std::cout << "Error reading files" << std::endl;
+        }
 
     std::vector<int> *doppler = &acq_dump.doppler;
     std::vector<unsigned int> *samples = &acq_dump.samples;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 48e1bda56..82b06b177 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -112,8 +112,7 @@ GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisit
 }
 
 
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx()
-= default;
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -130,8 +129,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test()
-    = default;
+    ~GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index 526bd3476..e9acd6ac9 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -107,8 +107,7 @@ GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC201
     rx_message = 0;
 }
 
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx()
-= default;
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::~GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx() = default;
 
 
 // ###########################################################
@@ -124,8 +123,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL1CaPcpsTongAcquisitionGSoC2013Test()
-    = default;
+    ~GpsL1CaPcpsTongAcquisitionGSoC2013Test() = default;
 
     void init();
     void config_1();
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
index 0305870db..8176537e2 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
@@ -105,8 +105,7 @@ GpsL2MPcpsAcquisitionTest_msg_rx::GpsL2MPcpsAcquisitionTest_msg_rx() : gr::block
     rx_message = 0;
 }
 
-GpsL2MPcpsAcquisitionTest_msg_rx::~GpsL2MPcpsAcquisitionTest_msg_rx()
-= default;
+GpsL2MPcpsAcquisitionTest_msg_rx::~GpsL2MPcpsAcquisitionTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -126,8 +125,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL2MPcpsAcquisitionTest()
-    = default;
+    ~GpsL2MPcpsAcquisitionTest() = default;
 
     void init();
     void plot_grid();
@@ -184,7 +182,10 @@ void GpsL2MPcpsAcquisitionTest::plot_grid()
 
     auto samples_per_code = static_cast<unsigned int>(floor(static_cast<double>(sampling_frequency_hz) / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS))));
     acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
-    if (!acq_dump.read_binary_acq()) std::cout << "Error reading files" << std::endl;
+    if (!acq_dump.read_binary_acq())
+        {
+            std::cout << "Error reading files" << std::endl;
+        }
 
     std::vector<int> *doppler = &acq_dump.doppler;
     std::vector<unsigned int> *samples = &acq_dump.samples;
@@ -204,7 +205,7 @@ void GpsL2MPcpsAcquisitionTest::plot_grid()
                 {
                     boost::filesystem::path p(gnuplot_executable);
                     boost::filesystem::path dir = p.parent_path();
-                    const std::string& gnuplot_path = dir.native();
+                    const std::string &gnuplot_path = dir.native();
                     Gnuplot::set_GNUPlotPath(gnuplot_path);
 
                     Gnuplot g1("impulses");
diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
index 9c411c862..42fb1496a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/filter/fir_filter_test.cc
@@ -137,7 +137,10 @@ TEST_F(FirFilterTest, InstantiateGrComplexGrComplex)
     configure_gr_complex_gr_complex();
     std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
@@ -147,7 +150,10 @@ TEST_F(FirFilterTest, InstantiateCshortCshort)
     configure_cshort_cshort();
     std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
@@ -158,7 +164,10 @@ TEST_F(FirFilterTest, InstantiateCbyteCbyte)
     configure_cbyte_cbyte();
     std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
@@ -169,7 +178,10 @@ TEST_F(FirFilterTest, InstantiateCbyteGrComplex)
     configure_cbyte_gr_complex();
     std::unique_ptr<FirFilter> filter(new FirFilter(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
index f23a84558..a77e9d853 100644
--- a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_lite_test.cc
@@ -95,7 +95,10 @@ TEST_F(NotchFilterLiteTest, InstantiateGrComplexGrComplex)
     configure_gr_complex_gr_complex();
     std::unique_ptr<NotchFilterLite> filter(new NotchFilterLite(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
index b3c9fbece..943ac2fe2 100644
--- a/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/filter/notch_filter_test.cc
@@ -95,7 +95,10 @@ TEST_F(NotchFilterTest, InstantiateGrComplexGrComplex)
     configure_gr_complex_gr_complex();
     std::unique_ptr<NotchFilter> filter(new NotchFilter(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc b/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
index 729ff78dd..83a63d551 100644
--- a/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/filter/pulse_blanking_filter_test.cc
@@ -94,7 +94,10 @@ TEST_F(PulseBlankingFilterTest, InstantiateGrComplexGrComplex)
     configure_gr_complex_gr_complex();
     std::unique_ptr<PulseBlankingFilter> filter(new PulseBlankingFilter(config.get(), "InputFilter", 1, 1));
     int res = 0;
-    if (filter) res = 1;
+    if (filter)
+        {
+            res = 1;
+        }
     ASSERT_EQ(1, res);
 }
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
index f401b1bc9..f671a9b34 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
@@ -60,8 +60,14 @@ bool acquisition_dump_reader::read_binary_acq()
     if ((var_->dims[0] != d_samples_per_code) or (var_->dims[1] != d_num_doppler_bins))
         {
             std::cout << "Invalid Acquisition dump file: dimension matrix error" << std::endl;
-            if (var_->dims[0] != d_samples_per_code) std::cout << "Expected " << d_samples_per_code << " samples per code. Obtained " << var_->dims[0] << std::endl;
-            if (var_->dims[1] != d_num_doppler_bins) std::cout << "Expected " << d_num_doppler_bins << " Doppler bins. Obtained " << var_->dims[1] << std::endl;
+            if (var_->dims[0] != d_samples_per_code)
+                {
+                    std::cout << "Expected " << d_samples_per_code << " samples per code. Obtained " << var_->dims[0] << std::endl;
+                }
+            if (var_->dims[1] != d_num_doppler_bins)
+                {
+                    std::cout << "Expected " << d_num_doppler_bins << " Doppler bins. Obtained " << var_->dims[1] << std::endl;
+                }
             Mat_VarFree(var_);
             Mat_Close(matfile);
             return false;
@@ -218,7 +224,10 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
     sample_counter = 0;
     num_dwells = 0;
     PRN = 0;
-    if (d_doppler_step == 0) d_doppler_step = 1;
+    if (d_doppler_step == 0)
+        {
+            d_doppler_step = 1;
+        }
     d_num_doppler_bins = static_cast<unsigned int>(ceil(static_cast<double>(static_cast<int>(d_doppler_max) - static_cast<int>(-d_doppler_max)) / static_cast<double>(d_doppler_step)));
     std::vector<std::vector<float> > mag_aux(d_num_doppler_bins, std::vector<float>(d_samples_per_code));
     mag = mag_aux;
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
index 10012705b..946e43b80 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@@ -133,8 +133,7 @@ HybridObservablesTest_msg_rx::HybridObservablesTest_msg_rx() : gr::block("Hybrid
     rx_message = 0;
 }
 
-HybridObservablesTest_msg_rx::~HybridObservablesTest_msg_rx()
-= default;
+HybridObservablesTest_msg_rx::~HybridObservablesTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -185,8 +184,7 @@ HybridObservablesTest_tlm_msg_rx::HybridObservablesTest_tlm_msg_rx() : gr::block
     rx_message = 0;
 }
 
-HybridObservablesTest_tlm_msg_rx::~HybridObservablesTest_tlm_msg_rx()
-= default;
+HybridObservablesTest_tlm_msg_rx::~HybridObservablesTest_tlm_msg_rx() = default;
 
 
 // ###########################################################
@@ -278,8 +276,7 @@ public:
         mapStringValues_["2G"] = evGLO_2G;
     }
 
-    ~HybridObservablesTest()
-    = default;
+    ~HybridObservablesTest() = default;
 
     bool ReadRinexObs(std::vector<arma::mat>* obs_vec, Gnss_Synchro gnss);
 
@@ -330,7 +327,9 @@ int HybridObservablesTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork err");
+        {
+            perror("fork err");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
@@ -662,9 +661,13 @@ void HybridObservablesTest::configure_receiver(
     config = std::make_shared<InMemoryConfiguration>();
     config->set_property("Tracking.dump", "true");
     if (high_dyn)
-        config->set_property("Tracking.high_dyn", "true");
+        {
+            config->set_property("Tracking.high_dyn", "true");
+        }
     else
-        config->set_property("Tracking.high_dyn", "false");
+        {
+            config->set_property("Tracking.high_dyn", "false");
+        }
     config->set_property("Tracking.smoother_length", std::to_string(smoother_length));
     config->set_property("Tracking.dump_filename", "./tracking_ch_");
     config->set_property("Tracking.implementation", implementation);
@@ -1677,7 +1680,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
         FLAGS_high_dyn);
 
 
-    for (auto & n : gnss_synchro_vec)
+    for (auto& n : gnss_synchro_vec)
         {
             //setup the signal synchronization, simulating an acquisition
             if (!FLAGS_enable_external_signal_file)
@@ -1775,7 +1778,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
     //Observables
     std::shared_ptr<ObservablesInterface> observables(new HybridObservables(config.get(), "Observables", tracking_ch_vec.size() + 1, tracking_ch_vec.size()));
 
-    for (auto & n : tracking_ch_vec)
+    for (auto& n : tracking_ch_vec)
         {
             ASSERT_NO_THROW({
                 n->connect(top_block);
@@ -1815,7 +1818,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
         file_source->seek(2 * FLAGS_skip_samples, 0);  //skip head. ibyte, two bytes per complex sample
     }) << "Failure connecting the blocks.";
 
-    for (auto & n : tracking_ch_vec)
+    for (auto& n : tracking_ch_vec)
         {
             n->start_tracking();
         }
@@ -1921,7 +1924,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
 
     //Cut measurement tail zeros
     arma::uvec index;
-    for (auto & n : measured_obs_vec)
+    for (auto& n : measured_obs_vec)
         {
             index = arma::find(n.col(0) > 0.0, 1, "last");
             if ((!index.empty()) and index(0) < (nepoch - 1))
@@ -1961,7 +1964,9 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
                 {
                     prn_pairs.push_back(i);
                     if (ss.peek() == ',')
-                        ss.ignore();
+                        {
+                            ss.ignore();
+                        }
                 }
 
             if (prn_pairs.size() % 2 != 0)
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
index 72522a769..60e496ede 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
@@ -42,8 +42,7 @@ protected:
     {
         this->conf();
     }
-    ~NmeaPrinterTest()
-    = default;
+    ~NmeaPrinterTest() = default;
     void conf();
     rtk_t rtk;
 };
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
index c4a559448..2f5e819f0 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rinex_printer_test.cc
@@ -58,7 +58,10 @@ TEST(RinexPrinterTest, GalileoObsHeader)
         }
     std::string expected_str("E    4 C1B L1B D1B S1B                                      SYS / # / OBS TYPES ");
     EXPECT_EQ(0, expected_str.compare(line_aux));
-    if (remove(rp1->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp1->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
     line_aux.clear();
 
     std::shared_ptr<Rinex_Printer> rp2;
@@ -82,7 +85,10 @@ TEST(RinexPrinterTest, GalileoObsHeader)
     std::string expected_str2("E   12 C1B L1B D1B S1B C5X L5X D5X S5X C7X L7X D7X S7X      SYS / # / OBS TYPES ");
     EXPECT_EQ(0, expected_str2.compare(line_aux));
 
-    if (remove(rp2->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp2->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -113,7 +119,10 @@ TEST(RinexPrinterTest, GlonassObsHeader)
         }
     std::string expected_str("R    4 C1C L1C D1C S1C                                      SYS / # / OBS TYPES ");
     EXPECT_EQ(0, expected_str.compare(line_aux));
-    if (remove(rp1->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp1->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
     line_aux.clear();
 }
 
@@ -158,7 +167,10 @@ TEST(RinexPrinterTest, MixedObsHeader)
     std::string expected_str2("E    8 C1B L1B D1B S1B C5X L5X D5X S5X                      SYS / # / OBS TYPES ");
     EXPECT_EQ(0, expected_str.compare(line_aux));
     EXPECT_EQ(0, expected_str2.compare(line_aux2));
-    if (remove(rp1->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp1->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -202,7 +214,10 @@ TEST(RinexPrinterTest, MixedObsHeaderGpsGlo)
     std::string expected_str2("R    4 C1C L1C D1C S1C                                      SYS / # / OBS TYPES ");
     EXPECT_EQ(0, expected_str.compare(line_aux));
     EXPECT_EQ(0, expected_str2.compare(line_aux2));
-    if (remove(rp1->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp1->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -270,7 +285,10 @@ TEST(RinexPrinterTest, GalileoObsLog)
     std::string expected_str("E22  22000000.000 7         3.724 7      1534.000 7        42.000               ");
     EXPECT_EQ(0, expected_str.compare(line_aux));
 
-    if (remove(rp->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -338,7 +356,10 @@ TEST(RinexPrinterTest, GlonassObsLog)
     std::string expected_str("R22  22000000.000 7         3.724 7      1534.000 7        42.000               ");
     EXPECT_EQ(0, expected_str.compare(line_aux));
 
-    if (remove(rp->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -419,7 +440,10 @@ TEST(RinexPrinterTest, GpsObsLogDualBand)
     std::string expected_str("G08  22000002.100 6         7.226 6       321.000 6        39.000  22000000.000 7         3.724 7      1534.000 7        42.000");
     EXPECT_EQ(0, expected_str.compare(line_aux));
 
-    if (remove(rp->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -500,7 +524,10 @@ TEST(RinexPrinterTest, GalileoObsLogDualBand)
     std::string expected_str("E08  22000002.100 6         7.226 6       321.000 6        39.000  22000000.000 7         3.724 7      1534.000 7        42.000");
     EXPECT_EQ(0, expected_str.compare(line_aux));
 
-    if (remove(rp->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -610,7 +637,10 @@ TEST(RinexPrinterTest, MixedObsLog)
     std::string expected_str("E16  22000000.000 7         0.127 7       -20.000 7        42.000  22000000.000 6         8.292 6      1534.000 6        41.000");
     EXPECT_EQ(0, expected_str.compare(line_aux));
 
-    if (remove(rp->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
 
 
@@ -719,5 +749,8 @@ TEST(RinexPrinterTest, MixedObsLogGpsGlo)
     std::string expected_str("R16  22000000.000 6         8.292 6      1534.000 6        41.000  22000000.000 7         0.127 7       -20.000 7        42.000");
     EXPECT_EQ(0, expected_str.compare(line_aux));
 
-    if (remove(rp->obsfilename.c_str()) != 0) LOG(INFO) << "Error deleting temporary file";
+    if (remove(rp->obsfilename.c_str()) != 0)
+        {
+            LOG(INFO) << "Error deleting temporary file";
+        }
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
index 2bf2b0a12..28b69ce0d 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
@@ -58,11 +58,26 @@ rtk_t configure_rtklib_options()
     int positioning_mode = -1;
     std::string default_pos_mode("Single");
     std::string positioning_mode_str = configuration->property(role + ".positioning_mode", default_pos_mode); /* (PMODE_XXX) see src/algorithms/libs/rtklib/rtklib.h */
-    if (positioning_mode_str == "Single") positioning_mode = PMODE_SINGLE;
-    if (positioning_mode_str == "Static") positioning_mode = PMODE_STATIC;
-    if (positioning_mode_str == "Kinematic") positioning_mode = PMODE_KINEMA;
-    if (positioning_mode_str == "PPP_Static") positioning_mode = PMODE_PPP_STATIC;
-    if (positioning_mode_str == "PPP_Kinematic") positioning_mode = PMODE_PPP_KINEMA;
+    if (positioning_mode_str == "Single")
+        {
+            positioning_mode = PMODE_SINGLE;
+        }
+    if (positioning_mode_str == "Static")
+        {
+            positioning_mode = PMODE_STATIC;
+        }
+    if (positioning_mode_str == "Kinematic")
+        {
+            positioning_mode = PMODE_KINEMA;
+        }
+    if (positioning_mode_str == "PPP_Static")
+        {
+            positioning_mode = PMODE_PPP_STATIC;
+        }
+    if (positioning_mode_str == "PPP_Kinematic")
+        {
+            positioning_mode = PMODE_PPP_KINEMA;
+        }
 
     if (positioning_mode == -1)
         {
@@ -107,12 +122,30 @@ rtk_t configure_rtklib_options()
     std::string default_iono_model("OFF");
     std::string iono_model_str = configuration->property(role + ".iono_model", default_iono_model); /*  (IONOOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
     int iono_model = -1;
-    if (iono_model_str == "OFF") iono_model = IONOOPT_OFF;
-    if (iono_model_str == "Broadcast") iono_model = IONOOPT_BRDC;
-    if (iono_model_str == "SBAS") iono_model = IONOOPT_SBAS;
-    if (iono_model_str == "Iono-Free-LC") iono_model = IONOOPT_IFLC;
-    if (iono_model_str == "Estimate_STEC") iono_model = IONOOPT_EST;
-    if (iono_model_str == "IONEX") iono_model = IONOOPT_TEC;
+    if (iono_model_str == "OFF")
+        {
+            iono_model = IONOOPT_OFF;
+        }
+    if (iono_model_str == "Broadcast")
+        {
+            iono_model = IONOOPT_BRDC;
+        }
+    if (iono_model_str == "SBAS")
+        {
+            iono_model = IONOOPT_SBAS;
+        }
+    if (iono_model_str == "Iono-Free-LC")
+        {
+            iono_model = IONOOPT_IFLC;
+        }
+    if (iono_model_str == "Estimate_STEC")
+        {
+            iono_model = IONOOPT_EST;
+        }
+    if (iono_model_str == "IONEX")
+        {
+            iono_model = IONOOPT_TEC;
+        }
     if (iono_model == -1)
         {
             //warn user and set the default
@@ -126,11 +159,26 @@ rtk_t configure_rtklib_options()
     std::string default_trop_model("OFF");
     int trop_model = -1;
     std::string trop_model_str = configuration->property(role + ".trop_model", default_trop_model); /*  (TROPOPT_XXX) see src/algorithms/libs/rtklib/rtklib.h */
-    if (trop_model_str == "OFF") trop_model = TROPOPT_OFF;
-    if (trop_model_str == "Saastamoinen") trop_model = TROPOPT_SAAS;
-    if (trop_model_str == "SBAS") trop_model = TROPOPT_SBAS;
-    if (trop_model_str == "Estimate_ZTD") trop_model = TROPOPT_EST;
-    if (trop_model_str == "Estimate_ZTD_Grad") trop_model = TROPOPT_ESTG;
+    if (trop_model_str == "OFF")
+        {
+            trop_model = TROPOPT_OFF;
+        }
+    if (trop_model_str == "Saastamoinen")
+        {
+            trop_model = TROPOPT_SAAS;
+        }
+    if (trop_model_str == "SBAS")
+        {
+            trop_model = TROPOPT_SBAS;
+        }
+    if (trop_model_str == "Estimate_ZTD")
+        {
+            trop_model = TROPOPT_EST;
+        }
+    if (trop_model_str == "Estimate_ZTD_Grad")
+        {
+            trop_model = TROPOPT_ESTG;
+        }
     if (trop_model == -1)
         {
             //warn user and set the default
@@ -175,11 +223,26 @@ rtk_t configure_rtklib_options()
     std::string default_gps_ar("Continuous");
     std::string integer_ambiguity_resolution_gps_str = configuration->property(role + ".AR_GPS", default_gps_ar); /* Integer Ambiguity Resolution mode for GPS (0:off,1:continuous,2:instantaneous,3:fix and hold,4:ppp-ar) */
     int integer_ambiguity_resolution_gps = -1;
-    if (integer_ambiguity_resolution_gps_str == "OFF") integer_ambiguity_resolution_gps = ARMODE_OFF;
-    if (integer_ambiguity_resolution_gps_str == "Continuous") integer_ambiguity_resolution_gps = ARMODE_CONT;
-    if (integer_ambiguity_resolution_gps_str == "Instantaneous") integer_ambiguity_resolution_gps = ARMODE_INST;
-    if (integer_ambiguity_resolution_gps_str == "Fix-and-Hold") integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
-    if (integer_ambiguity_resolution_gps_str == "PPP-AR") integer_ambiguity_resolution_gps = ARMODE_PPPAR;
+    if (integer_ambiguity_resolution_gps_str == "OFF")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_OFF;
+        }
+    if (integer_ambiguity_resolution_gps_str == "Continuous")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_CONT;
+        }
+    if (integer_ambiguity_resolution_gps_str == "Instantaneous")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_INST;
+        }
+    if (integer_ambiguity_resolution_gps_str == "Fix-and-Hold")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_FIXHOLD;
+        }
+    if (integer_ambiguity_resolution_gps_str == "PPP-AR")
+        {
+            integer_ambiguity_resolution_gps = ARMODE_PPPAR;
+        }
     if (integer_ambiguity_resolution_gps == -1)
         {
             //warn user and set the default
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
index 518472edd..28da8661d 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -109,8 +109,7 @@ GpsL1CADllPllTelemetryDecoderTest_msg_rx::GpsL1CADllPllTelemetryDecoderTest_msg_
     rx_message = 0;
 }
 
-GpsL1CADllPllTelemetryDecoderTest_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_msg_rx()
-= default;
+GpsL1CADllPllTelemetryDecoderTest_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -161,8 +160,7 @@ GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::GpsL1CADllPllTelemetryDecoderTest_
     rx_message = 0;
 }
 
-GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx()
-= default;
+GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx::~GpsL1CADllPllTelemetryDecoderTest_tlm_msg_rx() = default;
 
 
 // ###########################################################
@@ -198,8 +196,7 @@ public:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL1CATelemetryDecoderTest()
-    = default;
+    ~GpsL1CATelemetryDecoderTest() = default;
 
     void configure_receiver();
 
@@ -240,7 +237,9 @@ int GpsL1CATelemetryDecoderTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork err");
+        {
+            perror("fork err");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc
index 1094fbd7f..122184eb7 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/galileo_e5a_tracking_test.cc
@@ -65,8 +65,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GalileoE5aTrackingTest()
-    = default;
+    ~GalileoE5aTrackingTest() = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
index c8a6f94d0..003c63a9d 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_c_aid_tracking_test.cc
@@ -98,8 +98,7 @@ GlonassL1CaDllPllCAidTrackingTest_msg_rx::GlonassL1CaDllPllCAidTrackingTest_msg_
     rx_message = 0;
 }
 
-GlonassL1CaDllPllCAidTrackingTest_msg_rx::~GlonassL1CaDllPllCAidTrackingTest_msg_rx()
-= default;
+GlonassL1CaDllPllCAidTrackingTest_msg_rx::~GlonassL1CaDllPllCAidTrackingTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -116,8 +115,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GlonassL1CaDllPllCAidTrackingTest()
-    = default;
+    ~GlonassL1CaDllPllCAidTrackingTest() = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
index d83116a49..20a910ce4 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/glonass_l1_ca_dll_pll_tracking_test.cc
@@ -99,8 +99,7 @@ GlonassL1CaDllPllTrackingTest_msg_rx::GlonassL1CaDllPllTrackingTest_msg_rx() : g
     rx_message = 0;
 }
 
-GlonassL1CaDllPllTrackingTest_msg_rx::~GlonassL1CaDllPllTrackingTest_msg_rx()
-= default;
+GlonassL1CaDllPllTrackingTest_msg_rx::~GlonassL1CaDllPllTrackingTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -117,8 +116,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GlonassL1CaDllPllTrackingTest()
-    = default;
+    ~GlonassL1CaDllPllTrackingTest() = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
index b9750b5e3..8fcd3a726 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@@ -110,8 +110,7 @@ GpsL1CADllPllTrackingTest_msg_rx::GpsL1CADllPllTrackingTest_msg_rx() : gr::block
 }
 
 
-GpsL1CADllPllTrackingTest_msg_rx::~GpsL1CADllPllTrackingTest_msg_rx()
-= default;
+GpsL1CADllPllTrackingTest_msg_rx::~GpsL1CADllPllTrackingTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -166,8 +165,7 @@ public:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL1CADllPllTrackingTest()
-    = default;
+    ~GpsL1CADllPllTrackingTest() = default;
 
     void configure_receiver(double PLL_wide_bw_hz,
         double DLL_wide_bw_hz,
@@ -213,7 +211,9 @@ int GpsL1CADllPllTrackingTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork err");
+        {
+            perror("fork err");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
index 341185dad..f987d1973 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
@@ -111,8 +111,7 @@ GpsL1CAKfTrackingTest_msg_rx::GpsL1CAKfTrackingTest_msg_rx() : gr::block("GpsL1C
 }
 
 
-GpsL1CAKfTrackingTest_msg_rx::~GpsL1CAKfTrackingTest_msg_rx()
-= default;
+GpsL1CAKfTrackingTest_msg_rx::~GpsL1CAKfTrackingTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -157,8 +156,7 @@ public:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL1CAKfTrackingTest()
-    = default;
+    ~GpsL1CAKfTrackingTest() = default;
 
     void configure_receiver();
 
@@ -199,7 +197,9 @@ int GpsL1CAKfTrackingTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork err");
+        {
+            perror("fork err");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
index fe9cd4c85..3b6b325a4 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l2_m_dll_pll_tracking_test.cc
@@ -103,8 +103,7 @@ GpsL2MDllPllTrackingTest_msg_rx::GpsL2MDllPllTrackingTest_msg_rx() : gr::block("
 }
 
 
-GpsL2MDllPllTrackingTest_msg_rx::~GpsL2MDllPllTrackingTest_msg_rx()
-= default;
+GpsL2MDllPllTrackingTest_msg_rx::~GpsL2MDllPllTrackingTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -120,8 +119,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL2MDllPllTrackingTest()
-    = default;
+    ~GpsL2MDllPllTrackingTest() = default;
 
     void init();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
index e64973c8f..15756f3bc 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
@@ -126,8 +126,7 @@ TrackingPullInTest_msg_rx::TrackingPullInTest_msg_rx() : gr::block("TrackingPull
 }
 
 
-TrackingPullInTest_msg_rx::~TrackingPullInTest_msg_rx()
-= default;
+TrackingPullInTest_msg_rx::~TrackingPullInTest_msg_rx() = default;
 
 
 // ###########################################################
@@ -202,8 +201,7 @@ public:
         mapStringValues_["2G"] = evGLO_2G;
     }
 
-    ~TrackingPullInTest()
-    = default;
+    ~TrackingPullInTest() = default;
 
     void configure_receiver(double PLL_wide_bw_hz,
         double DLL_wide_bw_hz,
@@ -252,7 +250,9 @@ int TrackingPullInTest::generate_signal()
 
     int pid;
     if ((pid = fork()) == -1)
-        perror("fork err");
+        {
+            perror("fork err");
+        }
     else if (pid == 0)
         {
             execv(&generator_binary[0], parmList);
@@ -716,7 +716,10 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
             ASSERT_EQ(acquire_signal(FLAGS_test_satellite_PRN), true);
             bool found_satellite = doppler_measurements_map.find(FLAGS_test_satellite_PRN) != doppler_measurements_map.end();
             EXPECT_TRUE(found_satellite) << "Error: satellite SV: " << FLAGS_test_satellite_PRN << " is not acquired";
-            if (!found_satellite) return;
+            if (!found_satellite)
+                {
+                    return;
+                }
         }
     else
         {

From 9146b2ef11067408a1d49a946e1df9ef85557591 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 21:29:37 +0100
Subject: [PATCH 057/123] Add check options

---
 .clang-tidy | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index 425050765..d71c07a3b 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,4 +1,62 @@
 ---
 Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
-HeaderFilterRegex: '.*'
+WarningsAsErrors: ''
+HeaderFilterRegex: ''
+AnalyzeTemporaryDtors: false
 FormatStyle: 'file'
+CheckOptions:
+  - key:             google-build-namespaces.HeaderFileExtensions
+    value:           ',h'
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
+  - key:             google-readability-function-size.StatementThreshold
+    value:           '800'
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
+    value:           '10'
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
+    value:           '2'
+  - key:             google-runtime-int.SignedTypePrefix
+    value:           int
+  - key:             google-runtime-int.TypeSuffix
+    value:           '_t'
+  - key:             google-runtime-int.UnsignedTypePrefix
+    value:           uint
+  - key:             google-runtime-references.WhiteListTypes
+    value:           ''
+  - key:             misc-throw-by-value-catch-by-reference.CheckThrowTemporaries
+    value:           '1'
+  - key:             modernize-loop-convert.MaxCopySize
+    value:           '16'
+  - key:             modernize-loop-convert.MinConfidence
+    value:           reasonable
+  - key:             modernize-loop-convert.NamingStyle
+    value:           CamelCase
+  - key:             modernize-pass-by-value.IncludeStyle
+    value:           llvm
+  - key:             modernize-pass-by-value.ValuesOnly
+    value:           '0'
+  - key:             modernize-raw-string-literal.ReplaceShorterLiterals
+    value:           '0'
+  - key:             modernize-replace-auto-ptr.IncludeStyle
+    value:           llvm
+  - key:             modernize-use-auto.MinTypeNameLength
+    value:           '5'
+  - key:             modernize-use-auto.RemoveStars
+    value:           '0'
+  - key:             modernize-use-equals-default.IgnoreMacros
+    value:           '1'
+  - key:             modernize-use-noexcept.ReplacementString
+    value:           ''
+  - key:             modernize-use-noexcept.UseNoexceptFalse
+    value:           '1'
+  - key:             modernize-use-nullptr.NullMacros
+    value:           'NULL'
+  - key:             performance-faster-string-find.StringLikeClasses
+    value:           'std::basic_string'
+  - key:             performance-move-const-arg.CheckTriviallyCopyableMove
+    value:           '1'
+  - key:             performance-type-promotion-in-math-fn.IncludeStyle
+    value:           llvm
+  - key:             performance-unnecessary-value-param.IncludeStyle
+    value:           llvm
+...

From 4d60ea2e5af188eea434d91aca5abd0bd7c6919b Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 22:00:48 +0100
Subject: [PATCH 058/123] Catch exception by reference

---
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 0cdeafcd5..151c667c8 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -614,7 +614,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_cnav_ephemeris_map", d_pvt_solver->gps_cnav_ephemeris_map);
                                     LOG(INFO) << "Saved GPS L2CM or L5 Ephemeris map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -640,7 +640,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_ephemeris_map", d_pvt_solver->gps_ephemeris_map);
                                     LOG(INFO) << "Saved GPS L1 CA Ephemeris map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -666,7 +666,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gal_ephemeris_map", d_pvt_solver->galileo_ephemeris_map);
                                     LOG(INFO) << "Saved Galileo E1 Ephemeris map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -696,7 +696,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", d_pvt_solver->glonass_gnav_ephemeris_map);
                                     LOG(INFO) << "Saved GLONASS GNAV Ephemeris map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -730,7 +730,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -756,7 +756,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gal_utc_model", d_pvt_solver->galileo_utc_model);
                                     LOG(INFO) << "Saved Galileo UTC model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -786,7 +786,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_iono_model", d_pvt_solver->gps_iono);
                                     LOG(INFO) << "Saved GPS ionospheric model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -816,7 +816,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_cnav_iono_model", d_pvt_solver->gps_cnav_iono);
                                     LOG(INFO) << "Saved GPS CNAV ionospheric model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -846,7 +846,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gal_iono_model", d_pvt_solver->galileo_iono);
                                     LOG(INFO) << "Saved Galileo ionospheric model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -876,7 +876,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gps_almanac_map", d_pvt_solver->gps_almanac_map);
                                     LOG(INFO) << "Saved GPS almanac map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -906,7 +906,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gal_almanac_map", d_pvt_solver->galileo_almanac_map);
                                     LOG(INFO) << "Saved Galileo almanac data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -936,7 +936,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_cnav_utc_model", d_pvt_solver->gps_cnav_utc_model);
                                     LOG(INFO) << "Saved GPS CNAV UTC model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -966,7 +966,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gnav_ephemeris_map", d_pvt_solver->glonass_gnav_ephemeris_map);
                                     LOG(INFO) << "Saved GLONASS GNAV ephemeris map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -996,7 +996,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_gnav_utc_model", d_pvt_solver->glonass_gnav_utc_model);
                                     LOG(INFO) << "Saved GLONASS UTC model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1026,7 +1026,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_ephemeris_map", d_pvt_solver->beidou_dnav_ephemeris_map);
                                     LOG(INFO) << "Saved BeiDou DNAV Ephemeris map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1056,7 +1056,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_iono_model", d_pvt_solver->beidou_dnav_iono);
                                     LOG(INFO) << "Saved BeiDou DNAV ionospheric model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1086,7 +1086,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_almanac_map", d_pvt_solver->beidou_dnav_almanac_map);
                                     LOG(INFO) << "Saved BeiDou DNAV almanac map data";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1116,7 +1116,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                     xml << boost::serialization::make_nvp("GNSS-SDR_bds_dnav_utc_model", d_pvt_solver->beidou_dnav_utc_model);
                                     LOG(INFO) << "Saved BeiDou DNAV UTC model parameters";
                                 }
-                            catch (const boost::archive::archive_exception e)
+                            catch (const boost::archive::archive_exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }

From 992fddcc464b1af0b95b53937e5cf4cd9431647c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 11 Feb 2019 22:45:07 +0100
Subject: [PATCH 059/123] Apply clang-tidy checks

---
 .../gps_l1_ca_pcps_acquisition_test_fpga.cc         | 13 +++++--------
 .../gps_l1_ca_dll_pll_tracking_test_fpga.cc         |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
index 79515988e..a64b752e8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
@@ -36,6 +36,7 @@
 #include <gnuradio/top_block.h>
 #include <chrono>
 #include <cstdlib>
+#include <utility>
 #ifdef GR_GREATER_38
 #include <gnuradio/analog/sig_source.h>
 #else
@@ -203,7 +204,7 @@ void GpsL1CaPcpsAcquisitionTestFpga_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast &e)
@@ -225,9 +226,7 @@ GpsL1CaPcpsAcquisitionTestFpga_msg_rx::GpsL1CaPcpsAcquisitionTestFpga_msg_rx() :
 }
 
 
-GpsL1CaPcpsAcquisitionTestFpga_msg_rx::~GpsL1CaPcpsAcquisitionTestFpga_msg_rx()
-{
-}
+GpsL1CaPcpsAcquisitionTestFpga_msg_rx::~GpsL1CaPcpsAcquisitionTestFpga_msg_rx() = default;
 
 
 class GpsL1CaPcpsAcquisitionTestFpga : public ::testing::Test
@@ -241,9 +240,7 @@ protected:
         gnss_synchro = Gnss_Synchro();
     }
 
-    ~GpsL1CaPcpsAcquisitionTestFpga()
-    {
-    }
+    ~GpsL1CaPcpsAcquisitionTestFpga() = default;
 
     void init();
 
@@ -385,7 +382,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTestFpga, ValidationOfResults)
     ASSERT_EQ(1, msg_rx->rx_message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS.";
 
     double delay_error_samples = std::abs(expected_delay_samples - gnss_synchro.Acq_delay_samples);
-    float delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000);
+    auto delay_error_chips = static_cast<float>(delay_error_samples * 1023 / 4000);
     double doppler_error_hz = std::abs(expected_doppler_hz - gnss_synchro.Acq_doppler_hz);
 
     EXPECT_LE(doppler_error_hz, 666) << "Doppler error exceeds the expected value: 666 Hz = 2/(3*integration period)";
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
index fc7b028fe..0f93e68d7 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
@@ -143,7 +143,7 @@ void sending_thread(gr::top_block_sptr top_block, const char *file_name)
     usleep(FIVE_SECONDS);  // wait for some time to give time to the other thread to program the device
 
     //send_tracking_gps_input_samples(dma_descr, rx_signal_file, file_length);
-    send_tracking_gps_input_samples(rx_signal_file, file_length, std::move(top_block));
+    send_tracking_gps_input_samples(rx_signal_file, file_length, top_block);
 
     fclose(rx_signal_file);
 }

From eae967ed1a2c90da29e0e532be98f58345ba8459 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 01:00:36 +0100
Subject: [PATCH 060/123] clang-tidy: apply performance-unnecessary-value-param
 check

See https://clang.llvm.org/extra/clang-tidy/checks/performance-unnecessary-value-param.html
---
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc        |  2 +-
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.h         |  2 +-
 src/algorithms/PVT/libs/nmea_printer.cc                |  2 +-
 src/algorithms/PVT/libs/nmea_printer.h                 |  2 +-
 .../adapters/beidou_b1i_pcps_acquisition.cc            |  5 +++--
 .../acquisition/adapters/beidou_b1i_pcps_acquisition.h |  2 +-
 .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc  |  5 +++--
 .../adapters/galileo_e1_pcps_ambiguous_acquisition.h   |  2 +-
 .../acquisition/adapters/gps_l1_ca_pcps_acquisition.cc |  5 +++--
 .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h  |  2 +-
 .../acquisition/adapters/gps_l2_m_pcps_acquisition.cc  |  5 +++--
 .../acquisition/adapters/gps_l2_m_pcps_acquisition.h   |  2 +-
 .../acquisition/adapters/gps_l5i_pcps_acquisition.cc   |  5 +++--
 .../acquisition/adapters/gps_l5i_pcps_acquisition.h    |  2 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc   |  4 ++--
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h    |  6 +++---
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc |  8 ++++----
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h  |  6 +++---
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.cc    |  8 ++++----
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.h     |  6 +++---
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc      |  8 ++++----
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h       |  6 +++---
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc   |  8 ++++----
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.h    |  6 +++---
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc        |  8 ++++----
 .../gnuradio_blocks/pcps_tong_acquisition_cc.h         |  6 +++---
 .../gnuradio_blocks/signal_generator_c.cc              |  2 +-
 .../gnuradio_blocks/signal_generator_c.h               |  4 ++--
 .../adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc   |  5 +++--
 .../adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h    |  2 +-
 .../adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc   |  5 +++--
 .../adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h    |  2 +-
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc       |  5 +++--
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.h        |  2 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc         |  6 +++---
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h          |  8 ++++----
 .../glonass_l1_ca_dll_pll_tracking_cc.cc               |  4 ++--
 .../glonass_l1_ca_dll_pll_tracking_cc.h                |  6 +++---
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc         |  6 +++---
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h          |  8 ++++----
 .../glonass_l2_ca_dll_pll_tracking_cc.cc               |  4 ++--
 .../glonass_l2_ca_dll_pll_tracking_cc.h                |  6 +++---
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc             |  6 +++---
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h              |  8 ++++----
 .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc        |  4 ++--
 .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h         |  6 +++---
 src/core/libs/INIReader.cc                             |  2 +-
 src/core/libs/INIReader.h                              |  2 +-
 src/core/monitor/gnss_synchro_udp_sink.cc              |  2 +-
 src/core/monitor/gnss_synchro_udp_sink.h               |  2 +-
 src/core/receiver/gnss_flowgraph.cc                    |  2 +-
 src/core/receiver/gnss_flowgraph.h                     |  2 +-
 .../acquisition/gps_l1_ca_pcps_acquisition_test.cc     | 10 +++++-----
 53 files changed, 126 insertions(+), 118 deletions(-)

diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
index d46259cc8..af039f276 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
@@ -34,7 +34,7 @@
 #include <iostream>
 #include <sstream>
 
-Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port) : socket{io_service}
+Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port) : socket{io_service}
 {
     for (auto address : addresses)
         {
diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
index bec163986..f8c6552ae 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
@@ -38,7 +38,7 @@
 class Monitor_Pvt_Udp_Sink
 {
 public:
-    Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t &port);
+    Monitor_Pvt_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port);
     bool write_monitor_pvt(Monitor_Pvt monitor_pvt);
 
 private:
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 3d4ebc74a..8f4122c58 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -269,7 +269,7 @@ bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr<rtklib_solver>& pvt_dat
 }
 
 
-char Nmea_Printer::checkSum(std::string sentence)
+char Nmea_Printer::checkSum(const std::string& sentence)
 {
     char check = 0;
     // iterate over the string, XOR each byte with the total sum:
diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h
index 6e18d7451..b7373f45b 100644
--- a/src/algorithms/PVT/libs/nmea_printer.h
+++ b/src/algorithms/PVT/libs/nmea_printer.h
@@ -82,7 +82,7 @@ private:
     std::string get_UTC_NMEA_time(boost::posix_time::ptime d_position_UTC_time);
     std::string longitude_to_hm(double longitude);
     std::string latitude_to_hm(double lat);
-    char checkSum(std::string sentence);
+    char checkSum(const std::string& sentence);
     bool print_avg_pos;
     bool d_flag_nmea_output_file;
 };
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
index 7ee2a7277..050e44eb4 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
@@ -39,15 +39,16 @@
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
 
 BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
     ConfigurationInterface* configuration,
-    const std::string& role,
+    std::string role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(role),
+    unsigned int out_streams) : role_(std::move(role)),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
index 334aff555..3b6c185a8 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
@@ -55,7 +55,7 @@ class BeidouB1iPcpsAcquisition : public AcquisitionInterface
 {
 public:
     BeidouB1iPcpsAcquisition(ConfigurationInterface* configuration,
-        const std::string& role, unsigned int in_streams,
+        std::string role, unsigned int in_streams,
         unsigned int out_streams);
 
     virtual ~BeidouB1iPcpsAcquisition();
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 5f4137f7d..8e81cc18f 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -37,6 +37,7 @@
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
@@ -44,9 +45,9 @@ using google::LogMessage;
 
 GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
     ConfigurationInterface* configuration,
-    const std::string& role,
+    std::string role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(role),
+    unsigned int out_streams) : role_(std::move(role)),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
index ee4538022..13dd5fe4a 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
@@ -52,7 +52,7 @@ class GalileoE1PcpsAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
     GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
index e27f37581..9d6d74d86 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -41,6 +41,7 @@
 #include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
@@ -48,9 +49,9 @@ using google::LogMessage;
 
 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
     ConfigurationInterface* configuration,
-    const std::string& role,
+    std::string role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(role),
+    unsigned int out_streams) : role_(std::move(role)),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
index efca26bdd..ed9767a81 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
@@ -56,7 +56,7 @@ class GpsL1CaPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
index 00fcb7624..9cc6f5633 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -39,6 +39,7 @@
 #include "gps_l2c_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
@@ -46,9 +47,9 @@ using google::LogMessage;
 
 GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
     ConfigurationInterface* configuration,
-    const std::string& role,
+    std::string role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(role),
+    unsigned int out_streams) : role_(std::move(role)),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
index da1c7ef6e..f296e6304 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
@@ -53,7 +53,7 @@ class GpsL2MPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL2MPcpsAcquisition(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
index d3b722823..6d36db29b 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -39,6 +39,7 @@
 #include "gps_l5_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
@@ -46,9 +47,9 @@ using google::LogMessage;
 
 GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
     ConfigurationInterface* configuration,
-    const std::string& role,
+    std::string role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(role),
+    unsigned int out_streams) : role_(std::move(role)),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
index af8cabb81..02f48d11d 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
@@ -53,7 +53,7 @@ class GpsL5iPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL5iPcpsAcquisition(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index c6f14d597..a3579ee23 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -53,7 +53,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make
     int samples_per_ms, int samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     bool both_signal_components_,
     int CAF_window_hz_,
     int Zero_padding_)
@@ -73,7 +73,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit
     int samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     bool both_signal_components_,
     int CAF_window_hz_,
     int Zero_padding_) : gr::block("galileo_e5a_noncoherentIQ_acquisition_caf_cc",
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
index c95a74b82..7ef061db4 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
@@ -56,7 +56,7 @@ galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(unsigned int sampled_ms,
     int samples_per_ms, int samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     bool both_signal_components_,
     int CAF_window_hz_,
     int Zero_padding_);
@@ -78,7 +78,7 @@ private:
         int samples_per_ms, int samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         bool both_signal_components_,
         int CAF_window_hz_,
         int Zero_padding_);
@@ -90,7 +90,7 @@ private:
         int samples_per_ms, int samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         bool both_signal_components_,
         int CAF_window_hz_,
         int Zero_padding_);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index cb528d0b1..06a249bb5 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -47,7 +47,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(
     int64_t fs_in,
     int32_t samples_per_ms,
     int32_t samples_per_code,
-    bool dump, std::string dump_filename)
+    bool dump, const std::string &dump_filename)
 {
     return galileo_pcps_8ms_acquisition_cc_sptr(
         new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms,
@@ -63,9 +63,9 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc(
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    std::string dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc",
-                                     gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
-                                     gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
+    const std::string &dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc",
+                                            gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
+                                            gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
index 0c1b81e20..372ce1fd6 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
@@ -51,7 +51,7 @@ galileo_pcps_8ms_make_acquisition_cc(uint32_t sampled_ms,
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    std::string dump_filename);
+    const std::string& dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition for
@@ -69,7 +69,7 @@ private:
         int32_t samples_per_ms,
         int32_t samples_per_code,
         bool dump,
-        std::string dump_filename);
+        const std::string& dump_filename);
 
     galileo_pcps_8ms_acquisition_cc(
         uint32_t sampled_ms,
@@ -79,7 +79,7 @@ private:
         int32_t samples_per_ms,
         int32_t samples_per_code,
         bool dump,
-        std::string dump_filename);
+        const std::string& dump_filename);
 
     void calculate_magnitudes(
         gr_complex* fft_begin,
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 5e8100f59..e41af55c2 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -49,7 +49,7 @@ using google::LogMessage;
 pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
     int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min,
     int64_t fs_in, int32_t samples_per_ms, bool dump,
-    std::string dump_filename)
+    const std::string &dump_filename)
 {
     return pcps_assisted_acquisition_cc_sptr(
         new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min,
@@ -60,9 +60,9 @@ pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
 pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc(
     int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min,
     int64_t fs_in, int32_t samples_per_ms, bool dump,
-    std::string dump_filename) : gr::block("pcps_assisted_acquisition_cc",
-                                     gr::io_signature::make(1, 1, sizeof(gr_complex)),
-                                     gr::io_signature::make(0, 0, sizeof(gr_complex)))
+    const std::string &dump_filename) : gr::block("pcps_assisted_acquisition_cc",
+                                            gr::io_signature::make(1, 1, sizeof(gr_complex)),
+                                            gr::io_signature::make(0, 0, sizeof(gr_complex)))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
index b27f920df..8cfff7f41 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
@@ -67,7 +67,7 @@ pcps_make_assisted_acquisition_cc(
     int32_t doppler_min,
     int64_t fs_in,
     int32_t samples_per_ms,
-    bool dump, std::string dump_filename);
+    bool dump, const std::string& dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition.
@@ -82,12 +82,12 @@ private:
     pcps_make_assisted_acquisition_cc(int32_t max_dwells, uint32_t sampled_ms,
         int32_t doppler_max, int32_t doppler_min, int64_t fs_in,
         int32_t samples_per_ms, bool dump,
-        std::string dump_filename);
+        const std::string& dump_filename);
 
     pcps_assisted_acquisition_cc(int32_t max_dwells, uint32_t sampled_ms,
         int32_t doppler_max, int32_t doppler_min, int64_t fs_in,
         int32_t samples_per_ms, bool dump,
-        std::string dump_filename);
+        const std::string& dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index 17082ae25..0d8609934 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -53,7 +53,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc(
     int64_t fs_in,
     int32_t samples_per_ms,
     int32_t samples_per_code,
-    bool dump, std::string dump_filename)
+    bool dump, const std::string &dump_filename)
 {
     return pcps_cccwsr_acquisition_cc_sptr(
         new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in,
@@ -69,9 +69,9 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc(
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    std::string dump_filename) : gr::block("pcps_cccwsr_acquisition_cc",
-                                     gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
-                                     gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
+    const std::string &dump_filename) : gr::block("pcps_cccwsr_acquisition_cc",
+                                            gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
+                                            gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
index b1edf0106..8776ab37f 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
@@ -58,7 +58,7 @@ pcps_cccwsr_make_acquisition_cc(
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    std::string dump_filename);
+    const std::string& dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition with
@@ -71,12 +71,12 @@ private:
     pcps_cccwsr_make_acquisition_cc(uint32_t sampled_ms, uint32_t max_dwells,
         uint32_t doppler_max, int64_t fs_in,
         int32_t samples_per_ms, int32_t samples_per_code,
-        bool dump, std::string dump_filename);
+        bool dump, const std::string& dump_filename);
 
     pcps_cccwsr_acquisition_cc(uint32_t sampled_ms, uint32_t max_dwells,
         uint32_t doppler_max, int64_t fs_in,
         int32_t samples_per_ms, int32_t samples_per_code,
-        bool dump, std::string dump_filename);
+        bool dump, const std::string& dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index a55b352c9..e43f0d079 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -52,7 +52,7 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc(
     int32_t samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    std::string dump_filename)
+    const std::string& dump_filename)
 {
     return pcps_quicksync_acquisition_cc_sptr(
         new pcps_quicksync_acquisition_cc(
@@ -72,9 +72,9 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc(
     int32_t samples_per_ms, int32_t samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    std::string dump_filename) : gr::block("pcps_quicksync_acquisition_cc",
-                                     gr::io_signature::make(1, 1, (sizeof(gr_complex) * sampled_ms * samples_per_ms)),
-                                     gr::io_signature::make(0, 0, (sizeof(gr_complex) * sampled_ms * samples_per_ms)))
+    const std::string& dump_filename) : gr::block("pcps_quicksync_acquisition_cc",
+                                            gr::io_signature::make(1, 1, (sizeof(gr_complex) * sampled_ms * samples_per_ms)),
+                                            gr::io_signature::make(0, 0, (sizeof(gr_complex) * sampled_ms * samples_per_ms)))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
index cf24625a5..8e41d903d 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -76,7 +76,7 @@ pcps_quicksync_make_acquisition_cc(
     int32_t samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    std::string dump_filename);
+    const std::string& dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition with
@@ -95,7 +95,7 @@ private:
         int32_t samples_per_ms, int32_t samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        std::string dump_filename);
+        const std::string& dump_filename);
 
     pcps_quicksync_acquisition_cc(uint32_t folding_factor,
         uint32_t sampled_ms, uint32_t max_dwells,
@@ -103,7 +103,7 @@ private:
         int32_t samples_per_ms, int32_t samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        std::string dump_filename);
+        const std::string& dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index 7fc685028..72271cefc 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -69,7 +69,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(
     uint32_t tong_init_val,
     uint32_t tong_max_val,
     uint32_t tong_max_dwells,
-    bool dump, std::string dump_filename)
+    bool dump, const std::string &dump_filename)
 {
     return pcps_tong_acquisition_cc_sptr(
         new pcps_tong_acquisition_cc(sampled_ms, doppler_max, fs_in, samples_per_ms, samples_per_code,
@@ -87,9 +87,9 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc(
     uint32_t tong_max_val,
     uint32_t tong_max_dwells,
     bool dump,
-    std::string dump_filename) : gr::block("pcps_tong_acquisition_cc",
-                                     gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
-                                     gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
+    const std::string &dump_filename) : gr::block("pcps_tong_acquisition_cc",
+                                            gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
+                                            gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
index e2443fa33..027f5d58a 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -74,7 +74,7 @@ pcps_tong_make_acquisition_cc(
     uint32_t tong_max_val,
     uint32_t tong_max_dwells,
     bool dump,
-    std::string dump_filename);
+    const std::string& dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition with
@@ -88,13 +88,13 @@ private:
         int64_t fs_in, int32_t samples_per_ms,
         int32_t samples_per_code, uint32_t tong_init_val,
         uint32_t tong_max_val, uint32_t tong_max_dwells,
-        bool dump, std::string dump_filename);
+        bool dump, const std::string& dump_filename);
 
     pcps_tong_acquisition_cc(uint32_t sampled_ms, uint32_t doppler_max,
         int64_t fs_in, int32_t samples_per_ms,
         int32_t samples_per_code, uint32_t tong_init_val,
         uint32_t tong_max_val, uint32_t tong_max_dwells,
-        bool dump, std::string dump_filename);
+        bool dump, const std::string& dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 84a90d555..378ef90cc 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -48,7 +48,7 @@
 * a boost shared_ptr. This is effectively the public constructor.
 */
 signal_generator_c_sptr
-signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::string> system, const std::vector<unsigned int> &PRN,
+signal_make_generator_c(const std::vector<std::string> &signal1, const std::vector<std::string> &system, const std::vector<unsigned int> &PRN,
     const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
     const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
     unsigned int fs_in, unsigned int vector_length, float BW_BB)
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
index 2201a849c..a57f2f1b3 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
@@ -61,7 +61,7 @@ using signal_generator_c_sptr = boost::shared_ptr<signal_generator_c>;
 * interface for creating new instances.
 */
 signal_generator_c_sptr
-signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::string> system, const std::vector<unsigned int> &PRN,
+signal_make_generator_c(const std::vector<std::string> &signal1, const std::vector<std::string> &system, const std::vector<unsigned int> &PRN,
     const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
     const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
     unsigned int fs_in, unsigned int vector_length, float BW_BB);
@@ -80,7 +80,7 @@ private:
 
     /* Create the signal_generator_c object*/
     friend signal_generator_c_sptr
-    signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::string> system, const std::vector<unsigned int> &PRN,
+    signal_make_generator_c(const std::vector<std::string> &signal1, const std::vector<std::string> &system, const std::vector<unsigned int> &PRN,
         const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
         const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
         unsigned int fs_in, unsigned int vector_length, float BW_BB);
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
index e3ca80dbe..804f93148 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
@@ -42,14 +42,15 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
 
 
 GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, std::string role,
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
index d50003964..5911b4288 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
@@ -54,7 +54,7 @@ class GlonassL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
index 419ccc462..091f68df4 100644
--- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
@@ -40,14 +40,15 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
 
 
 GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, std::string role,
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h
index b5659c527..5946b8713 100644
--- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h
@@ -52,7 +52,7 @@ class GlonassL2CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL2CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
index 5531be4e0..af3dcff79 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
@@ -41,14 +41,15 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
+#include <utility>
 
 
 using google::LogMessage;
 
 
 GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, std::string role,
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
index a1c54aa46..d48474ead 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
@@ -53,7 +53,7 @@ class GpsL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        const std::string& role,
+        std::string role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 21a040646..a3d70f0e8 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -65,7 +65,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -88,7 +88,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items,
 }
 
 
-void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg)
+void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg)
 {
     //pmt::print(msg);
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
@@ -105,7 +105,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index 2a5102942..7af766d60 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -59,7 +59,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr
 glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -90,7 +90,7 @@ private:
     glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -101,7 +101,7 @@ private:
     glonass_l1_ca_dll_pll_c_aid_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -169,7 +169,7 @@ private:
     int32_t d_extend_correlation_ms;
     bool d_enable_extended_integration;
     bool d_preamble_synchronized;
-    void msg_handler_preamble_index(pmt::pmt_t msg);
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
     //Integration period in samples
     int32_t d_correlation_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 68d94e82f..469978680 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -62,7 +62,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips)
@@ -86,7 +86,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips) : gr::block("Glonass_L1_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)),
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
index 15bc1c90f..80a04dedf 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
@@ -56,7 +56,7 @@ glonass_l1_ca_dll_pll_tracking_cc_sptr
 glonass_l1_ca_dll_pll_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips);
@@ -84,7 +84,7 @@ private:
     glonass_l1_ca_dll_pll_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
@@ -92,7 +92,7 @@ private:
     Glonass_L1_Ca_Dll_Pll_Tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index ae689ab8a..78f29b10f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -85,7 +85,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items,
 }
 
 
-void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg)
+void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg)
 {
     //pmt::print(msg);
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
@@ -102,7 +102,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
index 1be8d3c7f..e71970e39 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
@@ -57,7 +57,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr
 glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -88,7 +88,7 @@ private:
     glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -99,7 +99,7 @@ private:
     glonass_l2_ca_dll_pll_c_aid_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -167,7 +167,7 @@ private:
     int32_t d_extend_correlation_ms;
     bool d_enable_extended_integration;
     bool d_preamble_synchronized;
-    void msg_handler_preamble_index(pmt::pmt_t msg);
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
     //Integration period in samples
     int32_t d_correlation_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index 8156ea09b..b8311938d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips)
@@ -86,7 +86,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips) : gr::block("Glonass_L2_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)),
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
index 29f6bb077..20ebca8c2 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
@@ -54,7 +54,7 @@ glonass_l2_ca_dll_pll_tracking_cc_sptr
 glonass_l2_ca_dll_pll_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips);
@@ -82,7 +82,7 @@ private:
     glonass_l2_ca_dll_pll_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
@@ -90,7 +90,7 @@ private:
     Glonass_L2_Ca_Dll_Pll_Tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 45a890cbe..1cb3eab43 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -54,7 +54,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -77,7 +77,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items,
 }
 
 
-void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg)
+void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg)
 {
     //pmt::print(msg);
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
@@ -94,7 +94,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index ecbe2c15f..f35affeef 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -57,7 +57,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr
 gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -88,7 +88,7 @@ private:
     gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -99,7 +99,7 @@ private:
     gps_l1_ca_dll_pll_c_aid_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -163,7 +163,7 @@ private:
     int32_t d_extend_correlation_ms;
     bool d_enable_extended_integration;
     bool d_preamble_synchronized;
-    void msg_handler_preamble_index(pmt::pmt_t msg);
+    void msg_handler_preamble_index(const pmt::pmt_t& msg);
 
     //Integration period in samples
     int32_t d_correlation_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index 96c478a3f..15c806123 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -64,7 +64,7 @@ gps_l1_ca_kf_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float dll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
@@ -95,7 +95,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string &dump_filename,
     float dll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
index e4acf778b..91e4b4b47 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
@@ -60,7 +60,7 @@ gps_l1_ca_kf_make_tracking_cc(uint32_t order,
     int64_t if_freq,
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    std::string dump_filename,
+    const std::string& dump_filename,
     float pll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
@@ -93,7 +93,7 @@ private:
         int64_t if_freq,
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float dll_bw_hz,
         float early_late_space_chips,
         bool bce_run,
@@ -106,7 +106,7 @@ private:
         int64_t if_freq,
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        std::string dump_filename,
+        const std::string& dump_filename,
         float dll_bw_hz,
         float early_late_space_chips,
         bool bce_run,
diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc
index 63c076b82..454986615 100644
--- a/src/core/libs/INIReader.cc
+++ b/src/core/libs/INIReader.cc
@@ -64,7 +64,7 @@ int INIReader::ParseError()
 }
 
 
-std::string INIReader::Get(const std::string& section, const std::string& name, std::string default_value)
+std::string INIReader::Get(const std::string& section, const std::string& name, const std::string& default_value)
 {
     std::string key = MakeKey(section, name);
     return _values.count(key) ? _values[key] : default_value;
diff --git a/src/core/libs/INIReader.h b/src/core/libs/INIReader.h
index bfe168bd9..1a9f0f3e5 100644
--- a/src/core/libs/INIReader.h
+++ b/src/core/libs/INIReader.h
@@ -67,7 +67,7 @@ public:
 
     //! Get a string value from INI file, returning default_value if not found.
     std::string Get(const std::string& section, const std::string& name,
-        std::string default_value);
+        const std::string& default_value);
 
     //! Get an integer (long) value from INI file, returning default_value if not found.
     int64_t GetInteger(const std::string& section, const std::string& name, int64_t default_value);
diff --git a/src/core/monitor/gnss_synchro_udp_sink.cc b/src/core/monitor/gnss_synchro_udp_sink.cc
index 54f489433..b07ee5d11 100644
--- a/src/core/monitor/gnss_synchro_udp_sink.cc
+++ b/src/core/monitor/gnss_synchro_udp_sink.cc
@@ -35,7 +35,7 @@
 #include <iostream>
 #include <sstream>
 
-Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port) : socket{io_service}
+Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port) : socket{io_service}
 {
     for (auto address : addresses)
         {
diff --git a/src/core/monitor/gnss_synchro_udp_sink.h b/src/core/monitor/gnss_synchro_udp_sink.h
index d72b2f18a..70aaf0c1e 100644
--- a/src/core/monitor/gnss_synchro_udp_sink.h
+++ b/src/core/monitor/gnss_synchro_udp_sink.h
@@ -42,7 +42,7 @@
 class Gnss_Synchro_Udp_Sink
 {
 public:
-    Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port);
+    Gnss_Synchro_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port);
     bool write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks);
 
 private:
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 82cc49e09..95a954016 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -1340,7 +1340,7 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what)
 }
 
 
-void GNSSFlowgraph::priorize_satellites(std::vector<std::pair<int, Gnss_Satellite>> visible_satellites)
+void GNSSFlowgraph::priorize_satellites(const std::vector<std::pair<int, Gnss_Satellite>>& visible_satellites)
 {
     size_t old_size;
     Gnss_Signal gs;
diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h
index 67f86bc6b..4862ca181 100644
--- a/src/core/receiver/gnss_flowgraph.h
+++ b/src/core/receiver/gnss_flowgraph.h
@@ -141,7 +141,7 @@ public:
     /*!
      * \brief Priorize visible satellites in the specified vector
      */
-    void priorize_satellites(std::vector<std::pair<int, Gnss_Satellite>> visible_satellites);
+    void priorize_satellites(const std::vector<std::pair<int, Gnss_Satellite>>& visible_satellites);
 
 private:
     void init();  // Populates the SV PRN list available for acquisition and tracking
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index 5cc30eeb1..08102c802 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -70,7 +70,7 @@ class GpsL1CaPcpsAcquisitionTest_msg_rx : public gr::block
 {
 private:
     friend GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make();
-    void msg_handler_events(pmt::pmt_t msg);
+    void msg_handler_events(const pmt::pmt_t &msg);
     GpsL1CaPcpsAcquisitionTest_msg_rx();
 
 public:
@@ -85,7 +85,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make()
 }
 
 
-void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
+void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(const pmt::pmt_t &msg)
 {
     try
         {
@@ -236,14 +236,14 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid()
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate)
+TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, Instantiate /*unused*/)
 {
     init();
     boost::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = boost::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition_1C", 1, 0);
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
+TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/)
 {
     int fs_in = 4000000;
     int nsamples = 4000;
@@ -276,7 +276,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
+TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ValidationOfResults /*unused*/)
 {
     std::chrono::time_point<std::chrono::system_clock> start, end;
     std::chrono::duration<double> elapsed_seconds(0.0);

From 5b50e74ca81a85d959eb3bf4a285b778efd67549 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 01:25:27 +0100
Subject: [PATCH 061/123] clang-tidy: apply performance-for-range-copy check

See https://clang.llvm.org/extra/clang-tidy/checks/performance-for-range-copy.html
---
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc | 4 ++--
 src/algorithms/libs/rtcm.h                      | 2 +-
 src/core/monitor/gnss_synchro_udp_sink.cc       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
index af039f276..0599416e4 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
@@ -36,7 +36,7 @@
 
 Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port) : socket{io_service}
 {
-    for (auto address : addresses)
+    for (const auto& address : addresses)
         {
             boost::asio::ip::udp::endpoint endpoint(boost::asio::ip::address::from_string(address, error), port);
             endpoints.push_back(endpoint);
@@ -50,7 +50,7 @@ bool Monitor_Pvt_Udp_Sink::write_monitor_pvt(Monitor_Pvt monitor_pvt)
     oa << monitor_pvt;
     std::string outbound_data = archive_stream.str();
 
-    for (auto endpoint : endpoints)
+    for (const auto& endpoint : endpoints)
         {
             socket.open(endpoint.protocol(), error);
             socket.connect(endpoint, error);
diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index f409d4e84..d390dc568 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -629,7 +629,7 @@ private:
                     recent_msgs_.pop_front();
                 }
 
-            for (auto participant : participants_)
+            for (const auto& participant : participants_)
                 {
                     participant->deliver(msg);
                 }
diff --git a/src/core/monitor/gnss_synchro_udp_sink.cc b/src/core/monitor/gnss_synchro_udp_sink.cc
index b07ee5d11..dbb8510f0 100644
--- a/src/core/monitor/gnss_synchro_udp_sink.cc
+++ b/src/core/monitor/gnss_synchro_udp_sink.cc
@@ -37,7 +37,7 @@
 
 Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port) : socket{io_service}
 {
-    for (auto address : addresses)
+    for (const auto& address : addresses)
         {
             boost::asio::ip::udp::endpoint endpoint(boost::asio::ip::address::from_string(address, error), port);
             endpoints.push_back(endpoint);
@@ -51,7 +51,7 @@ bool Gnss_Synchro_Udp_Sink::write_gnss_synchro(const std::vector<Gnss_Synchro>&
     oa << stocks;
     std::string outbound_data = archive_stream.str();
 
-    for (auto endpoint : endpoints)
+    for (const auto& endpoint : endpoints)
         {
             socket.open(endpoint.protocol(), error);
             socket.connect(endpoint, error);

From 0c4b68c92d939cb56e73f322ce301d390f498b9d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 02:07:06 +0100
Subject: [PATCH 062/123] clang-tidy: apply performance-move-const-arg check

See https://clang.llvm.org/extra/clang-tidy/checks/performance-move-const-arg.html
---
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc        | 4 ++--
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc      | 4 ++--
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.cc         | 4 ++--
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc           | 4 ++--
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc        | 4 ++--
 .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc | 4 ++--
 .../signal_generator/gnuradio_blocks/signal_generator_c.cc  | 2 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc              | 6 +++---
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc    | 4 ++--
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc              | 6 +++---
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc    | 4 ++--
 .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc  | 6 +++---
 .../tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc    | 4 ++--
 src/core/monitor/gnss_synchro_monitor.cc                    | 2 +-
 .../acquisition/gps_l1_ca_pcps_acquisition_test.cc          | 2 +-
 15 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index a3579ee23..ddaf50528 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -60,7 +60,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make
 {
     return galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr(
         new galileo_e5a_noncoherentIQ_acquisition_caf_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms,
-            samples_per_code, bit_transition_flag, dump, std::move(dump_filename), both_signal_components_, CAF_window_hz_, Zero_padding_));
+            samples_per_code, bit_transition_flag, dump, dump_filename, both_signal_components_, CAF_window_hz_, Zero_padding_));
 }
 
 
@@ -153,7 +153,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index 06a249bb5..f846e7dff 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -51,7 +51,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(
 {
     return galileo_pcps_8ms_acquisition_cc_sptr(
         new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms,
-            samples_per_code, dump, std::move(dump_filename)));
+            samples_per_code, dump, dump_filename));
 }
 
 
@@ -95,7 +95,7 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index e41af55c2..9c7c009de 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -53,7 +53,7 @@ pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
 {
     return pcps_assisted_acquisition_cc_sptr(
         new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min,
-            fs_in, samples_per_ms, dump, std::move(dump_filename)));
+            fs_in, samples_per_ms, dump, dump_filename));
 }
 
 
@@ -90,7 +90,7 @@ pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index 0d8609934..b8ec55bbd 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -57,7 +57,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc(
 {
     return pcps_cccwsr_acquisition_cc_sptr(
         new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in,
-            samples_per_ms, samples_per_code, dump, std::move(dump_filename)));
+            samples_per_ms, samples_per_code, dump, dump_filename));
 }
 
 
@@ -105,7 +105,7 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index e43f0d079..e47a0a18c 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -61,7 +61,7 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc(
             fs_in, samples_per_ms,
             samples_per_code,
             bit_transition_flag,
-            dump, std::move(dump_filename)));
+            dump, dump_filename));
 }
 
 
@@ -114,7 +114,7 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_corr_acumulator = nullptr;
     d_signal_folded = nullptr;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index 72271cefc..e4a52da7b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -73,7 +73,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(
 {
     return pcps_tong_acquisition_cc_sptr(
         new pcps_tong_acquisition_cc(sampled_ms, doppler_max, fs_in, samples_per_ms, samples_per_code,
-            tong_init_val, tong_max_val, tong_max_dwells, dump, std::move(dump_filename)));
+            tong_init_val, tong_max_val, tong_max_dwells, dump, dump_filename));
 }
 
 
@@ -121,7 +121,7 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 378ef90cc..d25fded66 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -53,7 +53,7 @@ signal_make_generator_c(const std::vector<std::string> &signal1, const std::vect
     const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
     unsigned int fs_in, unsigned int vector_length, float BW_BB)
 {
-    return gnuradio::get_initial_sptr(new signal_generator_c(std::move(signal1), std::move(system), PRN, CN0_dB, doppler_Hz, delay_chips, delay_sec,
+    return gnuradio::get_initial_sptr(new signal_generator_c(signal1, system, PRN, CN0_dB, doppler_Hz, delay_chips, delay_sec,
         data_flag, noise_flag, fs_in, vector_length, BW_BB));
 }
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index a3d70f0e8..5a7ea0aa4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -74,7 +74,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new glonass_l1_ca_dll_pll_c_aid_tracking_cc(
-        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
+        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
 }
 
 
@@ -94,7 +94,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const p
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
     if (d_enable_extended_integration == false)  //avoid re-setting preamble indicator
         {
-            d_preamble_timestamp_s = pmt::to_double(std::move(msg));
+            d_preamble_timestamp_s = pmt::to_double(msg);
             d_enable_extended_integration = true;
             d_preamble_synchronized = false;
         }
@@ -125,7 +125,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
     d_correlation_length_samples = static_cast<int32_t>(d_vector_length);
 
     // Initialize tracking  ==========================================
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 469978680..bffcbcbd3 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -68,7 +68,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l1_ca_dll_pll_tracking_cc_sptr(new Glonass_L1_Ca_Dll_Pll_Tracking_cc(
-        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, early_late_space_chips));
+        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
 }
 
 
@@ -98,7 +98,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_current_prn_length_samples = static_cast<int32_t>(d_vector_length);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index 78f29b10f..4f0d5773e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -71,7 +71,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr(new glonass_l2_ca_dll_pll_c_aid_tracking_cc(
-        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
+        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
 }
 
 
@@ -91,7 +91,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const p
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
     if (d_enable_extended_integration == false)  //avoid re-setting preamble indicator
         {
-            d_preamble_timestamp_s = pmt::to_double(std::move(msg));
+            d_preamble_timestamp_s = pmt::to_double(msg);
             d_enable_extended_integration = true;
             d_preamble_synchronized = false;
         }
@@ -122,7 +122,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
     d_correlation_length_samples = static_cast<int32_t>(d_vector_length);
 
     // Initialize tracking  ==========================================
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index b8311938d..e24e88159 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -68,7 +68,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l2_ca_dll_pll_tracking_cc_sptr(new Glonass_L2_Ca_Dll_Pll_Tracking_cc(
-        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, early_late_space_chips));
+        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
 }
 
 
@@ -98,7 +98,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_current_prn_length_samples = static_cast<int32_t>(d_vector_length);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 1cb3eab43..015122438 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -63,7 +63,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
     float early_late_space_chips)
 {
     return gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_cc(
-        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
+        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
 }
 
 
@@ -83,7 +83,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
     if (d_enable_extended_integration == false)  //avoid re-setting preamble indicator
         {
-            d_preamble_timestamp_s = pmt::to_double(std::move(msg));
+            d_preamble_timestamp_s = pmt::to_double(msg);
             d_enable_extended_integration = true;
             d_preamble_synchronized = false;
         }
@@ -114,7 +114,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
     d_correlation_length_samples = static_cast<int32_t>(d_vector_length);
 
     // Initialize tracking  ==========================================
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index 15c806123..a2040c7d8 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -74,7 +74,7 @@ gps_l1_ca_kf_make_tracking_cc(
     int32_t bce_kappa)
 {
     return gps_l1_ca_kf_tracking_cc_sptr(new Gps_L1_Ca_Kf_Tracking_cc(order, if_freq,
-        fs_in, vector_length, dump, std::move(dump_filename), dll_bw_hz, early_late_space_chips,
+        fs_in, vector_length, dump, dump_filename, dll_bw_hz, early_late_space_chips,
         bce_run, bce_ptrans, bce_strans, bce_nu, bce_kappa));
 }
 
@@ -115,7 +115,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc(
     d_if_freq = if_freq;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = std::move(dump_filename);
+    d_dump_filename = dump_filename;
 
     d_current_prn_length_samples = static_cast<int>(d_vector_length);
 
diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc
index ad9f40e37..0454c19eb 100644
--- a/src/core/monitor/gnss_synchro_monitor.cc
+++ b/src/core/monitor/gnss_synchro_monitor.cc
@@ -64,7 +64,7 @@ gnss_synchro_monitor::gnss_synchro_monitor(unsigned int n_channels,
     d_output_rate_ms = output_rate_ms;
     d_nchannels = n_channels;
 
-    udp_sink_ptr = std::unique_ptr<Gnss_Synchro_Udp_Sink>(new Gnss_Synchro_Udp_Sink(std::move(udp_addresses), udp_port));
+    udp_sink_ptr = std::unique_ptr<Gnss_Synchro_Udp_Sink>(new Gnss_Synchro_Udp_Sink(udp_addresses, udp_port));
 
     count = 0;
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index 08102c802..13a9d8f54 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -89,7 +89,7 @@ void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(const pmt::pmt_t &msg
 {
     try
         {
-            int64_t message = pmt::to_long(std::move(msg));
+            int64_t message = pmt::to_long(msg);
             rx_message = message;
         }
     catch (boost::bad_any_cast &e)

From 9551c5e5a163b2cd108c9c7d9046acad6b87e8f7 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 02:44:44 +0100
Subject: [PATCH 063/123] clang-tidy: apply performance-unnecessary-value-param
 check

---
 src/core/monitor/gnss_synchro_monitor.cc | 2 +-
 src/core/monitor/gnss_synchro_monitor.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc
index 0454c19eb..35c0aee79 100644
--- a/src/core/monitor/gnss_synchro_monitor.cc
+++ b/src/core/monitor/gnss_synchro_monitor.cc
@@ -57,7 +57,7 @@ gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
 gnss_synchro_monitor::gnss_synchro_monitor(unsigned int n_channels,
     int output_rate_ms,
     int udp_port,
-    std::vector<std::string> udp_addresses) : gr::sync_block("gnss_synchro_monitor",
+    const std::vector<std::string>& udp_addresses) : gr::sync_block("gnss_synchro_monitor",
                                                   gr::io_signature::make(n_channels, n_channels, sizeof(Gnss_Synchro)),
                                                   gr::io_signature::make(0, 0, 0))
 {
diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index 7c22a1290..ae95fb012 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -74,7 +74,7 @@ public:
     gnss_synchro_monitor(unsigned int nchannels,
         int output_rate_ms,
         int udp_port,
-        std::vector<std::string> udp_addresses);
+        const std::vector<std::string>& udp_addresses);
 
     ~gnss_synchro_monitor();  //!< Default destructor
 

From ef0da0a9733e2b5f1dd1269477fd870d94bf66e5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 09:16:22 +0100
Subject: [PATCH 064/123] clang-tidy: apply performance-unnecessary-value-param
 check

---
 src/core/monitor/gnss_synchro_monitor.cc | 4 ++--
 src/core/monitor/gnss_synchro_monitor.h  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc
index 35c0aee79..f8997d6a3 100644
--- a/src/core/monitor/gnss_synchro_monitor.cc
+++ b/src/core/monitor/gnss_synchro_monitor.cc
@@ -45,12 +45,12 @@ using google::LogMessage;
 gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
     int output_rate_ms,
     int udp_port,
-    std::vector<std::string> udp_addresses)
+    const std::vector<std::string>& udp_addresses)
 {
     return gnss_synchro_monitor_sptr(new gnss_synchro_monitor(n_channels,
         output_rate_ms,
         udp_port,
-        std::move(udp_addresses)));
+        udp_addresses));
 }
 
 
diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index ae95fb012..a0a8e470a 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -48,7 +48,7 @@ using gnss_synchro_monitor_sptr = boost::shared_ptr<gnss_synchro_monitor>;
 gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
     int output_rate_ms,
     int udp_port,
-    std::vector<std::string> udp_addresses);
+    const std::vector<std::string>& udp_addresses);
 
 /*!
  * \brief This class implements a block that computes the PVT solution with Galileo E1 signals
@@ -59,7 +59,7 @@ private:
     friend gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int nchannels,
         int output_rate_ms,
         int udp_port,
-        std::vector<std::string> udp_addresses);
+        const std::vector<std::string>& udp_addresses);
 
     unsigned int d_nchannels;
 

From 111c6291ec1e530b21ef4735ef59c7343aa8d2f6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 12:07:40 +0100
Subject: [PATCH 065/123] Revert "clang-tidy: apply
 performance-unnecessary-value-param check"

This reverts commit eae967ed1a2c90da29e0e532be98f58345ba8459.
---
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc        |  2 +-
 src/algorithms/PVT/libs/monitor_pvt_udp_sink.h         |  2 +-
 src/algorithms/PVT/libs/nmea_printer.cc                |  2 +-
 src/algorithms/PVT/libs/nmea_printer.h                 |  2 +-
 .../adapters/beidou_b1i_pcps_acquisition.cc            |  5 ++---
 .../acquisition/adapters/beidou_b1i_pcps_acquisition.h |  2 +-
 .../adapters/galileo_e1_pcps_ambiguous_acquisition.cc  |  5 ++---
 .../adapters/galileo_e1_pcps_ambiguous_acquisition.h   |  2 +-
 .../acquisition/adapters/gps_l1_ca_pcps_acquisition.cc |  5 ++---
 .../acquisition/adapters/gps_l1_ca_pcps_acquisition.h  |  2 +-
 .../acquisition/adapters/gps_l2_m_pcps_acquisition.cc  |  5 ++---
 .../acquisition/adapters/gps_l2_m_pcps_acquisition.h   |  2 +-
 .../acquisition/adapters/gps_l5i_pcps_acquisition.cc   |  5 ++---
 .../acquisition/adapters/gps_l5i_pcps_acquisition.h    |  2 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc   |  4 ++--
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.h    |  6 +++---
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc |  8 ++++----
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h  |  6 +++---
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.cc    |  8 ++++----
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.h     |  6 +++---
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc      |  8 ++++----
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h       |  6 +++---
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc   |  8 ++++----
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.h    |  6 +++---
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc        |  8 ++++----
 .../gnuradio_blocks/pcps_tong_acquisition_cc.h         |  6 +++---
 .../gnuradio_blocks/signal_generator_c.cc              |  2 +-
 .../gnuradio_blocks/signal_generator_c.h               |  4 ++--
 .../adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc   |  5 ++---
 .../adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h    |  2 +-
 .../adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc   |  5 ++---
 .../adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h    |  2 +-
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc       |  5 ++---
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.h        |  2 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc         |  6 +++---
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h          |  8 ++++----
 .../glonass_l1_ca_dll_pll_tracking_cc.cc               |  4 ++--
 .../glonass_l1_ca_dll_pll_tracking_cc.h                |  6 +++---
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc         |  6 +++---
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h          |  8 ++++----
 .../glonass_l2_ca_dll_pll_tracking_cc.cc               |  4 ++--
 .../glonass_l2_ca_dll_pll_tracking_cc.h                |  6 +++---
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc             |  6 +++---
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h              |  8 ++++----
 .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc        |  4 ++--
 .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h         |  6 +++---
 src/core/libs/INIReader.cc                             |  2 +-
 src/core/libs/INIReader.h                              |  2 +-
 src/core/monitor/gnss_synchro_udp_sink.cc              |  2 +-
 src/core/monitor/gnss_synchro_udp_sink.h               |  2 +-
 src/core/receiver/gnss_flowgraph.cc                    |  2 +-
 src/core/receiver/gnss_flowgraph.h                     |  2 +-
 .../acquisition/gps_l1_ca_pcps_acquisition_test.cc     | 10 +++++-----
 53 files changed, 118 insertions(+), 126 deletions(-)

diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
index 0599416e4..3dc8c8b08 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
@@ -34,7 +34,7 @@
 #include <iostream>
 #include <sstream>
 
-Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port) : socket{io_service}
+Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port) : socket{io_service}
 {
     for (const auto& address : addresses)
         {
diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
index f8c6552ae..bec163986 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
@@ -38,7 +38,7 @@
 class Monitor_Pvt_Udp_Sink
 {
 public:
-    Monitor_Pvt_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port);
+    Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t &port);
     bool write_monitor_pvt(Monitor_Pvt monitor_pvt);
 
 private:
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 8f4122c58..3d4ebc74a 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -269,7 +269,7 @@ bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr<rtklib_solver>& pvt_dat
 }
 
 
-char Nmea_Printer::checkSum(const std::string& sentence)
+char Nmea_Printer::checkSum(std::string sentence)
 {
     char check = 0;
     // iterate over the string, XOR each byte with the total sum:
diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h
index b7373f45b..6e18d7451 100644
--- a/src/algorithms/PVT/libs/nmea_printer.h
+++ b/src/algorithms/PVT/libs/nmea_printer.h
@@ -82,7 +82,7 @@ private:
     std::string get_UTC_NMEA_time(boost::posix_time::ptime d_position_UTC_time);
     std::string longitude_to_hm(double longitude);
     std::string latitude_to_hm(double lat);
-    char checkSum(const std::string& sentence);
+    char checkSum(std::string sentence);
     bool print_avg_pos;
     bool d_flag_nmea_output_file;
 };
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
index 050e44eb4..7ee2a7277 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.cc
@@ -39,16 +39,15 @@
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 BeidouB1iPcpsAcquisition::BeidouB1iPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
index 3b6c185a8..334aff555 100644
--- a/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/beidou_b1i_pcps_acquisition.h
@@ -55,7 +55,7 @@ class BeidouB1iPcpsAcquisition : public AcquisitionInterface
 {
 public:
     BeidouB1iPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role, unsigned int in_streams,
+        const std::string& role, unsigned int in_streams,
         unsigned int out_streams);
 
     virtual ~BeidouB1iPcpsAcquisition();
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 8e81cc18f..5f4137f7d 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -37,7 +37,6 @@
 #include "gnss_sdr_flags.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -45,9 +44,9 @@ using google::LogMessage;
 
 GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
index 13dd5fe4a..ee4538022 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.h
@@ -52,7 +52,7 @@ class GalileoE1PcpsAmbiguousAcquisition : public AcquisitionInterface
 {
 public:
     GalileoE1PcpsAmbiguousAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
index 9d6d74d86..e27f37581 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -41,7 +41,6 @@
 #include "gps_sdr_signal_processing.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -49,9 +48,9 @@ using google::LogMessage;
 
 GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
index ed9767a81..efca26bdd 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.h
@@ -56,7 +56,7 @@ class GpsL1CaPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL1CaPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
index 9cc6f5633..00fcb7624 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -39,7 +39,6 @@
 #include "gps_l2c_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -47,9 +46,9 @@ using google::LogMessage;
 
 GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
index f296e6304..da1c7ef6e 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.h
@@ -53,7 +53,7 @@ class GpsL2MPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL2MPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
index 6d36db29b..d3b722823 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -39,7 +39,6 @@
 #include "gps_l5_signal.h"
 #include <boost/math/distributions/exponential.hpp>
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
@@ -47,9 +46,9 @@ using google::LogMessage;
 
 GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
     ConfigurationInterface* configuration,
-    std::string role,
+    const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
index 02f48d11d..af8cabb81 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.h
@@ -53,7 +53,7 @@ class GpsL5iPcpsAcquisition : public AcquisitionInterface
 {
 public:
     GpsL5iPcpsAcquisition(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index ddaf50528..84e517a09 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -53,7 +53,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make
     int samples_per_ms, int samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     bool both_signal_components_,
     int CAF_window_hz_,
     int Zero_padding_)
@@ -73,7 +73,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit
     int samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     bool both_signal_components_,
     int CAF_window_hz_,
     int Zero_padding_) : gr::block("galileo_e5a_noncoherentIQ_acquisition_caf_cc",
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
index 7ef061db4..c95a74b82 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.h
@@ -56,7 +56,7 @@ galileo_e5a_noncoherentIQ_make_acquisition_caf_cc(unsigned int sampled_ms,
     int samples_per_ms, int samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     bool both_signal_components_,
     int CAF_window_hz_,
     int Zero_padding_);
@@ -78,7 +78,7 @@ private:
         int samples_per_ms, int samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         bool both_signal_components_,
         int CAF_window_hz_,
         int Zero_padding_);
@@ -90,7 +90,7 @@ private:
         int samples_per_ms, int samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         bool both_signal_components_,
         int CAF_window_hz_,
         int Zero_padding_);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index f846e7dff..7b5566aba 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -47,7 +47,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(
     int64_t fs_in,
     int32_t samples_per_ms,
     int32_t samples_per_code,
-    bool dump, const std::string &dump_filename)
+    bool dump, std::string dump_filename)
 {
     return galileo_pcps_8ms_acquisition_cc_sptr(
         new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms,
@@ -63,9 +63,9 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc(
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    const std::string &dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc",
-                                            gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
-                                            gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
+    std::string dump_filename) : gr::block("galileo_pcps_8ms_acquisition_cc",
+                                     gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
+                                     gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
index 372ce1fd6..0c1b81e20 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.h
@@ -51,7 +51,7 @@ galileo_pcps_8ms_make_acquisition_cc(uint32_t sampled_ms,
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    const std::string& dump_filename);
+    std::string dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition for
@@ -69,7 +69,7 @@ private:
         int32_t samples_per_ms,
         int32_t samples_per_code,
         bool dump,
-        const std::string& dump_filename);
+        std::string dump_filename);
 
     galileo_pcps_8ms_acquisition_cc(
         uint32_t sampled_ms,
@@ -79,7 +79,7 @@ private:
         int32_t samples_per_ms,
         int32_t samples_per_code,
         bool dump,
-        const std::string& dump_filename);
+        std::string dump_filename);
 
     void calculate_magnitudes(
         gr_complex* fft_begin,
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 9c7c009de..413b7af10 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -49,7 +49,7 @@ using google::LogMessage;
 pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
     int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min,
     int64_t fs_in, int32_t samples_per_ms, bool dump,
-    const std::string &dump_filename)
+    std::string dump_filename)
 {
     return pcps_assisted_acquisition_cc_sptr(
         new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min,
@@ -60,9 +60,9 @@ pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
 pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc(
     int32_t max_dwells, uint32_t sampled_ms, int32_t doppler_max, int32_t doppler_min,
     int64_t fs_in, int32_t samples_per_ms, bool dump,
-    const std::string &dump_filename) : gr::block("pcps_assisted_acquisition_cc",
-                                            gr::io_signature::make(1, 1, sizeof(gr_complex)),
-                                            gr::io_signature::make(0, 0, sizeof(gr_complex)))
+    std::string dump_filename) : gr::block("pcps_assisted_acquisition_cc",
+                                     gr::io_signature::make(1, 1, sizeof(gr_complex)),
+                                     gr::io_signature::make(0, 0, sizeof(gr_complex)))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
index 8cfff7f41..b27f920df 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.h
@@ -67,7 +67,7 @@ pcps_make_assisted_acquisition_cc(
     int32_t doppler_min,
     int64_t fs_in,
     int32_t samples_per_ms,
-    bool dump, const std::string& dump_filename);
+    bool dump, std::string dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition.
@@ -82,12 +82,12 @@ private:
     pcps_make_assisted_acquisition_cc(int32_t max_dwells, uint32_t sampled_ms,
         int32_t doppler_max, int32_t doppler_min, int64_t fs_in,
         int32_t samples_per_ms, bool dump,
-        const std::string& dump_filename);
+        std::string dump_filename);
 
     pcps_assisted_acquisition_cc(int32_t max_dwells, uint32_t sampled_ms,
         int32_t doppler_max, int32_t doppler_min, int64_t fs_in,
         int32_t samples_per_ms, bool dump,
-        const std::string& dump_filename);
+        std::string dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index b8ec55bbd..918bc5aa2 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -53,7 +53,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc(
     int64_t fs_in,
     int32_t samples_per_ms,
     int32_t samples_per_code,
-    bool dump, const std::string &dump_filename)
+    bool dump, std::string dump_filename)
 {
     return pcps_cccwsr_acquisition_cc_sptr(
         new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in,
@@ -69,9 +69,9 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc(
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    const std::string &dump_filename) : gr::block("pcps_cccwsr_acquisition_cc",
-                                            gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
-                                            gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
+    std::string dump_filename) : gr::block("pcps_cccwsr_acquisition_cc",
+                                     gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
+                                     gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
index 8776ab37f..b1edf0106 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.h
@@ -58,7 +58,7 @@ pcps_cccwsr_make_acquisition_cc(
     int32_t samples_per_ms,
     int32_t samples_per_code,
     bool dump,
-    const std::string& dump_filename);
+    std::string dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition with
@@ -71,12 +71,12 @@ private:
     pcps_cccwsr_make_acquisition_cc(uint32_t sampled_ms, uint32_t max_dwells,
         uint32_t doppler_max, int64_t fs_in,
         int32_t samples_per_ms, int32_t samples_per_code,
-        bool dump, const std::string& dump_filename);
+        bool dump, std::string dump_filename);
 
     pcps_cccwsr_acquisition_cc(uint32_t sampled_ms, uint32_t max_dwells,
         uint32_t doppler_max, int64_t fs_in,
         int32_t samples_per_ms, int32_t samples_per_code,
-        bool dump, const std::string& dump_filename);
+        bool dump, std::string dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index e47a0a18c..d04c71495 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -52,7 +52,7 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc(
     int32_t samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    const std::string& dump_filename)
+    std::string dump_filename)
 {
     return pcps_quicksync_acquisition_cc_sptr(
         new pcps_quicksync_acquisition_cc(
@@ -72,9 +72,9 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc(
     int32_t samples_per_ms, int32_t samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    const std::string& dump_filename) : gr::block("pcps_quicksync_acquisition_cc",
-                                            gr::io_signature::make(1, 1, (sizeof(gr_complex) * sampled_ms * samples_per_ms)),
-                                            gr::io_signature::make(0, 0, (sizeof(gr_complex) * sampled_ms * samples_per_ms)))
+    std::string dump_filename) : gr::block("pcps_quicksync_acquisition_cc",
+                                     gr::io_signature::make(1, 1, (sizeof(gr_complex) * sampled_ms * samples_per_ms)),
+                                     gr::io_signature::make(0, 0, (sizeof(gr_complex) * sampled_ms * samples_per_ms)))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
index 8e41d903d..cf24625a5 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.h
@@ -76,7 +76,7 @@ pcps_quicksync_make_acquisition_cc(
     int32_t samples_per_code,
     bool bit_transition_flag,
     bool dump,
-    const std::string& dump_filename);
+    std::string dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition with
@@ -95,7 +95,7 @@ private:
         int32_t samples_per_ms, int32_t samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        const std::string& dump_filename);
+        std::string dump_filename);
 
     pcps_quicksync_acquisition_cc(uint32_t folding_factor,
         uint32_t sampled_ms, uint32_t max_dwells,
@@ -103,7 +103,7 @@ private:
         int32_t samples_per_ms, int32_t samples_per_code,
         bool bit_transition_flag,
         bool dump,
-        const std::string& dump_filename);
+        std::string dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index e4a52da7b..319525ca3 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -69,7 +69,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(
     uint32_t tong_init_val,
     uint32_t tong_max_val,
     uint32_t tong_max_dwells,
-    bool dump, const std::string &dump_filename)
+    bool dump, std::string dump_filename)
 {
     return pcps_tong_acquisition_cc_sptr(
         new pcps_tong_acquisition_cc(sampled_ms, doppler_max, fs_in, samples_per_ms, samples_per_code,
@@ -87,9 +87,9 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc(
     uint32_t tong_max_val,
     uint32_t tong_max_dwells,
     bool dump,
-    const std::string &dump_filename) : gr::block("pcps_tong_acquisition_cc",
-                                            gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
-                                            gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
+    std::string dump_filename) : gr::block("pcps_tong_acquisition_cc",
+                                     gr::io_signature::make(1, 1, sizeof(gr_complex) * sampled_ms * samples_per_ms),
+                                     gr::io_signature::make(0, 0, sizeof(gr_complex) * sampled_ms * samples_per_ms))
 {
     this->message_port_register_out(pmt::mp("events"));
     d_sample_counter = 0ULL;  // SAMPLE COUNTER
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
index 027f5d58a..e2443fa33 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.h
@@ -74,7 +74,7 @@ pcps_tong_make_acquisition_cc(
     uint32_t tong_max_val,
     uint32_t tong_max_dwells,
     bool dump,
-    const std::string& dump_filename);
+    std::string dump_filename);
 
 /*!
  * \brief This class implements a Parallel Code Phase Search Acquisition with
@@ -88,13 +88,13 @@ private:
         int64_t fs_in, int32_t samples_per_ms,
         int32_t samples_per_code, uint32_t tong_init_val,
         uint32_t tong_max_val, uint32_t tong_max_dwells,
-        bool dump, const std::string& dump_filename);
+        bool dump, std::string dump_filename);
 
     pcps_tong_acquisition_cc(uint32_t sampled_ms, uint32_t doppler_max,
         int64_t fs_in, int32_t samples_per_ms,
         int32_t samples_per_code, uint32_t tong_init_val,
         uint32_t tong_max_val, uint32_t tong_max_dwells,
-        bool dump, const std::string& dump_filename);
+        bool dump, std::string dump_filename);
 
     void calculate_magnitudes(gr_complex* fft_begin, int32_t doppler_shift,
         int32_t doppler_offset);
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index d25fded66..6029af1ac 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -48,7 +48,7 @@
 * a boost shared_ptr. This is effectively the public constructor.
 */
 signal_generator_c_sptr
-signal_make_generator_c(const std::vector<std::string> &signal1, const std::vector<std::string> &system, const std::vector<unsigned int> &PRN,
+signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::string> system, const std::vector<unsigned int> &PRN,
     const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
     const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
     unsigned int fs_in, unsigned int vector_length, float BW_BB)
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
index a57f2f1b3..2201a849c 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.h
@@ -61,7 +61,7 @@ using signal_generator_c_sptr = boost::shared_ptr<signal_generator_c>;
 * interface for creating new instances.
 */
 signal_generator_c_sptr
-signal_make_generator_c(const std::vector<std::string> &signal1, const std::vector<std::string> &system, const std::vector<unsigned int> &PRN,
+signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::string> system, const std::vector<unsigned int> &PRN,
     const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
     const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
     unsigned int fs_in, unsigned int vector_length, float BW_BB);
@@ -80,7 +80,7 @@ private:
 
     /* Create the signal_generator_c object*/
     friend signal_generator_c_sptr
-    signal_make_generator_c(const std::vector<std::string> &signal1, const std::vector<std::string> &system, const std::vector<unsigned int> &PRN,
+    signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::string> system, const std::vector<unsigned int> &PRN,
         const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
         const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
         unsigned int fs_in, unsigned int vector_length, float BW_BB);
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
index 804f93148..e3ca80dbe 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.cc
@@ -42,15 +42,14 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 
 GlonassL1CaDllPllCAidTracking::GlonassL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, const std::string& role,
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
index 5911b4288..d50003964 100644
--- a/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/glonass_l1_ca_dll_pll_c_aid_tracking.h
@@ -54,7 +54,7 @@ class GlonassL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
index 091f68df4..419ccc462 100644
--- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.cc
@@ -40,15 +40,14 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 
 GlonassL2CaDllPllCAidTracking::GlonassL2CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, const std::string& role,
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h
index 5946b8713..b5659c527 100644
--- a/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/glonass_l2_ca_dll_pll_c_aid_tracking.h
@@ -52,7 +52,7 @@ class GlonassL2CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GlonassL2CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
index af3dcff79..5531be4e0 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc
@@ -41,15 +41,14 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include <glog/logging.h>
-#include <utility>
 
 
 using google::LogMessage;
 
 
 GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
-    ConfigurationInterface* configuration, std::string role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    ConfigurationInterface* configuration, const std::string& role,
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
index d48474ead..a1c54aa46 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_c_aid_tracking.h
@@ -53,7 +53,7 @@ class GpsL1CaDllPllCAidTracking : public TrackingInterface
 {
 public:
     GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
-        std::string role,
+        const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 5a7ea0aa4..b422fa6ec 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -65,7 +65,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -88,7 +88,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items,
 }
 
 
-void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg)
+void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg)
 {
     //pmt::print(msg);
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
@@ -105,7 +105,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index 7af766d60..2a5102942 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -59,7 +59,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr
 glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -90,7 +90,7 @@ private:
     glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -101,7 +101,7 @@ private:
     glonass_l1_ca_dll_pll_c_aid_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -169,7 +169,7 @@ private:
     int32_t d_extend_correlation_ms;
     bool d_enable_extended_integration;
     bool d_preamble_synchronized;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
+    void msg_handler_preamble_index(pmt::pmt_t msg);
 
     //Integration period in samples
     int32_t d_correlation_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index bffcbcbd3..3df2c07f6 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -62,7 +62,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips)
@@ -86,7 +86,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips) : gr::block("Glonass_L1_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)),
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
index 80a04dedf..15bc1c90f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
@@ -56,7 +56,7 @@ glonass_l1_ca_dll_pll_tracking_cc_sptr
 glonass_l1_ca_dll_pll_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips);
@@ -84,7 +84,7 @@ private:
     glonass_l1_ca_dll_pll_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
@@ -92,7 +92,7 @@ private:
     Glonass_L1_Ca_Dll_Pll_Tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index 4f0d5773e..b31f4167b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -85,7 +85,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items,
 }
 
 
-void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg)
+void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg)
 {
     //pmt::print(msg);
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
@@ -102,7 +102,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
index e71970e39..1be8d3c7f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
@@ -57,7 +57,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr
 glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -88,7 +88,7 @@ private:
     glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -99,7 +99,7 @@ private:
     glonass_l2_ca_dll_pll_c_aid_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -167,7 +167,7 @@ private:
     int32_t d_extend_correlation_ms;
     bool d_enable_extended_integration;
     bool d_preamble_synchronized;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
+    void msg_handler_preamble_index(pmt::pmt_t msg);
 
     //Integration period in samples
     int32_t d_correlation_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index e24e88159..b5b4dcd3e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -62,7 +62,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips)
@@ -86,7 +86,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips) : gr::block("Glonass_L2_Ca_Dll_Pll_Tracking_cc", gr::io_signature::make(1, 1, sizeof(gr_complex)),
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
index 20ebca8c2..29f6bb077 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
@@ -54,7 +54,7 @@ glonass_l2_ca_dll_pll_tracking_cc_sptr
 glonass_l2_ca_dll_pll_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float early_late_space_chips);
@@ -82,7 +82,7 @@ private:
     glonass_l2_ca_dll_pll_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
@@ -90,7 +90,7 @@ private:
     Glonass_L2_Ca_Dll_Pll_Tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float early_late_space_chips);
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index 015122438..aed6b2abc 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -54,7 +54,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -77,7 +77,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::forecast(int noutput_items,
 }
 
 
-void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(const pmt::pmt_t &msg)
+void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t msg)
 {
     //pmt::print(msg);
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
@@ -94,7 +94,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index f35affeef..ecbe2c15f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -57,7 +57,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr
 gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float dll_bw_hz,
     float pll_bw_narrow_hz,
@@ -88,7 +88,7 @@ private:
     gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -99,7 +99,7 @@ private:
     gps_l1_ca_dll_pll_c_aid_tracking_cc(
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float pll_bw_hz,
         float dll_bw_hz,
         float pll_bw_narrow_hz,
@@ -163,7 +163,7 @@ private:
     int32_t d_extend_correlation_ms;
     bool d_enable_extended_integration;
     bool d_preamble_synchronized;
-    void msg_handler_preamble_index(const pmt::pmt_t& msg);
+    void msg_handler_preamble_index(pmt::pmt_t msg);
 
     //Integration period in samples
     int32_t d_correlation_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index a2040c7d8..8ddf18102 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -64,7 +64,7 @@ gps_l1_ca_kf_make_tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float dll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
@@ -95,7 +95,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc(
     int64_t fs_in,
     uint32_t vector_length,
     bool dump,
-    const std::string &dump_filename,
+    std::string dump_filename,
     float dll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
index 91e4b4b47..e4acf778b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
@@ -60,7 +60,7 @@ gps_l1_ca_kf_make_tracking_cc(uint32_t order,
     int64_t if_freq,
     int64_t fs_in, uint32_t vector_length,
     bool dump,
-    const std::string& dump_filename,
+    std::string dump_filename,
     float pll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
@@ -93,7 +93,7 @@ private:
         int64_t if_freq,
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float dll_bw_hz,
         float early_late_space_chips,
         bool bce_run,
@@ -106,7 +106,7 @@ private:
         int64_t if_freq,
         int64_t fs_in, uint32_t vector_length,
         bool dump,
-        const std::string& dump_filename,
+        std::string dump_filename,
         float dll_bw_hz,
         float early_late_space_chips,
         bool bce_run,
diff --git a/src/core/libs/INIReader.cc b/src/core/libs/INIReader.cc
index 454986615..63c076b82 100644
--- a/src/core/libs/INIReader.cc
+++ b/src/core/libs/INIReader.cc
@@ -64,7 +64,7 @@ int INIReader::ParseError()
 }
 
 
-std::string INIReader::Get(const std::string& section, const std::string& name, const std::string& default_value)
+std::string INIReader::Get(const std::string& section, const std::string& name, std::string default_value)
 {
     std::string key = MakeKey(section, name);
     return _values.count(key) ? _values[key] : default_value;
diff --git a/src/core/libs/INIReader.h b/src/core/libs/INIReader.h
index 1a9f0f3e5..bfe168bd9 100644
--- a/src/core/libs/INIReader.h
+++ b/src/core/libs/INIReader.h
@@ -67,7 +67,7 @@ public:
 
     //! Get a string value from INI file, returning default_value if not found.
     std::string Get(const std::string& section, const std::string& name,
-        const std::string& default_value);
+        std::string default_value);
 
     //! Get an integer (long) value from INI file, returning default_value if not found.
     int64_t GetInteger(const std::string& section, const std::string& name, int64_t default_value);
diff --git a/src/core/monitor/gnss_synchro_udp_sink.cc b/src/core/monitor/gnss_synchro_udp_sink.cc
index dbb8510f0..2978537ea 100644
--- a/src/core/monitor/gnss_synchro_udp_sink.cc
+++ b/src/core/monitor/gnss_synchro_udp_sink.cc
@@ -35,7 +35,7 @@
 #include <iostream>
 #include <sstream>
 
-Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port) : socket{io_service}
+Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port) : socket{io_service}
 {
     for (const auto& address : addresses)
         {
diff --git a/src/core/monitor/gnss_synchro_udp_sink.h b/src/core/monitor/gnss_synchro_udp_sink.h
index 70aaf0c1e..d72b2f18a 100644
--- a/src/core/monitor/gnss_synchro_udp_sink.h
+++ b/src/core/monitor/gnss_synchro_udp_sink.h
@@ -42,7 +42,7 @@
 class Gnss_Synchro_Udp_Sink
 {
 public:
-    Gnss_Synchro_Udp_Sink(const std::vector<std::string>& addresses, const uint16_t& port);
+    Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port);
     bool write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks);
 
 private:
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 95a954016..82cc49e09 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -1340,7 +1340,7 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what)
 }
 
 
-void GNSSFlowgraph::priorize_satellites(const std::vector<std::pair<int, Gnss_Satellite>>& visible_satellites)
+void GNSSFlowgraph::priorize_satellites(std::vector<std::pair<int, Gnss_Satellite>> visible_satellites)
 {
     size_t old_size;
     Gnss_Signal gs;
diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h
index 4862ca181..67f86bc6b 100644
--- a/src/core/receiver/gnss_flowgraph.h
+++ b/src/core/receiver/gnss_flowgraph.h
@@ -141,7 +141,7 @@ public:
     /*!
      * \brief Priorize visible satellites in the specified vector
      */
-    void priorize_satellites(const std::vector<std::pair<int, Gnss_Satellite>>& visible_satellites);
+    void priorize_satellites(std::vector<std::pair<int, Gnss_Satellite>> visible_satellites);
 
 private:
     void init();  // Populates the SV PRN list available for acquisition and tracking
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index 13a9d8f54..8dd6ef17f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -70,7 +70,7 @@ class GpsL1CaPcpsAcquisitionTest_msg_rx : public gr::block
 {
 private:
     friend GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make();
-    void msg_handler_events(const pmt::pmt_t &msg);
+    void msg_handler_events(pmt::pmt_t msg);
     GpsL1CaPcpsAcquisitionTest_msg_rx();
 
 public:
@@ -85,7 +85,7 @@ GpsL1CaPcpsAcquisitionTest_msg_rx_sptr GpsL1CaPcpsAcquisitionTest_msg_rx_make()
 }
 
 
-void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(const pmt::pmt_t &msg)
+void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
@@ -236,14 +236,14 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid()
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, Instantiate /*unused*/)
+TEST_F(GpsL1CaPcpsAcquisitionTest, Instantiate)
 {
     init();
     boost::shared_ptr<GpsL1CaPcpsAcquisition> acquisition = boost::make_shared<GpsL1CaPcpsAcquisition>(config.get(), "Acquisition_1C", 1, 0);
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/)
+TEST_F(GpsL1CaPcpsAcquisitionTest, ConnectAndRun)
 {
     int fs_in = 4000000;
     int nsamples = 4000;
@@ -276,7 +276,7 @@ TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ConnectAndRun /*unused*/)
 }
 
 
-TEST_F(GpsL1CaPcpsAcquisitionTest /*unused*/, ValidationOfResults /*unused*/)
+TEST_F(GpsL1CaPcpsAcquisitionTest, ValidationOfResults)
 {
     std::chrono::time_point<std::chrono::system_clock> start, end;
     std::chrono::duration<double> elapsed_seconds(0.0);

From 004dd4a38a64dfa2114e3ec683594a60a92c5d20 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 12:57:37 +0100
Subject: [PATCH 066/123] Replace the deprecated branch_path() by parent_path()

---
 .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
index c211ed710..c18bb2e3a 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc
@@ -250,10 +250,10 @@ void write_results(const std::vector<volk_gnsssdr_test_results_t> *results, bool
     const fs::path config_path(path);
     // Until we can update the config on a kernel by kernel basis
     // do not overwrite volk_gnsssdr_config when using a regex.
-    if (!fs::exists(config_path.branch_path()))
+    if (!fs::exists(config_path.parent_path()))
         {
-            std::cout << "Creating " << config_path.branch_path() << " ..." << std::endl;
-            fs::create_directories(config_path.branch_path());
+            std::cout << "Creating " << config_path.parent_path() << " ..." << std::endl;
+            fs::create_directories(config_path.parent_path());
         }
 
     std::ofstream config;

From 31383258b0bf2140c7d21060b828599ae7913e28 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 12 Feb 2019 15:56:18 +0100
Subject: [PATCH 067/123] clang-tidy: apply checks

---
 .../galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc        | 4 ++--
 .../gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc      | 4 ++--
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.cc         | 4 ++--
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc           | 4 ++--
 .../gnuradio_blocks/pcps_quicksync_acquisition_cc.cc        | 4 ++--
 .../acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc | 4 ++--
 .../signal_generator/gnuradio_blocks/signal_generator_c.cc  | 2 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc              | 6 +++---
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc    | 4 ++--
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc              | 6 +++---
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc    | 4 ++--
 .../gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc  | 6 +++---
 .../tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc    | 4 ++--
 .../acquisition/gps_l1_ca_pcps_acquisition_test.cc          | 2 +-
 14 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
index 84e517a09..c6f14d597 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc
@@ -60,7 +60,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr galileo_e5a_noncoherentIQ_make
 {
     return galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr(
         new galileo_e5a_noncoherentIQ_acquisition_caf_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms,
-            samples_per_code, bit_transition_flag, dump, dump_filename, both_signal_components_, CAF_window_hz_, Zero_padding_));
+            samples_per_code, bit_transition_flag, dump, std::move(dump_filename), both_signal_components_, CAF_window_hz_, Zero_padding_));
 }
 
 
@@ -153,7 +153,7 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
index 7b5566aba..cb528d0b1 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/galileo_pcps_8ms_acquisition_cc.cc
@@ -51,7 +51,7 @@ galileo_pcps_8ms_acquisition_cc_sptr galileo_pcps_8ms_make_acquisition_cc(
 {
     return galileo_pcps_8ms_acquisition_cc_sptr(
         new galileo_pcps_8ms_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in, samples_per_ms,
-            samples_per_code, dump, dump_filename));
+            samples_per_code, dump, std::move(dump_filename)));
 }
 
 
@@ -95,7 +95,7 @@ galileo_pcps_8ms_acquisition_cc::galileo_pcps_8ms_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 413b7af10..5e8100f59 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -53,7 +53,7 @@ pcps_assisted_acquisition_cc_sptr pcps_make_assisted_acquisition_cc(
 {
     return pcps_assisted_acquisition_cc_sptr(
         new pcps_assisted_acquisition_cc(max_dwells, sampled_ms, doppler_max, doppler_min,
-            fs_in, samples_per_ms, dump, dump_filename));
+            fs_in, samples_per_ms, dump, std::move(dump_filename)));
 }
 
 
@@ -90,7 +90,7 @@ pcps_assisted_acquisition_cc::pcps_assisted_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
index 918bc5aa2..17082ae25 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc
@@ -57,7 +57,7 @@ pcps_cccwsr_acquisition_cc_sptr pcps_cccwsr_make_acquisition_cc(
 {
     return pcps_cccwsr_acquisition_cc_sptr(
         new pcps_cccwsr_acquisition_cc(sampled_ms, max_dwells, doppler_max, fs_in,
-            samples_per_ms, samples_per_code, dump, dump_filename));
+            samples_per_ms, samples_per_code, dump, std::move(dump_filename)));
 }
 
 
@@ -105,7 +105,7 @@ pcps_cccwsr_acquisition_cc::pcps_cccwsr_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
index d04c71495..a55b352c9 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_quicksync_acquisition_cc.cc
@@ -61,7 +61,7 @@ pcps_quicksync_acquisition_cc_sptr pcps_quicksync_make_acquisition_cc(
             fs_in, samples_per_ms,
             samples_per_code,
             bit_transition_flag,
-            dump, dump_filename));
+            dump, std::move(dump_filename)));
 }
 
 
@@ -114,7 +114,7 @@ pcps_quicksync_acquisition_cc::pcps_quicksync_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_corr_acumulator = nullptr;
     d_signal_folded = nullptr;
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
index 319525ca3..7fc685028 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_tong_acquisition_cc.cc
@@ -73,7 +73,7 @@ pcps_tong_acquisition_cc_sptr pcps_tong_make_acquisition_cc(
 {
     return pcps_tong_acquisition_cc_sptr(
         new pcps_tong_acquisition_cc(sampled_ms, doppler_max, fs_in, samples_per_ms, samples_per_code,
-            tong_init_val, tong_max_val, tong_max_dwells, dump, dump_filename));
+            tong_init_val, tong_max_val, tong_max_dwells, dump, std::move(dump_filename)));
 }
 
 
@@ -121,7 +121,7 @@ pcps_tong_acquisition_cc::pcps_tong_acquisition_cc(
 
     // For dumping samples into a file
     d_dump = dump;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_doppler_resolution = 0;
     d_threshold = 0;
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 6029af1ac..84a90d555 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -53,7 +53,7 @@ signal_make_generator_c(std::vector<std::string> signal1, std::vector<std::strin
     const std::vector<unsigned int> &delay_chips, const std::vector<unsigned int> &delay_sec, bool data_flag, bool noise_flag,
     unsigned int fs_in, unsigned int vector_length, float BW_BB)
 {
-    return gnuradio::get_initial_sptr(new signal_generator_c(signal1, system, PRN, CN0_dB, doppler_Hz, delay_chips, delay_sec,
+    return gnuradio::get_initial_sptr(new signal_generator_c(std::move(signal1), std::move(system), PRN, CN0_dB, doppler_Hz, delay_chips, delay_sec,
         data_flag, noise_flag, fs_in, vector_length, BW_BB));
 }
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
index b422fa6ec..21a040646 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -74,7 +74,7 @@ glonass_l1_ca_dll_pll_c_aid_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new glonass_l1_ca_dll_pll_c_aid_tracking_cc(
-        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
+        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
 }
 
 
@@ -94,7 +94,7 @@ void glonass_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pm
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
     if (d_enable_extended_integration == false)  //avoid re-setting preamble indicator
         {
-            d_preamble_timestamp_s = pmt::to_double(msg);
+            d_preamble_timestamp_s = pmt::to_double(std::move(msg));
             d_enable_extended_integration = true;
             d_preamble_synchronized = false;
         }
@@ -125,7 +125,7 @@ glonass_l1_ca_dll_pll_c_aid_tracking_cc::glonass_l1_ca_dll_pll_c_aid_tracking_cc
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
     d_correlation_length_samples = static_cast<int32_t>(d_vector_length);
 
     // Initialize tracking  ==========================================
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 3df2c07f6..68d94e82f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -68,7 +68,7 @@ glonass_l1_ca_dll_pll_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l1_ca_dll_pll_tracking_cc_sptr(new Glonass_L1_Ca_Dll_Pll_Tracking_cc(
-        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
+        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, early_late_space_chips));
 }
 
 
@@ -98,7 +98,7 @@ Glonass_L1_Ca_Dll_Pll_Tracking_cc::Glonass_L1_Ca_Dll_Pll_Tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_current_prn_length_samples = static_cast<int32_t>(d_vector_length);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
index b31f4167b..ae689ab8a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.cc
@@ -71,7 +71,7 @@ glonass_l2_ca_dll_pll_c_aid_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l2_ca_dll_pll_c_aid_tracking_cc_sptr(new glonass_l2_ca_dll_pll_c_aid_tracking_cc(
-        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
+        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
 }
 
 
@@ -91,7 +91,7 @@ void glonass_l2_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pm
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
     if (d_enable_extended_integration == false)  //avoid re-setting preamble indicator
         {
-            d_preamble_timestamp_s = pmt::to_double(msg);
+            d_preamble_timestamp_s = pmt::to_double(std::move(msg));
             d_enable_extended_integration = true;
             d_preamble_synchronized = false;
         }
@@ -122,7 +122,7 @@ glonass_l2_ca_dll_pll_c_aid_tracking_cc::glonass_l2_ca_dll_pll_c_aid_tracking_cc
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
     d_correlation_length_samples = static_cast<int32_t>(d_vector_length);
 
     // Initialize tracking  ==========================================
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index b5b4dcd3e..8156ea09b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -68,7 +68,7 @@ glonass_l2_ca_dll_pll_make_tracking_cc(
     float early_late_space_chips)
 {
     return glonass_l2_ca_dll_pll_tracking_cc_sptr(new Glonass_L2_Ca_Dll_Pll_Tracking_cc(
-        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
+        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, early_late_space_chips));
 }
 
 
@@ -98,7 +98,7 @@ Glonass_L2_Ca_Dll_Pll_Tracking_cc::Glonass_L2_Ca_Dll_Pll_Tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_current_prn_length_samples = static_cast<int32_t>(d_vector_length);
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
index aed6b2abc..45a890cbe 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc
@@ -63,7 +63,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
     float early_late_space_chips)
 {
     return gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_cc(
-        fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
+        fs_in, vector_length, dump, std::move(dump_filename), pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
 }
 
 
@@ -83,7 +83,7 @@ void gps_l1_ca_dll_pll_c_aid_tracking_cc::msg_handler_preamble_index(pmt::pmt_t
     DLOG(INFO) << "Extended correlation enabled for Tracking CH " << d_channel << ": Satellite " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN);
     if (d_enable_extended_integration == false)  //avoid re-setting preamble indicator
         {
-            d_preamble_timestamp_s = pmt::to_double(msg);
+            d_preamble_timestamp_s = pmt::to_double(std::move(msg));
             d_enable_extended_integration = true;
             d_preamble_synchronized = false;
         }
@@ -114,7 +114,7 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
     d_dump = dump;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
     d_correlation_length_samples = static_cast<int32_t>(d_vector_length);
 
     // Initialize tracking  ==========================================
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
index 8ddf18102..96c478a3f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.cc
@@ -74,7 +74,7 @@ gps_l1_ca_kf_make_tracking_cc(
     int32_t bce_kappa)
 {
     return gps_l1_ca_kf_tracking_cc_sptr(new Gps_L1_Ca_Kf_Tracking_cc(order, if_freq,
-        fs_in, vector_length, dump, dump_filename, dll_bw_hz, early_late_space_chips,
+        fs_in, vector_length, dump, std::move(dump_filename), dll_bw_hz, early_late_space_chips,
         bce_run, bce_ptrans, bce_strans, bce_nu, bce_kappa));
 }
 
@@ -115,7 +115,7 @@ Gps_L1_Ca_Kf_Tracking_cc::Gps_L1_Ca_Kf_Tracking_cc(
     d_if_freq = if_freq;
     d_fs_in = fs_in;
     d_vector_length = vector_length;
-    d_dump_filename = dump_filename;
+    d_dump_filename = std::move(dump_filename);
 
     d_current_prn_length_samples = static_cast<int>(d_vector_length);
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index 8dd6ef17f..5cc30eeb1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -89,7 +89,7 @@ void GpsL1CaPcpsAcquisitionTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 {
     try
         {
-            int64_t message = pmt::to_long(msg);
+            int64_t message = pmt::to_long(std::move(msg));
             rx_message = message;
         }
     catch (boost::bad_any_cast &e)

From 719af13a3305e1ead0a594c1d3859452461e8f51 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 14 Feb 2019 12:51:43 +0100
Subject: [PATCH 068/123] Remove google-runtime-references check

---
 .clang-tidy                                   |  4 +--
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      | 30 +++++++++----------
 src/algorithms/PVT/libs/rtklib_solver.cc      |  4 +--
 src/core/receiver/control_message_factory.cc  |  2 +-
 src/core/receiver/control_message_factory.h   |  2 +-
 src/core/receiver/control_thread.cc           | 17 +++++++----
 src/core/receiver/control_thread.h            |  2 +-
 src/core/receiver/gnss_block_factory.cc       |  6 ++--
 src/core/receiver/gnss_block_factory.h        |  6 ++--
 src/core/receiver/gnss_flowgraph.cc           |  3 +-
 src/core/receiver/gnss_flowgraph.h            |  2 +-
 11 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index d71c07a3b..bcc3e3cdb 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,google-runtime-references,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
+Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
@@ -21,8 +21,6 @@ CheckOptions:
     value:           '_t'
   - key:             google-runtime-int.UnsignedTypePrefix
     value:           uint
-  - key:             google-runtime-references.WhiteListTypes
-    value:           ''
   - key:             misc-throw-by-value-catch-by-reference.CheckThrowTemporaries
     value:           '1'
   - key:             modernize-loop-convert.MaxCopySize
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 151c667c8..e618e7b5d 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -618,7 +618,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << e.what();
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -704,7 +704,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -734,7 +734,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << e.what();
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -764,7 +764,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -794,7 +794,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -824,7 +824,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -854,7 +854,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -914,7 +914,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -944,7 +944,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -974,7 +974,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1004,7 +1004,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1064,7 +1064,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1124,7 +1124,7 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
                                 {
                                     LOG(WARNING) << "Problem opening output XML file";
                                 }
-                            catch (std::exception& e)
+                            catch (const std::exception& e)
                                 {
                                     LOG(WARNING) << e.what();
                                 }
@@ -1176,7 +1176,7 @@ bool rtklib_pvt_cc::save_gnss_synchro_map_xml(const std::string& file_name)
                     xml << boost::serialization::make_nvp("GNSS-SDR_gnss_synchro_map", gnss_observables_map);
                     LOG(INFO) << "Saved gnss_sychro map data";
                 }
-            catch (std::exception& e)
+            catch (const std::exception& e)
                 {
                     LOG(WARNING) << e.what();
                     return false;
@@ -1201,7 +1201,7 @@ bool rtklib_pvt_cc::load_gnss_synchro_map_xml(const std::string& file_name)
             xml >> boost::serialization::make_nvp("GNSS-SDR_gnss_synchro_map", gnss_observables_map);
             //std::cout << "Loaded gnss_synchro map data with " << gnss_synchro_map.size() << " pseudoranges" << std::endl;
         }
-    catch (std::exception& e)
+    catch (const std::exception& e)
         {
             std::cout << e.what() << "File: " << file_name;
             return false;
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index aeabc0517..0a9115622 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -93,11 +93,11 @@ rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag
                 {
                     try
                         {
-                            d_dump_file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
+                            d_dump_file.exceptions(std::ofstream::failbit | std::ofstream::badbit);
                             d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
                             LOG(INFO) << "PVT lib dump enabled Log file: " << d_dump_filename.c_str();
                         }
-                    catch (const std::ifstream::failure &e)
+                    catch (const std::ofstream::failure &e)
                         {
                             LOG(WARNING) << "Exception opening RTKLIB dump file " << e.what();
                         }
diff --git a/src/core/receiver/control_message_factory.cc b/src/core/receiver/control_message_factory.cc
index d2871d39e..435a9a6d6 100644
--- a/src/core/receiver/control_message_factory.cc
+++ b/src/core/receiver/control_message_factory.cc
@@ -53,7 +53,7 @@ gr::message::sptr ControlMessageFactory::GetQueueMessage(unsigned int who, unsig
 }
 
 
-std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> ControlMessageFactory::GetControlMessages(const gr::message::sptr& queue_message)
+std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> ControlMessageFactory::GetControlMessages(const gr::message::sptr queue_message)  // NOLINT(performance-unnecessary-value-param)
 {
     std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages = std::make_shared<std::vector<std::shared_ptr<ControlMessage>>>();
     unsigned int control_messages_count = queue_message->length() / sizeof(ControlMessage);
diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h
index 3aac015a9..4ca93e725 100644
--- a/src/core/receiver/control_message_factory.h
+++ b/src/core/receiver/control_message_factory.h
@@ -58,7 +58,7 @@ public:
     virtual ~ControlMessageFactory();
 
     gr::message::sptr GetQueueMessage(unsigned int who, unsigned int what);
-    std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> GetControlMessages(const gr::message::sptr& queue_message);
+    std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> GetControlMessages(const gr::message::sptr queue_message);  // NOLINT(performance-unnecessary-value-param)
 };
 
 #endif /*GNSS_SDR_CONTROL_MESSAGE_FACTORY_H_*/
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 71e789778..6bb4f7b9d 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -285,11 +285,16 @@ int ControlThread::run()
     flowgraph_->disconnect();
 
     // Join keyboard thread
-    keyboard_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
-    sysv_queue_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
-    cmd_interface_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
-
-    LOG(INFO) << "Flowgraph stopped";
+    try
+        {
+            keyboard_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
+            sysv_queue_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
+            cmd_interface_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
+        }
+    catch (const boost::thread_interrupted &interrupt)
+        {
+            DLOG(INFO) << "Thread interrupted";
+        }
 
     if (restart_)
         {
@@ -300,7 +305,7 @@ int ControlThread::run()
 }
 
 
-void ControlThread::set_control_queue(const gr::msg_queue::sptr &control_queue)
+void ControlThread::set_control_queue(const gr::msg_queue::sptr control_queue)  // NOLINT(performance-unnecessary-value-param)
 {
     if (flowgraph_->running())
         {
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index b500e43fa..590ebb622 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -93,7 +93,7 @@ public:
      *
      * \param[in] boost::shared_ptr<gr::msg_queue> control_queue
      */
-    void set_control_queue(const gr::msg_queue::sptr& control_queue);
+    void set_control_queue(const gr::msg_queue::sptr control_queue); // NOLINT(performance-unnecessary-value-param)
 
 
     unsigned int processed_control_messages()
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index e0e08a8c0..dce01a732 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -182,7 +182,7 @@ GNSSBlockFactory::~GNSSBlockFactory() = default;
 
 
 std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetSignalSource(
-    const std::shared_ptr<ConfigurationInterface>& configuration, const gr::msg_queue::sptr& queue, int ID)
+    const std::shared_ptr<ConfigurationInterface>& configuration, const gr::msg_queue::sptr queue, int ID)  // NOLINT(performance-unnecessary-value-param)
 {
     std::string default_implementation = "File_Signal_Source";
     std::string role = "SignalSource";  //backwards compatibility for old conf files
@@ -851,7 +851,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_B1(
 }
 
 std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFactory::GetChannels(
-    const std::shared_ptr<ConfigurationInterface>& configuration, const gr::msg_queue::sptr& queue)
+    const std::shared_ptr<ConfigurationInterface>& configuration, const gr::msg_queue::sptr queue)  // NOLINT(performance-unnecessary-value-param)
 {
     std::string default_implementation = "Pass_Through";
     std::string tracking_implementation;
@@ -1139,7 +1139,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
     const std::shared_ptr<ConfigurationInterface>& configuration,
     const std::string& role,
     const std::string& implementation, unsigned int in_streams,
-    unsigned int out_streams, const gr::msg_queue::sptr& queue)
+    unsigned int out_streams, const gr::msg_queue::sptr queue)  // NOLINT(performance-unnecessary-value-param)
 {
     std::unique_ptr<GNSSBlockInterface> block;
 
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index e3eb02226..d9c153794 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -58,7 +58,7 @@ public:
     GNSSBlockFactory();
     virtual ~GNSSBlockFactory();
     std::unique_ptr<GNSSBlockInterface> GetSignalSource(const std::shared_ptr<ConfigurationInterface>& configuration,
-        const gr::msg_queue::sptr& queue, int ID = -1);
+        const gr::msg_queue::sptr queue, int ID = -1); // NOLINT(performance-unnecessary-value-param)
 
     std::unique_ptr<GNSSBlockInterface> GetSignalConditioner(const std::shared_ptr<ConfigurationInterface>& configuration, int ID = -1);
 
@@ -67,7 +67,7 @@ public:
     std::unique_ptr<GNSSBlockInterface> GetObservables(const std::shared_ptr<ConfigurationInterface>& configuration);
 
     std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GetChannels(const std::shared_ptr<ConfigurationInterface>& configuration,
-        const gr::msg_queue::sptr& queue);
+        const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param)
 
     /*
      * \brief Returns the block with the required configuration and implementation
@@ -75,7 +75,7 @@ public:
     std::unique_ptr<GNSSBlockInterface> GetBlock(const std::shared_ptr<ConfigurationInterface>& configuration,
         const std::string& role, const std::string& implementation,
         unsigned int in_streams, unsigned int out_streams,
-        const gr::msg_queue::sptr& queue = nullptr);
+        const gr::msg_queue::sptr queue = nullptr); // NOLINT(performance-unnecessary-value-param)
 
 private:
     std::unique_ptr<GNSSBlockInterface> GetChannel_1C(const std::shared_ptr<ConfigurationInterface>& configuration,
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 82cc49e09..be8b18f01 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -62,7 +62,7 @@
 
 using google::LogMessage;
 
-GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr& queue)
+GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr queue)  // NOLINT(performance-unnecessary-value-param)
 {
     connected_ = false;
     running_ = false;
@@ -839,6 +839,7 @@ void GNSSFlowgraph::disconnect()
             for (unsigned int i = 0; i < channels_count_; i++)
                 {
                     top_block_->disconnect(observables_->get_right_block(), i, pvt_->get_left_block(), i);
+                    top_block_->disconnect(observables_->get_right_block(), i, GnssSynchroMonitor_, i);
                     top_block_->msg_disconnect(channels_.at(i)->get_right_block(), pmt::mp("telemetry"), pvt_->get_left_block(), pmt::mp("telemetry"));
                 }
         }
diff --git a/src/core/receiver/gnss_flowgraph.h b/src/core/receiver/gnss_flowgraph.h
index 67f86bc6b..e0023b444 100644
--- a/src/core/receiver/gnss_flowgraph.h
+++ b/src/core/receiver/gnss_flowgraph.h
@@ -72,7 +72,7 @@ public:
     /*!
      * \brief Constructor that initializes the receiver flow graph
      */
-    GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr& queue);
+    GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr queue);  // NOLINT(performance-unnecessary-value-param)
 
     /*!
      * \brief Destructor

From 786118a30579616528eda40cc973a7c8817c1d6f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 14 Feb 2019 16:46:16 +0100
Subject: [PATCH 069/123] Fix disconection of Monitor block

---
 src/core/receiver/gnss_flowgraph.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index be8b18f01..5989d9940 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -839,7 +839,10 @@ void GNSSFlowgraph::disconnect()
             for (unsigned int i = 0; i < channels_count_; i++)
                 {
                     top_block_->disconnect(observables_->get_right_block(), i, pvt_->get_left_block(), i);
-                    top_block_->disconnect(observables_->get_right_block(), i, GnssSynchroMonitor_, i);
+                    if (enable_monitor_)
+                        {
+                            top_block_->disconnect(observables_->get_right_block(), i, GnssSynchroMonitor_, i);
+                        }
                     top_block_->msg_disconnect(channels_.at(i)->get_right_block(), pmt::mp("telemetry"), pvt_->get_left_block(), pmt::mp("telemetry"));
                 }
         }

From b5c59ee6f75c2bc8691a12454fec4bfedabbdb1f Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 14 Feb 2019 22:49:36 +0100
Subject: [PATCH 070/123] Fix defects detected by Coverity Scan

---
 .../PVT/libs/monitor_pvt_udp_sink.cc          | 32 ++++++++++++++++++-
 .../PVT/libs/monitor_pvt_udp_sink.h           |  2 +-
 src/algorithms/PVT/libs/pvt_conf.cc           |  3 ++
 src/algorithms/PVT/libs/rtklib_solver.cc      | 29 +++++++++++++++++
 .../libs/rtklib/rtklib_conversions.cc         |  2 ++
 .../beidou_b1i_telemetry_decoder_cc.cc        |  1 +
 .../gnuradio_blocks/dll_pll_veml_tracking.cc  |  1 +
 src/core/receiver/control_thread.cc           |  4 ++-
 src/core/receiver/gnss_flowgraph.cc           |  2 +-
 .../gps_navigation_message.cc                 |  1 +
 src/main/main.cc                              | 15 ++++++---
 11 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
index 3dc8c8b08..2982ec401 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.cc
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <sstream>
 
+
 Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t& port) : socket{io_service}
 {
     for (const auto& address : addresses)
@@ -41,9 +42,38 @@ Monitor_Pvt_Udp_Sink::Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, c
             boost::asio::ip::udp::endpoint endpoint(boost::asio::ip::address::from_string(address, error), port);
             endpoints.push_back(endpoint);
         }
+    monitor_pvt.TOW_at_current_symbol_ms = 0U;
+    monitor_pvt.week = 0U;
+    monitor_pvt.RX_time = 0.0;
+    monitor_pvt.user_clk_offset = 0.0;
+    monitor_pvt.pos_x = 0.0;
+    monitor_pvt.pos_y = 0.0;
+    monitor_pvt.pos_z = 0.0;
+    monitor_pvt.vel_x = 0.0;
+    monitor_pvt.vel_y = 0.0;
+    monitor_pvt.vel_z = 0.0;
+    monitor_pvt.cov_xx = 0.0;
+    monitor_pvt.cov_yy = 0.0;
+    monitor_pvt.cov_zz = 0.0;
+    monitor_pvt.cov_xy = 0.0;
+    monitor_pvt.cov_yz = 0.0;
+    monitor_pvt.cov_zx = 0.0;
+    monitor_pvt.latitude = 0.0;
+    monitor_pvt.longitude = 0.0;
+    monitor_pvt.height = 0.0;
+    monitor_pvt.valid_sats = 0;
+    monitor_pvt.solution_status = 0;
+    monitor_pvt.solution_type = 0;
+    monitor_pvt.AR_ratio_factor = 0.0;
+    monitor_pvt.AR_ratio_threshold = 0.0;
+    monitor_pvt.gdop = 0.0;
+    monitor_pvt.pdop = 0.0;
+    monitor_pvt.hdop = 0.0;
+    monitor_pvt.vdop = 0.0;
 }
 
-bool Monitor_Pvt_Udp_Sink::write_monitor_pvt(Monitor_Pvt monitor_pvt)
+
+bool Monitor_Pvt_Udp_Sink::write_monitor_pvt(const Monitor_Pvt& monitor_pvt)
 {
     std::ostringstream archive_stream;
     boost::archive::binary_oarchive oa{archive_stream};
diff --git a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
index bec163986..bf132bad4 100644
--- a/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
+++ b/src/algorithms/PVT/libs/monitor_pvt_udp_sink.h
@@ -39,7 +39,7 @@ class Monitor_Pvt_Udp_Sink
 {
 public:
     Monitor_Pvt_Udp_Sink(std::vector<std::string> addresses, const uint16_t &port);
-    bool write_monitor_pvt(Monitor_Pvt monitor_pvt);
+    bool write_monitor_pvt(const Monitor_Pvt &monitor_pvt);
 
 private:
     boost::asio::io_service io_service;
diff --git a/src/algorithms/PVT/libs/pvt_conf.cc b/src/algorithms/PVT/libs/pvt_conf.cc
index 0f528f438..6a1e1023c 100644
--- a/src/algorithms/PVT/libs/pvt_conf.cc
+++ b/src/algorithms/PVT/libs/pvt_conf.cc
@@ -67,4 +67,7 @@ Pvt_Conf::Pvt_Conf()
     kml_output_path = std::string(".");
     xml_output_path = std::string(".");
     rtcm_output_file_path = std::string(".");
+
+    monitor_enabled = false;
+    udp_port = 0;
 }
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index 0a9115622..7ad5da2c8 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -103,6 +103,35 @@ rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag
                         }
                 }
         }
+    // PVT MONITOR
+    monitor_pvt.TOW_at_current_symbol_ms = 0U;
+    monitor_pvt.week = 0U;
+    monitor_pvt.RX_time = 0.0;
+    monitor_pvt.user_clk_offset = 0.0;
+    monitor_pvt.pos_x = 0.0;
+    monitor_pvt.pos_y = 0.0;
+    monitor_pvt.pos_z = 0.0;
+    monitor_pvt.vel_x = 0.0;
+    monitor_pvt.vel_y = 0.0;
+    monitor_pvt.vel_z = 0.0;
+    monitor_pvt.cov_xx = 0.0;
+    monitor_pvt.cov_yy = 0.0;
+    monitor_pvt.cov_zz = 0.0;
+    monitor_pvt.cov_xy = 0.0;
+    monitor_pvt.cov_yz = 0.0;
+    monitor_pvt.cov_zx = 0.0;
+    monitor_pvt.latitude = 0.0;
+    monitor_pvt.longitude = 0.0;
+    monitor_pvt.height = 0.0;
+    monitor_pvt.valid_sats = 0;
+    monitor_pvt.solution_status = 0;
+    monitor_pvt.solution_type = 0;
+    monitor_pvt.AR_ratio_factor = 0.0;
+    monitor_pvt.AR_ratio_threshold = 0.0;
+    monitor_pvt.gdop = 0.0;
+    monitor_pvt.pdop = 0.0;
+    monitor_pvt.hdop = 0.0;
+    monitor_pvt.vdop = 0.0;
 }
 
 bool rtklib_solver::save_matfile()
diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.cc b/src/algorithms/libs/rtklib/rtklib_conversions.cc
index ffd595c44..6008fdfd4 100644
--- a/src/algorithms/libs/rtklib/rtklib_conversions.cc
+++ b/src/algorithms/libs/rtklib/rtklib_conversions.cc
@@ -388,6 +388,7 @@ alm_t alm_to_rtklib(const Gps_Almanac& gps_alm)
     rtklib_alm.week = gps_alm.i_WNa;
     gtime_t toa;
     toa.time = gps_alm.i_Toa;
+    toa.sec = 0.0;
     rtklib_alm.toa = toa;
     rtklib_alm.A = gps_alm.d_sqrt_A * gps_alm.d_sqrt_A;
     rtklib_alm.e = gps_alm.d_e_eccentricity;
@@ -416,6 +417,7 @@ alm_t alm_to_rtklib(const Galileo_Almanac& gal_alm)
     rtklib_alm.week = gal_alm.i_WNa;
     gtime_t toa;
     toa.time = gal_alm.i_Toa;
+    toa.sec = 0.0;
     rtklib_alm.toa = toa;
     rtklib_alm.A = 5440.588203494 + gal_alm.d_Delta_sqrt_A;
     rtklib_alm.A = rtklib_alm.A * rtklib_alm.A;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
index 8da254729..7a39e31ec 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/beidou_b1i_telemetry_decoder_cc.cc
@@ -123,6 +123,7 @@ beidou_b1i_telemetry_decoder_cc::beidou_b1i_telemetry_decoder_cc(
     d_preamble_index = 0;
     d_flag_frame_sync = false;
     d_TOW_at_current_symbol_ms = 0;
+    d_TOW_at_Preamble_ms = 0U;
     Flag_valid_word = false;
     d_CRC_error_counter = 0;
     d_flag_preamble = false;
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index 518e5dfda..36fdaed0e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -99,6 +99,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
     d_secondary_code_length = 0U;
     d_secondary_code_string = nullptr;
     d_preambles_symbols = nullptr;
+    d_preamble_length_symbols = 0;
     signal_type = std::string(trk_parameters.signal);
 
     std::map<std::string, std::string> map_signal_pretty_name;
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 6bb4f7b9d..0b9115d94 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -879,7 +879,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
     // 2. Compute rx GPS time from UTC time
     gtime_t utc_gtime;
     utc_gtime.time = rx_utc_time;
-    utc_gtime.sec = 0;
+    utc_gtime.sec = 0.0;
     gtime_t gps_gtime = utc2gpst(utc_gtime);
 
     // 3. loop through all the available ephemeris or almanac and compute satellite positions and elevations
@@ -950,6 +950,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
             double clock_bias_s;
             gtime_t aux_gtime;
             aux_gtime.time = fmod(utc2gpst(gps_gtime).time + 345600, 604800);
+            aux_gtime.sec = 0.0;
             alm2pos(aux_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s);
             double Az, El, dist_m;
             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]};
@@ -977,6 +978,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
             double clock_bias_s;
             gtime_t gal_gtime;
             gal_gtime.time = fmod(utc2gpst(gps_gtime).time + 345600, 604800);
+            gal_gtime.sec = 0.0;
             alm2pos(gal_gtime, &rtklib_alm, &r_sat[0], &clock_bias_s);
             double Az, El, dist_m;
             arma::vec r_sat_eb_e = arma::vec{r_sat[0], r_sat[1], r_sat[2]};
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 5989d9940..126dffbd1 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -418,7 +418,7 @@ void GNSSFlowgraph::connect()
                                                 {
                                                     decimation--;
                                                 };
-                                            double acq_fs = fs / decimation;
+                                            double acq_fs = static_cast<double>(fs) / static_cast<double>(decimation);
 
                                             if (decimation > 1)
                                                 {
diff --git a/src/core/system_parameters/gps_navigation_message.cc b/src/core/system_parameters/gps_navigation_message.cc
index e38f6bdb2..e551551dc 100644
--- a/src/core/system_parameters/gps_navigation_message.cc
+++ b/src/core/system_parameters/gps_navigation_message.cc
@@ -115,6 +115,7 @@ void Gps_Navigation_Message::reset()
     d_beta1 = 0.0;
     d_beta2 = 0.0;
     d_beta3 = 0.0;
+    d_A2 = 0.0;
     d_A1 = 0.0;
     d_A0 = 0.0;
     d_t_OT = 0;
diff --git a/src/main/main.cc b/src/main/main.cc
index 77620833f..62641fd25 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -132,17 +132,22 @@ int main(int argc, char** argv)
                 }
         }
 
-    std::unique_ptr<ControlThread> control_thread(new ControlThread());
-
-    // record startup time
     std::chrono::time_point<std::chrono::system_clock> start, end;
     start = std::chrono::system_clock::now();
-
-    int return_code;
+    int return_code = 0;
     try
         {
+            std::unique_ptr<ControlThread> control_thread(new ControlThread());
+            // record startup time
+            start = std::chrono::system_clock::now();
             return_code = control_thread->run();
         }
+    catch (const boost::thread_resource_error& e)
+        {
+            std::cout << "Failed to create boost thread." << std::endl;
+            google::ShutDownCommandLineFlags();
+            return 1;
+        }
     catch (const boost::exception& e)
         {
             if (GOOGLE_STRIP_LOG == 0)

From 890752601d538915cd3fbf534bd5a19383d4c812 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 14 Feb 2019 23:44:38 +0100
Subject: [PATCH 071/123] Fix defects detected by Coverity Scan

---
 src/algorithms/libs/beidou_b1i_signal_processing.cc          | 2 +-
 src/core/system_parameters/beidou_dnav_navigation_message.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/libs/beidou_b1i_signal_processing.cc b/src/algorithms/libs/beidou_b1i_signal_processing.cc
index d95b2844e..61e1ffa47 100644
--- a/src/algorithms/libs/beidou_b1i_signal_processing.cc
+++ b/src/algorithms/libs/beidou_b1i_signal_processing.cc
@@ -57,7 +57,7 @@ void beidou_b1i_code_gen_int(int32_t* _dest, int32_t _prn, uint32_t _chip_shift)
     prn_idx = _prn - 1;
 
     /* A simple error check */
-    if ((prn_idx < 0) || (prn_idx > 51))
+    if ((prn_idx < 0) || (prn_idx > 32))
         {
             return;
         }
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc
index 9a83d1598..52f1ea88b 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.cc
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc
@@ -831,7 +831,7 @@ int32_t Beidou_Dnav_Navigation_Message::d2_subframe_decoder(std::string const& s
                     d_eccentricity_msb = static_cast<double>(read_navigation_unsigned(subframe_bits, D2_E_MSB));
                     d_eccentricity_msb_bits = (read_navigation_unsigned(subframe_bits, D2_E_MSB));
                     // Adjust for lsb in next page (shift number of lsb to the left)
-                    d_eccentricity_msb = static_cast<double>((static_cast<int>(d_eccentricity_msb) << 22));
+                    d_eccentricity_msb = d_eccentricity_msb << 22;
                     d_eccentricity_msb_bits = d_eccentricity_msb_bits << 22;
 
                     // Set system flags for message reception

From 2da0ef3c84305af238faf984b2a271402725ea87 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 15 Feb 2019 10:02:32 +0100
Subject: [PATCH 072/123] Improve initialization

---
 .../beidou_dnav_navigation_message.cc         | 154 +++++++++---------
 1 file changed, 78 insertions(+), 76 deletions(-)

diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc
index 52f1ea88b..68e8664e7 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.cc
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc
@@ -58,7 +58,7 @@ void Beidou_Dnav_Navigation_Message::reset()
     flag_d1_sf5_p9 = false;
     flag_d1_sf5_p10 = false;
     flag_new_SOW_available = false;
-    d_previous_aode = 0;
+    d_previous_aode = 0.0;
 
     flag_sf1_p1 = false;
     flag_sf1_p2 = false;
@@ -91,63 +91,65 @@ void Beidou_Dnav_Navigation_Message::reset()
     d_eccentricity_msb = 0;
     d_eccentricity_lsb = 0;
 
-    d_SOW = 0;
-    d_SOW_SF1 = 0;
-    d_SOW_SF2 = 0;
-    d_SOW_SF3 = 0;
-    d_SOW_SF4 = 0;
-    d_SOW_SF5 = 0;
-    d_AODE = 0;
-    d_Crs = 0;
-    d_Delta_n = 0;
-    d_M_0 = 0;
-    d_Cuc = 0;
-    d_eccentricity = 0;
-    d_Cus = 0;
-    d_sqrt_A = 0;
-    d_Toe_sf2 = 0;
-    d_Toc = 0;
-    d_Cic = 0;
-    d_OMEGA0 = 0;
-    d_Cis = 0;
-    d_i_0 = 0;
-    d_Crc = 0;
-    d_OMEGA = 0;
-    d_OMEGA_DOT = 0;
-    d_IDOT = 0;
+    d_SOW = 0.0;
+    d_SOW_SF1 = 0.0;
+    d_SOW_SF2 = 0.0;
+    d_SOW_SF3 = 0.0;
+    d_SOW_SF4 = 0.0;
+    d_SOW_SF5 = 0.0;
+    d_AODE = 0.0;
+    d_Crs = 0.0;
+    d_Delta_n = 0.0;
+    d_M_0 = 0.0;
+    d_Cuc = 0.0;
+    d_eccentricity = 0.0;
+    d_Cus = 0.0;
+    d_sqrt_A = 0.0;
+    d_Toe_sf2 = 0.0;
+    d_Toe_sf3 = 0.0;
+    d_Toe = 0.0;
+    d_Toc = 0.0;
+    d_Cic = 0.0;
+    d_OMEGA0 = 0.0;
+    d_Cis = 0.0;
+    d_i_0 = 0.0;
+    d_Crc = 0.0;
+    d_OMEGA = 0.0;
+    d_OMEGA_DOT = 0.0;
+    d_IDOT = 0.0;
     i_BEIDOU_week = 0;
     i_SV_accuracy = 0;
     i_SV_health = 0;
-    d_TGD1 = 0;
-    d_TGD2 = 0;
-    d_AODC = -1;
+    d_TGD1 = 0.0;
+    d_TGD2 = 0.0;
+    d_AODC = -1.0;
     //    i_AODO = 0;
 
     b_fit_interval_flag = false;
-    d_spare1 = 0;
-    d_spare2 = 0;
+    d_spare1 = 0.0;
+    d_spare2 = 0.0;
 
-    d_A_f0 = 0;
-    d_A_f1 = 0;
-    d_A_f2 = 0;
+    d_A_f0 = 0.0;
+    d_A_f1 = 0.0;
+    d_A_f2 = 0.0;
 
     //clock terms
     //d_master_clock=0;
-    d_dtr = 0;
-    d_satClkCorr = 0;
-    d_satClkDrift = 0;
+    d_dtr = 0.0;
+    d_satClkCorr = 0.0;
+    d_satClkDrift = 0.0;
 
     // satellite positions
-    d_satpos_X = 0;
-    d_satpos_Y = 0;
-    d_satpos_Z = 0;
+    d_satpos_X = 0.0;
+    d_satpos_Y = 0.0;
+    d_satpos_Z = 0.0;
 
     // info
     i_channel_ID = 0;
     i_satellite_PRN = 0;
 
     // time synchro
-    d_subframe_timestamp_ms = 0;
+    d_subframe_timestamp_ms = 0.0;
 
     // flags
     b_alert_flag = false;
@@ -157,23 +159,23 @@ void Beidou_Dnav_Navigation_Message::reset()
     // Ionosphere and UTC
     flag_iono_valid = false;
     flag_utc_model_valid = false;
-    d_alpha0 = 0;
-    d_alpha1 = 0;
-    d_alpha2 = 0;
-    d_alpha3 = 0;
-    d_beta0 = 0;
-    d_beta1 = 0;
-    d_beta2 = 0;
-    d_beta3 = 0;
-    d_A1UTC = 0;
-    d_A0UTC = 0;
-    d_DeltaT_LS = 0;
+    d_alpha0 = 0.0;
+    d_alpha1 = 0.0;
+    d_alpha2 = 0.0;
+    d_alpha3 = 0.0;
+    d_beta0 = 0.0;
+    d_beta1 = 0.0;
+    d_beta2 = 0.0;
+    d_beta3 = 0.0;
+    d_A1UTC = 0.0;
+    d_A0UTC = 0.0;
+    d_DeltaT_LS = 0.0;
     i_WN_LSF = 0;
     i_DN = 0;
-    d_DeltaT_LSF = 0;
+    d_DeltaT_LSF = 0.0;
 
     //Almanac
-    d_Toa = 0;
+    d_Toa = 0.0;
     i_WN_A = 0;
     for (int32_t i = 1; i < 36; i++)
         {
@@ -181,30 +183,30 @@ void Beidou_Dnav_Navigation_Message::reset()
         }
 
     // Satellite velocity
-    d_satvel_X = 0;
-    d_satvel_Y = 0;
-    d_satvel_Z = 0;
-    d_A1GPS = 0;
-    d_A0GPS = 0;
-    d_A1GAL = 0;
-    d_A0GAL = 0;
-    d_A1GLO = 0;
-    d_A0GLO = 0;
-    d_SQRT_A_ALMANAC = 0;
-    d_A1_ALMANAC = 0;
-    d_A0_ALMANAC = 0;
-    d_OMEGA0_ALMANAC = 0;
-    d_E_ALMANAC = 0;
-    d_DELTA_I = 0;
-    d_TOA = 0;
-    d_OMEGA_DOT_ALMANAC = 0;
-    d_OMEGA_ALMANAC = 0;
-    d_M0_ALMANAC = 0;
+    d_satvel_X = 0.0;
+    d_satvel_Y = 0.0;
+    d_satvel_Z = 0.0;
+    d_A1GPS = 0.0;
+    d_A0GPS = 0.0;
+    d_A1GAL = 0.0;
+    d_A0GAL = 0.0;
+    d_A1GLO = 0.0;
+    d_A0GLO = 0.0;
+    d_SQRT_A_ALMANAC = 0.0;
+    d_A1_ALMANAC = 0.0;
+    d_A0_ALMANAC = 0.0;
+    d_OMEGA0_ALMANAC = 0.0;
+    d_E_ALMANAC = 0.0;
+    d_DELTA_I = 0.0;
+    d_TOA = 0.0;
+    d_OMEGA_DOT_ALMANAC = 0.0;
+    d_OMEGA_ALMANAC = 0.0;
+    d_M0_ALMANAC = 0.0;
     almanac_WN = 0;
-    d_toa2 = 0;
-    d_A_f0 = 0;
-    d_A_f1 = 0;
-    d_A_f2 = 0;
+    d_toa2 = 0.0;
+    d_A_f0 = 0.0;
+    d_A_f1 = 0.0;
+    d_A_f2 = 0.0;
 
     auto gnss_sat = Gnss_Satellite();
     std::string _system("Beidou");

From 0a1df17cca50e2c069de8c0b2f83142ca34204fe Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 17 Feb 2019 13:36:13 +0100
Subject: [PATCH 073/123] Fix building in debug mode

Fixes for macOS
---
 CMakeLists.txt                            | 132 +++++++++++++---------
 src/algorithms/libs/rtklib/CMakeLists.txt |   8 +-
 src/algorithms/libs/rtklib/rtklib.h       |   2 +-
 src/tests/CMakeLists.txt                  |  45 ++++----
 4 files changed, 112 insertions(+), 75 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7977ec0bc..4b6559552 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,6 +407,86 @@ endif()
 
 
 
+################################################################################
+# Set C and C++ standard
+################################################################################
+# Support of C++17 is still not possible due to pm_remez.h (solved in GNU Radio 3.8)
+# Enable C++14 support in GCC >= 6.1.1
+# Fallback to C++11 when using GCC < 6.1.1
+
+if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
+    set(CMAKE_C_STANDARD 11)
+    if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
+            set(CMAKE_CXX_STANDARD 11)
+        else()
+            set(CMAKE_CXX_STANDARD 14)
+        endif()
+    endif()
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        if(OS_IS_MACOSX)
+            # See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
+            if(CLANG_VERSION VERSION_LESS "600")
+                set(CMAKE_CXX_STANDARD 11)
+            else()
+                set(CMAKE_CXX_STANDARD 14)
+            endif()
+        else()
+            if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
+                set(CMAKE_CXX_STANDARD 11)
+            else()
+                # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
+                set(CMAKE_CXX_STANDARD 14)
+                # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
+                # set(CMAKE_CXX_STANDARD 17)
+                # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
+            endif()
+        endif()
+    endif()
+    if((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)))
+        set(CMAKE_CXX_STANDARD 11)
+    endif()
+    set(CMAKE_C_EXTENSIONS OFF)
+    set(CMAKE_CXX_EXTENSIONS OFF)
+else()
+    if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
+            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+        else()
+            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+        endif()
+    endif()
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+        if(OS_IS_MACOSX)
+            if(CLANG_VERSION VERSION_LESS "600")
+                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+            else()
+                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+            endif()
+        else()
+            if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
+                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+            else()
+                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+            endif()
+        endif()
+    endif()
+endif()
+
+# Visibility
+# See https://gcc.gnu.org/wiki/Visibility
+if(POLICY CMP0053)
+    cmake_policy(SET CMP0063 NEW)
+    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+    set(CMAKE_C_VISIBILITY_PRESET hidden)
+    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+else()
+    if((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+        add_definitions(-fvisibility=hidden)
+    endif()
+endif()
+
+
 ################################################################################
 # Check if the compiler defines the architecture as ARM
 ################################################################################
@@ -1121,9 +1201,6 @@ endif()
 # Check that BLAS (Basic Linear Algebra Subprograms) is found in the system
 # See http://www.netlib.org/blas/
 #############################################################################
-if(OS_IS_MACOSX)
-    set(BLA_VENDOR "Apple")
-endif()
 find_library(BLAS blas)
 if(NOT BLAS)
     message(" The BLAS library has not been found.")
@@ -1819,61 +1896,16 @@ endif()
 ########################################################################
 # Set compiler flags
 ########################################################################
-# Support of C++17 is still not possible due to pm_remez.h (solved in GNU Radio 3.8)
-# Enable C++14 support in GCC >= 6.1.1
-# Fallback to C++11 when using GCC < 6.1.1
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
-        set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
-    else()
-        # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
-        # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
-            # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
-        # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "8.0.0")
-    endif()
     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wall -Wextra")  #Add warning flags: For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
 endif()
 
-# Support of C++17 is still not possible due to pm_remez.h (solved in GNU Radio 3.8)
-# Enable C++14 support in Clang >= 3.5.0 or AppleClang >= 600
-# Fallback to C++11 if older version
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(OS_IS_MACOSX)
-        # See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
-        if(CLANG_VERSION VERSION_LESS "600")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
-        else()
-            # if(CLANG_VERSION VERSION_LESS "900")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
-            # else(CLANG_VERSION VERSION_LESS "900")
-            # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
-            # endif(CLANG_VERSION VERSION_LESS "900")
-        endif()
-    else()
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
-        else()
-            # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
-            # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-            # set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++17")
-            # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-        endif()
-    endif()
-
     if(OS_IS_MACOSX)
         set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -stdlib=libc++")
     endif()
 endif()
 
-if(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND NOT WIN32)
-    if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
-        set(CMAKE_C_STANDARD 11)
-        set(CMAKE_CXX_STANDARD 11)
-    endif()
-endif()
-
 # Processor-architecture related flags
 # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
 if(NOT ARCH_COMPILER_FLAGS)
@@ -1901,10 +1933,6 @@ endif()
 set(MY_CXX_FLAGS "${MY_CXX_FLAGS} ${ARCH_COMPILER_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_FLAGS}")
 
-if((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-    # https://gcc.gnu.org/wiki/Visibility
-    add_definitions(-fvisibility=hidden)
-endif()
 
 
 ########################################################################
diff --git a/src/algorithms/libs/rtklib/CMakeLists.txt b/src/algorithms/libs/rtklib/CMakeLists.txt
index f049333be..6a85ff21b 100644
--- a/src/algorithms/libs/rtklib/CMakeLists.txt
+++ b/src/algorithms/libs/rtklib/CMakeLists.txt
@@ -71,10 +71,14 @@ target_link_libraries(algorithms_libs_rtklib
     PRIVATE
         Gflags::gflags
         Glog::glog
-        ${BLAS}
-        ${LAPACK}
 )
 
+if(OS_IS_MACOSX)
+    target_link_libraries(algorithms_libs_rtklib PRIVATE "-framework Accelerate")
+else()
+    target_link_libraries(algorithms_libs_rtklib PRIVATE ${LAPACK} ${BLAS})
+endif()
+
 set_property(TARGET algorithms_libs_rtklib
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index 00ba91be2..2cf0f1a63 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -224,7 +224,7 @@ const int NSYSQZS = 0;
 #define ENABDS
 #ifdef ENABDS
 const int MINPRNBDS = 1;                          //!<   min satellite sat number of BeiDou
-const int MAXPRNBDS = 35;                         //!<   max satellite sat number of BeiDou
+const int MAXPRNBDS = 37;                         //!<   max satellite sat number of BeiDou
 const int NSATBDS = (MAXPRNBDS - MINPRNBDS + 1);  //!<   number of BeiDou satellites
 const int NSYSBDS = 1;
 #else
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 98b782fd2..197a3b162 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -44,10 +44,23 @@ set(TOOLCHAIN_ARG "")
 if(EXISTS $ENV{OECORE_TARGET_SYSROOT})
     set(GTEST_COMPILER "")
     set(TOOLCHAIN_ARG "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Toolchains/oe-sdk_cross.cmake")
+else()
+    if(ENABLE_PACKAGING)
+        set(TOOLCHAIN_ARG "-DCMAKE_VERBOSE_MAKEFILE=ON")
+    endif()
 endif()
 
 if(NOT ${GTEST_DIR_LOCAL})
     # if GTEST_DIR is not defined, we download and build it
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+        set(DEBUG_POSTFIX "d")
+    endif()
+    if(OS_IS_MACOSX)
+        if(CMAKE_GENERATOR STREQUAL Xcode)
+            set(DEBUG_PREFIX "Debug/")
+        endif()
+    endif()
+
     if(CMAKE_VERSION VERSION_LESS 3.2)
       ExternalProject_Add(
         gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
@@ -55,7 +68,7 @@ if(NOT ${GTEST_DIR_LOCAL})
         GIT_TAG release-${GNSSSDR_GTEST_LOCAL_VERSION}
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-        CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF ${TOOLCHAIN_ARG}
+        CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -Dgtest_hide_internal_symbols=ON ${TOOLCHAIN_ARG}
         UPDATE_COMMAND ""
         PATCH_COMMAND ""
         INSTALL_COMMAND ""
@@ -67,22 +80,15 @@ if(NOT ${GTEST_DIR_LOCAL})
         GIT_TAG release-${GNSSSDR_GTEST_LOCAL_VERSION}
         SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
         BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}
-        CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF ${TOOLCHAIN_ARG}
+        CMAKE_ARGS ${GTEST_COMPILER} -DINSTALL_GTEST=OFF -DBUILD_GMOCK=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -Dgtest_hide_internal_symbols=ON ${TOOLCHAIN_ARG}
         UPDATE_COMMAND ""
         PATCH_COMMAND ""
-        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${CMAKE_STATIC_LIBRARY_SUFFIX}
-            ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${CMAKE_STATIC_LIBRARY_SUFFIX}
+        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
+            ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}
         INSTALL_COMMAND ""
       )
     endif()
-
     ExternalProject_Get_Property(gtest-${GNSSSDR_GTEST_LOCAL_VERSION} binary_dir)
-    if(OS_IS_MACOSX)
-        if(CMAKE_GENERATOR STREQUAL Xcode)
-            set(FINAL_D "d")
-            set(ADD_DEBUG "Debug/")
-        endif()
-    endif()
 
     if(NOT TARGET GTest::GTest)
         file(MAKE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/include)
@@ -90,9 +96,9 @@ if(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(GTest::GTest gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
         set_target_properties(GTest::GTest PROPERTIES
             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-            IMPORTED_LOCATION "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            IMPORTED_LOCATION "${binary_dir}/googletest/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${DEBUG_POSTFIX}${CMAKE_DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
             INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/include"
-            INTERFACE_LINK_LIBRARIES "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INTERFACE_LINK_LIBRARIES "${binary_dir}/googletest/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${DEBUG_POSTFIX}${CMAKE_DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
         )
         set_target_properties(GTest::GTest PROPERTIES
             INTERFACE_LINK_LIBRARIES Threads::Threads
@@ -103,12 +109,11 @@ if(NOT ${GTEST_DIR_LOCAL})
         add_dependencies(GTest::Main gtest-${GNSSSDR_GTEST_LOCAL_VERSION})
         set_target_properties(GTest::Main PROPERTIES
             IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-            IMPORTED_LOCATION "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            IMPORTED_LOCATION "${binary_dir}/googletest/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
             INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${GNSSSDR_GTEST_LOCAL_VERSION}/googletest/include"
-            INTERFACE_LINK_LIBRARIES "${binary_dir}/googletest/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+            INTERFACE_LINK_LIBRARIES "${binary_dir}/googletest/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
         )
     endif()
-
 else()
     if(GTEST_INCLUDE_DIRS)
         set(GTEST_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS} ${LIBGTEST_DEV_DIR})
@@ -128,8 +133,8 @@ else()
             set_target_properties(GTest::GTest PROPERTIES
                 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
                 INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}"
-                INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
-                IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
             )
             set_target_properties(GTest::GTest PROPERTIES
                 INTERFACE_LINK_LIBRARIES Threads::Threads
@@ -141,8 +146,8 @@ else()
             set_target_properties(GTest::Main PROPERTIES
                 IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
                 INTERFACE_INCLUDE_DIRECTORIES "${GTEST_INCLUDE_DIRS}"
-                INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
-                IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${ADD_DEBUG}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${FINAL_D}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                INTERFACE_LINK_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+                IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${DEBUG_PREFIX}${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main${DEBUG_POSTFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}"
         )
         endif()
     endif()

From 83501f86f56a61bfd0effb25b76e055a8ca50b51 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 17 Feb 2019 13:36:33 +0100
Subject: [PATCH 074/123] Fix headers

---
 src/core/system_parameters/beidou_dnav_ephemeris.cc        | 7 +++----
 src/core/system_parameters/beidou_dnav_ephemeris.h         | 6 +++---
 src/core/system_parameters/beidou_dnav_iono.cc             | 7 +++----
 src/core/system_parameters/beidou_dnav_iono.h              | 6 +++---
 .../system_parameters/beidou_dnav_navigation_message.cc    | 7 ++++---
 .../system_parameters/beidou_dnav_navigation_message.h     | 4 ++--
 src/core/system_parameters/beidou_dnav_utc_model.cc        | 2 +-
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/core/system_parameters/beidou_dnav_ephemeris.cc b/src/core/system_parameters/beidou_dnav_ephemeris.cc
index bb9bcde71..3ae8335f2 100644
--- a/src/core/system_parameters/beidou_dnav_ephemeris.cc
+++ b/src/core/system_parameters/beidou_dnav_ephemeris.cc
@@ -1,12 +1,11 @@
 /*!
- * \file beidou_ephemeris.cc
+ * \file beidou_dnav_ephemeris.cc
  * \brief  Interface of a BeiDou EPHEMERIS storage and orbital model functions
- *
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -24,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_ephemeris.h b/src/core/system_parameters/beidou_dnav_ephemeris.h
index 238a0a728..2cdfcfe61 100644
--- a/src/core/system_parameters/beidou_dnav_ephemeris.h
+++ b/src/core/system_parameters/beidou_dnav_ephemeris.h
@@ -1,11 +1,11 @@
 /*!
- * \file beidou_ephemeris.h
+ * \file beidou_dnav_ephemeris.h
  * \brief  Interface of a BEIDOU EPHEMERIS storage
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -23,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_iono.cc b/src/core/system_parameters/beidou_dnav_iono.cc
index b7d4ebb7e..a0a20743b 100644
--- a/src/core/system_parameters/beidou_dnav_iono.cc
+++ b/src/core/system_parameters/beidou_dnav_iono.cc
@@ -1,12 +1,11 @@
 /*!
- * \file beidou_iono.cc
+ * \file beidou_dnav_iono.cc
  * \brief  Interface of a BEIDOU IONOSPHERIC MODEL storage
- *
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -24,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_iono.h b/src/core/system_parameters/beidou_dnav_iono.h
index b7a11faf6..2349360bc 100644
--- a/src/core/system_parameters/beidou_dnav_iono.h
+++ b/src/core/system_parameters/beidou_dnav_iono.h
@@ -1,11 +1,11 @@
 /*!
- * \file beidou_iono.h
+ * \file beidou_dnav_iono.h
  * \brief  Interface of a BEIDOU IONOSPHERIC MODEL storage
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  *
  * -------------------------------------------------------------------------
  *
- * Copyright (C) 2010-2015  (see AUTHORS file for a list of contributors)
+ * Copyright (C) 2010-2019  (see AUTHORS file for a list of contributors)
  *
  * GNSS-SDR is a software defined Global Navigation
  *          Satellite Systems receiver
@@ -23,7 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.cc b/src/core/system_parameters/beidou_dnav_navigation_message.cc
index 68e8664e7..e280d07f8 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.cc
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.cc
@@ -1,6 +1,7 @@
 /*!
- * \file beidou_navigation_message.cc
- * \brief  Implementation of a BeiDou D1 NAV Data message decoder as described in BeiDou ICD Version 2.1
+ * \file beidou_dnav_navigation_message.cc
+ * \brief  Implementation of a BeiDou D1 NAV Data message decoder as described
+ * in BeiDou ICD Version 2.1
  *
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  * \author Damian Miralles, 2018. dmiralles2009@gmail.com
@@ -24,7 +25,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h
index 44d83ca39..97408e452 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.h
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.h
@@ -1,5 +1,5 @@
 /*!
- * \file beidou_navigation_message.h
+ * \file beidou_dnav_navigation_message.h
  * \brief  Interface of a BeiDou DNAV Data message decoder
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com
  * \author Damian Miralles, 2018. dmiralles2009@gmail.com
@@ -24,7 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
+ * along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
  *
  * -------------------------------------------------------------------------
  */
diff --git a/src/core/system_parameters/beidou_dnav_utc_model.cc b/src/core/system_parameters/beidou_dnav_utc_model.cc
index e56d2c1b8..1997f9276 100644
--- a/src/core/system_parameters/beidou_dnav_utc_model.cc
+++ b/src/core/system_parameters/beidou_dnav_utc_model.cc
@@ -1,5 +1,5 @@
 /*!
- * \file beidou_dnav_utc_model.c
+ * \file beidou_dnav_utc_model.cc
  * \brief  Interface of a BeiDou UTC Model storage
  * \author Damian Miralles, 2018. dmiralles2009(at)gmail.com
  * \author Sergi Segura, 2018. sergi.segura.munoz(at)gmail.com

From 8cab43ea6ae4a43723dcc1bef0db9c5e09ccd8f7 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 17 Feb 2019 13:36:53 +0100
Subject: [PATCH 075/123] Cosmetic fix

---
 src/utils/rinex2assist/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index c32cd3b1d..d42b379b5 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -97,5 +97,5 @@ if(Boost_FOUND)
     )
 else()
     message(STATUS "Boost Iostreams library not found.")
-    message(STATUS "rinex2assist will not be built.")
+    message(STATUS " rinex2assist will not be built.")
 endif()

From 9cdee7ee22b454d077b6d6d1ff728a467f7cb797 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 18 Feb 2019 04:58:03 +0100
Subject: [PATCH 076/123] Add C extensions needed by SUPL

---
 CMakeLists.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b6559552..a97512181 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -446,7 +446,6 @@ if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
     if((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)))
         set(CMAKE_CXX_STANDARD 11)
     endif()
-    set(CMAKE_C_EXTENSIONS OFF)
     set(CMAKE_CXX_EXTENSIONS OFF)
 else()
     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)

From b3f1cdb5fcaed167580535261e0d9545b6c0a0b7 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 18 Feb 2019 05:51:25 +0100
Subject: [PATCH 077/123] Rely in CMake fallback for C++ standard

---
 CMakeLists.txt | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a97512181..a24614ea5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -410,42 +410,9 @@ endif()
 ################################################################################
 # Set C and C++ standard
 ################################################################################
-# Support of C++17 is still not possible due to pm_remez.h (solved in GNU Radio 3.8)
-# Enable C++14 support in GCC >= 6.1.1
-# Fallback to C++11 when using GCC < 6.1.1
-
 if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
     set(CMAKE_C_STANDARD 11)
-    if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
-            set(CMAKE_CXX_STANDARD 11)
-        else()
-            set(CMAKE_CXX_STANDARD 14)
-        endif()
-    endif()
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        if(OS_IS_MACOSX)
-            # See https://trac.macports.org/wiki/XcodeVersionInfo for Apple Clang version equivalences
-            if(CLANG_VERSION VERSION_LESS "600")
-                set(CMAKE_CXX_STANDARD 11)
-            else()
-                set(CMAKE_CXX_STANDARD 14)
-            endif()
-        else()
-            if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-                set(CMAKE_CXX_STANDARD 11)
-            else()
-                # if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-                set(CMAKE_CXX_STANDARD 14)
-                # else(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-                # set(CMAKE_CXX_STANDARD 17)
-                # endif(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0.0")
-            endif()
-        endif()
-    endif()
-    if((NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") AND (NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)))
-        set(CMAKE_CXX_STANDARD 11)
-    endif()
+    set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_EXTENSIONS OFF)
 else()
     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)

From e8fa2a0932ca7d8cee1362c9057986be30563ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Cebri=C3=A1n=20Juan?= <acebrianjuan@gmail.com>
Date: Mon, 18 Feb 2019 17:51:02 +0100
Subject: [PATCH 078/123] Rename the decimation factor parameter of the Monitor
 block configuration from output_rate_ms to decimation_factor

---
 src/core/monitor/gnss_synchro_monitor.cc | 14 +++++++-------
 src/core/monitor/gnss_synchro_monitor.h  |  8 ++++----
 src/core/receiver/gnss_flowgraph.cc      |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc
index f8997d6a3..49b609ce6 100644
--- a/src/core/monitor/gnss_synchro_monitor.cc
+++ b/src/core/monitor/gnss_synchro_monitor.cc
@@ -43,25 +43,25 @@ using google::LogMessage;
 
 
 gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
-    int output_rate_ms,
+    int decimation_factor,
     int udp_port,
     const std::vector<std::string>& udp_addresses)
 {
     return gnss_synchro_monitor_sptr(new gnss_synchro_monitor(n_channels,
-        output_rate_ms,
+        decimation_factor,
         udp_port,
         udp_addresses));
 }
 
 
 gnss_synchro_monitor::gnss_synchro_monitor(unsigned int n_channels,
-    int output_rate_ms,
+    int decimation_factor,
     int udp_port,
     const std::vector<std::string>& udp_addresses) : gr::sync_block("gnss_synchro_monitor",
-                                                  gr::io_signature::make(n_channels, n_channels, sizeof(Gnss_Synchro)),
-                                                  gr::io_signature::make(0, 0, 0))
+                                                         gr::io_signature::make(n_channels, n_channels, sizeof(Gnss_Synchro)),
+                                                         gr::io_signature::make(0, 0, 0))
 {
-    d_output_rate_ms = output_rate_ms;
+    d_decimation_factor = decimation_factor;
     d_nchannels = n_channels;
 
     udp_sink_ptr = std::unique_ptr<Gnss_Synchro_Udp_Sink>(new Gnss_Synchro_Udp_Sink(udp_addresses, udp_port));
@@ -80,7 +80,7 @@ int gnss_synchro_monitor::work(int noutput_items, gr_vector_const_void_star& inp
     for (int epoch = 0; epoch < noutput_items; epoch++)
         {
             count++;
-            if (count >= d_output_rate_ms)
+            if (count >= d_decimation_factor)
                 {
                     for (unsigned int i = 0; i < d_nchannels; i++)
                         {
diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index a0a8e470a..696e6a4e8 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -46,7 +46,7 @@ class gnss_synchro_monitor;
 using gnss_synchro_monitor_sptr = boost::shared_ptr<gnss_synchro_monitor>;
 
 gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
-    int output_rate_ms,
+    int decimation_factor,
     int udp_port,
     const std::vector<std::string>& udp_addresses);
 
@@ -57,13 +57,13 @@ class gnss_synchro_monitor : public gr::sync_block
 {
 private:
     friend gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int nchannels,
-        int output_rate_ms,
+        int decimation_factor,
         int udp_port,
         const std::vector<std::string>& udp_addresses);
 
     unsigned int d_nchannels;
 
-    int d_output_rate_ms;
+    int d_decimation_factor;
 
     std::unique_ptr<Gnss_Synchro_Udp_Sink> udp_sink_ptr;
 
@@ -72,7 +72,7 @@ private:
 
 public:
     gnss_synchro_monitor(unsigned int nchannels,
-        int output_rate_ms,
+        int decimation_factor,
         int udp_port,
         const std::vector<std::string>& udp_addresses);
 
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 126dffbd1..d88508c7b 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -1538,7 +1538,7 @@ void GNSSFlowgraph::init()
     if (enable_monitor_)
         {
             GnssSynchroMonitor_ = gr::basic_block_sptr(new gnss_synchro_monitor(channels_count_,
-                configuration_->property("Monitor.output_rate_ms", 1),
+                configuration_->property("Monitor.decimation_factor", 1),
                 configuration_->property("Monitor.udp_port", 1234),
                 udp_addr_vec));
         }

From 82b7a244ebe56d3971b6b5d445aafb717e9dbdbe Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 18 Feb 2019 21:44:19 +0100
Subject: [PATCH 079/123] Small fixes

---
 src/algorithms/PVT/adapters/rtklib_pvt.cc     |  2 +-
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      | 46 ++++++++++---------
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.h       | 28 +++++------
 src/core/receiver/control_thread.cc           |  6 ++-
 4 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 33e6e5acc..fd6e667af 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -802,5 +802,5 @@ gr::basic_block_sptr RtklibPvt::get_left_block()
 
 gr::basic_block_sptr RtklibPvt::get_right_block()
 {
-    return pvt_;  // this is a sink, nothing downstream
+    return nullptr;  // this is a sink, nothing downstream
 }
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index e618e7b5d..ed531f0f2 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -562,8 +562,6 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
             xml_base_path = xml_base_path + boost::filesystem::path::preferred_separator;
         }
 
-    d_pvt_solver = std::make_shared<rtklib_solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
-    d_pvt_solver->set_averaging_depth(1);
 
     d_rx_time = 0.0;
 
@@ -580,7 +578,10 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
 
             udp_sink_ptr = std::unique_ptr<Monitor_Pvt_Udp_Sink>(new Monitor_Pvt_Udp_Sink(udp_addr_vec, conf_.udp_port));
         }
-
+    else
+        {
+            udp_sink_ptr = nullptr;
+        }
 
     // Create Sys V message queue
     first_fix = true;
@@ -591,6 +592,9 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
             std::cout << "GNSS-SDR can not create message queues!" << std::endl;
             throw std::exception();
         }
+
+    d_pvt_solver = std::make_shared<rtklib_solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
+    d_pvt_solver->set_averaging_depth(1);
     start = std::chrono::system_clock::now();
 }
 
@@ -1210,14 +1214,28 @@ bool rtklib_pvt_cc::load_gnss_synchro_map_xml(const std::string& file_name)
 }
 
 
+std::vector<std::string> rtklib_pvt_cc::split_string(const std::string& s, char delim)
+{
+    std::vector<std::string> v;
+    std::stringstream ss(s);
+    std::string item;
+
+    while (std::getline(ss, item, delim))
+        {
+            *(std::back_inserter(v)++) = item;
+        }
+
+    return v;
+}
+
+
 bool rtklib_pvt_cc::get_latest_PVT(double* longitude_deg,
     double* latitude_deg,
     double* height_m,
     double* ground_speed_kmh,
     double* course_over_ground_deg,
-    time_t* UTC_time)
+    time_t* UTC_time) const
 {
-    gr::thread::scoped_lock lock(d_setlock);
     if (d_pvt_solver->is_valid_position())
         {
             *latitude_deg = d_pvt_solver->get_latitude();
@@ -1225,7 +1243,7 @@ bool rtklib_pvt_cc::get_latest_PVT(double* longitude_deg,
             *height_m = d_pvt_solver->get_height();
             *ground_speed_kmh = d_pvt_solver->get_speed_over_ground() * 3600.0 / 1000.0;
             *course_over_ground_deg = d_pvt_solver->get_course_over_ground();
-            *UTC_time = to_time_t(d_pvt_solver->get_position_UTC_time());
+            *UTC_time = convert_to_time_t(d_pvt_solver->get_position_UTC_time());
 
             return true;
         }
@@ -1237,8 +1255,6 @@ bool rtklib_pvt_cc::get_latest_PVT(double* longitude_deg,
 int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_items,
     gr_vector_void_star& output_items __attribute__((unused)))
 {
-    gr::thread::scoped_lock l(d_setlock);
-
     for (int32_t epoch = 0; epoch < noutput_items; epoch++)
         {
             bool flag_display_pvt = false;
@@ -3284,17 +3300,3 @@ int rtklib_pvt_cc::work(int noutput_items, gr_vector_const_void_star& input_item
 
     return noutput_items;
 }
-
-std::vector<std::string> rtklib_pvt_cc::split_string(const std::string& s, char delim)
-{
-    std::vector<std::string> v;
-    std::stringstream ss(s);
-    std::string item;
-
-    while (std::getline(ss, item, delim))
-        {
-            *(std::back_inserter(v)++) = item;
-        }
-
-    return v;
-}
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index f2174039e..72b038683 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -85,15 +85,15 @@ private:
 
     bool b_rtcm_writing_started;
     bool b_rtcm_enabled;
-    int32_t d_rtcm_MT1045_rate_ms;  //!< Galileo Broadcast Ephemeris
-    int32_t d_rtcm_MT1019_rate_ms;  //!< GPS Broadcast Ephemeris (orbits)
-    int32_t d_rtcm_MT1020_rate_ms;  //!< GLONASS Broadcast Ephemeris (orbits)
-    int32_t d_rtcm_MT1077_rate_ms;  //!< The type 7 Multiple Signal Message format for the USA’s GPS system, popular
-    int32_t d_rtcm_MT1087_rate_ms;  //!< GLONASS MSM7. The type 7 Multiple Signal Message format for the Russian GLONASS system
-    int32_t d_rtcm_MT1097_rate_ms;  //!< Galileo MSM7. The type 7 Multiple Signal Message format for Europe’s Galileo system
+    int32_t d_rtcm_MT1045_rate_ms;  // Galileo Broadcast Ephemeris
+    int32_t d_rtcm_MT1019_rate_ms;  // GPS Broadcast Ephemeris (orbits)
+    int32_t d_rtcm_MT1020_rate_ms;  // GLONASS Broadcast Ephemeris (orbits)
+    int32_t d_rtcm_MT1077_rate_ms;  // The type 7 Multiple Signal Message format for the USA’s GPS system, popular
+    int32_t d_rtcm_MT1087_rate_ms;  // GLONASS MSM7. The type 7 Multiple Signal Message format for the Russian GLONASS system
+    int32_t d_rtcm_MT1097_rate_ms;  // Galileo MSM7. The type 7 Multiple Signal Message format for Europe’s Galileo system
     int32_t d_rtcm_MSM_rate_ms;
 
-    int32_t d_last_status_print_seg;  //for status printer
+    int32_t d_last_status_print_seg;  // for status printer
 
     uint32_t d_nchannels;
     std::string d_dump_filename;
@@ -132,14 +132,14 @@ private:
     bool send_sys_v_ttff_msg(ttff_msgbuf ttff);
     std::chrono::time_point<std::chrono::system_clock> start, end;
 
-    bool save_gnss_synchro_map_xml(const std::string& file_name);  //debug helper function
+    bool save_gnss_synchro_map_xml(const std::string& file_name);  // debug helper function
 
-    bool load_gnss_synchro_map_xml(const std::string& file_name);  //debug helper function
+    bool load_gnss_synchro_map_xml(const std::string& file_name);  // debug helper function
 
     bool d_xml_storage;
     std::string xml_base_path;
 
-    inline std::time_t to_time_t(boost::posix_time::ptime pt)
+    inline std::time_t convert_to_time_t(const boost::posix_time::ptime pt) const
     {
         return (pt - boost::posix_time::ptime(boost::gregorian::date(1970, 1, 1))).total_seconds();
     }
@@ -153,8 +153,10 @@ public:
         const Pvt_Conf& conf_,
         const rtk_t& rtk);
 
+    ~rtklib_pvt_cc();  //!< Default destructor
+
     /*!
-     * \brief Get latest set of ephemeris from PVT block
+     * \brief Get latest set of GPS ephemeris from PVT block
      *
      */
     std::map<int, Gps_Ephemeris> get_gps_ephemeris_map() const;
@@ -183,9 +185,7 @@ public:
         double* height_m,
         double* ground_speed_kmh,
         double* course_over_ground_deg,
-        time_t* UTC_time);
-
-    ~rtklib_pvt_cc();  //!< Default destructor
+        time_t* UTC_time) const;
 
     int work(int noutput_items, gr_vector_const_void_star& input_items,
         gr_vector_void_star& output_items);  //!< PVT Signal Processing
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 0b9115d94..5ebb96ad0 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -293,7 +293,11 @@ int ControlThread::run()
         }
     catch (const boost::thread_interrupted &interrupt)
         {
-            DLOG(INFO) << "Thread interrupted";
+            DLOG(WARNING) << "Thread interrupted";
+        }
+    catch (const boost::system::system_error &e)
+        {
+            LOG(WARNING) << "System error";
         }
 
     if (restart_)

From 1decfcc4882b30dfcb5e4fcc0231f0ed1618afed Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 18 Feb 2019 21:45:12 +0100
Subject: [PATCH 080/123] Remove unused checks

---
 CMakeLists.txt           | 15 ---------------
 src/tests/CMakeLists.txt |  8 +-------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24614ea5..7476d5f2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -469,15 +469,6 @@ endif()
 
 
 
-################################################################################
-# Check for availability of SSE
-################################################################################
-if(NOT ENABLE_GENERIC_ARCH)
-    include(TestForSSE)
-endif()
-
-
-
 ################################################################################
 # Find the POSIX thread (pthread) libraries
 ################################################################################
@@ -1866,12 +1857,6 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
     set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wall -Wextra")  #Add warning flags: For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(OS_IS_MACOSX)
-        set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -stdlib=libc++")
-    endif()
-endif()
-
 # Processor-architecture related flags
 # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
 if(NOT ARCH_COMPILER_FLAGS)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 197a3b162..f3da0060f 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -58,6 +58,7 @@ if(NOT ${GTEST_DIR_LOCAL})
     if(OS_IS_MACOSX)
         if(CMAKE_GENERATOR STREQUAL Xcode)
             set(DEBUG_PREFIX "Debug/")
+            set(DEBUG_POSTFIX "d")
         endif()
     endif()
 
@@ -167,12 +168,6 @@ if(OPENSSL_FOUND)
     add_definitions(-DUSE_OPENSSL_FALLBACK=1)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if(OS_IS_MACOSX)
-        set(CLANG_FLAGS "-stdlib=libc++ -lc++")
-    endif()
-endif()
-
 if(OPENCL_FOUND)
     add_definitions(-DOPENCL_BLOCKS_TEST=1)
 endif()
@@ -350,7 +345,6 @@ if(ENABLE_UNIT_TESTING)
 
     target_link_libraries(run_tests
         PUBLIC
-            ${CLANG_FLAGS}
             Boost::chrono
             Boost::filesystem
             Boost::system

From 4784a58af044a189ea4ea87fbda3af8e8de82c43 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 18 Feb 2019 22:20:32 +0100
Subject: [PATCH 081/123] Remove unused definitions

---
 src/algorithms/PVT/libs/pvt_solution.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/algorithms/PVT/libs/pvt_solution.h b/src/algorithms/PVT/libs/pvt_solution.h
index 116cd771e..7afd074d2 100644
--- a/src/algorithms/PVT/libs/pvt_solution.h
+++ b/src/algorithms/PVT/libs/pvt_solution.h
@@ -37,8 +37,6 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <deque>
 
-const unsigned int PVT_MAX_CHANNELS = 90;
-const unsigned int PVT_MAX_PRN = 127;  // 126 is SBAS
 
 /*!
  * \brief Base class for a PVT solution

From b5e52776629d8913670dbebb807bdc3f1cf93d2a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 18 Feb 2019 22:29:50 +0100
Subject: [PATCH 082/123] Fix random crashes when program ended in macOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The program randomly crashed when destroying the pvt block (EXC_BAD_ACCESS). This didn’t happen on Linux.

Beidou PVT fixes not available in macOS until finding the root cause.
---
 src/algorithms/libs/rtklib/rtklib.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index 2cf0f1a63..e6eb11faa 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -221,7 +221,9 @@ const int NSATQZS = 0;
 const int NSYSQZS = 0;
 #endif
 
+#ifndef __APPLE__
 #define ENABDS
+#endif
 #ifdef ENABDS
 const int MINPRNBDS = 1;                          //!<   min satellite sat number of BeiDou
 const int MAXPRNBDS = 37;                         //!<   max satellite sat number of BeiDou

From eedc3d5de67bf0a4dfcc074589506ff955bb6d05 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 19 Feb 2019 09:08:09 +0100
Subject: [PATCH 083/123] clang-tidy: apply checks

---
 src/algorithms/PVT/adapters/rtklib_pvt.cc                     | 3 ++-
 .../signal_source/adapters/rtl_tcp_signal_source.cc           | 4 ++--
 src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h | 2 +-
 .../tracking/adapters/galileo_e1_tcp_connector_tracking.cc    | 2 +-
 .../tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc     | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index fd6e667af..78de824ed 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -42,6 +42,7 @@
 namespace bc = boost::math;
 #else
 #include <boost/integer/common_factor_rt.hpp>
+#include <utility>
 namespace bc = boost::integer;
 #endif
 
@@ -52,7 +53,7 @@ using google::LogMessage;
 RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(role),
+    unsigned int out_streams) : role_(std::move(role)),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
index a6f6db9ac..6f6f549df 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@@ -48,10 +48,10 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_stream,
     unsigned int out_stream,
-    boost::shared_ptr<gr::msg_queue> queue) : role_(role),
+    boost::shared_ptr<gr::msg_queue> queue) : role_(std::move(role)),
                                               in_stream_(in_stream),
                                               out_stream_(out_stream),
-                                              queue_(std::move(std::move(queue)))
+                                              queue_(std::move(queue))
 {
     // DUMP PARAMETERS
     std::string empty = "";
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
index 74fdbf77a..74f2b02d5 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.h
@@ -90,7 +90,7 @@ private:
 
     // rtl_tcp settings
     std::string address_;
-    short port_;
+    int16_t port_;
     bool AGC_enabled_;
     double sample_rate_;
     bool flip_iq_;
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index 358e952c9..340b2bc89 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -48,7 +48,7 @@ using google::LogMessage;
 
 GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
     ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
index 15e7f650b..3000ac8ae 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
@@ -47,7 +47,7 @@ using google::LogMessage;
 
 GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
     ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################

From a154f90bf5259323b04bc4051afa7fc3dd52154e Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 19 Feb 2019 18:20:58 +0100
Subject: [PATCH 084/123] Fix bug in telemetry message handling

---
 src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index ed531f0f2..044d50927 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -233,7 +233,7 @@ void rtklib_pvt_cc::msg_handler_telemetry(const pmt::pmt_t& msg)
                 }
 
             // ************* BeiDou telemetry *****************
-            if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Ephemeris>))
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Ephemeris>))
                 {
                     // ### Beidou EPHEMERIS ###
                     std::shared_ptr<Beidou_Dnav_Ephemeris> bds_dnav_eph;
@@ -317,6 +317,7 @@ std::map<int, Beidou_Dnav_Almanac> rtklib_pvt_cc::get_beidou_dnav_almanac_map()
     return d_pvt_solver->beidou_dnav_almanac_map;
 }
 
+
 void rtklib_pvt_cc::clear_ephemeris()
 {
     d_pvt_solver->gps_ephemeris_map.clear();

From 88147d4956dad161178710b69b7db5745f7ab5a8 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Wed, 20 Feb 2019 22:21:53 +0100
Subject: [PATCH 085/123] Fix build with Clang (not AppleClang) on macOS

---
 src/algorithms/libs/CMakeLists.txt                       | 8 ++++++++
 .../signal_source/gnuradio_blocks/CMakeLists.txt         | 9 +++++++++
 src/algorithms/tracking/libs/CMakeLists.txt              | 9 +++++++++
 src/core/monitor/CMakeLists.txt                          | 9 +++++++++
 src/core/receiver/CMakeLists.txt                         | 9 +++++++++
 5 files changed, 44 insertions(+)

diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 64ac7c64b..32c8a876e 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -139,6 +139,14 @@ set_property(TARGET algorithms_libs
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
+        target_compile_definitions(algorithms_libs
+            PUBLIC
+                -DBOOST_ASIO_HAS_STD_STRING_VIEW
+        )
+    endif()
+endif()
 
 ###############################################################################
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index 5ad9ffe2e..740bd4b8c 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -75,6 +75,15 @@ if(ENABLE_RAW_UDP AND PCAP_FOUND)
     )
 endif()
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
+        target_compile_definitions(signal_source_gr_blocks
+            PUBLIC
+                -DBOOST_ASIO_HAS_STD_STRING_VIEW
+        )
+    endif()
+endif()
+
 set_property(TARGET signal_source_gr_blocks APPEND PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 4607478ee..63ca330df 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -91,6 +91,15 @@ target_include_directories(tracking_libs
         ${OPT_TRACKING_INCLUDES}
 )
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
+        target_compile_definitions(tracking_libs
+            PUBLIC
+                -DBOOST_ASIO_HAS_STD_STRING_VIEW
+        )
+    endif()
+endif()
+
 set_property(TARGET tracking_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt
index 73ddc1d9d..13f13576d 100644
--- a/src/core/monitor/CMakeLists.txt
+++ b/src/core/monitor/CMakeLists.txt
@@ -49,6 +49,15 @@ target_link_libraries(core_monitor
         Gnuradio::pmt
 )
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
+        target_compile_definitions(core_monitor
+            PUBLIC
+                -DBOOST_ASIO_HAS_STD_STRING_VIEW
+        )
+    endif()
+endif()
+
 set_property(TARGET core_monitor
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 065cca98c..877658b64 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -159,6 +159,15 @@ target_link_libraries(core_receiver
         pvt_adapters
 )
 
+if(OS_IS_MACOSX)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
+        target_compile_definitions(core_receiver
+            PUBLIC
+                -DBOOST_ASIO_HAS_STD_STRING_VIEW
+        )
+    endif()
+endif()
+
 set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/receiver>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>

From 0715c4de45b9e21cdf0749dbe7e6f7aea436af52 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Wed, 20 Feb 2019 23:36:26 +0100
Subject: [PATCH 086/123] clang-tidy: add and apply
 readability-inconsistent-declaration-parameter-name check

---
 .clang-tidy                             | 2 +-
 src/core/monitor/gnss_synchro_monitor.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index bcc3e3cdb..0affa0685 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
+Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-inconsistent-declaration-parameter-name,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
diff --git a/src/core/monitor/gnss_synchro_monitor.h b/src/core/monitor/gnss_synchro_monitor.h
index 696e6a4e8..632fa72ed 100644
--- a/src/core/monitor/gnss_synchro_monitor.h
+++ b/src/core/monitor/gnss_synchro_monitor.h
@@ -56,7 +56,7 @@ gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
 class gnss_synchro_monitor : public gr::sync_block
 {
 private:
-    friend gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int nchannels,
+    friend gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
         int decimation_factor,
         int udp_port,
         const std::vector<std::string>& udp_addresses);
@@ -71,7 +71,7 @@ private:
 
 
 public:
-    gnss_synchro_monitor(unsigned int nchannels,
+    gnss_synchro_monitor(unsigned int n_channels,
         int decimation_factor,
         int udp_port,
         const std::vector<std::string>& udp_addresses);

From 9bc771bed6bdbaae635e254a9171764e42b896e5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 09:59:06 +0100
Subject: [PATCH 087/123] Deploy a new option -DENABLE_CLANG_TIDY to integrate
 clang-tidy checks and fixes into the compilation process, if found. It
 defaults to OFF

---
 CMakeLists.txt                                | 54 +++++++++++--------
 src/algorithms/PVT/adapters/CMakeLists.txt    |  9 ++++
 .../PVT/gnuradio_blocks/CMakeLists.txt        |  9 ++++
 src/algorithms/PVT/libs/CMakeLists.txt        |  9 ++++
 .../acquisition/adapters/CMakeLists.txt       |  9 ++++
 .../gnuradio_blocks/CMakeLists.txt            |  9 ++++
 .../acquisition/libs/CMakeLists.txt           |  9 ++++
 .../channel/adapters/CMakeLists.txt           |  9 ++++
 src/algorithms/channel/libs/CMakeLists.txt    |  9 ++++
 .../conditioner/adapters/CMakeLists.txt       |  9 ++++
 .../data_type_adapter/adapters/CMakeLists.txt |  9 ++++
 .../input_filter/adapters/CMakeLists.txt      |  9 ++++
 .../gnuradio_blocks/CMakeLists.txt            |  9 ++++
 src/algorithms/libs/CMakeLists.txt            | 18 +++++++
 .../observables/adapters/CMakeLists.txt       |  9 ++++
 .../gnuradio_blocks/CMakeLists.txt            |  9 ++++
 .../resampler/adapters/CMakeLists.txt         |  9 ++++
 .../resampler/gnuradio_blocks/CMakeLists.txt  |  9 ++++
 .../signal_generator/adapters/CMakeLists.txt  | 11 +++-
 .../gnuradio_blocks/CMakeLists.txt            | 17 ++++--
 .../signal_source/adapters/CMakeLists.txt     |  9 ++++
 .../gnuradio_blocks/CMakeLists.txt            |  9 ++++
 .../signal_source/libs/CMakeLists.txt         |  9 ++++
 .../telemetry_decoder/adapters/CMakeLists.txt |  9 ++++
 .../gnuradio_blocks/CMakeLists.txt            |  9 ++++
 .../telemetry_decoder/libs/CMakeLists.txt     |  9 ++++
 .../tracking/adapters/CMakeLists.txt          |  9 ++++
 .../tracking/gnuradio_blocks/CMakeLists.txt   |  9 ++++
 src/algorithms/tracking/libs/CMakeLists.txt   |  9 ++++
 src/core/libs/CMakeLists.txt                  |  9 ++++
 src/core/monitor/CMakeLists.txt               | 11 +++-
 src/core/monitor/gnss_synchro_monitor.cc      |  4 --
 src/core/receiver/CMakeLists.txt              |  9 ++++
 src/core/receiver/control_thread.cc           |  2 +-
 src/core/system_parameters/CMakeLists.txt     |  9 ++++
 src/main/CMakeLists.txt                       |  9 ++++
 src/tests/CMakeLists.txt                      |  4 +-
 37 files changed, 345 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7476d5f2d..a57aebad3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ endif()
 
 ########################################################################
 # Determine optional blocks/libraries to be built (default: not built)
-# Enable them at the command line by doing 'cmake -DENABLE_XXX=ON ../'
+# Enable them at the command line by doing 'cmake -DENABLE_XXX=ON ..'
 ########################################################################
 # Support of optional RF front-ends
 option(ENABLE_UHD "Enable the use of UHD (driver for all USRP devices)" ON)
@@ -58,6 +58,9 @@ option(ENABLE_RAW_UDP "Enable the use of high-optimized custom UDP packet sample
 option(ENABLE_GPERFTOOLS "Enable linking to Gperftools libraries (tcmalloc and profiler)" OFF)
 option(ENABLE_GPROF "Enable the use of the GNU profiler tool 'gprof'" OFF)
 
+# Code correctness
+option(ENABLE_CLANG_TIDY "Enable the use of clang-tidy when compiling" OFF)
+
 # Acceleration
 option(ENABLE_PROFILING "Enable execution of volk_gnsssdr_profile at the end of the building" OFF)
 option(ENABLE_OPENCL "Enable building of processing blocks implemented with OpenCL (experimental)" OFF)
@@ -1529,8 +1532,8 @@ endif()
 find_package(Doxygen)
 if(DOXYGEN_FOUND)
     message(STATUS "Doxygen found.")
-    message(STATUS "You can build the documentation with '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc'.")
-    message(STATUS "When done, point your browser to ${CMAKE_BINARY_DIR}/html/index.html")
+    message(STATUS " You can build the documentation with '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc'.")
+    message(STATUS " When done, point your browser to ${CMAKE_BINARY_DIR}/html/index.html")
     set(HAVE_DOT ${DOXYGEN_DOT_FOUND})
     file(TO_NATIVE_PATH ${CMAKE_SOURCE_DIR} top_srcdir)
     file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR} top_builddir)
@@ -1552,7 +1555,7 @@ if(DOXYGEN_FOUND)
         COMMENT "Generating API documentation with Doxygen." VERBATIM
     )
     if(LATEX_COMPILER)
-        message(STATUS "'${CMAKE_MAKE_PROGRAM_PRETTY_NAME} pdfmanual' will generate a manual at ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf")
+        message(STATUS " '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} pdfmanual' will generate a manual at ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf")
         add_custom_target(pdfmanual
             COMMAND ${CMAKE_MAKE_PROGRAM}
             COMMAND ${CMAKE_COMMAND} -E copy refman.pdf ${CMAKE_BINARY_DIR}/docs/GNSS-SDR_manual.pdf
@@ -1562,7 +1565,7 @@ if(DOXYGEN_FOUND)
             COMMENT "Generating PDF manual with Doxygen." VERBATIM
         )
     endif()
-    message(STATUS "'${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc-clean' will clean the documentation.")
+    message(STATUS " '${CMAKE_MAKE_PROGRAM_PRETTY_NAME} doc-clean' will clean the documentation.")
     add_custom_target(doc-clean
         COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/docs/html
         COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/docs/latex
@@ -1600,7 +1603,7 @@ if(ENABLE_OPENCL)
     else()
         if(OPENCL_FOUND)
             message(STATUS "OpenCL has been found and will be used by some processing blocks")
-            message(STATUS "You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ../' ")
+            message(STATUS " You can disable OpenCL use by doing 'cmake -DENABLE_OPENCL=OFF ..' ")
         endif()
     endif()
     if(ENABLE_GENERIC_ARCH)
@@ -1627,10 +1630,10 @@ endif()
 if(ENABLE_CUDA)
     find_package(CUDA REQUIRED)
     message(STATUS "NVIDIA CUDA GPU Acceleration will be enabled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_CUDA=OFF ../'")
+    message(STATUS " You can disable it with 'cmake -DENABLE_CUDA=OFF ..'")
 else()
     message(STATUS "NVIDIA CUDA GPU Acceleration will be not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_CUDA=ON ../' to add support for GPU-based acceleration using CUDA.")
+    message(STATUS " Enable it with 'cmake -DENABLE_CUDA=ON ..' to add support for GPU-based acceleration using CUDA.")
 endif()
 
 
@@ -1640,7 +1643,7 @@ endif()
 ###############################################################################
 if(ENABLE_RAW_UDP)
     message(STATUS "High-optimized custom UDP IP packet source is enabled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_RAW_UDP=OFF ../'")
+    message(STATUS " You can disable it with 'cmake -DENABLE_RAW_UDP=OFF ..'")
     find_package(PCAP)
     if(NOT PCAP_FOUND)
         message(FATAL_ERROR "PCAP required to compile custom UDP packet sample source (with ENABLE_RAW_UDP=ON)")
@@ -1654,10 +1657,10 @@ endif()
 ###############################################################################
 if(ENABLE_FPGA)
     message(STATUS "FPGA Acceleration will be enabled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_FPGA=OFF ../'")
+    message(STATUS " You can disable it with 'cmake -DENABLE_FPGA=OFF ..'")
 else()
     message(STATUS "Fpga Acceleration will be not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_FPGA=ON ../' to add support for GPU-based acceleration using the FPGA.")
+    message(STATUS " Enable it with 'cmake -DENABLE_FPGA=ON ..' to add support for GPU-based acceleration using the FPGA.")
 endif()
 
 
@@ -1707,7 +1710,7 @@ if(ENABLE_OSMOSDR)
     find_package(GROSMOSDR)
     if(GROSMOSDR_FOUND)
         message(STATUS "The driver for OsmoSDR and other front-ends (HackRF, bladeRF, Realtek's RTL2832U-based dongles, etc.) will be compiled.")
-        message(STATUS "You can disable it with 'cmake -DENABLE_OSMOSDR=OFF ../'")
+        message(STATUS " You can disable it with 'cmake -DENABLE_OSMOSDR=OFF ..'")
     else()
         if(ENABLE_PACKAGING)
             message(WARNING "gr-osmosdr has not been found. Source blocks depending on it will NOT be built.")
@@ -1717,7 +1720,7 @@ if(ENABLE_OSMOSDR)
     endif()
 else()
     message(STATUS "The (optional) driver for OsmoSDR and related front-ends is not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_OSMOSDR=ON ../' to add support for OsmoSDR and other front-ends (HackRF, bladeRF, Realtek's RTL2832U-based USB dongles, etc.)")
+    message(STATUS " Enable it with 'cmake -DENABLE_OSMOSDR=ON ..' to add support for OsmoSDR and other front-ends (HackRF, bladeRF, Realtek's RTL2832U-based USB dongles, etc.)")
 endif()
 
 
@@ -1755,10 +1758,10 @@ endif()
 
 if(ENABLE_FLEXIBAND)
     message(STATUS "The Teleorbit Flexiband front-end source will be compiled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_FLEXIBAND=OFF ../'")
+    message(STATUS " You can disable it with 'cmake -DENABLE_FLEXIBAND=OFF ..'")
 else()
     message(STATUS "The (optional) Teleorbit Flexiband front-end driver adapter is not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_FLEXIBAND=ON ../' to add support for the Teleorbit Flexiband front-end.")
+    message(STATUS " Enable it with 'cmake -DENABLE_FLEXIBAND=ON ..' to add support for the Teleorbit Flexiband front-end.")
 endif()
 if(ENABLE_FLEXIBAND)
     find_package(TELEORBIT)
@@ -1780,11 +1783,11 @@ if(GN3S_DRIVER)
 endif()
 if(ENABLE_GN3S)
     message(STATUS "The GN3S driver will be compiled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_GN3S=OFF ../'")
+    message(STATUS " You can disable it with 'cmake -DENABLE_GN3S=OFF ..'")
     find_package(GRGN3S QUIET)
 else()
     message(STATUS "The (optional and experimental) GN3S driver is not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_GN3S=ON ../' to add support for the GN3S dongle.")
+    message(STATUS " Enable it with 'cmake -DENABLE_GN3S=ON ..' to add support for the GN3S dongle.")
 endif()
 
 
@@ -1802,11 +1805,11 @@ endif()
 
 if(ENABLE_ARRAY)
     message(STATUS "CTTC's Antenna Array front-end driver will be compiled.")
-    message(STATUS "You can disable it with 'cmake -DENABLE_ARRAY=OFF ../'")
+    message(STATUS " You can disable it with 'cmake -DENABLE_ARRAY=OFF ..'")
     find_package(GRDBFCTTC QUIET)
 else()
     message(STATUS "The (optional) CTTC's Antenna Array front-end driver is not enabled.")
-    message(STATUS "Enable it with 'cmake -DENABLE_ARRAY=ON ../' to add support for the CTTC experimental array front-end.")
+    message(STATUS " Enable it with 'cmake -DENABLE_ARRAY=ON ..' to add support for the CTTC experimental array front-end.")
 endif()
 
 
@@ -1818,11 +1821,11 @@ if(ENABLE_GPERFTOOLS)
     find_package(GPERFTOOLS)
     if(NOT GPERFTOOLS_FOUND)
         message(STATUS "Although ENABLE_GPERFTOOLS has been set to ON, GPerftools has not been found.")
-        message(STATUS "Binaries will be compiled without 'tcmalloc' and 'profiler' libraries.")
-        message(STATUS "You can install GPerftools from https://github.com/gperftools/gperftools")
+        message(STATUS " Binaries will be compiled without 'tcmalloc' and 'profiler' libraries.")
+        message(STATUS " You can install GPerftools from https://github.com/gperftools/gperftools")
     else()
         message(STATUS "GPerftools libraries found.")
-        message(STATUS "Binaries will be compiled with 'tcmalloc' and 'profiler' libraries.")
+        message(STATUS " Binaries will be compiled with 'tcmalloc' and 'profiler' libraries.")
     endif()
 endif()
 if(ENABLE_GPERFTOOLS)
@@ -1900,7 +1903,12 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             message(STATUS "clang-tidy not found.")
         else()
             message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
-            set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-checks=*")
+            if(ENABLE_CLANG_TIDY)
+                message(STATUS " clang-tidy will be used in compilation. You can disable it with 'cmake -DENABLE_CLANG_TIDY=OFF ..'")
+            else()
+                message(STATUS " You can enable clang-tidy usage in compilation with 'cmake -DENABLE_CLANG_TIDY=ON ..'")
+            endif()
+            set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-fix")
             set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
         endif()
     endif()
diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 60dba0590..954d057bc 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -49,6 +49,15 @@ if(Boost_VERSION LESS 105800)
     target_compile_definitions(pvt_adapters PRIVATE -DOLD_BOOST=1)
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(pvt_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET pvt_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 9a426daf6..6c36caa24 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -41,6 +41,15 @@ target_link_libraries(pvt_gr_blocks
         core_system_parameters
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(pvt_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 target_include_directories(pvt_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
diff --git a/src/algorithms/PVT/libs/CMakeLists.txt b/src/algorithms/PVT/libs/CMakeLists.txt
index a19859234..d04fa0cb5 100644
--- a/src/algorithms/PVT/libs/CMakeLists.txt
+++ b/src/algorithms/PVT/libs/CMakeLists.txt
@@ -79,6 +79,15 @@ target_include_directories(pvt_libs
 
 target_compile_definitions(pvt_libs PRIVATE -DGNSS_SDR_VERSION="${VERSION}")
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(pvt_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET pvt_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/algorithms/libs>
diff --git a/src/algorithms/acquisition/adapters/CMakeLists.txt b/src/algorithms/acquisition/adapters/CMakeLists.txt
index c6285d699..bfe54fa8e 100644
--- a/src/algorithms/acquisition/adapters/CMakeLists.txt
+++ b/src/algorithms/acquisition/adapters/CMakeLists.txt
@@ -110,6 +110,15 @@ target_include_directories(acquisition_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(acquisition_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET acquisition_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
index e0db64422..5a135364b 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt
@@ -94,6 +94,15 @@ if(OPENCL_FOUND)
     target_include_directories(acquisition_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS})
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(acquisition_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET acquisition_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/acquisition/libs/CMakeLists.txt b/src/algorithms/acquisition/libs/CMakeLists.txt
index 678cb5f2d..4b8eefec8 100644
--- a/src/algorithms/acquisition/libs/CMakeLists.txt
+++ b/src/algorithms/acquisition/libs/CMakeLists.txt
@@ -45,6 +45,15 @@ target_link_libraries(acquisition_libs
         core_system_parameters
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(acquisition_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET acquisition_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/channel/adapters/CMakeLists.txt b/src/algorithms/channel/adapters/CMakeLists.txt
index 14bc0f16b..7bf49e73d 100644
--- a/src/algorithms/channel/adapters/CMakeLists.txt
+++ b/src/algorithms/channel/adapters/CMakeLists.txt
@@ -41,6 +41,15 @@ target_include_directories(channel_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(channel_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET channel_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/channel/libs/CMakeLists.txt b/src/algorithms/channel/libs/CMakeLists.txt
index 7a6582046..c055123bc 100644
--- a/src/algorithms/channel/libs/CMakeLists.txt
+++ b/src/algorithms/channel/libs/CMakeLists.txt
@@ -43,6 +43,15 @@ target_link_libraries(channel_libs
         core_receiver
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(channel_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET channel_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/conditioner/adapters/CMakeLists.txt b/src/algorithms/conditioner/adapters/CMakeLists.txt
index 92f967849..6e0e68a45 100644
--- a/src/algorithms/conditioner/adapters/CMakeLists.txt
+++ b/src/algorithms/conditioner/adapters/CMakeLists.txt
@@ -47,6 +47,15 @@ target_include_directories(conditioner_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(conditioner_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET conditioner_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
index 39a4c7216..a9042d832 100644
--- a/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
+++ b/src/algorithms/data_type_adapter/adapters/CMakeLists.txt
@@ -63,6 +63,15 @@ target_include_directories(data_type_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(data_type_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET data_type_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index 9201bcc79..f1709bf7f 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -64,6 +64,15 @@ if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     target_compile_definitions(input_filter_adapters PUBLIC -DGR_GREATER_38=1)
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(input_filter_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET input_filter_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
index 682c1f01b..72cb7962c 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
@@ -51,6 +51,15 @@ target_link_libraries(input_filter_gr_blocks
         Log4cpp::log4cpp
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(input_filter_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET input_filter_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 32c8a876e..78878897b 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -148,6 +148,15 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(algorithms_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 ###############################################################################
 
 source_group(Headers FILES gnss_sdr_flags.h)
@@ -169,6 +178,15 @@ target_compile_definitions(gnss_sdr_flags
     PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(gnss_sdr_flags
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET gnss_sdr_flags
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/observables/adapters/CMakeLists.txt b/src/algorithms/observables/adapters/CMakeLists.txt
index 78d5c0b98..a75cd92df 100644
--- a/src/algorithms/observables/adapters/CMakeLists.txt
+++ b/src/algorithms/observables/adapters/CMakeLists.txt
@@ -43,6 +43,15 @@ target_link_libraries(obs_adapters
         Glog::glog
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(obs_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET obs_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
index d1fb176eb..e50fabfd2 100644
--- a/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/observables/gnuradio_blocks/CMakeLists.txt
@@ -46,6 +46,15 @@ target_link_libraries(obs_gr_blocks
         algorithms_libs
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(obs_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET obs_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/resampler/adapters/CMakeLists.txt b/src/algorithms/resampler/adapters/CMakeLists.txt
index 58d7e2099..18554d352 100644
--- a/src/algorithms/resampler/adapters/CMakeLists.txt
+++ b/src/algorithms/resampler/adapters/CMakeLists.txt
@@ -56,6 +56,15 @@ if(${PC_GNURADIO_RUNTIME_VERSION} VERSION_GREATER "3.7.13.4")
     target_compile_definitions(resampler_adapters PUBLIC -DGR_GREATER_38=1)
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(resampler_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET resampler_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
index 5b4c38b99..e5193d7eb 100644
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -48,6 +48,15 @@ target_link_libraries(resampler_gr_blocks
         Glog::glog
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(resampler_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET resampler_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/signal_generator/adapters/CMakeLists.txt b/src/algorithms/signal_generator/adapters/CMakeLists.txt
index 8797cb514..fb651871e 100644
--- a/src/algorithms/signal_generator/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_generator/adapters/CMakeLists.txt
@@ -29,7 +29,7 @@ add_library(signal_generator_adapters
 target_link_libraries(signal_generator_adapters
     PUBLIC
         Gnuradio::blocks
-        signal_generator_blocks
+        signal_generator_gr_blocks
     PRIVATE
         Gflags::gflags
         Glog::glog
@@ -41,6 +41,15 @@ target_include_directories(signal_generator_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(signal_generator_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET signal_generator_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 87990a094..99e7debab 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -21,12 +21,12 @@ set(SIGNAL_GENERATOR_BLOCK_HEADERS signal_generator_c.h)
 
 source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
 
-add_library(signal_generator_blocks
+add_library(signal_generator_gr_blocks
     ${SIGNAL_GENERATOR_BLOCK_SOURCES}
     ${SIGNAL_GENERATOR_BLOCK_HEADERS}
 )
 
-target_link_libraries(signal_generator_blocks
+target_link_libraries(signal_generator_gr_blocks
     PUBLIC
         Boost::boost
         Gnuradio::runtime
@@ -36,12 +36,21 @@ target_link_libraries(signal_generator_blocks
         algorithms_libs
 )
 
-target_include_directories(signal_generator_blocks
+target_include_directories(signal_generator_gr_blocks
     PUBLIC
         ${CMAKE_SOURCE_DIR}/src/algorithms/libs
 )
 
-set_property(TARGET signal_generator_blocks
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(signal_generator_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
+set_property(TARGET signal_generator_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index e0233ad6f..5374a6fbf 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -253,6 +253,15 @@ target_compile_definitions(signal_source_adapters
     PRIVATE -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(signal_source_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET signal_source_adapters APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
index 740bd4b8c..4a4a264d2 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_source/gnuradio_blocks/CMakeLists.txt
@@ -84,6 +84,15 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(signal_source_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET signal_source_gr_blocks APPEND PROPERTY
     INTERFACE_INCLUDE_DIRECTORIES $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/signal_source/libs/CMakeLists.txt b/src/algorithms/signal_source/libs/CMakeLists.txt
index 7f07471ea..f6015ec59 100644
--- a/src/algorithms/signal_source/libs/CMakeLists.txt
+++ b/src/algorithms/signal_source/libs/CMakeLists.txt
@@ -93,6 +93,15 @@ if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
     )
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(signal_source_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET signal_source_libs APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )
diff --git a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
index cf8ca684d..17eb17e5d 100644
--- a/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
@@ -67,6 +67,15 @@ target_include_directories(telemetry_decoder_adapters
         ${CMAKE_SOURCE_DIR}/src/core/interfaces
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(telemetry_decoder_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET telemetry_decoder_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
index 6c76801de..8e71b0681 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
@@ -61,6 +61,15 @@ target_link_libraries(telemetry_decoder_gr_blocks
         Glog::glog
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(telemetry_decoder_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET telemetry_decoder_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
index 866c8957b..a802b970c 100644
--- a/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
+++ b/src/algorithms/telemetry_decoder/libs/CMakeLists.txt
@@ -44,6 +44,15 @@ target_link_libraries(telemetry_decoder_libs
         Glog::glog
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(telemetry_decoder_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET telemetry_decoder_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt
index 34c62dfb2..e51180bf6 100644
--- a/src/algorithms/tracking/adapters/CMakeLists.txt
+++ b/src/algorithms/tracking/adapters/CMakeLists.txt
@@ -116,6 +116,15 @@ if(ENABLE_CUDA)
     )
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(tracking_adapters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET tracking_adapters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 3341d142a..48da0fc1b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -102,6 +102,15 @@ if(ENABLE_CUDA)
     )
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(tracking_gr_blocks
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET tracking_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt
index 63ca330df..7a7951645 100644
--- a/src/algorithms/tracking/libs/CMakeLists.txt
+++ b/src/algorithms/tracking/libs/CMakeLists.txt
@@ -100,6 +100,15 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(tracking_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET tracking_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/core/libs/CMakeLists.txt b/src/core/libs/CMakeLists.txt
index d99d6f494..68b52890c 100644
--- a/src/core/libs/CMakeLists.txt
+++ b/src/core/libs/CMakeLists.txt
@@ -51,6 +51,15 @@ target_link_libraries(core_libs
         Pugixml::pugixml
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(core_libs
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET core_libs
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/core/monitor/CMakeLists.txt b/src/core/monitor/CMakeLists.txt
index 13f13576d..4549006c4 100644
--- a/src/core/monitor/CMakeLists.txt
+++ b/src/core/monitor/CMakeLists.txt
@@ -44,8 +44,6 @@ target_link_libraries(core_monitor
         Gnuradio::runtime
         core_system_parameters
     PRIVATE
-        Gflags::gflags
-        Glog::glog
         Gnuradio::pmt
 )
 
@@ -58,6 +56,15 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(core_monitor
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET core_monitor
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/core/monitor/gnss_synchro_monitor.cc b/src/core/monitor/gnss_synchro_monitor.cc
index 49b609ce6..d52fb10d7 100644
--- a/src/core/monitor/gnss_synchro_monitor.cc
+++ b/src/core/monitor/gnss_synchro_monitor.cc
@@ -33,15 +33,11 @@
 
 #include "gnss_synchro_monitor.h"
 #include "gnss_synchro.h"
-#include <glog/logging.h>
 #include <algorithm>
 #include <iostream>
 #include <utility>
 
 
-using google::LogMessage;
-
-
 gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
     int decimation_factor,
     int udp_port,
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 877658b64..538f2d72a 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -168,6 +168,15 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(core_receiver
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/receiver>
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/interfaces>
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 5ebb96ad0..75efbae2d 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -1051,7 +1051,7 @@ void ControlThread::sysv_queue_listener()
 {
     typedef struct
     {
-        long mtype;  // required by SysV queue messaging
+        long mtype;  // NOLINT(google-runtime-int) required by SysV queue messaging
         double stop_message;
     } stop_msgbuf;
 
diff --git a/src/core/system_parameters/CMakeLists.txt b/src/core/system_parameters/CMakeLists.txt
index bc1e89cc4..262aab718 100644
--- a/src/core/system_parameters/CMakeLists.txt
+++ b/src/core/system_parameters/CMakeLists.txt
@@ -117,6 +117,15 @@ target_link_libraries(core_system_parameters
         Gflags::gflags
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(core_system_parameters
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET core_system_parameters
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 40f0c3ff9..ad785f0f0 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -68,6 +68,15 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(gnss-sdr
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 add_custom_command(TARGET gnss-sdr
     POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index f3da0060f..afe871fdd 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -701,7 +701,7 @@ if(NOT ENABLE_PACKAGING)
             GTest::GTest
             GTest::Main
             Volkgnsssdr::volkgnsssdr
-            signal_generator_blocks
+            signal_generator_gr_blocks
             signal_source_gr_blocks
             signal_source_libs
             acquisition_adapters
@@ -746,7 +746,7 @@ if(NOT ENABLE_PACKAGING)
             signal_source_libs
             algorithms_libs
             tracking_adapters
-            signal_generator_blocks
+            signal_generator_gr_blocks
             core_receiver
             core_system_parameters
     )

From b3ae2c969a7c2e855af1c3e61ead1fa0bc4970ee Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 10:33:20 +0100
Subject: [PATCH 088/123] clang-tidy: apply fixes

---
 src/algorithms/PVT/adapters/rtklib_pvt.cc        |  2 +-
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.h          |  2 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.h          |  2 +-
 src/algorithms/PVT/libs/rinex_printer.cc         |  8 ++++----
 src/algorithms/PVT/libs/rinex_printer.h          | 16 ++++++++--------
 src/algorithms/PVT/libs/rtcm_printer.h           |  4 ++--
 src/algorithms/libs/geofunctions.h               |  2 +-
 src/algorithms/libs/rtcm.h                       | 10 +++++-----
 .../adapters/rtl_tcp_signal_source.cc            |  2 +-
 .../gnuradio_blocks/unpack_2bit_samples.h        |  2 +-
 .../unpack_spir_gss6450_samples.h                |  2 +-
 .../telemetry_decoder/libs/viterbi_decoder.h     |  4 ++--
 .../galileo_e1_tcp_connector_tracking.cc         |  2 +-
 .../adapters/gps_l1_ca_tcp_connector_tracking.cc |  2 +-
 .../gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h   |  2 +-
 .../beidou_dnav_navigation_message.h             |  2 +-
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 78de824ed..61b243633 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -53,7 +53,7 @@ using google::LogMessage;
 RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
-    unsigned int out_streams) : role_(std::move(role)),
+    unsigned int out_streams) : role_(role),
                                 in_streams_(in_streams),
                                 out_streams_(out_streams)
 {
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index 72b038683..939855318 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -58,7 +58,7 @@ class rtklib_pvt_cc;
 
 using rtklib_pvt_cc_sptr = boost::shared_ptr<rtklib_pvt_cc>;
 
-rtklib_pvt_cc_sptr rtklib_make_pvt_cc(uint32_t n_channels,
+rtklib_pvt_cc_sptr rtklib_make_pvt_cc(uint32_t nchannels,
     const Pvt_Conf& conf_,
     const rtk_t& rtk);
 
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.h b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
index 8a9c2b590..248a4b34d 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.h
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
@@ -60,7 +60,7 @@ public:
     hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file);
     ~hybrid_ls_pvt();
 
-    bool get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double Rx_time, bool flag_averaging);
+    bool get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging);
 
     std::map<int, Galileo_Ephemeris> galileo_ephemeris_map;  //!< Map storing new Galileo_Ephemeris
     std::map<int, Gps_Ephemeris> gps_ephemeris_map;          //!< Map storing new GPS_Ephemeris
diff --git a/src/algorithms/PVT/libs/rinex_printer.cc b/src/algorithms/PVT/libs/rinex_printer.cc
index 415cae4a7..10f552559 100644
--- a/src/algorithms/PVT/libs/rinex_printer.cc
+++ b/src/algorithms/PVT/libs/rinex_printer.cc
@@ -3867,9 +3867,9 @@ void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps
 }
 
 
-void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps_CNAV_Ephemeris>& gps_eph_map, const std::map<int32_t, Glonass_Gnav_Ephemeris>& glonass_gnav_eph_map)
+void Rinex_Printer::log_rinex_nav(std::fstream& out, const std::map<int32_t, Gps_CNAV_Ephemeris>& gps_cnav_eph_map, const std::map<int32_t, Glonass_Gnav_Ephemeris>& glonass_gnav_eph_map)
 {
-    Rinex_Printer::log_rinex_nav(out, gps_eph_map);
+    Rinex_Printer::log_rinex_nav(out, gps_cnav_eph_map);
     Rinex_Printer::log_rinex_nav(out, glonass_gnav_eph_map);
 }
 
@@ -4715,7 +4715,7 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps
 }
 
 
-void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& glonass_bands)
+void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris& gps_cnav_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& glonass_bands)
 {
     if (glonass_gnav_eph.d_m)
         {
@@ -4962,7 +4962,7 @@ void Rinex_Printer::rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris
 
     // -------- TIME OF FIRST OBS
     line.clear();
-    boost::posix_time::ptime p_gps_time = Rinex_Printer::compute_GPS_time(gps_eph, d_TOW_first_observation);
+    boost::posix_time::ptime p_gps_time = Rinex_Printer::compute_GPS_time(gps_cnav_eph, d_TOW_first_observation);
     std::string timestring = boost::posix_time::to_iso_string(p_gps_time);
     std::string year(timestring, 0, 4);
     std::string month(timestring, 4, 2);
diff --git a/src/algorithms/PVT/libs/rinex_printer.h b/src/algorithms/PVT/libs/rinex_printer.h
index 1c4475592..0e189dc80 100644
--- a/src/algorithms/PVT/libs/rinex_printer.h
+++ b/src/algorithms/PVT/libs/rinex_printer.h
@@ -186,17 +186,17 @@ public:
     /*!
      *  \brief Generates the Mixed (GPS L1 C/A /GLONASS) Observation data header. Example: galileo_bands("1C"), galileo_bands("1B 5X"), galileo_bands("5X"), ... Default: "1B".
      */
-    void rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& glo_bands = "1C");
+    void rinex_obs_header(std::fstream& out, const Gps_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& glonass_bands = "1C");
 
     /*!
      *  \brief Generates the Mixed (Galileo/GLONASS) Observation data header. Example: galileo_bands("1C"), galileo_bands("1B 5X"), galileo_bands("5X"), ... Default: "1B".
      */
-    void rinex_obs_header(std::fstream& out, const Galileo_Ephemeris& galileo_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& galileo_bands = "1B", const std::string& glo_bands = "1C");
+    void rinex_obs_header(std::fstream& out, const Galileo_Ephemeris& galileo_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& galileo_bands = "1B", const std::string& glonass_bands = "1C");
 
     /*!
      *  \brief Generates the Mixed (GPS L2C/GLONASS) Observation data header. Example: galileo_bands("1G")... Default: "1G".
      */
-    void rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris& gps_cnav_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& glo_bands = "1G");
+    void rinex_obs_header(std::fstream& out, const Gps_CNAV_Ephemeris& gps_cnav_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double d_TOW_first_observation, const std::string& glonass_bands = "1G");
 
     /*!
      *  \brief Generates the a Beidou B1I Observation data header. Example: beidou_bands("B1")
@@ -351,12 +351,12 @@ public:
     /*!
      *  \brief Writes Mixed GPS L2C - GLONASS observables into the RINEX file
      */
-    void log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& gps_cnav_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables);
+    void log_rinex_obs(std::fstream& out, const Gps_CNAV_Ephemeris& gps_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables);
 
     /*!
      *  \brief Writes Mixed Galileo/GLONASS observables into the RINEX file
      */
-    void log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& galileo_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double gps_obs_time, const std::map<int32_t, Gnss_Synchro>& observables);
+    void log_rinex_obs(std::fstream& out, const Galileo_Ephemeris& galileo_eph, const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const double galileo_obs_time, const std::map<int32_t, Gnss_Synchro>& observables);
 
     /*!
      *  \brief Writes BDS B1I observables into the RINEX file
@@ -374,7 +374,7 @@ public:
      */
     //void log_rinex_sbs(std::fstream & out, const Sbas_Raw_Msg & sbs_message);
 
-    void update_nav_header(std::fstream& out, const Gps_Utc_Model& gps_utc, const Gps_Iono& gps_iono);
+    void update_nav_header(std::fstream& out, const Gps_Utc_Model& utc_model, const Gps_Iono& gps_iono);
 
     void update_nav_header(std::fstream& out, const Gps_CNAV_Utc_Model& utc_model, const Gps_CNAV_Iono& iono);
 
@@ -388,11 +388,11 @@ public:
 
     void update_nav_header(std::fstream& out, const Gps_Iono& gps_iono, const Gps_Utc_Model& gps_utc, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac);
 
-    void update_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps_cnav_iono, const Gps_CNAV_Utc_Model& gps_cnav_utc, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac);
+    void update_nav_header(std::fstream& out, const Gps_CNAV_Iono& gps_iono, const Gps_CNAV_Utc_Model& gps_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac);
 
     void update_nav_header(std::fstream& out, const Galileo_Iono& galileo_iono, const Galileo_Utc_Model& galileo_utc_model, const Glonass_Gnav_Utc_Model& glonass_gnav_utc_model, const Glonass_Gnav_Almanac& glonass_gnav_almanac);
 
-    void update_nav_header(std::fstream& out, const Beidou_Dnav_Utc_Model& beidou_dnav_utc, const Beidou_Dnav_Iono& beidou_dnav_iono);
+    void update_nav_header(std::fstream& out, const Beidou_Dnav_Utc_Model& utc_model, const Beidou_Dnav_Iono& beidou_dnav_iono);
 
     void update_obs_header(std::fstream& out, const Gps_Utc_Model& utc_model);
 
diff --git a/src/algorithms/PVT/libs/rtcm_printer.h b/src/algorithms/PVT/libs/rtcm_printer.h
index c5ea3a54a..9db248eb9 100644
--- a/src/algorithms/PVT/libs/rtcm_printer.h
+++ b/src/algorithms/PVT/libs/rtcm_printer.h
@@ -48,7 +48,7 @@ public:
     /*!
      * \brief Default constructor.
      */
-    Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump, bool flag_rtcm_server, bool flag_rtcm_tty_port, uint16_t rtcm_tcp_port, uint16_t rtcm_station_id, const std::string& rtcm_dump_filename, bool time_tag_name = true, const std::string& base_path = ".");
+    Rtcm_Printer(const std::string& filename, bool flag_rtcm_file_dump, bool flag_rtcm_server, bool flag_rtcm_tty_port, uint16_t rtcm_tcp_port, uint16_t rtcm_station_id, const std::string& rtcm_dump_devname, bool time_tag_name = true, const std::string& base_path = ".");
 
     /*!
      * \brief Default destructor.
@@ -112,7 +112,7 @@ public:
      * \param utc_model GLONASS GNAV Clock Information broadcast in string 5
      * \return true or false upon operation success
      */
-    bool Print_Rtcm_MT1020(const Glonass_Gnav_Ephemeris& glo_gnav_eph, const Glonass_Gnav_Utc_Model& utc_model);
+    bool Print_Rtcm_MT1020(const Glonass_Gnav_Ephemeris& glonass_gnav_eph, const Glonass_Gnav_Utc_Model& utc_model);
 
     bool Print_Rtcm_MSM(uint32_t msm_number,
         const Gps_Ephemeris& gps_eph,
diff --git a/src/algorithms/libs/geofunctions.h b/src/algorithms/libs/geofunctions.h
index 677dc4a1d..6ab773504 100644
--- a/src/algorithms/libs/geofunctions.h
+++ b/src/algorithms/libs/geofunctions.h
@@ -102,7 +102,7 @@ double radtodeg(double angleInRadians);
 
 double mstoknotsh(double MetersPerSeconds);
 
-double mstokph(double Kph);
+double mstokph(double MetersPerSeconds);
 
 arma::vec CTM_to_Euler(const arma::mat &C);
 
diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index d390dc568..81f199a28 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -368,7 +368,7 @@ public:
     void run_server();   //<! Starts running the server
     void stop_server();  //<! Stops the server
 
-    void send_message(const std::string& message);  //<! Sends a message through the server to all connected clients
+    void send_message(const std::string& msg);      //<! Sends a message through the server to all connected clients
     bool is_server_running() const;                 //<! Returns true if the server is running, false otherwise
 
 private:
@@ -440,7 +440,7 @@ private:
      * \param gnss_synchroL2 Information generated by channels while processing the GLONASS GNAV L2 satellite
      * \return Returns the message content as set of bits
      */
-    std::bitset<107> get_MT1011_sat_content(const Glonass_Gnav_Ephemeris& ephGNAVL1, const Glonass_Gnav_Ephemeris& ephGNAVL2, double obs_time, const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2);
+    std::bitset<107> get_MT1011_sat_content(const Glonass_Gnav_Ephemeris& ephL1, const Glonass_Gnav_Ephemeris& ephL2, double obs_time, const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2);
     /*!
      * \brief Get the contents of the satellite specific portion of a type 1012 Message (GLONASS Extended RTK, L1 & L2)
      * \details Contents generated for each satellite. See table 3.5-14
@@ -452,7 +452,7 @@ private:
      * \param gnss_synchroL2 Information generated by channels while processing the GLONASS GNAV L2 satellite
      * \return Returns the message content as set of bits
      */
-    std::bitset<130> get_MT1012_sat_content(const Glonass_Gnav_Ephemeris& ephGNAVL1, const Glonass_Gnav_Ephemeris& ephGNAVL2, double obs_time, const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2);
+    std::bitset<130> get_MT1012_sat_content(const Glonass_Gnav_Ephemeris& ephL1, const Glonass_Gnav_Ephemeris& ephL2, double obs_time, const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2);
 
     std::string get_MSM_header(uint32_t msg_number,
         double obs_time,
@@ -1413,10 +1413,10 @@ private:
     int32_t set_DF393(bool more_messages);  //1 indicates that more MSMs follow for given physical time and reference station ID
 
     std::bitset<64> DF394;
-    int32_t set_DF394(const std::map<int32_t, Gnss_Synchro>& observables);
+    int32_t set_DF394(const std::map<int32_t, Gnss_Synchro>& gnss_synchro);
 
     std::bitset<32> DF395;
-    int32_t set_DF395(const std::map<int32_t, Gnss_Synchro>& observables);
+    int32_t set_DF395(const std::map<int32_t, Gnss_Synchro>& gnss_synchro);
 
     std::string set_DF396(const std::map<int32_t, Gnss_Synchro>& observables);
 
diff --git a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
index 6f6f549df..fd9fc9751 100644
--- a/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/rtl_tcp_signal_source.cc
@@ -48,7 +48,7 @@ RtlTcpSignalSource::RtlTcpSignalSource(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_stream,
     unsigned int out_stream,
-    boost::shared_ptr<gr::msg_queue> queue) : role_(std::move(role)),
+    boost::shared_ptr<gr::msg_queue> queue) : role_(role),
                                               in_stream_(in_stream),
                                               out_stream_(out_stream),
                                               queue_(std::move(queue))
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
index 33f3cb73e..876a38d1d 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.h
@@ -102,7 +102,7 @@ private:
     std::vector<int8_t> work_buffer_;
 
 public:
-    unpack_2bit_samples(bool big_endianBytes,
+    unpack_2bit_samples(bool big_endian_bytes,
         size_t item_size,
         bool big_endian_items,
         bool reverse_interleaving);
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
index 28ef0b073..dcb0552ca 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_spir_gss6450_samples.h
@@ -47,7 +47,7 @@ public:
     int work(int noutput_items,
         gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
     friend unpack_spir_gss6450_samples_sptr make_unpack_spir_gss6450_samples_sptr(unsigned int adc_nbit);
-    void decode_4bits_word(uint32_t input_int32, gr_complex *out, int adc_bits);
+    void decode_4bits_word(uint32_t input_uint32, gr_complex *out, int adc_bits);
     unpack_spir_gss6450_samples(unsigned int adc_nbit);
     ~unpack_spir_gss6450_samples();
 
diff --git a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h
index c2ae1327a..510673200 100644
--- a/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h
+++ b/src/algorithms/telemetry_decoder/libs/viterbi_decoder.h
@@ -55,7 +55,7 @@ public:
      */
     float decode_block(const double input_c[], int* output_u_int, const int LL);
 
-    float decode_continuous(const double sym[], const int traceback_depth, int output_u_int[],
+    float decode_continuous(const double sym[], const int traceback_depth, int bits[],
         const int nbits_requested, int& nbits_decoded);
 
 private:
@@ -113,7 +113,7 @@ private:
     void init_trellis_state();
     int do_acs(const double sym[], int nbits);
     int do_traceback(std::size_t traceback_length);
-    int do_tb_and_decode(int traceback_length, int requested_decoding_length, int state, int bits[], float& indicator_metric);
+    int do_tb_and_decode(int traceback_length, int requested_decoding_length, int state, int output_u_int[], float& indicator_metric);
 
     // branch metric function
     float gamma(const float rec_array[], int symbol, int nn);
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index 340b2bc89..358e952c9 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -48,7 +48,7 @@ using google::LogMessage;
 
 GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
     ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
index 3000ac8ae..15e7f650b 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
@@ -47,7 +47,7 @@ using google::LogMessage;
 
 GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
     ConfigurationInterface* configuration, const std::string& role,
-    unsigned int in_streams, unsigned int out_streams) : role_(std::move(role)), in_streams_(in_streams), out_streams_(out_streams)
+    unsigned int in_streams, unsigned int out_streams) : role_(role), in_streams_(in_streams), out_streams_(out_streams)
 {
     DLOG(INFO) << "role " << role;
     //################# CONFIGURATION PARAMETERS ########################
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
index e4acf778b..96305fc0b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
@@ -61,7 +61,7 @@ gps_l1_ca_kf_make_tracking_cc(uint32_t order,
     int64_t fs_in, uint32_t vector_length,
     bool dump,
     std::string dump_filename,
-    float pll_bw_hz,
+    float dll_bw_hz,
     float early_late_space_chips,
     bool bce_run,
     uint32_t bce_ptrans,
diff --git a/src/core/system_parameters/beidou_dnav_navigation_message.h b/src/core/system_parameters/beidou_dnav_navigation_message.h
index 97408e452..93c1c9a24 100644
--- a/src/core/system_parameters/beidou_dnav_navigation_message.h
+++ b/src/core/system_parameters/beidou_dnav_navigation_message.h
@@ -296,7 +296,7 @@ public:
      * \brief Computes the Coordinated Universal Time (UTC) and
      * returns it in [s] (IS-GPS-200E, 20.3.3.5.2.4)
      */
-    double utc_time(const double gpstime_corrected) const;
+    double utc_time(const double beidoutime_corrected) const;
 
     bool satellite_validation();
 

From 1ad13669388afa102d7babfa00442a1fea9762ae Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 11:03:35 +0100
Subject: [PATCH 089/123] clang-tidy: apply
 readability-inconsistent-declaration-parameter-name check

---
 src/core/libs/supl/asn-rrlp/constr_CHOICE.c    |  4 ++--
 src/core/libs/supl/asn-rrlp/converter-sample.c |  2 +-
 src/core/libs/supl/asn-supl/GeneralizedTime.h  | 10 +++++-----
 src/core/libs/supl/asn-supl/INTEGER.h          |  4 ++--
 src/core/libs/supl/asn-supl/OCTET_STRING.h     |  4 ++--
 src/core/libs/supl/asn-supl/UTCTime.h          |  2 +-
 src/core/libs/supl/asn-supl/asn_codecs_prim.h  |  4 ++--
 src/core/libs/supl/asn-supl/ber_decoder.h      |  4 ++--
 src/core/libs/supl/asn-supl/ber_tlv_tag.h      |  2 +-
 src/core/libs/supl/asn-supl/constr_CHOICE.c    |  4 ++--
 src/core/libs/supl/asn-supl/der_encoder.h      |  2 +-
 src/core/libs/supl/asn-supl/per_decoder.h      |  8 ++++----
 src/core/libs/supl/asn-supl/per_encoder.h      | 12 ++++++------
 src/core/libs/supl/asn-supl/per_support.h      | 12 ++++++------
 src/core/libs/supl/asn-supl/xer_decoder.h      |  2 +-
 src/core/libs/supl/asn-supl/xer_encoder.h      |  4 ++--
 src/core/libs/supl/asn-supl/xer_support.h      |  2 +-
 src/core/libs/supl/supl.h                      |  2 +-
 18 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/core/libs/supl/asn-rrlp/constr_CHOICE.c b/src/core/libs/supl/asn-rrlp/constr_CHOICE.c
index 75903fde7..1bf467254 100644
--- a/src/core/libs/supl/asn-rrlp/constr_CHOICE.c
+++ b/src/core/libs/supl/asn-rrlp/constr_CHOICE.c
@@ -63,8 +63,8 @@
 /*
  * See the definitions.
  */
-static int _fetch_present_idx(const void *struct_ptr, int off, int size);
-static void _set_present_idx(void *sptr, int offset, int size, int pres);
+static int _fetch_present_idx(const void *struct_ptr, int pres_offset, int size);
+static void _set_present_idx(void *struct_ptr, int offset, int size, int pres);
 
 /*
  * Tags are canonically sorted in the tag to member table.
diff --git a/src/core/libs/supl/asn-rrlp/converter-sample.c b/src/core/libs/supl/asn-rrlp/converter-sample.c
index 46136ebb3..af980a1d6 100644
--- a/src/core/libs/supl/asn-rrlp/converter-sample.c
+++ b/src/core/libs/supl/asn-rrlp/converter-sample.c
@@ -34,7 +34,7 @@ extern asn_TYPE_descriptor_t *asn_pdu_collection[];
 /*
  * Open file and parse its contens.
  */
-static void *data_decode_from_file(asn_TYPE_descriptor_t *asnTypeOfPDU,
+static void *data_decode_from_file(asn_TYPE_descriptor_t *pduType,
 	FILE *file, const char *name, ssize_t suggested_bufsize, int first_pdu);
 static int write_out(const void *buffer, size_t size, void *key);
 static FILE *argument_to_file(char *av[], int idx);
diff --git a/src/core/libs/supl/asn-supl/GeneralizedTime.h b/src/core/libs/supl/asn-supl/GeneralizedTime.h
index 657461d0f..3867820e3 100644
--- a/src/core/libs/supl/asn-supl/GeneralizedTime.h
+++ b/src/core/libs/supl/asn-supl/GeneralizedTime.h
@@ -34,13 +34,13 @@ extern "C"
  * instead of default local one.
  * On error returns -1 and errno set to EINVAL
  */
-    time_t asn_GT2time(const GeneralizedTime_t * /*st*/, struct tm *_optional_tm4fill,
+    time_t asn_GT2time(const GeneralizedTime_t * /*st*/, struct tm *ret_tm,
         int as_gmt);
 
     /* A version of the above function also returning the fractions of seconds */
     time_t asn_GT2time_frac(const GeneralizedTime_t * /*st*/,
         int *frac_value, int *frac_digits, /* (value / (10 ^ digits)) */
-        struct tm *_optional_tm4fill, int as_gmt);
+        struct tm *ret_tm, int as_gmt);
 
     /*
  * Another version returning fractions with defined precision
@@ -49,7 +49,7 @@ extern "C"
  */
     time_t asn_GT2time_prec(const GeneralizedTime_t * /*st*/,
         int *frac_value, int frac_digits,
-        struct tm *_optional_tm4fill, int as_gmt);
+        struct tm *ret_tm, int as_gmt);
 
     /*
  * Convert a struct tm into GeneralizedTime.
@@ -58,9 +58,9 @@ extern "C"
  * into a GMT time zone (encoding ends with a "Z").
  * On error, this function returns 0 and sets errno.
  */
-    GeneralizedTime_t *asn_time2GT(GeneralizedTime_t *_optional_gt,
+    GeneralizedTime_t *asn_time2GT(GeneralizedTime_t *opt_gt,
         const struct tm * /*tm*/, int force_gmt);
-    GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *_optional_gt,
+    GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *opt_gt,
         const struct tm * /*tm*/, int frac_value, int frac_digits, int force_gmt);
 
 #ifdef __cplusplus
diff --git a/src/core/libs/supl/asn-supl/INTEGER.h b/src/core/libs/supl/asn-supl/INTEGER.h
index 2acd13ab9..e389e6b43 100644
--- a/src/core/libs/supl/asn-supl/INTEGER.h
+++ b/src/core/libs/supl/asn-supl/INTEGER.h
@@ -57,8 +57,8 @@ extern "C"
  */
     int asn_INTEGER2long(const INTEGER_t *i, long *l);
     int asn_INTEGER2ulong(const INTEGER_t *i, unsigned long *l);
-    int asn_long2INTEGER(INTEGER_t *i, long l);
-    int asn_ulong2INTEGER(INTEGER_t *i, unsigned long l);
+    int asn_long2INTEGER(INTEGER_t *st, long value);
+    int asn_ulong2INTEGER(INTEGER_t *st, unsigned long value);
 
     /*
  * Convert the integer value into the corresponding enumeration map entry.
diff --git a/src/core/libs/supl/asn-supl/OCTET_STRING.h b/src/core/libs/supl/asn-supl/OCTET_STRING.h
index 124fde559..9387a4d4b 100644
--- a/src/core/libs/supl/asn-supl/OCTET_STRING.h
+++ b/src/core/libs/supl/asn-supl/OCTET_STRING.h
@@ -48,7 +48,7 @@ extern "C"
  * current contents of the OCTET STRING.
  * Returns 0 if it was possible to perform operation, -1 otherwise.
  */
-    int OCTET_STRING_fromBuf(OCTET_STRING_t *s, const char *str, int size);
+    int OCTET_STRING_fromBuf(OCTET_STRING_t *s, const char *str, int len);
 
 /* Handy conversion from the C string into the OCTET STRING. */
 #define OCTET_STRING_fromString(s, str) OCTET_STRING_fromBuf(s, str, -1)
@@ -59,7 +59,7 @@ extern "C"
  * empty OCTET STRING.
  */
     OCTET_STRING_t *OCTET_STRING_new_fromBuf(asn_TYPE_descriptor_t *td,
-        const char *str, int size);
+        const char *str, int len);
 
     /****************************
  * Internally useful stuff. *
diff --git a/src/core/libs/supl/asn-supl/UTCTime.h b/src/core/libs/supl/asn-supl/UTCTime.h
index 477c7931d..c8e73785c 100644
--- a/src/core/libs/supl/asn-supl/UTCTime.h
+++ b/src/core/libs/supl/asn-supl/UTCTime.h
@@ -27,7 +27,7 @@ extern "C"
     struct tm; /* <time.h> */
 
     /* See asn_GT2time() in GeneralizedTime.h */
-    time_t asn_UT2time(const UTCTime_t * /*st*/, struct tm *_optional_tm4fill, int as_gmt);
+    time_t asn_UT2time(const UTCTime_t * /*st*/, struct tm *_tm, int as_gmt);
 
     /* See asn_time2GT() in GeneralizedTime.h */
     UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm * /*tm*/, int force_gmt);
diff --git a/src/core/libs/supl/asn-supl/asn_codecs_prim.h b/src/core/libs/supl/asn-supl/asn_codecs_prim.h
index cb8c37937..6ebaefb87 100644
--- a/src/core/libs/supl/asn-supl/asn_codecs_prim.h
+++ b/src/core/libs/supl/asn-supl/asn_codecs_prim.h
@@ -41,8 +41,8 @@ extern "C"
  * Also see xer_decode_general() in xer_decoder.h
  */
     asn_dec_rval_t xer_decode_primitive(asn_codec_ctx_t *opt_codec_ctx,
-        asn_TYPE_descriptor_t *type_descriptor,
-        void **struct_ptr, size_t struct_size,
+        asn_TYPE_descriptor_t *td,
+        void **sptr, size_t struct_size,
         const char *opt_mname,
         const void *buf_ptr, size_t size,
         xer_primitive_body_decoder_f *prim_body_decoder);
diff --git a/src/core/libs/supl/asn-supl/ber_decoder.h b/src/core/libs/supl/asn-supl/ber_decoder.h
index 6a87fc23f..629aff043 100644
--- a/src/core/libs/supl/asn-supl/ber_decoder.h
+++ b/src/core/libs/supl/asn-supl/ber_decoder.h
@@ -23,7 +23,7 @@ extern "C"
     asn_dec_rval_t ber_decode(struct asn_codec_ctx_s *opt_codec_ctx,
         struct asn_TYPE_descriptor_s *type_descriptor,
         void **struct_ptr,  /* Pointer to a target structure's pointer */
-        const void *buffer, /* Data to be decoded */
+        const void *ptr, /* Data to be decoded */
         size_t size         /* Size of that buffer */
     );
 
@@ -49,7 +49,7 @@ extern "C"
  */
     asn_dec_rval_t ber_check_tags(
         struct asn_codec_ctx_s *opt_codec_ctx, /* codec options */
-        struct asn_TYPE_descriptor_s *type_descriptor,
+        struct asn_TYPE_descriptor_s *td,
         asn_struct_ctx_t *opt_ctx, /* saved decoding context */
         const void *ptr, size_t size,
         int tag_mode,      /* {-1,0,1}: IMPLICIT, no, EXPLICIT */
diff --git a/src/core/libs/supl/asn-supl/ber_tlv_tag.h b/src/core/libs/supl/asn-supl/ber_tlv_tag.h
index c8361549a..fa4c7321c 100644
--- a/src/core/libs/supl/asn-supl/ber_tlv_tag.h
+++ b/src/core/libs/supl/asn-supl/ber_tlv_tag.h
@@ -33,7 +33,7 @@ extern "C"
  * (i.e. "[PRIVATE 0]").
  * Return values correspond to their libc counterparts (if any).
  */
-    ssize_t ber_tlv_tag_snprint(ber_tlv_tag_t tag, char *buf, size_t buflen);
+    ssize_t ber_tlv_tag_snprint(ber_tlv_tag_t tag, char *buf, size_t size);
     ssize_t ber_tlv_tag_fwrite(ber_tlv_tag_t tag, FILE * /*f*/);
     char *ber_tlv_tag_string(ber_tlv_tag_t tag);
 
diff --git a/src/core/libs/supl/asn-supl/constr_CHOICE.c b/src/core/libs/supl/asn-supl/constr_CHOICE.c
index 75903fde7..1bf467254 100644
--- a/src/core/libs/supl/asn-supl/constr_CHOICE.c
+++ b/src/core/libs/supl/asn-supl/constr_CHOICE.c
@@ -63,8 +63,8 @@
 /*
  * See the definitions.
  */
-static int _fetch_present_idx(const void *struct_ptr, int off, int size);
-static void _set_present_idx(void *sptr, int offset, int size, int pres);
+static int _fetch_present_idx(const void *struct_ptr, int pres_offset, int size);
+static void _set_present_idx(void *struct_ptr, int offset, int size, int pres);
 
 /*
  * Tags are canonically sorted in the tag to member table.
diff --git a/src/core/libs/supl/asn-supl/der_encoder.h b/src/core/libs/supl/asn-supl/der_encoder.h
index 3eafbc281..059e83f70 100644
--- a/src/core/libs/supl/asn-supl/der_encoder.h
+++ b/src/core/libs/supl/asn-supl/der_encoder.h
@@ -53,7 +53,7 @@ extern "C"
  * Write out leading TL[v] sequence according to the type definition.
  */
     ssize_t der_write_tags(
-        struct asn_TYPE_descriptor_s *type_descriptor,
+        struct asn_TYPE_descriptor_s *sd,
         size_t struct_length,
         int tag_mode,      /* {-1,0,1}: IMPLICIT, no, EXPLICIT */
         int last_tag_form, /* {0,!0}: prim, constructed */
diff --git a/src/core/libs/supl/asn-supl/per_decoder.h b/src/core/libs/supl/asn-supl/per_decoder.h
index a28509464..4e410c5b2 100644
--- a/src/core/libs/supl/asn-supl/per_decoder.h
+++ b/src/core/libs/supl/asn-supl/per_decoder.h
@@ -20,8 +20,8 @@ extern "C"
  * On success, this call always returns (.consumed >= 1), as per X.691#10.1.3.
  */
     asn_dec_rval_t uper_decode_complete(struct asn_codec_ctx_s *opt_codec_ctx,
-        struct asn_TYPE_descriptor_s *type_descriptor, /* Type to decode */
-        void **struct_ptr,                             /* Pointer to a target structure's pointer */
+        struct asn_TYPE_descriptor_s *td, /* Type to decode */
+        void **sptr,                             /* Pointer to a target structure's pointer */
         const void *buffer,                            /* Data to be decoded */
         size_t size                                    /* Size of data buffer */
     );
@@ -31,8 +31,8 @@ extern "C"
  * WARNING: This call returns the number of BITS read from the stream. Beware.
  */
     asn_dec_rval_t uper_decode(struct asn_codec_ctx_s *opt_codec_ctx,
-        struct asn_TYPE_descriptor_s *type_descriptor, /* Type to decode */
-        void **struct_ptr,                             /* Pointer to a target structure's pointer */
+        struct asn_TYPE_descriptor_s *td, /* Type to decode */
+        void **sptr,                             /* Pointer to a target structure's pointer */
         const void *buffer,                            /* Data to be decoded */
         size_t size,                                   /* Size of data buffer */
         int skip_bits,                                 /* Number of unused leading bits, 0..7 */
diff --git a/src/core/libs/supl/asn-supl/per_encoder.h b/src/core/libs/supl/asn-supl/per_encoder.h
index 896013095..3f931769d 100644
--- a/src/core/libs/supl/asn-supl/per_encoder.h
+++ b/src/core/libs/supl/asn-supl/per_encoder.h
@@ -21,8 +21,8 @@ extern "C"
  * field of the return value. Use the following formula to convert to bytes:
  * 	bytes = ((.encoded + 7) / 8)
  */
-    asn_enc_rval_t uper_encode(struct asn_TYPE_descriptor_s *type_descriptor,
-        void *struct_ptr,                          /* Structure to be encoded */
+    asn_enc_rval_t uper_encode(struct asn_TYPE_descriptor_s *td,
+        void *sptr,                          /* Structure to be encoded */
         asn_app_consume_bytes_f *consume_bytes_cb, /* Data collector */
         void *app_key                              /* Arbitrary callback argument */
     );
@@ -33,8 +33,8 @@ extern "C"
  * field of the return value.
  */
     asn_enc_rval_t uper_encode_to_buffer(
-        struct asn_TYPE_descriptor_s *type_descriptor,
-        void *struct_ptr,  /* Structure to be encoded */
+        struct asn_TYPE_descriptor_s *td,
+        void *sptr,  /* Structure to be encoded */
         void *buffer,      /* Pre-allocated buffer */
         size_t buffer_size /* Initial buffer size (max) */
     );
@@ -47,9 +47,9 @@ extern "C"
  * encoding of uper_encode() and uper_encode_to_buffer().
  */
     ssize_t uper_encode_to_new_buffer(
-        struct asn_TYPE_descriptor_s *type_descriptor,
+        struct asn_TYPE_descriptor_s *td,
         asn_per_constraints_t *constraints,
-        void *struct_ptr, /* Structure to be encoded */
+        void *sptr, /* Structure to be encoded */
         void **buffer_r   /* Buffer allocated and returned */
     );
 
diff --git a/src/core/libs/supl/asn-supl/per_support.h b/src/core/libs/supl/asn-supl/per_support.h
index c99f12291..7ea76d331 100644
--- a/src/core/libs/supl/asn-supl/per_support.h
+++ b/src/core/libs/supl/asn-supl/per_support.h
@@ -56,24 +56,24 @@ extern "C"
  * This function returns -1 if the specified number of bits could not be
  * extracted due to EOD or other conditions.
  */
-    int32_t per_get_few_bits(asn_per_data_t *per_data, int get_nbits);
+    int32_t per_get_few_bits(asn_per_data_t *pd, int get_nbits);
 
     /* Undo the immediately preceeding "get_few_bits" operation */
-    void per_get_undo(asn_per_data_t *per_data, int get_nbits);
+    void per_get_undo(asn_per_data_t *pd, int get_nbits);
 
     /*
  * Extract a large number of bits from the specified PER data pointer.
  * This function returns -1 if the specified number of bits could not be
  * extracted due to EOD or other conditions.
  */
-    int per_get_many_bits(asn_per_data_t *pd, uint8_t *dst, int right_align,
+    int per_get_many_bits(asn_per_data_t *pd, uint8_t *dst, int alright,
         int get_nbits);
 
     /*
  * Get the length "n" from the Unaligned PER stream.
  */
     ssize_t uper_get_length(asn_per_data_t *pd,
-        int effective_bound_bits,
+        int ebits,
         int *repeat);
 
     /*
@@ -87,7 +87,7 @@ extern "C"
     ssize_t uper_get_nsnnwn(asn_per_data_t *pd);
 
     /* X.691-2008/11, #11.5.6 */
-    int uper_get_constrained_whole_number(asn_per_data_t *pd, unsigned long *v, int nbits);
+    int uper_get_constrained_whole_number(asn_per_data_t *pd, unsigned long *out_value, int nbits);
 
     /* Non-thread-safe debugging function, don't use it */
     char *per_data_string(asn_per_data_t *pd);
@@ -107,7 +107,7 @@ extern "C"
     } asn_per_outp_t;
 
     /* Output a small number of bits (<= 31) */
-    int per_put_few_bits(asn_per_outp_t *per_data, uint32_t bits, int obits);
+    int per_put_few_bits(asn_per_outp_t *po, uint32_t bits, int obits);
 
     /* Output a large number of bits */
     int per_put_many_bits(asn_per_outp_t *po, const uint8_t *src, int put_nbits);
diff --git a/src/core/libs/supl/asn-supl/xer_decoder.h b/src/core/libs/supl/asn-supl/xer_decoder.h
index 52444af51..02f62a0e1 100644
--- a/src/core/libs/supl/asn-supl/xer_decoder.h
+++ b/src/core/libs/supl/asn-supl/xer_decoder.h
@@ -18,7 +18,7 @@ extern "C"
  * The XER decoder of any ASN.1 type. May be invoked by the application.
  */
     asn_dec_rval_t xer_decode(struct asn_codec_ctx_s *opt_codec_ctx,
-        struct asn_TYPE_descriptor_s *type_descriptor,
+        struct asn_TYPE_descriptor_s *td,
         void **struct_ptr,  /* Pointer to a target structure's pointer */
         const void *buffer, /* Data to be decoded */
         size_t size         /* Size of data buffer */
diff --git a/src/core/libs/supl/asn-supl/xer_encoder.h b/src/core/libs/supl/asn-supl/xer_encoder.h
index 5b640d425..9cbd08102 100644
--- a/src/core/libs/supl/asn-supl/xer_encoder.h
+++ b/src/core/libs/supl/asn-supl/xer_encoder.h
@@ -25,8 +25,8 @@ extern "C"
     /*
  * The XER encoder of any type. May be invoked by the application.
  */
-    asn_enc_rval_t xer_encode(struct asn_TYPE_descriptor_s *type_descriptor,
-        void *struct_ptr, /* Structure to be encoded */
+    asn_enc_rval_t xer_encode(struct asn_TYPE_descriptor_s *td,
+        void *sptr, /* Structure to be encoded */
         enum xer_encoder_flags_e xer_flags,
         asn_app_consume_bytes_f *consume_bytes_cb,
         void *app_key /* Arbitrary callback argument */
diff --git a/src/core/libs/supl/asn-supl/xer_support.h b/src/core/libs/supl/asn-supl/xer_support.h
index 13d8bbd06..e28316d59 100644
--- a/src/core/libs/supl/asn-supl/xer_support.h
+++ b/src/core/libs/supl/asn-supl/xer_support.h
@@ -47,7 +47,7 @@ extern "C"
  * It will always be lesser than or equal to the specified _size.
  * The next invocation of this function must account the difference.
  */
-    ssize_t pxml_parse(int *_stateContext, const void *_buf, size_t _size,
+    ssize_t pxml_parse(int *_stateContext, const void *xmlbuf, size_t _size,
         pxml_callback_f *cb, void *_key);
 
 #ifdef __cplusplus
diff --git a/src/core/libs/supl/supl.h b/src/core/libs/supl/supl.h
index fc64e1ecd..2f997d6f3 100644
--- a/src/core/libs/supl/supl.h
+++ b/src/core/libs/supl/supl.h
@@ -243,7 +243,7 @@ void supl_set_wcdma_cell(supl_ctx_t *ctx, int mcc, int mns, int uc);
 void supl_set_gsm_cell_known(supl_ctx_t *ctx, int mcc, int mns, int lac, int ci, double lat, double lon, int uncert);
 void supl_set_server(supl_ctx_t *ctx, char *server);
 void supl_set_fd(supl_ctx_t *ctx, int fd);
-void supl_request(supl_ctx_t *ctx, int flags);
+void supl_request(supl_ctx_t *ctx, int request);
 
 int supl_get_assist(supl_ctx_t *ctx, char *server, supl_assist_t *assist);
 void supl_set_debug(FILE *log, int flags);

From 78afe4834d209fdae4024e858a33655fb13eefd2 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 11:23:25 +0100
Subject: [PATCH 090/123] Improve readability

---
 .clang-tidy | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 0affa0685..0cabf7daf 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,7 +1,45 @@
 ---
-Checks: '-*,boost-use-to-string,cert-dcl21-cpp,cert-dcl58-cpp,cert-env33-c,cert-err52-cpp,cert-err60-cpp,cert-flp30-c,clang-analyzer-cplusplus*,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-build-namespaces,google-runtime-int,misc-misplaced-const,misc-new-delete-overloads,misc-non-copyable-objects,misc-static-assert,misc-throw-by-value-catch-by-reference,misc-uniqueptr-reset-release,modernize-loop-convert,modernize-pass-by-value,modernize-raw-string-literal,modernize-use-auto,modernize-use-bool-literals,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-noexcept,modernize-use-nullptr,performance-faster-string-find,performance-inefficient-algorithm,performance-move-const-arg,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,readability-container-size-empty,readability-inconsistent-declaration-parameter-name,readability-named-parameter,readability-non-const-parameter,readability-string-compare'
+Checks: '-*,
+        boost-use-to-string,
+        cert-dcl21-cpp,
+        cert-dcl58-cpp,
+        cert-env33-c,
+        cert-err52-cpp,
+        cert-err60-cpp,
+        cert-flp30-c,
+        clang-analyzer-cplusplus*,
+        cppcoreguidelines-pro-type-static-cast-downcast,
+        cppcoreguidelines-slicing,
+        google-build-namespaces,
+        google-runtime-int,
+        misc-misplaced-const,
+        misc-new-delete-overloads,
+        misc-non-copyable-objects,
+        misc-static-assert,
+        misc-throw-by-value-catch-by-reference,
+        misc-uniqueptr-reset-release,
+        modernize-loop-convert,
+        modernize-pass-by-value,
+        modernize-raw-string-literal,
+        modernize-use-auto,
+        modernize-use-bool-literals,
+        modernize-use-equals-default,
+        modernize-use-equals-delete,
+        modernize-use-noexcept,
+        modernize-use-nullptr,
+        performance-faster-string-find,
+        performance-inefficient-algorithm,
+        performance-move-const-arg,
+        performance-type-promotion-in-math-fn,
+        performance-unnecessary-copy-initialization,
+        performance-unnecessary-value-param,
+        readability-container-size-empty,
+        readability-inconsistent-declaration-parameter-name,
+        readability-named-parameter,
+        readability-non-const-parameter,
+        readability-string-compare'
 WarningsAsErrors: ''
-HeaderFilterRegex: ''
+HeaderFilterRegex: '*.h'
 AnalyzeTemporaryDtors: false
 FormatStyle: 'file'
 CheckOptions:
@@ -18,7 +56,7 @@ CheckOptions:
   - key:             google-runtime-int.SignedTypePrefix
     value:           int
   - key:             google-runtime-int.TypeSuffix
-    value:           '_t'
+    value:           _t
   - key:             google-runtime-int.UnsignedTypePrefix
     value:           uint
   - key:             misc-throw-by-value-catch-by-reference.CheckThrowTemporaries
@@ -57,4 +95,8 @@ CheckOptions:
     value:           llvm
   - key:             performance-unnecessary-value-param.IncludeStyle
     value:           llvm
+  - key:             readability-inconsistent-declaration-parameter-name.IgnoreMacros
+    value:           '1'
+  - key:             readability-inconsistent-declaration-parameter-name.Strict
+    value:           '0'
 ...

From b617213784a37a7a94db7061700137e1c0e9d180 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 11:42:56 +0100
Subject: [PATCH 091/123] Extend clang-tidy checking to tests and utils

---
 src/tests/CMakeLists.txt                       | 16 ++++++++++++++++
 src/tests/common-files/gnuplot_i.h             |  2 +-
 src/tests/system-tests/libs/CMakeLists.txt     |  9 +++++++++
 .../libs/CMakeLists.txt                        |  9 +++++++++
 src/utils/front-end-cal/CMakeLists.txt         | 18 ++++++++++++++++++
 src/utils/rinex2assist/CMakeLists.txt          |  9 +++++++++
 6 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index afe871fdd..196ec6913 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -404,6 +404,14 @@ if(ENABLE_UNIT_TESTING)
             )
         endif()
     endif()
+    if(ENABLE_CLANG_TIDY)
+        if(CLANG_TIDY_EXE)
+            set_target_properties(run_tests
+                PROPERTIES
+                    CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+            )
+        endif()
+    endif()
     if(ENABLE_CUDA)
         target_link_libraries(run_tests
             PUBLIC
@@ -476,6 +484,14 @@ function(add_system_test executable)
             COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${executable}>
             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:${executable}>)
     endif()
+    if(ENABLE_CLANG_TIDY)
+        if(CLANG_TIDY_EXE)
+            set_target_properties(${executable}
+                PROPERTIES
+                    CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+            )
+        endif()
+    endif()
 endfunction()
 
 
diff --git a/src/tests/common-files/gnuplot_i.h b/src/tests/common-files/gnuplot_i.h
index 983ca0870..afdc47c3a 100644
--- a/src/tests/common-files/gnuplot_i.h
+++ b/src/tests/common-files/gnuplot_i.h
@@ -2003,7 +2003,7 @@ void Gnuplot::init()
 // whose name is specified as argument.  If the requested variable is not
 // part of the environment list, the function returns a NULL pointer.
 #if (defined(unix) || defined(__unix) || defined(__unix__)) && !defined(__APPLE__)
-    if (std::getenv("DISPLAY") == NULL)
+    if (std::getenv("DISPLAY") == nullptr)
         {
             valid = false;
             throw GnuplotException("Can't find DISPLAY variable");
diff --git a/src/tests/system-tests/libs/CMakeLists.txt b/src/tests/system-tests/libs/CMakeLists.txt
index 921d3cbf0..d29962cdf 100644
--- a/src/tests/system-tests/libs/CMakeLists.txt
+++ b/src/tests/system-tests/libs/CMakeLists.txt
@@ -41,6 +41,15 @@ target_link_libraries(system_testing_lib
         Matio::matio
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(system_testing_lib
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET system_testing_lib
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
index b98390b27..1935b7eda 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/CMakeLists.txt
@@ -48,6 +48,15 @@ target_link_libraries(signal_processing_testing_lib
         Glog::glog
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(signal_processing_testing_lib
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 set_property(TARGET signal_processing_testing_lib
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 061ecbaee..821009d47 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -46,6 +46,15 @@ target_link_libraries(front_end_cal_lib
         Boost::thread
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(front_end_cal_lib
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
 target_link_libraries(front-end-cal
@@ -65,6 +74,15 @@ target_compile_definitions(front-end-cal
     PUBLIC -DGNSSSDR_INSTALL_DIR="${CMAKE_INSTALL_PREFIX}"
 )
 
+if(ENABLE_CLANG_TIDY)
+    if(CLANG_TIDY_EXE)
+        set_target_properties(front-end-cal
+            PROPERTIES
+                CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+        )
+    endif()
+endif()
+
 add_custom_command(TARGET front-end-cal POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:front-end-cal>
         ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:front-end-cal>)
diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index d42b379b5..9f2c6b911 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -86,6 +86,15 @@ if(Boost_FOUND)
         add_dependencies(rinex2assist gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
     endif()
 
+    if(ENABLE_CLANG_TIDY)
+        if(CLANG_TIDY_EXE)
+            set_target_properties(rinex2assist
+                PROPERTIES
+                    CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
+            )
+        endif()
+    endif()
+
     add_custom_command(TARGET rinex2assist POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:rinex2assist>
             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>

From 5d427df585cfe15fcd66efda31409187872942fc Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 12:09:18 +0100
Subject: [PATCH 092/123] clang-tidy: apply
 performance-type-promotion-in-math-fn check

---
 src/algorithms/libs/gps_l2c_signal.cc | 2 +-
 src/algorithms/libs/gps_l5_signal.cc  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/algorithms/libs/gps_l2c_signal.cc b/src/algorithms/libs/gps_l2c_signal.cc
index b3b20be20..d8995a1f2 100644
--- a/src/algorithms/libs/gps_l2c_signal.cc
+++ b/src/algorithms/libs/gps_l2c_signal.cc
@@ -119,7 +119,7 @@ void gps_l2c_m_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _pr
 
             //--- Make index array to read L2C code values -------------------------
             //TODO: Check this formula! Seems to start with an extra sample
-            _codeValueIndex = ceil((_ts * (static_cast<float>(i) + 1)) / _tc) - 1;
+            _codeValueIndex = std::ceil((_ts * (static_cast<float>(i) + 1)) / _tc) - 1;
             //aux = (_ts * (i + 1)) / _tc;
             //_codeValueIndex = static_cast<int32_t>(static_cast<long>(aux)) - 1;
 
diff --git a/src/algorithms/libs/gps_l5_signal.cc b/src/algorithms/libs/gps_l5_signal.cc
index 198aa27af..f0e07ecd0 100644
--- a/src/algorithms/libs/gps_l5_signal.cc
+++ b/src/algorithms/libs/gps_l5_signal.cc
@@ -240,7 +240,7 @@ void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
 
             //--- Make index array to read L5 code values -------------------------
             //TODO: Check this formula! Seems to start with an extra sample
-            _codeValueIndex = ceil((_ts * (static_cast<float>(i) + 1)) / _tc) - 1;
+            _codeValueIndex = std::ceil((_ts * (static_cast<float>(i) + 1)) / _tc) - 1;
             //aux = (_ts * (i + 1)) / _tc;
             //_codeValueIndex = static_cast<int32_t> (static_cast<long>(aux)) - 1;
 
@@ -325,7 +325,7 @@ void gps_l5q_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
 
             //--- Make index array to read L5 code values -------------------------
             //TODO: Check this formula! Seems to start with an extra sample
-            _codeValueIndex = ceil((_ts * (static_cast<float>(i) + 1)) / _tc) - 1;
+            _codeValueIndex = std::ceil((_ts * (static_cast<float>(i) + 1)) / _tc) - 1;
             //aux = (_ts * (i + 1)) / _tc;
             //_codeValueIndex = static_cast<int32_t> (static_cast<long>(aux)) - 1;
 

From a734411b8698b1bfd46fa93f5219ed1303bc9ea3 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 12:46:01 +0100
Subject: [PATCH 093/123] clang-tidy: apply
 performance-type-promotion-in-math-fn check

---
 .../galileo_e1_tcp_connector_tracking_cc.cc              | 4 ++--
 .../gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc | 2 +-
 .../gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc | 2 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc               | 8 ++++----
 src/algorithms/tracking/libs/tracking_discriminators.cc  | 4 ++--
 src/utils/rinex2assist/CMakeLists.txt                    | 9 ---------
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index 641dcf248..36fae9906 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -321,8 +321,8 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
                     float acq_trk_shif_correction_samples;
                     int32_t acq_to_trk_delay_samples;
                     acq_to_trk_delay_samples = d_sample_counter - d_acq_sample_stamp;
-                    acq_trk_shif_correction_samples = d_current_prn_length_samples - fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
-                    samples_offset = round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
+                    acq_trk_shif_correction_samples = d_current_prn_length_samples - std::fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
+                    samples_offset = std::round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
                     current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
                     current_synchro_data.fs = d_fs_in;
                     *out[0] = current_synchro_data;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
index 68d94e82f..e00604c90 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.cc
@@ -574,7 +574,7 @@ int Glonass_L1_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
                     double acq_trk_shif_correction_samples;
                     int32_t acq_to_trk_delay_samples;
                     acq_to_trk_delay_samples = d_sample_counter - d_acq_sample_stamp;
-                    acq_trk_shif_correction_samples = d_current_prn_length_samples - fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
+                    acq_trk_shif_correction_samples = d_current_prn_length_samples - std::fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
                     samples_offset = round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
                     current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
                     d_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);  // count for the processed samples
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
index 8156ea09b..b161483c5 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.cc
@@ -574,7 +574,7 @@ int Glonass_L2_Ca_Dll_Pll_Tracking_cc::general_work(int noutput_items __attribut
                     double acq_trk_shif_correction_samples;
                     int32_t acq_to_trk_delay_samples;
                     acq_to_trk_delay_samples = d_sample_counter - d_acq_sample_stamp;
-                    acq_trk_shif_correction_samples = d_current_prn_length_samples - fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
+                    acq_trk_shif_correction_samples = d_current_prn_length_samples - std::fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_current_prn_length_samples));
                     samples_offset = round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
                     current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
                     d_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);  // count for the processed samples
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 2912e8e2c..51c8d20fc 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -204,7 +204,7 @@ void Gps_L1_Ca_Tcp_Connector_Tracking_cc::start_tracking()
     T_prn_mod_seconds = T_chip_mod_seconds * GPS_L1_CA_CODE_LENGTH_CHIPS;
     T_prn_mod_samples = T_prn_mod_seconds * static_cast<float>(d_fs_in);
 
-    d_next_prn_length_samples = round(T_prn_mod_samples);
+    d_next_prn_length_samples = std::round(T_prn_mod_samples);
 
     float T_prn_true_seconds = GPS_L1_CA_CODE_LENGTH_CHIPS / GPS_L1_CA_CODE_RATE_HZ;
     float T_prn_true_samples = T_prn_true_seconds * static_cast<float>(d_fs_in);
@@ -213,7 +213,7 @@ void Gps_L1_Ca_Tcp_Connector_Tracking_cc::start_tracking()
     float N_prn_diff;
     N_prn_diff = acq_trk_diff_seconds / T_prn_true_seconds;
     float corrected_acq_phase_samples, delay_correction_samples;
-    corrected_acq_phase_samples = fmod((d_acq_code_phase_samples + T_prn_diff_seconds * N_prn_diff * static_cast<float>(d_fs_in)), T_prn_true_samples);
+    corrected_acq_phase_samples = std::fmod((d_acq_code_phase_samples + T_prn_diff_seconds * N_prn_diff * static_cast<float>(d_fs_in)), T_prn_true_samples);
     if (corrected_acq_phase_samples < 0)
         {
             corrected_acq_phase_samples = T_prn_mod_samples + corrected_acq_phase_samples;
@@ -357,8 +357,8 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
                     float acq_trk_shif_correction_samples;
                     int32_t acq_to_trk_delay_samples;
                     acq_to_trk_delay_samples = d_sample_counter - d_acq_sample_stamp;
-                    acq_trk_shif_correction_samples = d_next_prn_length_samples - fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_next_prn_length_samples));
-                    samples_offset = round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
+                    acq_trk_shif_correction_samples = d_next_prn_length_samples - std::fmod(static_cast<float>(acq_to_trk_delay_samples), static_cast<float>(d_next_prn_length_samples));
+                    samples_offset = std::round(d_acq_code_phase_samples + acq_trk_shif_correction_samples);
                     current_synchro_data.Tracking_sample_counter = d_sample_counter + static_cast<uint64_t>(samples_offset);
                     current_synchro_data.fs = d_fs_in;
                     *out[0] = current_synchro_data;
diff --git a/src/algorithms/tracking/libs/tracking_discriminators.cc b/src/algorithms/tracking/libs/tracking_discriminators.cc
index c7ba2858f..f1944ddc5 100644
--- a/src/algorithms/tracking/libs/tracking_discriminators.cc
+++ b/src/algorithms/tracking/libs/tracking_discriminators.cc
@@ -64,7 +64,7 @@ double fll_four_quadrant_atan(gr_complex prompt_s1, gr_complex prompt_s2, double
  */
 double pll_four_quadrant_atan(gr_complex prompt_s1)
 {
-    return atan2(prompt_s1.imag(), prompt_s1.real());
+    return static_cast<double>(std::atan2(prompt_s1.imag(), prompt_s1.real()));
 }
 
 
@@ -79,7 +79,7 @@ double pll_cloop_two_quadrant_atan(gr_complex prompt_s1)
 {
     if (prompt_s1.real() != 0.0)
         {
-            return atan(prompt_s1.imag() / prompt_s1.real());
+            return static_cast<double>(std::atan(prompt_s1.imag() / prompt_s1.real()));
         }
     return 0.0;
 }
diff --git a/src/utils/rinex2assist/CMakeLists.txt b/src/utils/rinex2assist/CMakeLists.txt
index 9f2c6b911..d42b379b5 100644
--- a/src/utils/rinex2assist/CMakeLists.txt
+++ b/src/utils/rinex2assist/CMakeLists.txt
@@ -86,15 +86,6 @@ if(Boost_FOUND)
         add_dependencies(rinex2assist gpstk-${GNSSSDR_GPSTK_LOCAL_VERSION})
     endif()
 
-    if(ENABLE_CLANG_TIDY)
-        if(CLANG_TIDY_EXE)
-            set_target_properties(rinex2assist
-                PROPERTIES
-                    CXX_CLANG_TIDY "${DO_CLANG_TIDY}"
-            )
-        endif()
-    endif()
-
     add_custom_command(TARGET rinex2assist POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:rinex2assist>
             ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:rinex2assist>

From edbebfbef839baca9c527fdbab11943ab6080615 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 12:52:29 +0100
Subject: [PATCH 094/123] Cosmetic fix

---
 src/tests/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 196ec6913..4ea6bd739 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -241,7 +241,7 @@ if(ENABLE_UNIT_TESTING_EXTRA OR ENABLE_SYSTEM_TESTING_EXTRA OR ENABLE_FPGA)
     ################################################################################
     find_package(GPSTK)
     if(NOT GPSTK_FOUND OR ENABLE_OWN_GPSTK)
-      message(STATUS "GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.")
+      message(STATUS " GPSTk v${GNSSSDR_GPSTK_LOCAL_VERSION} will be automatically downloaded and built when doing 'make'.")
       if("${TOOLCHAIN_ARG}" STREQUAL "")
           set(TOOLCHAIN_ARG "-DCMAKE_CXX_FLAGS=\"-Wno-deprecated\"")
           set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")

From 1e356ad8dc74eb6cc17331f34667190cd3d23fa5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 13:36:21 +0100
Subject: [PATCH 095/123] clang-tidy: add and apply misc-unused-using-decls
 check

---
 .clang-tidy                                                 | 1 +
 src/algorithms/input_filter/adapters/CMakeLists.txt         | 2 ++
 src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt  | 2 --
 src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc     | 2 --
 .../input_filter/gnuradio_blocks/notch_lite_cc.cc           | 2 --
 .../input_filter/gnuradio_blocks/pulse_blanking_cc.cc       | 2 --
 src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt     | 3 ---
 .../gnuradio_blocks/direct_resampler_conditioner_cb.cc      | 3 ---
 .../gnuradio_blocks/direct_resampler_conditioner_cc.cc      | 2 --
 .../gnuradio_blocks/direct_resampler_conditioner_cs.cc      | 6 +++---
 10 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index 0cabf7daf..dbcac08e4 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -18,6 +18,7 @@ Checks: '-*,
         misc-static-assert,
         misc-throw-by-value-catch-by-reference,
         misc-uniqueptr-reset-release,
+        misc-unused-using-decls,
         modernize-loop-convert,
         modernize-pass-by-value,
         modernize-raw-string-literal,
diff --git a/src/algorithms/input_filter/adapters/CMakeLists.txt b/src/algorithms/input_filter/adapters/CMakeLists.txt
index f1709bf7f..8459dea90 100644
--- a/src/algorithms/input_filter/adapters/CMakeLists.txt
+++ b/src/algorithms/input_filter/adapters/CMakeLists.txt
@@ -51,6 +51,8 @@ target_link_libraries(input_filter_adapters
         input_filter_gr_blocks
         algorithms_libs
     PRIVATE
+        Gflags::gflags
+        Glog::glog
         Volk::volk
 )
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
index 72cb7962c..e45410533 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/input_filter/gnuradio_blocks/CMakeLists.txt
@@ -46,8 +46,6 @@ target_link_libraries(input_filter_gr_blocks
         Gnuradio::filter
         Volkgnsssdr::volkgnsssdr
     PRIVATE
-        Gflags::gflags
-        Glog::glog
         Log4cpp::log4cpp
 )
 
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
index 3a3c9f8a3..dee531eaf 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_cc.cc
@@ -30,13 +30,11 @@
 
 #include "notch_cc.h"
 #include <boost/math/distributions/chi_squared.hpp>
-#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <cmath>
 #include <cstring>
 
-using google::LogMessage;
 
 notch_sptr make_notch_filter(float pfa, float p_c_factor,
     int32_t length_, int32_t n_segments_est, int32_t n_segments_reset)
diff --git a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
index 03a3639db..d73b5cbb8 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/notch_lite_cc.cc
@@ -30,13 +30,11 @@
 
 #include "notch_lite_cc.h"
 #include <boost/math/distributions/chi_squared.hpp>
-#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <cmath>
 #include <cstring>
 
-using google::LogMessage;
 
 notch_lite_sptr make_notch_filter_lite(float p_c_factor, float pfa, int32_t length_, int32_t n_segments_est, int32_t n_segments_reset, int32_t n_segments_coeff)
 {
diff --git a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
index 02c98fb5c..593339bc6 100644
--- a/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
+++ b/src/algorithms/input_filter/gnuradio_blocks/pulse_blanking_cc.cc
@@ -30,12 +30,10 @@
 
 #include "pulse_blanking_cc.h"
 #include <boost/math/distributions/chi_squared.hpp>
-#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <volk/volk.h>
 #include <cmath>
 
-using google::LogMessage;
 
 pulse_blanking_cc_sptr make_pulse_blanking_cc(float pfa, int32_t length_,
     int32_t n_segments_est, int32_t n_segments_reset)
diff --git a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
index e5193d7eb..33dd7b6ab 100644
--- a/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/resampler/gnuradio_blocks/CMakeLists.txt
@@ -43,9 +43,6 @@ target_link_libraries(resampler_gr_blocks
     PUBLIC
         Gnuradio::runtime
         Volk::volk
-    PRIVATE
-        Gflags::gflags
-        Glog::glog
 )
 
 if(ENABLE_CLANG_TIDY)
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
index 39bf2883a..99948c3bb 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cb.cc
@@ -33,12 +33,9 @@
 
 
 #include "direct_resampler_conditioner_cb.h"
-#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 
 
-using google::LogMessage;
-
 direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
     double sample_freq_in, double sample_freq_out)
 {
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
index a288cd4da..09d6c2e6c 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
@@ -37,8 +37,6 @@
 #include <gnuradio/io_signature.h>
 
 
-using google::LogMessage;
-
 direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
     double sample_freq_in, double sample_freq_out)
 {
diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
index 3506879b6..6a4b5a8d3 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cs.cc
@@ -33,10 +33,8 @@
 
 
 #include "direct_resampler_conditioner_cs.h"
-#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 
-using google::LogMessage;
 
 direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
     double sample_freq_in, double sample_freq_out)
@@ -49,7 +47,9 @@ direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
 
 direct_resampler_conditioner_cs::direct_resampler_conditioner_cs(
     double sample_freq_in,
-    double sample_freq_out) : gr::block("direct_resampler_make_conditioner_cs", gr::io_signature::make(1, 1, sizeof(lv_16sc_t)), gr::io_signature::make(1, 1, sizeof(lv_16sc_t))),
+    double sample_freq_out) : gr::block("direct_resampler_make_conditioner_cs",
+                                  gr::io_signature::make(1, 1, sizeof(lv_16sc_t)),
+                                  gr::io_signature::make(1, 1, sizeof(lv_16sc_t))),
                               d_sample_freq_in(sample_freq_in),
                               d_sample_freq_out(sample_freq_out),
                               d_phase(0),

From 6d6979bb568e6d4ee76030505bb10c1e5192adae Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Thu, 21 Feb 2019 13:46:24 +0100
Subject: [PATCH 096/123] Remove unused include

---
 .../resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
index 09d6c2e6c..b302272ca 100644
--- a/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
+++ b/src/algorithms/resampler/gnuradio_blocks/direct_resampler_conditioner_cc.cc
@@ -33,7 +33,6 @@
 
 
 #include "direct_resampler_conditioner_cc.h"
-#include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 
 

From 62a7e543594fc9dd567d71049be1f258f4892a19 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 10:47:24 +0100
Subject: [PATCH 097/123] Introduce readability-identifier-naming check

This commit enforces naming style for Classes and global constants:
Camel_Snake_Case for Classes
UPPER_CASE for global constants
CamelCase for abstract classes
---
 .clang-tidy                                   |  11 +-
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      |   2 +-
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.h       |   2 +-
 src/algorithms/PVT/libs/gpx_printer.cc        |   4 +-
 src/algorithms/PVT/libs/gpx_printer.h         |   2 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc      |  26 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.h       |   6 +-
 src/algorithms/PVT/libs/kml_printer.cc        |   4 +-
 src/algorithms/PVT/libs/kml_printer.h         |   2 +-
 src/algorithms/PVT/libs/ls_pvt.cc             |   8 +-
 src/algorithms/PVT/libs/nmea_printer.cc       |   2 +-
 src/algorithms/PVT/libs/nmea_printer.h        |   4 +-
 src/algorithms/PVT/libs/rtklib_solver.cc      |  20 +-
 src/algorithms/PVT/libs/rtklib_solver.h       |   6 +-
 ...lileo_e1_pcps_8ms_ambiguous_acquisition.cc |   2 +-
 .../galileo_e1_pcps_ambiguous_acquisition.cc  |  16 +-
 ...eo_e1_pcps_cccwsr_ambiguous_acquisition.cc |   2 +-
 ...e1_pcps_quicksync_ambiguous_acquisition.cc |   2 +-
 ...ileo_e1_pcps_tong_ambiguous_acquisition.cc |   2 +-
 ...ileo_e5a_noncoherent_iq_acquisition_caf.cc |   2 +-
 .../adapters/galileo_e5a_pcps_acquisition.cc  |  18 +-
 .../adapters/gps_l5i_pcps_acquisition.cc      |  10 +-
 .../pcps_assisted_acquisition_cc.cc           |   2 +-
 .../libs/galileo_e1_signal_processing.cc      |  36 +-
 .../libs/galileo_e5_signal_processing.cc      |  26 +-
 src/algorithms/libs/gps_l5_signal.cc          |  72 ++--
 src/algorithms/libs/rtcm.cc                   | 146 ++++----
 src/algorithms/libs/rtcm.h                    |  18 +-
 src/algorithms/libs/rtklib/rtklib.h           |   4 +-
 src/algorithms/libs/rtklib/rtklib_pntpos.cc   |   6 +-
 src/algorithms/libs/rtklib/rtklib_ppp.cc      |   8 +-
 src/algorithms/libs/rtklib/rtklib_rtcm3.cc    |  40 +-
 src/algorithms/libs/rtklib/rtklib_rtcm3.h     |  14 +-
 src/algorithms/libs/rtklib/rtklib_rtkcmn.cc   |  28 +-
 src/algorithms/libs/rtklib/rtklib_rtkpos.cc   |   4 +-
 src/algorithms/libs/rtklib/rtklib_rtksvr.cc   |   6 +-
 src/algorithms/libs/rtklib/rtklib_rtksvr.h    |   4 +-
 src/algorithms/libs/rtklib/rtklib_sbas.cc     |   4 +-
 src/algorithms/libs/rtklib/rtklib_sbas.h      |  64 ++--
 src/algorithms/libs/rtklib/rtklib_solution.cc |   8 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc  |   4 +-
 .../adapters/signal_generator.cc              |   4 +-
 .../gnuradio_blocks/signal_generator_c.cc     |  38 +-
 .../rtl_tcp_signal_source_c.cc                |   2 +-
 .../gnuradio_blocks/rtl_tcp_signal_source_c.h |   2 +-
 .../signal_source/libs/gnss_sdr_valve.cc      |  10 +-
 .../signal_source/libs/gnss_sdr_valve.h       |   4 +-
 .../signal_source/libs/rtl_tcp_dongle_info.cc |  10 +-
 .../signal_source/libs/rtl_tcp_dongle_info.h  |   4 +-
 .../galileo_telemetry_decoder_cc.cc           |  36 +-
 .../gps_l5_telemetry_decoder_cc.cc            |  14 +-
 .../gps_l5_telemetry_decoder_cc.h             |   2 +-
 .../sbas_l1_telemetry_decoder_cc.cc           |  38 +-
 .../sbas_l1_telemetry_decoder_cc.h            |  22 +-
 .../libs/libswiftcnav/bits.c                  |  10 +-
 .../telemetry_decoder/libs/libswiftcnav/edc.c |   8 +-
 .../galileo_e1_dll_pll_veml_tracking.cc       |   2 +-
 .../galileo_e1_tcp_connector_tracking.cc      |   2 +-
 .../adapters/galileo_e5a_dll_pll_tracking.cc  |   6 +-
 .../adapters/gps_l5_dll_pll_tracking.cc       |   6 +-
 .../gnuradio_blocks/dll_pll_veml_tracking.cc  |  38 +-
 .../gnuradio_blocks/dll_pll_veml_tracking.h   |   4 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc   |  22 +-
 .../galileo_e1_tcp_connector_tracking_cc.h    |   4 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_cc.h |   2 +-
 .../glonass_l1_ca_dll_pll_c_aid_tracking_sc.h |   2 +-
 .../glonass_l1_ca_dll_pll_tracking_cc.h       |   2 +-
 .../glonass_l2_ca_dll_pll_c_aid_tracking_cc.h |   2 +-
 .../glonass_l2_ca_dll_pll_c_aid_tracking_sc.h |   2 +-
 .../glonass_l2_ca_dll_pll_tracking_cc.h       |   2 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h     |   2 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.h     |   2 +-
 .../gps_l1_ca_kf_tracking_cc.h                |   2 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc    |   2 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.h     |   4 +-
 .../tracking/libs/cpu_multicorrelator.cc      |  18 +-
 .../tracking/libs/cpu_multicorrelator.h       |   6 +-
 .../tracking/libs/cpu_multicorrelator_16sc.cc |  18 +-
 .../tracking/libs/cpu_multicorrelator_16sc.h  |   6 +-
 .../libs/cpu_multicorrelator_real_codes.cc    |  22 +-
 .../libs/cpu_multicorrelator_real_codes.h     |   6 +-
 .../tracking/libs/tcp_communication.cc        |  12 +-
 .../tracking/libs/tcp_communication.h         |  10 +-
 .../tracking/libs/tcp_packet_data.cc          |   4 +-
 .../tracking/libs/tcp_packet_data.h           |   6 +-
 src/core/interfaces/acquisition_interface.h   |   2 +-
 src/core/interfaces/tracking_interface.h      |   2 +-
 src/core/libs/gnss_sdr_supl_client.cc         |  62 ++--
 src/core/libs/gnss_sdr_supl_client.h          |   6 +-
 src/core/libs/supl/asn-rrlp/Accuracy.c        |   4 +-
 src/core/libs/supl/asn-rrlp/AcquisElement.c   |  20 +-
 .../libs/supl/asn-rrlp/AddionalAngleFields.c  |   8 +-
 .../supl/asn-rrlp/AddionalDopplerFields.c     |   8 +-
 .../supl/asn-rrlp/AdditionalDopplerFields.c   |   8 +-
 src/core/libs/supl/asn-rrlp/AlertFlag.c       |   4 +-
 .../libs/supl/asn-rrlp/Almanac-KeplerianSet.c |  40 +-
 src/core/libs/supl/asn-rrlp/Almanac.c         |   4 +-
 src/core/libs/supl/asn-rrlp/AlmanacElement.c  |  44 +--
 src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c   |   4 +-
 src/core/libs/supl/asn-rrlp/BCCHCarrier.c     |   4 +-
 src/core/libs/supl/asn-rrlp/BSIC.c            |   4 +-
 .../libs/supl/asn-rrlp/BadSignalElement.c     |   4 +-
 src/core/libs/supl/asn-rrlp/BitNumber.c       |   4 +-
 src/core/libs/supl/asn-rrlp/CellID.c          |   4 +-
 .../libs/supl/asn-rrlp/DGANSSSgnElement.c     |  16 +-
 src/core/libs/supl/asn-rrlp/DGPSCorrections.c |   8 +-
 src/core/libs/supl/asn-rrlp/EOTDQuality.c     |   8 +-
 .../libs/supl/asn-rrlp/EnvironmentCharacter.c |   4 +-
 .../asn-rrlp/EphemerisSubframe1Reserved.c     |  16 +-
 src/core/libs/supl/asn-rrlp/ErrorCodes.c      |   4 +-
 .../libs/supl/asn-rrlp/ExpOTDUncertainty.c    |   4 +-
 src/core/libs/supl/asn-rrlp/ExpectedOTD.c     |   4 +-
 .../asn-rrlp/Ext-GeographicalInformation.c    |   4 +-
 .../libs/supl/asn-rrlp/Extended-reference.c   |   8 +-
 src/core/libs/supl/asn-rrlp/FineRTD.c         |   4 +-
 src/core/libs/supl/asn-rrlp/FixType.c         |   4 +-
 src/core/libs/supl/asn-rrlp/FrameDrift.c      |   4 +-
 src/core/libs/supl/asn-rrlp/FrameNumber.c     |   4 +-
 .../libs/supl/asn-rrlp/GANSS-MsrSetElement.c  |   4 +-
 .../libs/supl/asn-rrlp/GANSS-SgnElement.c     |  28 +-
 .../libs/supl/asn-rrlp/GANSS-SgnTypeElement.c |   4 +-
 .../libs/supl/asn-rrlp/GANSSAlmanacElement.c  |   4 +-
 .../libs/supl/asn-rrlp/GANSSAlmanacModel.c    |  12 +-
 .../libs/supl/asn-rrlp/GANSSAssistanceData.c  |   4 +-
 src/core/libs/supl/asn-rrlp/GANSSClockModel.c |   4 +-
 src/core/libs/supl/asn-rrlp/GANSSDataBit.c    |   4 +-
 .../libs/supl/asn-rrlp/GANSSDataBitAssist.c   |   8 +-
 .../libs/supl/asn-rrlp/GANSSDiffCorrections.c |   4 +-
 .../asn-rrlp/GANSSGenericAssistDataElement.c  |   4 +-
 .../libs/supl/asn-rrlp/GANSSIonoStormFlags.c  |  20 +-
 .../libs/supl/asn-rrlp/GANSSIonosphereModel.c |  12 +-
 .../libs/supl/asn-rrlp/GANSSLocationInfo.c    |  12 +-
 src/core/libs/supl/asn-rrlp/GANSSNavModel.c   |  16 +-
 src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c |   4 +-
 .../supl/asn-rrlp/GANSSPositioningMethod.c    |   4 +-
 .../supl/asn-rrlp/GANSSRefMeasurementAssist.c |   4 +-
 .../asn-rrlp/GANSSRefMeasurementElement.c     |  16 +-
 .../libs/supl/asn-rrlp/GANSSRefTimeInfo.c     |   8 +-
 .../supl/asn-rrlp/GANSSSatelliteElement.c     |   8 +-
 src/core/libs/supl/asn-rrlp/GANSSSignalID.c   |   4 +-
 src/core/libs/supl/asn-rrlp/GANSSTOD.c        |   4 +-
 .../libs/supl/asn-rrlp/GANSSTODUncertainty.c  |   4 +-
 src/core/libs/supl/asn-rrlp/GANSSTODm.c       |   4 +-
 .../supl/asn-rrlp/GANSSTimeModelElement.c     |  12 +-
 src/core/libs/supl/asn-rrlp/GANSSUTCModel.c   |  32 +-
 src/core/libs/supl/asn-rrlp/GPS-MsrElement.c  |  20 +-
 .../libs/supl/asn-rrlp/GPS-MsrSetElement.c    |   4 +-
 .../libs/supl/asn-rrlp/GPSAssistanceData.c    |   4 +-
 .../asn-rrlp/GPSReferenceTimeUncertainty.c    |   4 +-
 src/core/libs/supl/asn-rrlp/GPSTOW23b.c       |   4 +-
 src/core/libs/supl/asn-rrlp/GPSTOW24b.c       |   4 +-
 src/core/libs/supl/asn-rrlp/GPSTOWAssist.c    |   4 +-
 .../asn-rrlp/GPSTimeAssistanceMeasurements.c  |  12 +-
 src/core/libs/supl/asn-rrlp/GPSWeek.c         |   4 +-
 .../libs/supl/asn-rrlp/IonosphericModel.c     |  32 +-
 src/core/libs/supl/asn-rrlp/LAC.c             |   4 +-
 src/core/libs/supl/asn-rrlp/LocErrorReason.c  |   4 +-
 src/core/libs/supl/asn-rrlp/LocationInfo.c    |   8 +-
 .../libs/supl/asn-rrlp/MeasureResponseTime.c  |   4 +-
 src/core/libs/supl/asn-rrlp/MethodType.c      |   4 +-
 src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c  |   4 +-
 .../libs/supl/asn-rrlp/MoreAssDataToBeSent.c  |   4 +-
 src/core/libs/supl/asn-rrlp/MpathIndic.c      |   4 +-
 .../libs/supl/asn-rrlp/MultiFrameOffset.c     |   4 +-
 src/core/libs/supl/asn-rrlp/MultipleSets.c    |   8 +-
 .../supl/asn-rrlp/NavModel-KeplerianSet.c     |  64 ++--
 .../libs/supl/asn-rrlp/NeighborIdentity.c     |   4 +-
 .../libs/supl/asn-rrlp/NumOfMeasurements.c    |   4 +-
 src/core/libs/supl/asn-rrlp/OCTET_STRING.c    |  18 +-
 .../libs/supl/asn-rrlp/OTD-MsrElementFirst.c  |   8 +-
 .../libs/supl/asn-rrlp/OTD-MsrElementRest.c   |   8 +-
 .../libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c  |   4 +-
 src/core/libs/supl/asn-rrlp/OTDValue.c        |   4 +-
 src/core/libs/supl/asn-rrlp/PDU.c             |   4 +-
 src/core/libs/supl/asn-rrlp/PositionData.c    |   4 +-
 src/core/libs/supl/asn-rrlp/PositionMethod.c  |   4 +-
 src/core/libs/supl/asn-rrlp/RRLP-Component.c  |   4 +-
 src/core/libs/supl/asn-rrlp/RefQuality.c      |   4 +-
 src/core/libs/supl/asn-rrlp/ReferenceFrame.c  |   8 +-
 .../supl/asn-rrlp/ReferenceIdentityType.c     |   4 +-
 .../libs/supl/asn-rrlp/ReferenceRelation.c    |   4 +-
 src/core/libs/supl/asn-rrlp/RelDistance.c     |   4 +-
 src/core/libs/supl/asn-rrlp/RelativeAlt.c     |   4 +-
 src/core/libs/supl/asn-rrlp/RequestIndex.c    |   4 +-
 .../libs/supl/asn-rrlp/RequiredResponseTime.c |   4 +-
 src/core/libs/supl/asn-rrlp/RoughRTD.c        |   4 +-
 src/core/libs/supl/asn-rrlp/SVID.c            |   4 +-
 src/core/libs/supl/asn-rrlp/SVIDMASK.c        |   4 +-
 src/core/libs/supl/asn-rrlp/SatElement.c      |  32 +-
 src/core/libs/supl/asn-rrlp/SatStatus.c       |   4 +-
 src/core/libs/supl/asn-rrlp/SatelliteID.c     |   4 +-
 .../supl/asn-rrlp/SeqOf-BadSatelliteSet.c     |   4 +-
 .../libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c  |   4 +-
 .../libs/supl/asn-rrlp/SeqOfAcquisElement.c   |   4 +-
 .../libs/supl/asn-rrlp/SeqOfAlmanacElement.c  |   4 +-
 .../supl/asn-rrlp/SeqOfBadSignalElement.c     |   4 +-
 .../supl/asn-rrlp/SeqOfDGANSSSgnElement.c     |   4 +-
 .../supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c  |   4 +-
 .../supl/asn-rrlp/SeqOfGANSS-SgnElement.c     |   4 +-
 .../supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c |   4 +-
 .../supl/asn-rrlp/SeqOfGANSSAlmanacElement.c  |   4 +-
 .../SeqOfGANSSGenericAssistDataElement.c      |   4 +-
 .../SeqOfGANSSRefMeasurementElement.c         |   4 +-
 .../asn-rrlp/SeqOfGANSSSatelliteElement.c     |   4 +-
 .../libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c  |   4 +-
 .../libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c  |   4 +-
 .../supl/asn-rrlp/SeqOfGPS-MsrSetElement.c    |   4 +-
 .../asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c   |   4 +-
 .../libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c    |   4 +-
 .../libs/supl/asn-rrlp/SeqOfNavModelElement.c |   4 +-
 .../asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c  |   4 +-
 .../supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c     |   4 +-
 .../supl/asn-rrlp/SeqOfOTD-MsrElementRest.c   |   4 +-
 .../supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c  |   4 +-
 .../asn-rrlp/SeqOfReferenceIdentityType.c     |   4 +-
 src/core/libs/supl/asn-rrlp/SeqOfSatElement.c |   4 +-
 .../libs/supl/asn-rrlp/SeqOfSgnTypeElement.c  |   4 +-
 .../asn-rrlp/SeqOfStandardClockModelElement.c |   4 +-
 .../SeqOfSystemInfoAssistBTS-R98-ExpOTD.c     |   4 +-
 .../supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c  |   4 +-
 src/core/libs/supl/asn-rrlp/SgnTypeElement.c  |   4 +-
 .../supl/asn-rrlp/StandardClockModelElement.c |  24 +-
 src/core/libs/supl/asn-rrlp/StdResolution.c   |   4 +-
 .../asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c |   4 +-
 .../libs/supl/asn-rrlp/SystemInfoAssistBTS.c  |   4 +-
 src/core/libs/supl/asn-rrlp/SystemInfoIndex.c |   4 +-
 src/core/libs/supl/asn-rrlp/TA0.c             |   4 +-
 src/core/libs/supl/asn-rrlp/TA1.c             |   4 +-
 src/core/libs/supl/asn-rrlp/TA2.c             |   4 +-
 src/core/libs/supl/asn-rrlp/TLMReservedBits.c |   4 +-
 src/core/libs/supl/asn-rrlp/TLMWord.c         |   4 +-
 src/core/libs/supl/asn-rrlp/TimeSlot.c        |   4 +-
 src/core/libs/supl/asn-rrlp/TimeSlotScheme.c  |   4 +-
 src/core/libs/supl/asn-rrlp/UTCModel.c        |  32 +-
 src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c  |   4 +-
 .../supl/asn-rrlp/UncompressedEphemeris.c     | 120 +++---
 src/core/libs/supl/asn-rrlp/UseMultipleSets.c |   4 +-
 src/core/libs/supl/asn-supl/AltitudeInfo.c    |  12 +-
 src/core/libs/supl/asn-supl/CPICH-Ec-N0.c     |   4 +-
 src/core/libs/supl/asn-supl/CPICH-RSCP.c      |   4 +-
 .../libs/supl/asn-supl/CdmaCellInformation.c  |  32 +-
 src/core/libs/supl/asn-supl/CellInfo.c        |   4 +-
 .../libs/supl/asn-supl/CellMeasuredResults.c  |   8 +-
 .../supl/asn-supl/CellMeasuredResultsList.c   |   4 +-
 .../libs/supl/asn-supl/CellParametersID.c     |   4 +-
 src/core/libs/supl/asn-supl/EncodingType.c    |   4 +-
 src/core/libs/supl/asn-supl/FQDN.c            |   4 +-
 src/core/libs/supl/asn-supl/FormatIndicator.c |   4 +-
 src/core/libs/supl/asn-supl/FrequencyInfo.c   |   4 +-
 src/core/libs/supl/asn-supl/GeneralizedTime.c |   4 +-
 .../libs/supl/asn-supl/GsmCellInformation.c   |  20 +-
 src/core/libs/supl/asn-supl/Horandveruncert.c |  24 +-
 src/core/libs/supl/asn-supl/Horandvervel.c    |  16 +-
 src/core/libs/supl/asn-supl/Horvel.c          |   8 +-
 src/core/libs/supl/asn-supl/Horveluncert.c    |  12 +-
 src/core/libs/supl/asn-supl/IA5String.c       |   4 +-
 src/core/libs/supl/asn-supl/IPAddress.c       |  12 +-
 src/core/libs/supl/asn-supl/KeyIdentity.c     |   4 +-
 src/core/libs/supl/asn-supl/KeyIdentity4.c    |   4 +-
 src/core/libs/supl/asn-supl/MAC.c             |   4 +-
 .../libs/supl/asn-supl/MeasuredResultsList.c  |   4 +-
 src/core/libs/supl/asn-supl/NMR.c             |   4 +-
 src/core/libs/supl/asn-supl/NMRelement.c      |  12 +-
 src/core/libs/supl/asn-supl/Notification.c    |   8 +-
 .../libs/supl/asn-supl/NotificationType.c     |   4 +-
 src/core/libs/supl/asn-supl/OCTET_STRING.c    |  18 +-
 src/core/libs/supl/asn-supl/Pathloss.c        |   4 +-
 src/core/libs/supl/asn-supl/PosMethod.c       |   4 +-
 src/core/libs/supl/asn-supl/PosPayLoad.c      |  16 +-
 .../libs/supl/asn-supl/PositionEstimate.c     |  28 +-
 src/core/libs/supl/asn-supl/PrefMethod.c      |   4 +-
 .../libs/supl/asn-supl/PrimaryCCPCH-RSCP.c    |   4 +-
 .../libs/supl/asn-supl/PrimaryCPICH-Info.c    |   4 +-
 src/core/libs/supl/asn-supl/QoP.c             |  16 +-
 src/core/libs/supl/asn-supl/SETAuthKey.c      |  12 +-
 src/core/libs/supl/asn-supl/SETId.c           |  24 +-
 src/core/libs/supl/asn-supl/SLPAddress.c      |   4 +-
 src/core/libs/supl/asn-supl/SLPMode.c         |   4 +-
 src/core/libs/supl/asn-supl/SatelliteInfo.c   |   4 +-
 .../libs/supl/asn-supl/SatelliteInfoElement.c |   8 +-
 src/core/libs/supl/asn-supl/SetSessionID.c    |   4 +-
 src/core/libs/supl/asn-supl/SlpSessionID.c    |   4 +-
 src/core/libs/supl/asn-supl/Status.c          |   4 +-
 src/core/libs/supl/asn-supl/StatusCode.c      |   4 +-
 src/core/libs/supl/asn-supl/TGSN.c            |   4 +-
 .../libs/supl/asn-supl/TimeslotISCP-List.c    |   4 +-
 src/core/libs/supl/asn-supl/TimeslotISCP.c    |   4 +-
 src/core/libs/supl/asn-supl/UARFCN.c          |   4 +-
 src/core/libs/supl/asn-supl/ULP-PDU.c         |   4 +-
 src/core/libs/supl/asn-supl/UTCTime.c         |   4 +-
 .../libs/supl/asn-supl/UTRA-CarrierRSSI.c     |   4 +-
 src/core/libs/supl/asn-supl/UlpMessage.c      |   4 +-
 src/core/libs/supl/asn-supl/Velocity.c        |   4 +-
 src/core/libs/supl/asn-supl/Ver.c             |   4 +-
 src/core/libs/supl/asn-supl/Version.c         |  12 +-
 src/core/libs/supl/asn-supl/VisibleString.c   |   4 +-
 .../libs/supl/asn-supl/WcdmaCellInformation.c |  16 +-
 .../libs/supl/asn-supl/XNavigationModel.c     |  16 +-
 src/core/receiver/concurrent_map.h            |   2 +-
 src/core/receiver/concurrent_queue.h          |   2 +-
 src/core/receiver/control_message_factory.h   |   2 +-
 src/core/receiver/control_thread.cc           |   4 +-
 src/core/receiver/control_thread.h            |   4 +-
 src/core/receiver/gnss_flowgraph.cc           |   4 +-
 src/core/system_parameters/Beidou_B1I.h       |   6 +-
 src/core/system_parameters/GLONASS_L1_L2_CA.h |  12 +-
 src/core/system_parameters/GPS_L1_CA.h        |   6 +-
 src/core/system_parameters/GPS_L2C.h          |   4 +-
 src/core/system_parameters/GPS_L5.h           |  38 +-
 src/core/system_parameters/Galileo_E1.h       | 350 +++++++++---------
 src/core/system_parameters/Galileo_E5a.h      | 288 +++++++-------
 .../beidou_dnav_ephemeris.cc                  |   2 +-
 .../system_parameters/galileo_fnav_message.cc | 288 +++++++-------
 .../galileo_navigation_message.cc             | 308 +++++++--------
 .../glonass_gnav_navigation_message.cc        |  22 +-
 src/core/system_parameters/gps_ephemeris.cc   |   2 +-
 src/main/main.cc                              |   4 +-
 src/tests/single_test_main.cc                 |   4 +-
 .../libs/rtklib_solver_dump_reader.cc         |  10 +-
 .../libs/rtklib_solver_dump_reader.h          |   4 +-
 .../libs/spirent_motion_csv_dump_reader.cc    |  16 +-
 .../libs/spirent_motion_csv_dump_reader.h     |   6 +-
 src/tests/system-tests/position_test.cc       |   8 +-
 src/tests/system-tests/ttff.cc                |   4 +-
 src/tests/test_main.cc                        |   4 +-
 ...8ms_ambiguous_acquisition_gsoc2013_test.cc |  14 +-
 ...cps_ambiguous_acquisition_gsoc2013_test.cc |  14 +-
 ...e1_pcps_ambiguous_acquisition_gsoc_test.cc |  14 +-
 ...ileo_e1_pcps_ambiguous_acquisition_test.cc |   4 +-
 ...wsr_ambiguous_acquisition_gsoc2013_test.cc |  14 +-
 ...ync_ambiguous_acquisition_gsoc2014_test.cc |  14 +-
 ...ong_ambiguous_acquisition_gsoc2013_test.cc |  14 +-
 ...cps_acquisition_gsoc2014_gensource_test.cc |  14 +-
 ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc |  14 +-
 ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc |  14 +-
 .../gps_l1_ca_pcps_acquisition_test.cc        |   2 +-
 ...cps_quicksync_acquisition_gsoc2014_test.cc |  14 +-
 ..._ca_pcps_tong_acquisition_gsoc2013_test.cc |  14 +-
 .../libs/acquisition_dump_reader.cc           |  10 +-
 .../libs/acquisition_dump_reader.h            |   8 +-
 .../libs/observables_dump_reader.cc           |  14 +-
 .../libs/observables_dump_reader.h            |   6 +-
 .../libs/tlm_dump_reader.cc                   |  10 +-
 .../libs/tlm_dump_reader.h                    |   4 +-
 .../libs/tracking_dump_reader.cc              |  10 +-
 .../libs/tracking_dump_reader.h               |   4 +-
 .../libs/tracking_true_obs_reader.cc          |  12 +-
 .../libs/tracking_true_obs_reader.h           |   4 +-
 .../libs/true_observables_reader.cc           |  10 +-
 .../libs/true_observables_reader.h            |   4 +-
 .../pvt/nmea_printer_test.cc                  |   2 +-
 .../signal-processing-blocks/pvt/rtcm_test.cc |   6 +-
 .../cpu_multicorrelator_real_codes_test.cc    |   6 +-
 .../tracking/cpu_multicorrelator_test.cc      |   6 +-
 src/utils/front-end-cal/front_end_cal.cc      |  18 +-
 src/utils/front-end-cal/main.cc               |  12 +-
 356 files changed, 2277 insertions(+), 2268 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index dbcac08e4..cca10bf8d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -35,12 +35,13 @@ Checks: '-*,
         performance-unnecessary-copy-initialization,
         performance-unnecessary-value-param,
         readability-container-size-empty,
+        readability-identifier-naming,
         readability-inconsistent-declaration-parameter-name,
         readability-named-parameter,
         readability-non-const-parameter,
         readability-string-compare'
 WarningsAsErrors: ''
-HeaderFilterRegex: '*.h'
+HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
 FormatStyle: 'file'
 CheckOptions:
@@ -100,4 +101,12 @@ CheckOptions:
     value:           '1'
   - key:             readability-inconsistent-declaration-parameter-name.Strict
     value:           '0'
+  - key:             readability-identifier-naming.ClassCase
+    value:           Camel_Snake_Case
+  - key:             readability-identifier-naming.StructCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.GlobalConstantCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.AbstractClassCase
+    value:           CamelCase
 ...
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index 044d50927..fcf93d12f 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -594,7 +594,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
             throw std::exception();
         }
 
-    d_pvt_solver = std::make_shared<rtklib_solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
+    d_pvt_solver = std::make_shared<Rtklib_Solver>(static_cast<int32_t>(nchannels), dump_ls_pvt_filename, d_dump, d_dump_mat, rtk);
     d_pvt_solver->set_averaging_depth(1);
     start = std::chrono::system_clock::now();
 }
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index 939855318..23ecb0206 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -114,7 +114,7 @@ private:
     bool d_kml_output_enabled;
     bool d_nmea_output_file_enabled;
 
-    std::shared_ptr<rtklib_solver> d_pvt_solver;
+    std::shared_ptr<Rtklib_Solver> d_pvt_solver;
 
     std::map<int, Gnss_Synchro> gnss_observables_map;
     bool observables_pairCompare_min(const std::pair<int, Gnss_Synchro>& a, const std::pair<int, Gnss_Synchro>& b);
diff --git a/src/algorithms/PVT/libs/gpx_printer.cc b/src/algorithms/PVT/libs/gpx_printer.cc
index 1e2fddf01..d37b77908 100644
--- a/src/algorithms/PVT/libs/gpx_printer.cc
+++ b/src/algorithms/PVT/libs/gpx_printer.cc
@@ -155,14 +155,14 @@ bool Gpx_Printer::set_headers(const std::string& filename, bool time_tag_name)
 }
 
 
-bool Gpx_Printer::print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values)
+bool Gpx_Printer::print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values)
 {
     double latitude;
     double longitude;
     double height;
 
     positions_printed = true;
-    const std::shared_ptr<rtklib_solver>& position_ = position;
+    const std::shared_ptr<Rtklib_Solver>& position_ = position;
 
     double speed_over_ground = position_->get_speed_over_ground();    // expressed in m/s
     double course_over_ground = position_->get_course_over_ground();  // expressed in deg
diff --git a/src/algorithms/PVT/libs/gpx_printer.h b/src/algorithms/PVT/libs/gpx_printer.h
index 27e9fe4ff..c584eba4c 100644
--- a/src/algorithms/PVT/libs/gpx_printer.h
+++ b/src/algorithms/PVT/libs/gpx_printer.h
@@ -58,7 +58,7 @@ public:
     Gpx_Printer(const std::string& base_path = ".");
     ~Gpx_Printer();
     bool set_headers(const std::string& filename, bool time_tag_name = true);
-    bool print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values);
+    bool print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values);
     bool close_file();
 };
 
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
index 5fbc52ab8..2b1adf739 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.cc
@@ -40,7 +40,7 @@
 
 using google::LogMessage;
 
-hybrid_ls_pvt::hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file) : Ls_Pvt()
+Hybrid_Ls_Pvt::Hybrid_Ls_Pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file) : Ls_Pvt()
 {
     // init empty ephemeris for all the available GNSS channels
     d_nchannels = nchannels;
@@ -69,7 +69,7 @@ hybrid_ls_pvt::hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag
 }
 
 
-hybrid_ls_pvt::~hybrid_ls_pvt()
+Hybrid_Ls_Pvt::~Hybrid_Ls_Pvt()
 {
     if (d_dump_file.is_open() == true)
         {
@@ -85,7 +85,7 @@ hybrid_ls_pvt::~hybrid_ls_pvt()
 }
 
 
-bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging)
+bool Hybrid_Ls_Pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging)
 {
     std::map<int, Gnss_Synchro>::iterator gnss_observables_iter;
     std::map<int, Galileo_Ephemeris>::iterator galileo_ephemeris_iter;
@@ -133,7 +133,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
 
                                 // COMMON RX TIME PVT ALGORITHM
                                 double Rx_time = hybrid_current_time;
-                                double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GALILEO_C_m_s;
+                                double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GALILEO_C_M_S;
 
                                 // 2- compute the clock drift using the clock model (broadcast) for this SV
                                 SV_clock_bias_s = galileo_ephemeris_iter->second.sv_clock_drift(Tx_time);
@@ -150,7 +150,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
 
                                 // 4- fill the observations vector with the corrected observables
                                 obs.resize(valid_obs + 1, 1);
-                                obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + SV_clock_bias_s * GALILEO_C_m_s - this->get_time_offset_s() * GALILEO_C_m_s;
+                                obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + SV_clock_bias_s * GALILEO_C_M_S - this->get_time_offset_s() * GALILEO_C_M_S;
 
                                 Galileo_week_number = galileo_ephemeris_iter->second.WN_5;  //for GST
                                 GST = galileo_ephemeris_iter->second.Galileo_System_Time(Galileo_week_number, hybrid_current_time);
@@ -188,7 +188,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
                                         // COMMON RX TIME PVT ALGORITHM MODIFICATION (Like RINEX files)
                                         // first estimate of transmit time
                                         double Rx_time = hybrid_current_time;
-                                        double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_m_s;
+                                        double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_M_S;
 
                                         // 2- compute the clock drift using the clock model (broadcast) for this SV, not including relativistic effect
                                         SV_clock_bias_s = gps_ephemeris_iter->second.sv_clock_drift(Tx_time);  //- gps_ephemeris_iter->second.d_TGD;
@@ -208,10 +208,10 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
                                         // See IS-GPS-200E section 20.3.3.3.3.2
                                         double sqrt_Gamma = GPS_L1_FREQ_HZ / GPS_L2_FREQ_HZ;
                                         double Gamma = sqrt_Gamma * sqrt_Gamma;
-                                        double P1_P2 = (1.0 - Gamma) * (gps_ephemeris_iter->second.d_TGD * GPS_C_m_s);
+                                        double P1_P2 = (1.0 - Gamma) * (gps_ephemeris_iter->second.d_TGD * GPS_C_M_S);
                                         double Code_bias_m = P1_P2 / (1.0 - Gamma);
                                         obs.resize(valid_obs + 1, 1);
-                                        obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_m_s - Code_bias_m - this->get_time_offset_s() * GPS_C_m_s;
+                                        obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_M_S - Code_bias_m - this->get_time_offset_s() * GPS_C_M_S;
 
                                         // SV ECEF DEBUG OUTPUT
                                         LOG(INFO) << "(new)ECEF GPS L1 CA satellite SV ID=" << gps_ephemeris_iter->second.i_satellite_PRN
@@ -243,7 +243,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
                                         // COMMON RX TIME PVT ALGORITHM MODIFICATION (Like RINEX files)
                                         // first estimate of transmit time
                                         double Rx_time = hybrid_current_time;
-                                        double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_m_s;
+                                        double Tx_time = Rx_time - gnss_observables_iter->second.Pseudorange_m / GPS_C_M_S;
 
                                         // 2- compute the clock drift using the clock model (broadcast) for this SV
                                         SV_clock_bias_s = gps_cnav_ephemeris_iter->second.sv_clock_drift(Tx_time);
@@ -261,7 +261,7 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
 
                                         // 4- fill the observations vector with the corrected observables
                                         obs.resize(valid_obs + 1, 1);
-                                        obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_m_s + SV_clock_bias_s * GPS_C_m_s;
+                                        obs(valid_obs) = gnss_observables_iter->second.Pseudorange_m + dtr * GPS_C_M_S + SV_clock_bias_s * GPS_C_M_S;
 
                                         GPS_week = gps_cnav_ephemeris_iter->second.i_GPS_week;
                                         GPS_week = GPS_week % 1024;  //Necessary due to the increase of WN bits in CNAV message (10 in GPS NAV and 13 in CNAV)
@@ -311,17 +311,17 @@ bool hybrid_ls_pvt::get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, do
                             DLOG(INFO) << " Executing Bancroft algorithm...";
                             rx_position_and_time = bancroftPos(satpos.t(), obs);
                             this->set_rx_pos(rx_position_and_time.rows(0, 2));             // save ECEF position for the next iteration
-                            this->set_time_offset_s(rx_position_and_time(3) / GPS_C_m_s);  // save time for the next iteration [meters]->[seconds]
+                            this->set_time_offset_s(rx_position_and_time(3) / GPS_C_M_S);  // save time for the next iteration [meters]->[seconds]
                         }
 
                     // Execute WLS using previous position as the initialization point
                     rx_position_and_time = leastSquarePos(satpos, obs, W);
 
                     this->set_rx_pos(rx_position_and_time.rows(0, 2));                                         // save ECEF position for the next iteration
-                    this->set_time_offset_s(this->get_time_offset_s() + rx_position_and_time(3) / GPS_C_m_s);  // accumulate the rx time error for the next iteration [meters]->[seconds]
+                    this->set_time_offset_s(this->get_time_offset_s() + rx_position_and_time(3) / GPS_C_M_S);  // accumulate the rx time error for the next iteration [meters]->[seconds]
 
                     DLOG(INFO) << "Hybrid Position at TOW=" << hybrid_current_time << " in ECEF (X,Y,Z,t[meters]) = " << rx_position_and_time;
-                    DLOG(INFO) << "Accumulated rx clock error=" << this->get_time_offset_s() << " clock error for this iteration=" << rx_position_and_time(3) / GPS_C_m_s << " [s]";
+                    DLOG(INFO) << "Accumulated rx clock error=" << this->get_time_offset_s() << " clock error for this iteration=" << rx_position_and_time(3) / GPS_C_M_S << " [s]";
 
                     // Compute GST and Gregorian time
                     if (GST != 0.0)
diff --git a/src/algorithms/PVT/libs/hybrid_ls_pvt.h b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
index 248a4b34d..79313c92b 100644
--- a/src/algorithms/PVT/libs/hybrid_ls_pvt.h
+++ b/src/algorithms/PVT/libs/hybrid_ls_pvt.h
@@ -46,7 +46,7 @@
 /*!
  * \brief This class implements a simple PVT Least Squares solution
  */
-class hybrid_ls_pvt : public Ls_Pvt
+class Hybrid_Ls_Pvt : public Ls_Pvt
 {
 private:
     int count_valid_position;
@@ -57,8 +57,8 @@ private:
     double d_galileo_current_time;
 
 public:
-    hybrid_ls_pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file);
-    ~hybrid_ls_pvt();
+    Hybrid_Ls_Pvt(int nchannels, std::string dump_filename, bool flag_dump_to_file);
+    ~Hybrid_Ls_Pvt();
 
     bool get_PVT(std::map<int, Gnss_Synchro> gnss_observables_map, double hybrid_current_time, bool flag_averaging);
 
diff --git a/src/algorithms/PVT/libs/kml_printer.cc b/src/algorithms/PVT/libs/kml_printer.cc
index f7f48aae3..790090544 100644
--- a/src/algorithms/PVT/libs/kml_printer.cc
+++ b/src/algorithms/PVT/libs/kml_printer.cc
@@ -212,7 +212,7 @@ bool Kml_Printer::set_headers(const std::string& filename, bool time_tag_name)
 }
 
 
-bool Kml_Printer::print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values)
+bool Kml_Printer::print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values)
 {
     double latitude;
     double longitude;
@@ -220,7 +220,7 @@ bool Kml_Printer::print_position(const std::shared_ptr<rtklib_solver>& position,
 
     positions_printed = true;
 
-    const std::shared_ptr<rtklib_solver>& position_ = position;
+    const std::shared_ptr<Rtklib_Solver>& position_ = position;
 
     double speed_over_ground = position_->get_speed_over_ground();    // expressed in m/s
     double course_over_ground = position_->get_course_over_ground();  // expressed in deg
diff --git a/src/algorithms/PVT/libs/kml_printer.h b/src/algorithms/PVT/libs/kml_printer.h
index 7909ad619..1608158b4 100644
--- a/src/algorithms/PVT/libs/kml_printer.h
+++ b/src/algorithms/PVT/libs/kml_printer.h
@@ -61,7 +61,7 @@ public:
     Kml_Printer(const std::string& base_path = std::string("."));
     ~Kml_Printer();
     bool set_headers(const std::string& filename, bool time_tag_name = true);
-    bool print_position(const std::shared_ptr<rtklib_solver>& position, bool print_average_values);
+    bool print_position(const std::shared_ptr<Rtklib_Solver>& position, bool print_average_values);
     bool close_file();
 };
 
diff --git a/src/algorithms/PVT/libs/ls_pvt.cc b/src/algorithms/PVT/libs/ls_pvt.cc
index 3ca239972..5f9b9ad48 100644
--- a/src/algorithms/PVT/libs/ls_pvt.cc
+++ b/src/algorithms/PVT/libs/ls_pvt.cc
@@ -95,7 +95,7 @@ arma::vec Ls_Pvt::bancroftPos(const arma::mat& satpos, const arma::vec& obs)
                         {
                             int z = B(i, 2);
                             double rho = (x - pos(0)) * (x - pos(0)) + (y - pos(1)) * (y - pos(1)) + (z - pos(2)) * (z - pos(2));
-                            traveltime = sqrt(rho) / GPS_C_m_s;
+                            traveltime = sqrt(rho) / GPS_C_M_S;
                         }
                     double angle = traveltime * 7.292115147e-5;
                     double cosa = cos(angle);
@@ -228,7 +228,7 @@ arma::vec Ls_Pvt::leastSquarePos(const arma::mat& satpos, const arma::vec& obs,
                                        (X(1, i) - pos(1)) +
                                    (X(2, i) - pos(2)) *
                                        (X(2, i) - pos(2));
-                            traveltime = sqrt(rho2) / GPS_C_m_s;
+                            traveltime = sqrt(rho2) / GPS_C_M_S;
 
                             //--- Correct satellite position (do to earth rotation) --------
                             Rot_X = Ls_Pvt::rotateSatellite(traveltime, X.col(i));  //armadillo
@@ -283,9 +283,9 @@ arma::vec Ls_Pvt::leastSquarePos(const arma::mat& satpos, const arma::vec& obs,
         }
 
     // check the consistency of the PVT solution
-    if (((fabs(pos(3)) * 1000.0) / GPS_C_m_s) > GPS_STARTOFFSET_ms * 2)
+    if (((fabs(pos(3)) * 1000.0) / GPS_C_M_S) > GPS_STARTOFFSET_MS * 2)
         {
-            LOG(WARNING) << "Receiver time offset out of range! Estimated RX Time error [s]:" << pos(3) / GPS_C_m_s;
+            LOG(WARNING) << "Receiver time offset out of range! Estimated RX Time error [s]:" << pos(3) / GPS_C_M_S;
             throw std::runtime_error("Receiver time offset out of range!");
         }
     return pos;
diff --git a/src/algorithms/PVT/libs/nmea_printer.cc b/src/algorithms/PVT/libs/nmea_printer.cc
index 3d4ebc74a..bbef7b0c7 100644
--- a/src/algorithms/PVT/libs/nmea_printer.cc
+++ b/src/algorithms/PVT/libs/nmea_printer.cc
@@ -199,7 +199,7 @@ void Nmea_Printer::close_serial()
 }
 
 
-bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr<rtklib_solver>& pvt_data, bool print_average_values)
+bool Nmea_Printer::Print_Nmea_Line(const std::shared_ptr<Rtklib_Solver>& pvt_data, bool print_average_values)
 {
     std::string GPRMC;
     std::string GPGGA;
diff --git a/src/algorithms/PVT/libs/nmea_printer.h b/src/algorithms/PVT/libs/nmea_printer.h
index 6e18d7451..6ceab023c 100644
--- a/src/algorithms/PVT/libs/nmea_printer.h
+++ b/src/algorithms/PVT/libs/nmea_printer.h
@@ -59,7 +59,7 @@ public:
     /*!
      * \brief Print NMEA PVT and satellite info to the initialized device
      */
-    bool Print_Nmea_Line(const std::shared_ptr<rtklib_solver>& pvt_data, bool print_average_values);
+    bool Print_Nmea_Line(const std::shared_ptr<Rtklib_Solver>& pvt_data, bool print_average_values);
 
     /*!
      * \brief Default destructor.
@@ -72,7 +72,7 @@ private:
     std::ofstream nmea_file_descriptor;  // Output file stream for NMEA log file
     std::string nmea_devname;
     int nmea_dev_descriptor;  // NMEA serial device descriptor (i.e. COM port)
-    std::shared_ptr<rtklib_solver> d_PVT_data;
+    std::shared_ptr<Rtklib_Solver> d_PVT_data;
     int init_serial(const std::string& serial_device);  //serial port control
     void close_serial();
     std::string get_GPGGA();  // fix data
diff --git a/src/algorithms/PVT/libs/rtklib_solver.cc b/src/algorithms/PVT/libs/rtklib_solver.cc
index 7ad5da2c8..72e40d2fe 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.cc
+++ b/src/algorithms/PVT/libs/rtklib_solver.cc
@@ -66,7 +66,7 @@
 
 using google::LogMessage;
 
-rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t &rtk)
+Rtklib_Solver::Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t &rtk)
 {
     // init empty ephemeris for all the available GNSS channels
     d_nchannels = nchannels;
@@ -134,7 +134,7 @@ rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag
     monitor_pvt.vdop = 0.0;
 }
 
-bool rtklib_solver::save_matfile()
+bool Rtklib_Solver::save_matfile()
 {
     // READ DUMP FILE
     std::string dump_filename = d_dump_filename;
@@ -431,7 +431,7 @@ bool rtklib_solver::save_matfile()
 }
 
 
-rtklib_solver::~rtklib_solver()
+Rtklib_Solver::~Rtklib_Solver()
 {
     if (d_dump_file.is_open() == true)
         {
@@ -458,35 +458,35 @@ rtklib_solver::~rtklib_solver()
 }
 
 
-double rtklib_solver::get_gdop() const
+double Rtklib_Solver::get_gdop() const
 {
     return dop_[0];
 }
 
 
-double rtklib_solver::get_pdop() const
+double Rtklib_Solver::get_pdop() const
 {
     return dop_[1];
 }
 
 
-double rtklib_solver::get_hdop() const
+double Rtklib_Solver::get_hdop() const
 {
     return dop_[2];
 }
 
 
-double rtklib_solver::get_vdop() const
+double Rtklib_Solver::get_vdop() const
 {
     return dop_[3];
 }
 
-Monitor_Pvt rtklib_solver::get_monitor_pvt() const
+Monitor_Pvt Rtklib_Solver::get_monitor_pvt() const
 {
     return monitor_pvt;
 }
 
-bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, bool flag_averaging)
+bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_map, bool flag_averaging)
 {
     std::map<int, Gnss_Synchro>::const_iterator gnss_observables_iter;
     std::map<int, Galileo_Ephemeris>::const_iterator galileo_ephemeris_iter;
@@ -916,7 +916,7 @@ bool rtklib_solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
                         }
                     else
                         {
-                            rx_position_and_time(3) = pvt_sol.dtr[0] / GPS_C_m_s;  // the receiver clock offset is expressed in [meters], so we convert it into [s]
+                            rx_position_and_time(3) = pvt_sol.dtr[0] / GPS_C_M_S;  // the receiver clock offset is expressed in [meters], so we convert it into [s]
                         }
                     this->set_rx_pos(rx_position_and_time.rows(0, 2));  // save ECEF position for the next iteration
 
diff --git a/src/algorithms/PVT/libs/rtklib_solver.h b/src/algorithms/PVT/libs/rtklib_solver.h
index a3504c796..9f8bd86f9 100644
--- a/src/algorithms/PVT/libs/rtklib_solver.h
+++ b/src/algorithms/PVT/libs/rtklib_solver.h
@@ -74,7 +74,7 @@
 /*!
  * \brief This class implements a simple PVT Least Squares solution
  */
-class rtklib_solver : public Pvt_Solution
+class Rtklib_Solver : public Pvt_Solution
 {
 private:
     rtk_t rtk_;
@@ -91,8 +91,8 @@ private:
 public:
     sol_t pvt_sol;
     ssat_t pvt_ssat[MAXSAT];
-    rtklib_solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk);
-    ~rtklib_solver();
+    Rtklib_Solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, bool flag_dump_to_mat, const rtk_t& rtk);
+    ~Rtklib_Solver();
 
     bool get_PVT(const std::map<int, Gnss_Synchro>& gnss_observables_map, bool flag_averaging);
     double get_hdop() const;
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
index 0f6449ff0..14aa840fa 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
@@ -82,7 +82,7 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
 
     //--- Find number of samples per spreading code (4 ms)  -----------------
     code_length_ = round(
-        fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+        fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
 
     vector_length_ = code_length_ * static_cast<int>(sampled_ms_ / 4);
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index 5f4137f7d..24bdc155e 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -98,10 +98,10 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
         }
     if (acq_parameters_.use_automatic_resampler)
         {
-            if (acq_parameters_.fs_in > Galileo_E1_OPT_ACQ_FS_HZ)
+            if (acq_parameters_.fs_in > GALILEO_E1_OPT_ACQ_FS_HZ)
                 {
-                    acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / Galileo_E1_OPT_ACQ_FS_HZ);
-                    uint32_t decimation = acq_parameters_.fs_in / Galileo_E1_OPT_ACQ_FS_HZ;
+                    acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / GALILEO_E1_OPT_ACQ_FS_HZ);
+                    uint32_t decimation = acq_parameters_.fs_in / GALILEO_E1_OPT_ACQ_FS_HZ;
                     while (acq_parameters_.fs_in % decimation > 0)
                         {
                             decimation--;
@@ -110,19 +110,19 @@ GalileoE1PcpsAmbiguousAcquisition::GalileoE1PcpsAmbiguousAcquisition(
                     acq_parameters_.resampled_fs = acq_parameters_.fs_in / static_cast<int>(acq_parameters_.resampler_ratio);
                 }
             //--- Find number of samples per spreading code (4 ms)  -----------------
-            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
             acq_parameters_.samples_per_ms = static_cast<float>(acq_parameters_.resampled_fs) * 0.001;
-            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
+            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
         }
     else
         {
             //--- Find number of samples per spreading code (4 ms)  -----------------
-            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
             acq_parameters_.samples_per_ms = static_cast<float>(fs_in_) * 0.001;
-            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
+            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E1_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
         }
 
-    acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(Galileo_E1_CODE_PERIOD_MS);
+    acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GALILEO_E1_CODE_PERIOD_MS);
     vector_length_ = sampled_ms_ * acq_parameters_.samples_per_ms;
     if (bit_transition_flag_)
         {
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
index a0de0804d..eab75852e 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
@@ -82,7 +82,7 @@ GalileoE1PcpsCccwsrAmbiguousAcquisition::GalileoE1PcpsCccwsrAmbiguousAcquisition
     //--- Find number of samples per spreading code (4 ms)  -----------------
 
     code_length_ = round(
-        fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+        fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
 
     vector_length_ = code_length_ * static_cast<int>(sampled_ms_ / 4);
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
index 7437faa8c..490ff99bd 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
@@ -69,7 +69,7 @@ GalileoE1PcpsQuickSyncAmbiguousAcquisition::GalileoE1PcpsQuickSyncAmbiguousAcqui
 
     /*--- Find number of samples per spreading code (4 ms)  -----------------*/
     code_length_ = round(
-        fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+        fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
 
     int samples_per_ms = round(code_length_ / 4.0);
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
index bdc0c3971..2f538e8f8 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
@@ -85,7 +85,7 @@ GalileoE1PcpsTongAmbiguousAcquisition::GalileoE1PcpsTongAmbiguousAcquisition(
     //--- Find number of samples per spreading code (4 ms)  -----------------
 
     code_length_ = round(
-        fs_in_ / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+        fs_in_ / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
 
     vector_length_ = code_length_ * static_cast<int>(sampled_ms_ / 4);
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
index 8d65ea52a..277c48b91 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -91,7 +91,7 @@ GalileoE5aNoncoherentIQAcquisitionCaf::GalileoE5aNoncoherentIQAcquisitionCaf(
     bit_transition_flag_ = configuration_->property(role + ".bit_transition_flag", false);
 
     //--- Find number of samples per spreading code (1ms)-------------------------
-    code_length_ = round(static_cast<double>(fs_in_) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS));
+    code_length_ = round(static_cast<double>(fs_in_) / GALILEO_E5A_CODE_CHIP_RATE_HZ * static_cast<double>(GALILEO_E5A_CODE_LENGTH_CHIPS));
 
     vector_length_ = code_length_ * sampled_ms_;
 
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
index 079599926..963cfe5f3 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition.cc
@@ -96,10 +96,10 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
         }
     if (acq_parameters_.use_automatic_resampler)
         {
-            if (acq_parameters_.fs_in > Galileo_E5a_OPT_ACQ_FS_HZ)
+            if (acq_parameters_.fs_in > GALILEO_E5A_OPT_ACQ_FS_HZ)
                 {
-                    acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / Galileo_E5a_OPT_ACQ_FS_HZ);
-                    uint32_t decimation = acq_parameters_.fs_in / Galileo_E5a_OPT_ACQ_FS_HZ;
+                    acq_parameters_.resampler_ratio = floor(static_cast<float>(acq_parameters_.fs_in) / GALILEO_E5A_OPT_ACQ_FS_HZ);
+                    uint32_t decimation = acq_parameters_.fs_in / GALILEO_E5A_OPT_ACQ_FS_HZ;
                     while (acq_parameters_.fs_in % decimation > 0)
                         {
                             decimation--;
@@ -109,21 +109,21 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
                 }
 
             //--- Find number of samples per spreading code -------------------------
-            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS)));
+            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS)));
             acq_parameters_.samples_per_ms = static_cast<float>(acq_parameters_.resampled_fs) * 0.001;
-            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E5a_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
+            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E5A_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
         }
     else
         {
             acq_parameters_.resampled_fs = fs_in_;
             //--- Find number of samples per spreading code -------------------------
-            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS)));
+            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS)));
             acq_parameters_.samples_per_ms = static_cast<float>(fs_in_) * 0.001;
-            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / Galileo_E5a_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
+            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GALILEO_E5A_CODE_CHIP_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
         }
 
     //--- Find number of samples per spreading code (1ms)-------------------------
-    code_length_ = static_cast<unsigned int>(std::round(static_cast<double>(fs_in_) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS)));
+    code_length_ = static_cast<unsigned int>(std::round(static_cast<double>(fs_in_) / GALILEO_E5A_CODE_CHIP_RATE_HZ * static_cast<double>(GALILEO_E5A_CODE_LENGTH_CHIPS)));
     vector_length_ = code_length_ * sampled_ms_;
 
     code_ = new gr_complex[vector_length_];
@@ -144,7 +144,7 @@ GalileoE5aPcpsAcquisition::GalileoE5aPcpsAcquisition(ConfigurationInterface* con
     acq_parameters_.it_size = item_size_;
     acq_parameters_.sampled_ms = sampled_ms_;
     acq_parameters_.ms_per_code = 1;
-    acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GALILEO_E5a_CODE_PERIOD_MS);
+    acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GALILEO_E5A_CODE_PERIOD_MS);
     acq_parameters_.num_doppler_bins_step2 = configuration_->property(role + ".second_nbins", 4);
     acq_parameters_.doppler_step2 = configuration_->property(role + ".second_doppler_step", 125.0);
     acq_parameters_.make_2_steps = configuration_->property(role + ".make_two_steps", false);
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
index d3b722823..69503c7bd 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition.cc
@@ -121,20 +121,20 @@ GpsL5iPcpsAcquisition::GpsL5iPcpsAcquisition(
                 }
 
             //--- Find number of samples per spreading code -------------------------
-            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GPS_L5i_CODE_RATE_HZ / GPS_L5i_CODE_LENGTH_CHIPS)));
+            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(acq_parameters_.resampled_fs) / (GPS_L5I_CODE_RATE_HZ / GPS_L5I_CODE_LENGTH_CHIPS)));
             acq_parameters_.samples_per_ms = static_cast<float>(acq_parameters_.resampled_fs) * 0.001;
-            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5i_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
+            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5I_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.resampled_fs)));
         }
     else
         {
             acq_parameters_.resampled_fs = fs_in_;
             //--- Find number of samples per spreading code -------------------------
-            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GPS_L5i_CODE_RATE_HZ / GPS_L5i_CODE_LENGTH_CHIPS)));
+            code_length_ = static_cast<unsigned int>(std::floor(static_cast<double>(fs_in_) / (GPS_L5I_CODE_RATE_HZ / GPS_L5I_CODE_LENGTH_CHIPS)));
             acq_parameters_.samples_per_ms = static_cast<float>(fs_in_) * 0.001;
-            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5i_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
+            acq_parameters_.samples_per_chip = static_cast<unsigned int>(ceil((1.0 / GPS_L5I_CODE_RATE_HZ) * static_cast<float>(acq_parameters_.fs_in)));
         }
 
-    acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GPS_L5i_PERIOD * 1000.0);
+    acq_parameters_.samples_per_code = acq_parameters_.samples_per_ms * static_cast<float>(GPS_L5I_PERIOD * 1000.0);
     vector_length_ = std::floor(acq_parameters_.sampled_ms * acq_parameters_.samples_per_ms) * (acq_parameters_.bit_transition_flag ? 2 : 1);
     code_ = new gr_complex[vector_length_];
     acquisition_ = pcps_make_acquisition(acq_parameters_);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
index 5e8100f59..bf7184488 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_assisted_acquisition_cc.cc
@@ -42,7 +42,7 @@
 #include <sstream>
 #include <utility>
 
-extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 using google::LogMessage;
 
diff --git a/src/algorithms/libs/galileo_e1_signal_processing.cc b/src/algorithms/libs/galileo_e1_signal_processing.cc
index 23a8d9a94..d3e92c804 100644
--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -51,7 +51,7 @@ void galileo_e1_code_gen_int(int* _dest, char _Signal[3], int32_t _prn)
 
     if (_galileo_signal.rfind("1B") != std::string::npos && _galileo_signal.length() >= 2)
         {
-            for (char i : Galileo_E1_B_PRIMARY_CODE[prn])
+            for (char i : GALILEO_E1_B_PRIMARY_CODE[prn])
                 {
                     hex_to_binary_converter(&_dest[index], i);
                     index += 4;
@@ -59,7 +59,7 @@ void galileo_e1_code_gen_int(int* _dest, char _Signal[3], int32_t _prn)
         }
     else if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2)
         {
-            for (char i : Galileo_E1_C_PRIMARY_CODE[prn])
+            for (char i : GALILEO_E1_C_PRIMARY_CODE[prn])
                 {
                     hex_to_binary_converter(&_dest[index], i);
                     index += 4;
@@ -70,7 +70,7 @@ void galileo_e1_code_gen_int(int* _dest, char _Signal[3], int32_t _prn)
 
 void galileo_e1_sinboc_11_gen_int(int* _dest, const int* _prn, uint32_t _length_out)
 {
-    const uint32_t _length_in = Galileo_E1_B_CODE_LENGTH_CHIPS;
+    const uint32_t _length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS;
     auto _period = static_cast<uint32_t>(_length_out / _length_in);
     for (uint32_t i = 0; i < _length_in; i++)
         {
@@ -88,7 +88,7 @@ void galileo_e1_sinboc_11_gen_int(int* _dest, const int* _prn, uint32_t _length_
 
 void galileo_e1_sinboc_61_gen_int(int* _dest, const int* _prn, uint32_t _length_out)
 {
-    const uint32_t _length_in = Galileo_E1_B_CODE_LENGTH_CHIPS;
+    const uint32_t _length_in = GALILEO_E1_B_CODE_LENGTH_CHIPS;
     auto _period = static_cast<uint32_t>(_length_out / _length_in);
 
     for (uint32_t i = 0; i < _length_in; i++)
@@ -108,7 +108,7 @@ void galileo_e1_sinboc_61_gen_int(int* _dest, const int* _prn, uint32_t _length_
 void galileo_e1_code_gen_sinboc11_float(float* _dest, char _Signal[3], uint32_t _prn)
 {
     std::string _galileo_signal = _Signal;
-    const auto _codeLength = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
+    const auto _codeLength = static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS);
     int32_t primary_code_E1_chips[4092];                            // _codeLength not accepted by Clang
     galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn);  //generate Galileo E1 code, 1 sample per chip
     for (uint32_t i = 0; i < _codeLength; i++)
@@ -122,7 +122,7 @@ void galileo_e1_code_gen_sinboc11_float(float* _dest, char _Signal[3], uint32_t
 void galileo_e1_gen_float(float* _dest, int* _prn, char _Signal[3])
 {
     std::string _galileo_signal = _Signal;
-    const uint32_t _codeLength = 12 * Galileo_E1_B_CODE_LENGTH_CHIPS;
+    const uint32_t _codeLength = 12 * GALILEO_E1_B_CODE_LENGTH_CHIPS;
     const float alpha = sqrt(10.0 / 11.0);
     const float beta = sqrt(1.0 / 11.0);
 
@@ -158,20 +158,20 @@ void galileo_e1_code_gen_float_sampled(float* _dest, char _Signal[3],
     // This function is based on the GNU software GPS for MATLAB in Kay Borre's book
     std::string _galileo_signal = _Signal;
     uint32_t _samplesPerCode;
-    const int32_t _codeFreqBasis = Galileo_E1_CODE_CHIP_RATE_HZ;  // Hz
-    auto _codeLength = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
-    auto* primary_code_E1_chips = static_cast<int32_t*>(volk_gnsssdr_malloc(static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+    const int32_t _codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_HZ;  // Hz
+    auto _codeLength = static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS);
+    auto* primary_code_E1_chips = static_cast<int32_t*>(volk_gnsssdr_malloc(static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * sizeof(int32_t), volk_gnsssdr_get_alignment()));
 
     _samplesPerCode = static_cast<uint32_t>(static_cast<double>(_fs) / (static_cast<double>(_codeFreqBasis) / static_cast<double>(_codeLength)));
     const int32_t _samplesPerChip = (_cboc == true) ? 12 : 2;
 
-    const uint32_t delay = ((static_cast<int32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS) - _chip_shift) % static_cast<int32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * _samplesPerCode / Galileo_E1_B_CODE_LENGTH_CHIPS;
+    const uint32_t delay = ((static_cast<int32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS) - _chip_shift) % static_cast<int32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * _samplesPerCode / GALILEO_E1_B_CODE_LENGTH_CHIPS;
 
     galileo_e1_code_gen_int(primary_code_E1_chips, _Signal, _prn);  // generate Galileo E1 code, 1 sample per chip
 
     float* _signal_E1;
 
-    _codeLength = _samplesPerChip * Galileo_E1_B_CODE_LENGTH_CHIPS;
+    _codeLength = _samplesPerChip * GALILEO_E1_B_CODE_LENGTH_CHIPS;
     _signal_E1 = new float[_codeLength];
 
     if (_cboc == true)
@@ -203,17 +203,17 @@ void galileo_e1_code_gen_float_sampled(float* _dest, char _Signal[3],
 
     if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2 && _secondary_flag)
         {
-            auto* _signal_E1C_secondary = new float[static_cast<int32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH) * _samplesPerCode];
+            auto* _signal_E1C_secondary = new float[static_cast<int32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH) * _samplesPerCode];
 
-            for (uint32_t i = 0; i < static_cast<uint32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH); i++)
+            for (uint32_t i = 0; i < static_cast<uint32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH); i++)
                 {
                     for (unsigned k = 0; k < _samplesPerCode; k++)
                         {
-                            _signal_E1C_secondary[i * _samplesPerCode + k] = _signal_E1[k] * (Galileo_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0f : -1.0f);
+                            _signal_E1C_secondary[i * _samplesPerCode + k] = _signal_E1[k] * (GALILEO_E1_C_SECONDARY_CODE.at(i) == '0' ? 1.0f : -1.0f);
                         }
                 }
 
-            _samplesPerCode *= static_cast<int32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
+            _samplesPerCode *= static_cast<int32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
 
             delete[] _signal_E1;
             _signal_E1 = _signal_E1C_secondary;
@@ -234,13 +234,13 @@ void galileo_e1_code_gen_complex_sampled(std::complex<float>* _dest, char _Signa
     bool _secondary_flag)
 {
     std::string _galileo_signal = _Signal;
-    const int32_t _codeFreqBasis = Galileo_E1_CODE_CHIP_RATE_HZ;  // Hz
+    const int32_t _codeFreqBasis = GALILEO_E1_CODE_CHIP_RATE_HZ;  // Hz
     auto _samplesPerCode = static_cast<uint32_t>(static_cast<double>(_fs) /
-                                                 (static_cast<double>(_codeFreqBasis) / static_cast<double>(Galileo_E1_B_CODE_LENGTH_CHIPS)));
+                                                 (static_cast<double>(_codeFreqBasis) / static_cast<double>(GALILEO_E1_B_CODE_LENGTH_CHIPS)));
 
     if (_galileo_signal.rfind("1C") != std::string::npos && _galileo_signal.length() >= 2 && _secondary_flag)
         {
-            _samplesPerCode *= static_cast<int32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
+            _samplesPerCode *= static_cast<int32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
         }
 
     auto* real_code = static_cast<float*>(volk_gnsssdr_malloc(_samplesPerCode * sizeof(float), volk_gnsssdr_get_alignment()));
diff --git a/src/algorithms/libs/galileo_e5_signal_processing.cc b/src/algorithms/libs/galileo_e5_signal_processing.cc
index baa91706f..dab7e1d77 100644
--- a/src/algorithms/libs/galileo_e5_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e5_signal_processing.cc
@@ -48,9 +48,9 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
         }
     if (_Signal[0] == '5' && _Signal[1] == 'Q')
         {
-            for (size_t i = 0; i < Galileo_E5a_Q_PRIMARY_CODE[prn].length() - 1; i++)
+            for (size_t i = 0; i < GALILEO_E5A_Q_PRIMARY_CODE[prn].length() - 1; i++)
                 {
-                    hex_to_binary_converter(a, Galileo_E5a_Q_PRIMARY_CODE[prn].at(i));
+                    hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(i));
                     _dest[index] = std::complex<float>(0.0, float(a[0]));
                     _dest[index + 1] = std::complex<float>(0.0, float(a[1]));
                     _dest[index + 2] = std::complex<float>(0.0, float(a[2]));
@@ -58,15 +58,15 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
                     index = index + 4;
                 }
             // last 2 bits are filled up zeros
-            hex_to_binary_converter(a, Galileo_E5a_Q_PRIMARY_CODE[prn].at(Galileo_E5a_Q_PRIMARY_CODE[prn].length() - 1));
+            hex_to_binary_converter(a, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(GALILEO_E5A_Q_PRIMARY_CODE[prn].length() - 1));
             _dest[index] = std::complex<float>(float(0.0), a[0]);
             _dest[index + 1] = std::complex<float>(float(0.0), a[1]);
         }
     else if (_Signal[0] == '5' && _Signal[1] == 'I')
         {
-            for (size_t i = 0; i < Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1; i++)
+            for (size_t i = 0; i < GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1; i++)
                 {
-                    hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(i));
+                    hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(i));
                     _dest[index] = std::complex<float>(float(a[0]), 0.0);
                     _dest[index + 1] = std::complex<float>(float(a[1]), 0.0);
                     _dest[index + 2] = std::complex<float>(float(a[2]), 0.0);
@@ -74,17 +74,17 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
                     index = index + 4;
                 }
             // last 2 bits are filled up zeros
-            hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1));
+            hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1));
             _dest[index] = std::complex<float>(float(a[0]), 0.0);
             _dest[index + 1] = std::complex<float>(float(a[1]), 0.0);
         }
     else if (_Signal[0] == '5' && _Signal[1] == 'X')
         {
             int32_t b[4];
-            for (size_t i = 0; i < Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1; i++)
+            for (size_t i = 0; i < GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1; i++)
                 {
-                    hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(i));
-                    hex_to_binary_converter(b, Galileo_E5a_Q_PRIMARY_CODE[prn].at(i));
+                    hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(i));
+                    hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(i));
                     _dest[index] = std::complex<float>(float(a[0]), float(b[0]));
                     _dest[index + 1] = std::complex<float>(float(a[1]), float(b[1]));
                     _dest[index + 2] = std::complex<float>(float(a[2]), float(b[2]));
@@ -92,8 +92,8 @@ void galileo_e5_a_code_gen_complex_primary(std::complex<float>* _dest, int32_t _
                     index = index + 4;
                 }
             // last 2 bits are filled up zeros
-            hex_to_binary_converter(a, Galileo_E5a_I_PRIMARY_CODE[prn].at(Galileo_E5a_I_PRIMARY_CODE[prn].length() - 1));
-            hex_to_binary_converter(b, Galileo_E5a_Q_PRIMARY_CODE[prn].at(Galileo_E5a_Q_PRIMARY_CODE[prn].length() - 1));
+            hex_to_binary_converter(a, GALILEO_E5A_I_PRIMARY_CODE[prn].at(GALILEO_E5A_I_PRIMARY_CODE[prn].length() - 1));
+            hex_to_binary_converter(b, GALILEO_E5A_Q_PRIMARY_CODE[prn].at(GALILEO_E5A_Q_PRIMARY_CODE[prn].length() - 1));
             _dest[index] = std::complex<float>(float(a[0]), float(b[0]));
             _dest[index + 1] = std::complex<float>(float(a[1]), float(b[1]));
         }
@@ -105,8 +105,8 @@ void galileo_e5_a_code_gen_complex_sampled(std::complex<float>* _dest, char _Sig
 {
     uint32_t _samplesPerCode;
     uint32_t delay;
-    const uint32_t _codeLength = Galileo_E5a_CODE_LENGTH_CHIPS;
-    const int32_t _codeFreqBasis = Galileo_E5a_CODE_CHIP_RATE_HZ;
+    const uint32_t _codeLength = GALILEO_E5A_CODE_LENGTH_CHIPS;
+    const int32_t _codeFreqBasis = GALILEO_E5A_CODE_CHIP_RATE_HZ;
 
     auto* _code = new std::complex<float>[_codeLength]();
 
diff --git a/src/algorithms/libs/gps_l5_signal.cc b/src/algorithms/libs/gps_l5_signal.cc
index f0e07ecd0..c1f234506 100644
--- a/src/algorithms/libs/gps_l5_signal.cc
+++ b/src/algorithms/libs/gps_l5_signal.cc
@@ -81,9 +81,9 @@ std::deque<bool> l5q_xb_shift(std::deque<bool> xb)
 std::deque<bool> make_l5i_xa()
 {
     std::deque<bool> xa = {true, true, true, true, true, true, true, true, true, true, true, true, true};
-    std::deque<bool> y(GPS_L5i_CODE_LENGTH_CHIPS, false);
+    std::deque<bool> y(GPS_L5I_CODE_LENGTH_CHIPS, false);
 
-    for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
         {
             y[i] = xa[12];
             xa = l5i_xa_shift(xa);
@@ -95,9 +95,9 @@ std::deque<bool> make_l5i_xa()
 std::deque<bool> make_l5i_xb()
 {
     std::deque<bool> xb = {true, true, true, true, true, true, true, true, true, true, true, true, true};
-    std::deque<bool> y(GPS_L5i_CODE_LENGTH_CHIPS, false);
+    std::deque<bool> y(GPS_L5I_CODE_LENGTH_CHIPS, false);
 
-    for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
         {
             y[i] = xb[12];
             xb = l5i_xb_shift(xb);
@@ -109,9 +109,9 @@ std::deque<bool> make_l5i_xb()
 std::deque<bool> make_l5q_xa()
 {
     std::deque<bool> xa = {true, true, true, true, true, true, true, true, true, true, true, true, true};
-    std::deque<bool> y(GPS_L5q_CODE_LENGTH_CHIPS, false);
+    std::deque<bool> y(GPS_L5Q_CODE_LENGTH_CHIPS, false);
 
-    for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
         {
             y[i] = xa[12];
             xa = l5q_xa_shift(xa);
@@ -123,9 +123,9 @@ std::deque<bool> make_l5q_xa()
 std::deque<bool> make_l5q_xb()
 {
     std::deque<bool> xb = {true, true, true, true, true, true, true, true, true, true, true, true, true};
-    std::deque<bool> y(GPS_L5q_CODE_LENGTH_CHIPS, false);
+    std::deque<bool> y(GPS_L5Q_CODE_LENGTH_CHIPS, false);
 
-    for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
         {
             y[i] = xb[12];
             xb = l5q_xb_shift(xb);
@@ -136,18 +136,18 @@ std::deque<bool> make_l5q_xb()
 
 void make_l5i(int32_t* _dest, int32_t prn)
 {
-    int32_t xb_offset = GPS_L5i_INIT_REG[prn];
+    int32_t xb_offset = GPS_L5I_INIT_REG[prn];
 
     std::deque<bool> xb = make_l5i_xb();
     std::deque<bool> xa = make_l5i_xa();
-    std::deque<bool> xb_shift(GPS_L5i_CODE_LENGTH_CHIPS, false);
+    std::deque<bool> xb_shift(GPS_L5I_CODE_LENGTH_CHIPS, false);
 
-    for (int32_t n = 0; n < GPS_L5i_CODE_LENGTH_CHIPS; n++)
+    for (int32_t n = 0; n < GPS_L5I_CODE_LENGTH_CHIPS; n++)
         {
-            xb_shift[n] = xb[(xb_offset + n) % GPS_L5i_CODE_LENGTH_CHIPS];
+            xb_shift[n] = xb[(xb_offset + n) % GPS_L5I_CODE_LENGTH_CHIPS];
         }
-    std::deque<bool> out_code(GPS_L5i_CODE_LENGTH_CHIPS, false);
-    for (int32_t n = 0; n < GPS_L5i_CODE_LENGTH_CHIPS; n++)
+    std::deque<bool> out_code(GPS_L5I_CODE_LENGTH_CHIPS, false);
+    for (int32_t n = 0; n < GPS_L5I_CODE_LENGTH_CHIPS; n++)
         {
             _dest[n] = xa[n] xor xb_shift[n];
         }
@@ -156,18 +156,18 @@ void make_l5i(int32_t* _dest, int32_t prn)
 
 void make_l5q(int32_t* _dest, int32_t prn)
 {
-    int32_t xb_offset = GPS_L5q_INIT_REG[prn];
+    int32_t xb_offset = GPS_L5Q_INIT_REG[prn];
 
     std::deque<bool> xb = make_l5q_xb();
     std::deque<bool> xa = make_l5q_xa();
-    std::deque<bool> xb_shift(GPS_L5q_CODE_LENGTH_CHIPS, false);
+    std::deque<bool> xb_shift(GPS_L5Q_CODE_LENGTH_CHIPS, false);
 
-    for (int32_t n = 0; n < GPS_L5q_CODE_LENGTH_CHIPS; n++)
+    for (int32_t n = 0; n < GPS_L5Q_CODE_LENGTH_CHIPS; n++)
         {
-            xb_shift[n] = xb[(xb_offset + n) % GPS_L5q_CODE_LENGTH_CHIPS];
+            xb_shift[n] = xb[(xb_offset + n) % GPS_L5Q_CODE_LENGTH_CHIPS];
         }
-    std::deque<bool> out_code(GPS_L5q_CODE_LENGTH_CHIPS, false);
-    for (int32_t n = 0; n < GPS_L5q_CODE_LENGTH_CHIPS; n++)
+    std::deque<bool> out_code(GPS_L5Q_CODE_LENGTH_CHIPS, false);
+    for (int32_t n = 0; n < GPS_L5Q_CODE_LENGTH_CHIPS; n++)
         {
             _dest[n] = xa[n] xor xb_shift[n];
         }
@@ -176,14 +176,14 @@ void make_l5q(int32_t* _dest, int32_t prn)
 
 void gps_l5i_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
 {
-    auto* _code = new int32_t[GPS_L5i_CODE_LENGTH_CHIPS];
+    auto* _code = new int32_t[GPS_L5I_CODE_LENGTH_CHIPS];
 
     if (_prn > 0 and _prn < 51)
         {
             make_l5i(_code, _prn - 1);
         }
 
-    for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
         {
             _dest[i] = std::complex<float>(1.0 - 2.0 * _code[i], 0.0);
         }
@@ -194,14 +194,14 @@ void gps_l5i_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
 
 void gps_l5i_code_gen_float(float* _dest, uint32_t _prn)
 {
-    auto* _code = new int32_t[GPS_L5i_CODE_LENGTH_CHIPS];
+    auto* _code = new int32_t[GPS_L5I_CODE_LENGTH_CHIPS];
 
     if (_prn > 0 and _prn < 51)
         {
             make_l5i(_code, _prn - 1);
         }
 
-    for (int32_t i = 0; i < GPS_L5i_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5I_CODE_LENGTH_CHIPS; i++)
         {
             _dest[i] = 1.0 - 2.0 * static_cast<float>(_code[i]);
         }
@@ -215,7 +215,7 @@ void gps_l5i_code_gen_float(float* _dest, uint32_t _prn)
  */
 void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs)
 {
-    auto* _code = new int32_t[GPS_L5i_CODE_LENGTH_CHIPS];
+    auto* _code = new int32_t[GPS_L5I_CODE_LENGTH_CHIPS];
     if (_prn > 0 and _prn < 51)
         {
             make_l5i(_code, _prn - 1);
@@ -224,14 +224,14 @@ void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
     int32_t _samplesPerCode, _codeValueIndex;
     float _ts;
     float _tc;
-    const int32_t _codeLength = GPS_L5i_CODE_LENGTH_CHIPS;
+    const int32_t _codeLength = GPS_L5I_CODE_LENGTH_CHIPS;
 
     //--- Find number of samples per spreading code ----------------------------
-    _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5i_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
+    _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5I_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
 
     //--- Find time constants --------------------------------------------------
     _ts = 1.0 / static_cast<float>(_fs);                   // Sampling period in sec
-    _tc = 1.0 / static_cast<float>(GPS_L5i_CODE_RATE_HZ);  // C/A chip period in sec
+    _tc = 1.0 / static_cast<float>(GPS_L5I_CODE_RATE_HZ);  // C/A chip period in sec
 
     //float aux;
     for (int32_t i = 0; i < _samplesPerCode; i++)
@@ -261,14 +261,14 @@ void gps_l5i_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
 
 void gps_l5q_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
 {
-    auto* _code = new int32_t[GPS_L5q_CODE_LENGTH_CHIPS];
+    auto* _code = new int32_t[GPS_L5Q_CODE_LENGTH_CHIPS];
 
     if (_prn > 0 and _prn < 51)
         {
             make_l5q(_code, _prn - 1);
         }
 
-    for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
         {
             _dest[i] = std::complex<float>(1.0 - 2.0 * _code[i], 0.0);
         }
@@ -279,14 +279,14 @@ void gps_l5q_code_gen_complex(std::complex<float>* _dest, uint32_t _prn)
 
 void gps_l5q_code_gen_float(float* _dest, uint32_t _prn)
 {
-    auto* _code = new int32_t[GPS_L5q_CODE_LENGTH_CHIPS];
+    auto* _code = new int32_t[GPS_L5Q_CODE_LENGTH_CHIPS];
 
     if (_prn > 0 and _prn < 51)
         {
             make_l5q(_code, _prn - 1);
         }
 
-    for (int32_t i = 0; i < GPS_L5q_CODE_LENGTH_CHIPS; i++)
+    for (int32_t i = 0; i < GPS_L5Q_CODE_LENGTH_CHIPS; i++)
         {
             _dest[i] = 1.0 - 2.0 * static_cast<float>(_code[i]);
         }
@@ -300,7 +300,7 @@ void gps_l5q_code_gen_float(float* _dest, uint32_t _prn)
  */
 void gps_l5q_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn, int32_t _fs)
 {
-    auto* _code = new int32_t[GPS_L5q_CODE_LENGTH_CHIPS];
+    auto* _code = new int32_t[GPS_L5Q_CODE_LENGTH_CHIPS];
     if (_prn > 0 and _prn < 51)
         {
             make_l5q(_code, _prn - 1);
@@ -309,14 +309,14 @@ void gps_l5q_code_gen_complex_sampled(std::complex<float>* _dest, uint32_t _prn,
     int32_t _samplesPerCode, _codeValueIndex;
     float _ts;
     float _tc;
-    const int32_t _codeLength = GPS_L5q_CODE_LENGTH_CHIPS;
+    const int32_t _codeLength = GPS_L5Q_CODE_LENGTH_CHIPS;
 
     //--- Find number of samples per spreading code ----------------------------
-    _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5q_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
+    _samplesPerCode = static_cast<int32_t>(static_cast<double>(_fs) / (static_cast<double>(GPS_L5Q_CODE_RATE_HZ) / static_cast<double>(_codeLength)));
 
     //--- Find time constants --------------------------------------------------
     _ts = 1.0 / static_cast<float>(_fs);                   // Sampling period in sec
-    _tc = 1.0 / static_cast<float>(GPS_L5q_CODE_RATE_HZ);  // C/A chip period in sec
+    _tc = 1.0 / static_cast<float>(GPS_L5Q_CODE_RATE_HZ);  // C/A chip period in sec
 
     //float aux;
     for (int32_t i = 0; i < _samplesPerCode; i++)
diff --git a/src/algorithms/libs/rtcm.cc b/src/algorithms/libs/rtcm.cc
index 72015187e..43915ee3b 100644
--- a/src/algorithms/libs/rtcm.cc
+++ b/src/algorithms/libs/rtcm.cc
@@ -50,7 +50,7 @@ Rtcm::Rtcm(uint16_t port)
     RTCM_port = port;
     preamble = std::bitset<8>("11010011");
     reserved_field = std::bitset<6>("000000");
-    rtcm_message_queue = std::make_shared<concurrent_queue<std::string> >();
+    rtcm_message_queue = std::make_shared<Concurrent_Queue<std::string> >();
     boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(), RTCM_port);
     servers.emplace_back(io_context, endpoint);
     server_is_running = false;
@@ -2197,64 +2197,64 @@ int32_t Rtcm::read_MT1045(const std::string& message, Galileo_Ephemeris& gal_eph
     gal_eph.SISA_3 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 8)));
     index += 8;
 
-    gal_eph.iDot_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 14))) * iDot_2_LSB;
+    gal_eph.iDot_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 14))) * I_DOT_2_LSB;
     index += 14;
 
-    gal_eph.t0c_4 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * t0c_4_LSB;
+    gal_eph.t0c_4 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * T0C_4_LSB;
     index += 14;
 
-    gal_eph.af2_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 6))) * af2_4_LSB;
+    gal_eph.af2_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 6))) * AF2_4_LSB;
     index += 6;
 
-    gal_eph.af1_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 21))) * af1_4_LSB;
+    gal_eph.af1_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 21))) * AF1_4_LSB;
     index += 21;
 
-    gal_eph.af0_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 31))) * af0_4_LSB;
+    gal_eph.af0_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 31))) * AF0_4_LSB;
     index += 31;
 
-    gal_eph.C_rs_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_rs_3_LSB;
+    gal_eph.C_rs_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_RS_3_LSB;
     index += 16;
 
-    gal_eph.delta_n_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * delta_n_3_LSB;
+    gal_eph.delta_n_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * DELTA_N_3_LSB;
     index += 16;
 
     gal_eph.M0_1 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * M0_1_LSB;
     index += 32;
 
-    gal_eph.C_uc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_uc_3_LSB;
+    gal_eph.C_uc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_UC_3_LSB;
     index += 16;
 
-    gal_eph.e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * e_1_LSB;
+    gal_eph.e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * E_1_LSB;
     index += 32;
 
-    gal_eph.C_us_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_us_3_LSB;
+    gal_eph.C_us_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_US_3_LSB;
     index += 16;
 
-    gal_eph.A_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * A_1_LSB_gal;
+    gal_eph.A_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 32))) * A_1_LSB_GAL;
     index += 32;
 
-    gal_eph.t0e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * t0e_1_LSB;
+    gal_eph.t0e_1 = static_cast<double>(Rtcm::bin_to_uint(message_bin.substr(index, 14))) * T0E_1_LSB;
     index += 14;
 
-    gal_eph.C_ic_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_ic_4_LSB;
+    gal_eph.C_ic_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_IC_4_LSB;
     index += 16;
 
     gal_eph.OMEGA_0_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * OMEGA_0_2_LSB;
     index += 32;
 
-    gal_eph.C_is_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_is_4_LSB;
+    gal_eph.C_is_4 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_IS_4_LSB;
     index += 16;
 
-    gal_eph.i_0_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * i_0_2_LSB;
+    gal_eph.i_0_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * I_0_2_LSB;
     index += 32;
 
-    gal_eph.C_rc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_rc_3_LSB;
+    gal_eph.C_rc_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 16))) * C_RC_3_LSB;
     index += 16;
 
-    gal_eph.omega_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * omega_2_LSB;
+    gal_eph.omega_2 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 32))) * OMEGA_2_LSB;
     index += 32;
 
-    gal_eph.OMEGA_dot_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 24))) * OMEGA_dot_3_LSB;
+    gal_eph.OMEGA_dot_3 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 24))) * OMEGA_DOT_3_LSB;
     index += 24;
 
     gal_eph.BGD_E1E5a_5 = static_cast<double>(Rtcm::bin_to_int(message_bin.substr(index, 10)));
@@ -3811,7 +3811,7 @@ int32_t Rtcm::set_DF011(const Gnss_Synchro& gnss_synchro)
 
 int32_t Rtcm::set_DF012(const Gnss_Synchro& gnss_synchro)
 {
-    const double lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+    const double lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
     double ambiguity = std::floor(gnss_synchro.Pseudorange_m / 299792.458);
     double gps_L1_pseudorange = std::round((gnss_synchro.Pseudorange_m - ambiguity * 299792.458) / 0.02);
     double gps_L1_pseudorange_c = gps_L1_pseudorange * 0.02 + ambiguity * 299792.458;
@@ -3873,7 +3873,7 @@ int32_t Rtcm::set_DF017(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro&
 
 int32_t Rtcm::set_DF018(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2)
 {
-    const double lambda2 = GPS_C_m_s / GPS_L2_FREQ_HZ;
+    const double lambda2 = GPS_C_M_S / GPS_L2_FREQ_HZ;
     int32_t l2_phaserange_minus_l1_pseudorange = 0xFFF80000;
     double ambiguity = std::floor(gnss_synchroL1.Pseudorange_m / 299792.458);
     double gps_L1_pseudorange = std::round((gnss_synchroL1.Pseudorange_m - ambiguity * 299792.458) / 0.02);
@@ -4103,7 +4103,7 @@ int32_t Rtcm::set_DF041(const Gnss_Synchro& gnss_synchro)
 
 int32_t Rtcm::set_DF042(const Gnss_Synchro& gnss_synchro)
 {
-    const double lambda = GLONASS_C_m_s / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
+    const double lambda = GLONASS_C_M_S / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
     double ambiguity = std::floor(gnss_synchro.Pseudorange_m / 599584.92);
     double glonass_L1_pseudorange = std::round((gnss_synchro.Pseudorange_m - ambiguity * 599584.92) / 0.02);
     double glonass_L1_pseudorange_c = glonass_L1_pseudorange * 0.02 + ambiguity * 299792.458;
@@ -4166,7 +4166,7 @@ int32_t Rtcm::set_DF047(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro&
 //TODO Need to consider frequency channel in this fields
 int32_t Rtcm::set_DF048(const Gnss_Synchro& gnss_synchroL1, const Gnss_Synchro& gnss_synchroL2)
 {
-    const double lambda2 = GLONASS_C_m_s / GLONASS_L2_CA_FREQ_HZ;
+    const double lambda2 = GLONASS_C_M_S / GLONASS_L2_CA_FREQ_HZ;
     int32_t l2_phaserange_minus_l1_pseudorange = 0xFFF80000;
     double ambiguity = std::floor(gnss_synchroL1.Pseudorange_m / 599584.92);
     double glonass_L1_pseudorange = std::round((gnss_synchroL1.Pseudorange_m - ambiguity * 599584.92) / 0.02);
@@ -4846,7 +4846,7 @@ int32_t Rtcm::set_DF291(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF292(const Galileo_Ephemeris& gal_eph)
 {
-    auto idot = static_cast<int32_t>(std::round(gal_eph.iDot_2 / FNAV_idot_2_LSB));
+    auto idot = static_cast<int32_t>(std::round(gal_eph.iDot_2 / FNAV_IDOT_2_LSB));
     DF292 = std::bitset<14>(idot);
     return 0;
 }
@@ -4866,7 +4866,7 @@ int32_t Rtcm::set_DF293(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF294(const Galileo_Ephemeris& gal_eph)
 {
-    auto af2 = static_cast<int16_t>(std::round(gal_eph.af2_4 / FNAV_af2_1_LSB));
+    auto af2 = static_cast<int16_t>(std::round(gal_eph.af2_4 / FNAV_AF2_1_LSB));
     DF294 = std::bitset<6>(af2);
     return 0;
 }
@@ -4874,7 +4874,7 @@ int32_t Rtcm::set_DF294(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF295(const Galileo_Ephemeris& gal_eph)
 {
-    auto af1 = static_cast<int64_t>(std::round(gal_eph.af1_4 / FNAV_af1_1_LSB));
+    auto af1 = static_cast<int64_t>(std::round(gal_eph.af1_4 / FNAV_AF1_1_LSB));
     DF295 = std::bitset<21>(af1);
     return 0;
 }
@@ -4882,7 +4882,7 @@ int32_t Rtcm::set_DF295(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF296(const Galileo_Ephemeris& gal_eph)
 {
-    int64_t af0 = static_cast<uint32_t>(std::round(gal_eph.af0_4 / FNAV_af0_1_LSB));
+    int64_t af0 = static_cast<uint32_t>(std::round(gal_eph.af0_4 / FNAV_AF0_1_LSB));
     DF296 = std::bitset<31>(af0);
     return 0;
 }
@@ -4890,7 +4890,7 @@ int32_t Rtcm::set_DF296(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF297(const Galileo_Ephemeris& gal_eph)
 {
-    auto crs = static_cast<int32_t>(std::round(gal_eph.C_rs_3 / FNAV_Crs_3_LSB));
+    auto crs = static_cast<int32_t>(std::round(gal_eph.C_rs_3 / FNAV_CRS_3_LSB));
     DF297 = std::bitset<16>(crs);
     return 0;
 }
@@ -4898,7 +4898,7 @@ int32_t Rtcm::set_DF297(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF298(const Galileo_Ephemeris& gal_eph)
 {
-    auto delta_n = static_cast<int32_t>(std::round(gal_eph.delta_n_3 / FNAV_deltan_3_LSB));
+    auto delta_n = static_cast<int32_t>(std::round(gal_eph.delta_n_3 / FNAV_DELTAN_3_LSB));
     DF298 = std::bitset<16>(delta_n);
     return 0;
 }
@@ -4914,7 +4914,7 @@ int32_t Rtcm::set_DF299(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF300(const Galileo_Ephemeris& gal_eph)
 {
-    int32_t cuc = static_cast<uint32_t>(std::round(gal_eph.C_uc_3 / FNAV_Cuc_3_LSB));
+    int32_t cuc = static_cast<uint32_t>(std::round(gal_eph.C_uc_3 / FNAV_CUC_3_LSB));
     DF300 = std::bitset<16>(cuc);
     return 0;
 }
@@ -4922,7 +4922,7 @@ int32_t Rtcm::set_DF300(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF301(const Galileo_Ephemeris& gal_eph)
 {
-    auto ecc = static_cast<uint64_t>(std::round(gal_eph.e_1 / FNAV_e_2_LSB));
+    auto ecc = static_cast<uint64_t>(std::round(gal_eph.e_1 / FNAV_E_2_LSB));
     DF301 = std::bitset<32>(ecc);
     return 0;
 }
@@ -4930,7 +4930,7 @@ int32_t Rtcm::set_DF301(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF302(const Galileo_Ephemeris& gal_eph)
 {
-    auto cus = static_cast<int32_t>(std::round(gal_eph.C_us_3 / FNAV_Cus_3_LSB));
+    auto cus = static_cast<int32_t>(std::round(gal_eph.C_us_3 / FNAV_CUS_3_LSB));
     DF302 = std::bitset<16>(cus);
     return 0;
 }
@@ -4938,7 +4938,7 @@ int32_t Rtcm::set_DF302(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF303(const Galileo_Ephemeris& gal_eph)
 {
-    auto sqr_a = static_cast<uint64_t>(std::round(gal_eph.A_1 / FNAV_a12_2_LSB));
+    auto sqr_a = static_cast<uint64_t>(std::round(gal_eph.A_1 / FNAV_A12_2_LSB));
     DF303 = std::bitset<32>(sqr_a);
     return 0;
 }
@@ -4946,7 +4946,7 @@ int32_t Rtcm::set_DF303(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF304(const Galileo_Ephemeris& gal_eph)
 {
-    auto toe = static_cast<uint32_t>(std::round(gal_eph.t0e_1 / FNAV_t0e_3_LSB));
+    auto toe = static_cast<uint32_t>(std::round(gal_eph.t0e_1 / FNAV_T0E_3_LSB));
     DF304 = std::bitset<14>(toe);
     return 0;
 }
@@ -4954,7 +4954,7 @@ int32_t Rtcm::set_DF304(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF305(const Galileo_Ephemeris& gal_eph)
 {
-    auto cic = static_cast<int32_t>(std::round(gal_eph.C_ic_4 / FNAV_Cic_4_LSB));
+    auto cic = static_cast<int32_t>(std::round(gal_eph.C_ic_4 / FNAV_CIC_4_LSB));
     DF305 = std::bitset<16>(cic);
     return 0;
 }
@@ -4962,7 +4962,7 @@ int32_t Rtcm::set_DF305(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF306(const Galileo_Ephemeris& gal_eph)
 {
-    auto Omega0 = static_cast<int64_t>(std::round(gal_eph.OMEGA_0_2 / FNAV_omega0_2_LSB));
+    auto Omega0 = static_cast<int64_t>(std::round(gal_eph.OMEGA_0_2 / FNAV_OMEGA0_2_LSB));
     DF306 = std::bitset<32>(Omega0);
     return 0;
 }
@@ -4970,7 +4970,7 @@ int32_t Rtcm::set_DF306(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF307(const Galileo_Ephemeris& gal_eph)
 {
-    auto cis = static_cast<int32_t>(std::round(gal_eph.C_is_4 / FNAV_Cis_4_LSB));
+    auto cis = static_cast<int32_t>(std::round(gal_eph.C_is_4 / FNAV_CIS_4_LSB));
     DF307 = std::bitset<16>(cis);
     return 0;
 }
@@ -4978,7 +4978,7 @@ int32_t Rtcm::set_DF307(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF308(const Galileo_Ephemeris& gal_eph)
 {
-    auto i0 = static_cast<int64_t>(std::round(gal_eph.i_0_2 / FNAV_i0_3_LSB));
+    auto i0 = static_cast<int64_t>(std::round(gal_eph.i_0_2 / FNAV_I0_3_LSB));
     DF308 = std::bitset<32>(i0);
     return 0;
 }
@@ -4986,7 +4986,7 @@ int32_t Rtcm::set_DF308(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF309(const Galileo_Ephemeris& gal_eph)
 {
-    int32_t crc = static_cast<uint32_t>(std::round(gal_eph.C_rc_3 / FNAV_Crc_3_LSB));
+    int32_t crc = static_cast<uint32_t>(std::round(gal_eph.C_rc_3 / FNAV_CRC_3_LSB));
     DF309 = std::bitset<16>(crc);
     return 0;
 }
@@ -4994,7 +4994,7 @@ int32_t Rtcm::set_DF309(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF310(const Galileo_Ephemeris& gal_eph)
 {
-    auto omega = static_cast<int32_t>(std::round(gal_eph.omega_2 / FNAV_omega0_2_LSB));
+    auto omega = static_cast<int32_t>(std::round(gal_eph.omega_2 / FNAV_OMEGA0_2_LSB));
     DF310 = std::bitset<32>(omega);
     return 0;
 }
@@ -5002,7 +5002,7 @@ int32_t Rtcm::set_DF310(const Galileo_Ephemeris& gal_eph)
 
 int32_t Rtcm::set_DF311(const Galileo_Ephemeris& gal_eph)
 {
-    auto Omegadot = static_cast<int64_t>(std::round(gal_eph.OMEGA_dot_3 / FNAV_omegadot_2_LSB));
+    auto Omegadot = static_cast<int64_t>(std::round(gal_eph.OMEGA_dot_3 / FNAV_OMEGADOT_2_LSB));
     DF311 = std::bitset<24>(Omegadot);
     return 0;
 }
@@ -5269,7 +5269,7 @@ std::string Rtcm::set_DF396(const std::map<int32_t, Gnss_Synchro>& observables)
 
 int32_t Rtcm::set_DF397(const Gnss_Synchro& gnss_synchro)
 {
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     double rough_range_s = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
 
     uint32_t int_ms = 0;
@@ -5294,7 +5294,7 @@ int32_t Rtcm::set_DF397(const Gnss_Synchro& gnss_synchro)
 
 int32_t Rtcm::set_DF398(const Gnss_Synchro& gnss_synchro)
 {
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
     uint32_t rr_mod_ms;
     if ((rough_range_m <= 0.0) || (rough_range_m > meters_to_miliseconds * 255.0))
@@ -5318,23 +5318,23 @@ int32_t Rtcm::set_DF399(const Gnss_Synchro& gnss_synchro)
 
     if (sig == "1C")
         {
-            lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
         }
     if (sig == "2S")
         {
-            lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
         }
     if (sig == "5X")
         {
-            lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
         }
     if (sig == "1B")
         {
-            lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
         }
     if (sig == "7X")
         {
-            lambda = GPS_C_m_s / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
+            lambda = GPS_C_M_S / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
         }
 
     double rough_phase_range_rate_ms = std::round(-gnss_synchro.Carrier_Doppler_hz * lambda);
@@ -5354,7 +5354,7 @@ int32_t Rtcm::set_DF399(const Gnss_Synchro& gnss_synchro)
 
 int32_t Rtcm::set_DF400(const Gnss_Synchro& gnss_synchro)
 {
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
     double psrng_s;
     int32_t fine_pseudorange;
@@ -5381,7 +5381,7 @@ int32_t Rtcm::set_DF400(const Gnss_Synchro& gnss_synchro)
 
 int32_t Rtcm::set_DF401(const Gnss_Synchro& gnss_synchro)
 {
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
     double phrng_m;
     int64_t fine_phaserange;
@@ -5393,32 +5393,32 @@ int32_t Rtcm::set_DF401(const Gnss_Synchro& gnss_synchro)
 
     if ((sig == "1C") && (sys == "G"))
         {
-            lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
         }
     if ((sig == "2S") && (sys == "G"))
         {
-            lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
         }
     if ((sig == "5X") && (sys == "E"))
         {
-            lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
         }
     if ((sig == "1B") && (sys == "E"))
         {
-            lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
         }
     if ((sig == "7X") && (sys == "E"))
         {
-            lambda = GPS_C_m_s / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
+            lambda = GPS_C_M_S / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
         }
     if ((sig == "1C") && (sys == "R"))
         {
-            lambda = GLONASS_C_m_s / ((GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN))));
+            lambda = GLONASS_C_M_S / ((GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN))));
         }
     if ((sig == "2C") && (sys == "R"))
         {
             // TODO Need to add slot number and freq number to gnss_syncro
-            lambda = GLONASS_C_m_s / (GLONASS_L2_CA_FREQ_HZ);
+            lambda = GLONASS_C_M_S / (GLONASS_L2_CA_FREQ_HZ);
         }
 
     phrng_m = (gnss_synchro.Carrier_phase_rads / GPS_TWO_PI) * lambda - rough_range_m;
@@ -5502,32 +5502,32 @@ int32_t Rtcm::set_DF404(const Gnss_Synchro& gnss_synchro)
 
     if ((sig_ == "1C") && (sys_ == "G"))
         {
-            lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
         }
     if ((sig_ == "2S") && (sys_ == "G"))
         {
-            lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
         }
     if ((sig_ == "5X") && (sys_ == "E"))
         {
-            lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
         }
     if ((sig_ == "1B") && (sys_ == "E"))
         {
-            lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
         }
     if ((sig_ == "7X") && (sys_ == "E"))
         {
-            lambda = GPS_C_m_s / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
+            lambda = GPS_C_M_S / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
         }
     if ((sig_ == "1C") && (sys_ == "R"))
         {
-            lambda = GLONASS_C_m_s / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
+            lambda = GLONASS_C_M_S / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
         }
     if ((sig_ == "2C") && (sys_ == "R"))
         {
             //TODO Need to add slot number and freq number to gnss syncro
-            lambda = GLONASS_C_m_s / (GLONASS_L2_CA_FREQ_HZ);
+            lambda = GLONASS_C_M_S / (GLONASS_L2_CA_FREQ_HZ);
         }
     double rough_phase_range_rate = std::round(-gnss_synchro.Carrier_Doppler_hz * lambda);
     double phrr = (-gnss_synchro.Carrier_Doppler_hz * lambda - rough_phase_range_rate);
@@ -5552,7 +5552,7 @@ int32_t Rtcm::set_DF404(const Gnss_Synchro& gnss_synchro)
 
 int32_t Rtcm::set_DF405(const Gnss_Synchro& gnss_synchro)
 {
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
     double psrng_s;
     int64_t fine_pseudorange;
@@ -5579,7 +5579,7 @@ int32_t Rtcm::set_DF405(const Gnss_Synchro& gnss_synchro)
 int32_t Rtcm::set_DF406(const Gnss_Synchro& gnss_synchro)
 {
     int64_t fine_phaserange_ex;
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     double rough_range_m = std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10) * meters_to_miliseconds * TWO_N10;
     double phrng_m;
     double lambda = 0.0;
@@ -5589,32 +5589,32 @@ int32_t Rtcm::set_DF406(const Gnss_Synchro& gnss_synchro)
 
     if ((sig_ == "1C") && (sys_ == "G"))
         {
-            lambda = GPS_C_m_s / GPS_L1_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L1_FREQ_HZ;
         }
     if ((sig_ == "2S") && (sys_ == "G"))
         {
-            lambda = GPS_C_m_s / GPS_L2_FREQ_HZ;
+            lambda = GPS_C_M_S / GPS_L2_FREQ_HZ;
         }
     if ((sig_ == "5X") && (sys_ == "E"))
         {
-            lambda = GPS_C_m_s / Galileo_E5a_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E5A_FREQ_HZ;
         }
     if ((sig_ == "1B") && (sys_ == "E"))
         {
-            lambda = GPS_C_m_s / Galileo_E1_FREQ_HZ;
+            lambda = GPS_C_M_S / GALILEO_E1_FREQ_HZ;
         }
     if ((sig_ == "7X") && (sys_ == "E"))
         {
-            lambda = GPS_C_m_s / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
+            lambda = GPS_C_M_S / 1.207140e9;  // Galileo_E1b_FREQ_HZ;
         }
     if ((sig_ == "1C") && (sys_ == "R"))
         {
-            lambda = GLONASS_C_m_s / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
+            lambda = GLONASS_C_M_S / (GLONASS_L1_CA_FREQ_HZ + (GLONASS_L1_CA_DFREQ_HZ * GLONASS_PRN.at(gnss_synchro.PRN)));
         }
     if ((sig_ == "2C") && (sys_ == "R"))
         {
             //TODO Need to add slot number and freq number to gnss syncro
-            lambda = GLONASS_C_m_s / (GLONASS_L2_CA_FREQ_HZ);
+            lambda = GLONASS_C_M_S / (GLONASS_L2_CA_FREQ_HZ);
         }
     phrng_m = (gnss_synchro.Carrier_phase_rads / GPS_TWO_PI) * lambda - rough_range_m;
 
diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 81f199a28..50e541020 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -596,10 +596,10 @@ private:
     };
 
 
-    class Rtcm_Listener
+    class RtcmListener
     {
     public:
-        virtual ~Rtcm_Listener() = default;
+        virtual ~RtcmListener() = default;
         virtual void deliver(const Rtcm_Message& msg) = 0;
     };
 
@@ -607,7 +607,7 @@ private:
     class Rtcm_Listener_Room
     {
     public:
-        inline void join(const std::shared_ptr<Rtcm_Listener>& participant)
+        inline void join(const std::shared_ptr<RtcmListener>& participant)
         {
             participants_.insert(participant);
             for (auto msg : recent_msgs_)
@@ -616,7 +616,7 @@ private:
                 }
         }
 
-        inline void leave(const std::shared_ptr<Rtcm_Listener>& participant)
+        inline void leave(const std::shared_ptr<RtcmListener>& participant)
         {
             participants_.erase(participant);
         }
@@ -636,7 +636,7 @@ private:
         }
 
     private:
-        std::set<std::shared_ptr<Rtcm_Listener> > participants_;
+        std::set<std::shared_ptr<RtcmListener> > participants_;
         enum
         {
             max_recent_msgs = 1
@@ -646,7 +646,7 @@ private:
 
 
     class Rtcm_Session
-        : public Rtcm_Listener,
+        : public RtcmListener,
           public std::enable_shared_from_this<Rtcm_Session>
     {
     public:
@@ -846,7 +846,7 @@ private:
     class Queue_Reader
     {
     public:
-        Queue_Reader(boost::asio::io_service& io_context, std::shared_ptr<concurrent_queue<std::string> >& queue, int32_t port) : queue_(queue)
+        Queue_Reader(boost::asio::io_service& io_context, std::shared_ptr<Concurrent_Queue<std::string> >& queue, int32_t port) : queue_(queue)
         {
             boost::asio::ip::tcp::resolver resolver(io_context);
             std::string host("localhost");
@@ -877,7 +877,7 @@ private:
 
     private:
         std::shared_ptr<Tcp_Internal_Client> c;
-        std::shared_ptr<concurrent_queue<std::string> >& queue_;
+        std::shared_ptr<Concurrent_Queue<std::string> >& queue_;
     };
 
 
@@ -952,7 +952,7 @@ private:
     };
 
     boost::asio::io_service io_context;
-    std::shared_ptr<concurrent_queue<std::string> > rtcm_message_queue;
+    std::shared_ptr<Concurrent_Queue<std::string> > rtcm_message_queue;
     std::thread t;
     std::thread tq;
     std::list<Rtcm::Tcp_Server> servers;
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index e6eb11faa..55ba3ac03 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -1308,7 +1308,7 @@ typedef struct
 } msm_h_t;
 
 
-const double chisqr[100] = {/* chi-sqr(n) (alpha=0.001) */
+const double CHISQR[100] = {/* chi-sqr(n) (alpha=0.001) */
     10.8, 13.8, 16.3, 18.5, 20.5, 22.5, 24.3, 26.1, 27.9, 29.6,
     31.3, 32.9, 34.5, 36.1, 37.7, 39.3, 40.8, 42.3, 43.8, 45.3,
     46.8, 48.3, 49.7, 51.2, 52.6, 54.1, 55.5, 56.9, 58.3, 59.7,
@@ -1321,7 +1321,7 @@ const double chisqr[100] = {/* chi-sqr(n) (alpha=0.001) */
     138, 139, 140, 142, 143, 144, 145, 147, 148, 149};
 
 
-const double lam_carr[MAXFREQ] = {/* carrier wave length (m) */
+const double LAM_CARR[MAXFREQ] = {/* carrier wave length (m) */
     SPEED_OF_LIGHT / FREQ1, SPEED_OF_LIGHT / FREQ2, SPEED_OF_LIGHT / FREQ5, SPEED_OF_LIGHT / FREQ6, SPEED_OF_LIGHT / FREQ7,
     SPEED_OF_LIGHT / FREQ8, SPEED_OF_LIGHT / FREQ9};
 
diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
index 58c1192e5..19cb48d46 100644
--- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc
@@ -488,7 +488,7 @@ int rescode(int iter, const obsd_t *obs, int n, const double *rs,
             /* GPS-L1 -> L1/B1 */
             if ((lam_L1 = nav->lam[obs[i].sat - 1][0]) > 0.0)
                 {
-                    dion *= std::pow(lam_L1 / lam_carr[0], 2.0);
+                    dion *= std::pow(lam_L1 / LAM_CARR[0], 2.0);
                 }
             /* tropospheric corrections */
             if (!tropcorr(obs[i].time, nav, pos, azel + i * 2,
@@ -571,9 +571,9 @@ int valsol(const double *azel, const int *vsat, int n,
 
     /* chi-square validation of residuals */
     vv = dot(v, v, nv);
-    if (nv > nx && vv > chisqr[nv - nx - 1])
+    if (nv > nx && vv > CHISQR[nv - nx - 1])
         {
-            sprintf(msg, "chi-square error nv=%d vv=%.1f cs=%.1f", nv, vv, chisqr[nv - nx - 1]);
+            sprintf(msg, "chi-square error nv=%d vv=%.1f cs=%.1f", nv, vv, CHISQR[nv - nx - 1]);
             return 0;
         }
     /* large gdop check */
diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.cc b/src/algorithms/libs/rtklib/rtklib_ppp.cc
index 9f7ee252f..83329ca48 100644
--- a/src/algorithms/libs/rtklib/rtklib_ppp.cc
+++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc
@@ -436,8 +436,8 @@ int fix_amb_ROUND(rtk_t *rtk, int *sat1, int *sat2, const int *NW, int n)
     double C1, C2, B1, v1, BC, v, vc, *NC, *var, lam_NL = lam_LC(1, 1, 0), lam1, lam2;
     int i, j, k, m = 0, N1, stat;
 
-    lam1 = lam_carr[0];
-    lam2 = lam_carr[1];
+    lam1 = LAM_CARR[0];
+    lam2 = LAM_CARR[1];
 
     C1 = std::pow(lam2, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
     C2 = -std::pow(lam1, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
@@ -498,8 +498,8 @@ int fix_amb_ILS(rtk_t *rtk, int *sat1, int *sat2, int *NW, int n)
     double C1, C2, *B1, *N1, *NC, *D, *E, *Q, s[2], lam_NL = lam_LC(1, 1, 0), lam1, lam2;
     int i, j, k, m = 0, info, stat, flgs[MAXSAT] = {0}, max_flg = 0;
 
-    lam1 = lam_carr[0];
-    lam2 = lam_carr[1];
+    lam1 = LAM_CARR[0];
+    lam2 = LAM_CARR[1];
 
     C1 = std::pow(lam2, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
     C2 = -std::pow(lam1, 2.0) / (std::pow(lam2, 2.0) - std::pow(lam1, 2.0));
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
index 42721e641..46dbedb4d 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm3.cc
@@ -385,8 +385,8 @@ int decode_type1002(rtcm_t *rtcm)
             if (ppr1 != static_cast<int>(0xFFF80000))
                 {
                     rtcm->obs.data[index].P[0] = pr1;
-                    cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / lam_carr[0]);
-                    rtcm->obs.data[index].L[0] = pr1 / lam_carr[0] + cp1;
+                    cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / LAM_CARR[0]);
+                    rtcm->obs.data[index].L[0] = pr1 / LAM_CARR[0] + cp1;
                 }
             rtcm->obs.data[index].LLI[0] = lossoflock(rtcm, sat, 0, lock1);
             rtcm->obs.data[index].SNR[0] = snratio(cnr1 * 0.25);
@@ -475,8 +475,8 @@ int decode_type1004(rtcm_t *rtcm)
             if (ppr1 != static_cast<int>(0xFFF80000))
                 {
                     rtcm->obs.data[index].P[0] = pr1;
-                    cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / lam_carr[0]);
-                    rtcm->obs.data[index].L[0] = pr1 / lam_carr[0] + cp1;
+                    cp1 = adjcp(rtcm, sat, 0, ppr1 * 0.0005 / LAM_CARR[0]);
+                    rtcm->obs.data[index].L[0] = pr1 / LAM_CARR[0] + cp1;
                 }
             rtcm->obs.data[index].LLI[0] = lossoflock(rtcm, sat, 0, lock1);
             rtcm->obs.data[index].SNR[0] = snratio(cnr1 * 0.25);
@@ -488,8 +488,8 @@ int decode_type1004(rtcm_t *rtcm)
                 }
             if (ppr2 != static_cast<int>(0xFFF80000))
                 {
-                    cp2 = adjcp(rtcm, sat, 1, ppr2 * 0.0005 / lam_carr[1]);
-                    rtcm->obs.data[index].L[1] = pr1 / lam_carr[1] + cp2;
+                    cp2 = adjcp(rtcm, sat, 1, ppr2 * 0.0005 / LAM_CARR[1]);
+                    rtcm->obs.data[index].L[1] = pr1 / LAM_CARR[1] + cp2;
                 }
             rtcm->obs.data[index].LLI[1] = lossoflock(rtcm, sat, 1, lock2);
             rtcm->obs.data[index].SNR[1] = snratio(cnr2 * 0.25);
@@ -1986,7 +1986,7 @@ int decode_ssr1_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
     i += 4; /* solution id */
     nsat = getbitu(rtcm->buff, i, ns);
     i += ns;
-    *udint = ssrudint[udi];
+    *udint = SSRUDINT[udi];
 
     trace(4, "decode_ssr1_head: time=%s sys=%d nsat=%d sync=%d iod=%d provid=%d solid=%d\n",
         time_str(rtcm->time, 2), sys, nsat, *sync, *iod, provid, solid);
@@ -2042,7 +2042,7 @@ int decode_ssr2_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
     i += 4; /* solution id */
     nsat = getbitu(rtcm->buff, i, ns);
     i += ns;
-    *udint = ssrudint[udi];
+    *udint = SSRUDINT[udi];
 
     trace(4, "decode_ssr2_head: time=%s sys=%d nsat=%d sync=%d iod=%d provid=%d solid=%d\n",
         time_str(rtcm->time, 2), sys, nsat, *sync, *iod, provid, solid);
@@ -2102,7 +2102,7 @@ int decode_ssr7_head(rtcm_t *rtcm, int sys, int *sync, int *iod,
     i += 1; /* MW consistency indicator */
     nsat = getbitu(rtcm->buff, i, ns);
     i += ns;
-    *udint = ssrudint[udi];
+    *udint = SSRUDINT[udi];
 
     trace(4, "decode_ssr7_head: time=%s sys=%d nsat=%d sync=%d iod=%d provid=%d solid=%d\n",
         time_str(rtcm->time, 2), sys, nsat, *sync, *iod, provid, solid);
@@ -2307,37 +2307,37 @@ int decode_ssr3(rtcm_t *rtcm, int sys)
         case SYS_GPS:
             np = 6;
             offp = 0;
-            codes = codes_gps;
+            codes = CODES_GPS;
             ncode = 17;
             break;
         case SYS_GLO:
             np = 5;
             offp = 0;
-            codes = codes_glo;
+            codes = CODES_GLO;
             ncode = 4;
             break;
         case SYS_GAL:
             np = 6;
             offp = 0;
-            codes = codes_gal;
+            codes = CODES_GAL;
             ncode = 19;
             break;
         case SYS_QZS:
             np = 4;
             offp = 192;
-            codes = codes_qzs;
+            codes = CODES_QZS;
             ncode = 13;
             break;
         case SYS_BDS:
             np = 6;
             offp = 1;
-            codes = codes_bds;
+            codes = CODES_BDS;
             ncode = 9;
             break;
         case SYS_SBS:
             np = 6;
             offp = 120;
-            codes = codes_sbs;
+            codes = CODES_SBS;
             ncode = 4;
             break;
         default:
@@ -2642,31 +2642,31 @@ int decode_ssr7(rtcm_t *rtcm, int sys)
         case SYS_GPS:
             np = 6;
             offp = 0;
-            codes = codes_gps;
+            codes = CODES_GPS;
             ncode = 17;
             break;
         case SYS_GLO:
             np = 5;
             offp = 0;
-            codes = codes_glo;
+            codes = CODES_GLO;
             ncode = 4;
             break;
         case SYS_GAL:
             np = 6;
             offp = 0;
-            codes = codes_gal;
+            codes = CODES_GAL;
             ncode = 19;
             break;
         case SYS_QZS:
             np = 4;
             offp = 192;
-            codes = codes_qzs;
+            codes = CODES_QZS;
             ncode = 13;
             break;
         case SYS_BDS:
             np = 6;
             offp = 1;
-            codes = codes_bds;
+            codes = CODES_BDS;
             ncode = 9;
             break;
         default:
diff --git a/src/algorithms/libs/rtklib/rtklib_rtcm3.h b/src/algorithms/libs/rtklib/rtklib_rtcm3.h
index b907f223d..847bae424 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtcm3.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtcm3.h
@@ -64,38 +64,38 @@ const double RANGE_MS = SPEED_OF_LIGHT * 0.001; /* range in 1 ms */
 
 
 /* ssr update intervals ------------------------------------------------------*/
-const double ssrudint[16] = {
+const double SSRUDINT[16] = {
     1, 2, 5, 10, 15, 30, 60, 120, 240, 300, 600, 900, 1800, 3600, 7200, 10800};
 
 
 /* ssr 3 and 7 signal and tracking mode ids ----------------------------------*/
-const int codes_gps[] = {
+const int CODES_GPS[] = {
     CODE_L1C, CODE_L1P, CODE_L1W, CODE_L1Y, CODE_L1M, CODE_L2C, CODE_L2D, CODE_L2S,
     CODE_L2L, CODE_L2X, CODE_L2P, CODE_L2W, CODE_L2Y, CODE_L2M, CODE_L5I, CODE_L5Q,
     CODE_L5X};
 
 
-const int codes_glo[] = {
+const int CODES_GLO[] = {
     CODE_L1C, CODE_L1P, CODE_L2C, CODE_L2P};
 
 
-const int codes_gal[] = {
+const int CODES_GAL[] = {
     CODE_L1A, CODE_L1B, CODE_L1C, CODE_L1X, CODE_L1Z, CODE_L5I, CODE_L5Q, CODE_L5X,
     CODE_L7I, CODE_L7Q, CODE_L7X, CODE_L8I, CODE_L8Q, CODE_L8X, CODE_L6A, CODE_L6B,
     CODE_L6C, CODE_L6X, CODE_L6Z};
 
 
-const int codes_qzs[] = {
+const int CODES_QZS[] = {
     CODE_L1C, CODE_L1S, CODE_L1L, CODE_L2S, CODE_L2L, CODE_L2X, CODE_L5I, CODE_L5Q,
     CODE_L5X, CODE_L6S, CODE_L6L, CODE_L6X, CODE_L1X};
 
 
-const int codes_bds[] = {
+const int CODES_BDS[] = {
     CODE_L1I, CODE_L1Q, CODE_L1X, CODE_L7I, CODE_L7Q, CODE_L7X, CODE_L6I, CODE_L6Q,
     CODE_L6X};
 
 
-const int codes_sbs[] = {
+const int CODES_SBS[] = {
     CODE_L1C, CODE_L5I, CODE_L5Q, CODE_L5X};
 
 
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
index 70b854400..35c7b3939 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
@@ -62,9 +62,9 @@
 #include <sys/types.h>
 
 
-const double gpst0[] = {1980, 1, 6, 0, 0, 0}; /* gps time reference */
-const double gst0[] = {1999, 8, 22, 0, 0, 0}; /* galileo system time reference */
-const double bdt0[] = {2006, 1, 1, 0, 0, 0};  /* beidou time reference */
+const double GPST0[] = {1980, 1, 6, 0, 0, 0}; /* gps time reference */
+const double GST0[] = {1999, 8, 22, 0, 0, 0}; /* galileo system time reference */
+const double BDT0[] = {2006, 1, 1, 0, 0, 0};  /* beidou time reference */
 
 static double timeoffset_ = 0.0;
 
@@ -154,7 +154,7 @@ char codepris[7][MAXFREQ][16] = {
 fatalfunc_t *fatalfunc = nullptr; /* fatal callback function */
 
 /* crc tables generated by util/gencrc ---------------------------------------*/
-const uint16_t tbl_CRC16[] = {
+const uint16_t TBL_CR_C16[] = {
     0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
     0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
     0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
@@ -189,7 +189,7 @@ const uint16_t tbl_CRC16[] = {
     0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0};
 
 
-const unsigned int tbl_CRC24Q[] = {
+const unsigned int TBL_CR_C24_Q[] = {
     0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
     0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
     0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
@@ -890,7 +890,7 @@ unsigned int rtk_crc24q(const unsigned char *buff, int len)
 
     for (i = 0; i < len; i++)
         {
-            crc = ((crc << 8) & 0xFFFFFF) ^ tbl_CRC24Q[(crc >> 16) ^ buff[i]];
+            crc = ((crc << 8) & 0xFFFFFF) ^ TBL_CR_C24_Q[(crc >> 16) ^ buff[i]];
         }
     return crc;
 }
@@ -912,7 +912,7 @@ uint16_t rtk_crc16(const unsigned char *buff, int len)
 
     for (i = 0; i < len; i++)
         {
-            crc = (crc << 8) ^ tbl_CRC16[((crc >> 8) ^ buff[i]) & 0xFF];
+            crc = (crc << 8) ^ TBL_CR_C16[((crc >> 8) ^ buff[i]) & 0xFF];
         }
     return crc;
 }
@@ -1551,7 +1551,7 @@ void time2epoch(gtime_t t, double *ep)
  *-----------------------------------------------------------------------------*/
 gtime_t gpst2time(int week, double sec)
 {
-    gtime_t t = epoch2time(gpst0);
+    gtime_t t = epoch2time(GPST0);
 
     if (sec < -1e9 || 1e9 < sec)
         {
@@ -1571,7 +1571,7 @@ gtime_t gpst2time(int week, double sec)
  *-----------------------------------------------------------------------------*/
 double time2gpst(gtime_t t, int *week)
 {
-    gtime_t t0 = epoch2time(gpst0);
+    gtime_t t0 = epoch2time(GPST0);
     time_t sec = t.time - t0.time;
     int w = static_cast<int>(sec / 604800);
 
@@ -1591,7 +1591,7 @@ double time2gpst(gtime_t t, int *week)
  *-----------------------------------------------------------------------------*/
 gtime_t gst2time(int week, double sec)
 {
-    gtime_t t = epoch2time(gst0);
+    gtime_t t = epoch2time(GST0);
 
     if (sec < -1e9 || 1e9 < sec)
         {
@@ -1611,7 +1611,7 @@ gtime_t gst2time(int week, double sec)
  *-----------------------------------------------------------------------------*/
 double time2gst(gtime_t t, int *week)
 {
-    gtime_t t0 = epoch2time(gst0);
+    gtime_t t0 = epoch2time(GST0);
     time_t sec = t.time - t0.time;
     int w = static_cast<int>(sec / (86400 * 7));
 
@@ -1631,7 +1631,7 @@ double time2gst(gtime_t t, int *week)
  *-----------------------------------------------------------------------------*/
 gtime_t bdt2time(int week, double sec)
 {
-    gtime_t t = epoch2time(bdt0);
+    gtime_t t = epoch2time(BDT0);
 
     if (sec < -1e9 || 1e9 < sec)
         {
@@ -1651,7 +1651,7 @@ gtime_t bdt2time(int week, double sec)
  *-----------------------------------------------------------------------------*/
 double time2bdt(gtime_t t, int *week)
 {
-    gtime_t t0 = epoch2time(bdt0);
+    gtime_t t0 = epoch2time(BDT0);
     time_t sec = t.time - t0.time;
     int w = static_cast<int>(sec / (86400 * 7));
 
@@ -4806,7 +4806,7 @@ void csmooth(obs_t *obs, int ns)
                         }
                     else
                         {
-                            dcp = lam_carr[j] * (p->L[j] - Lp[r - 1][s - 1][j]);
+                            dcp = LAM_CARR[j] * (p->L[j] - Lp[r - 1][s - 1][j]);
                             Ps[r - 1][s - 1][j] = p->P[j] / ns + (Ps[r - 1][s - 1][j] + dcp) * (ns - 1) / ns;
                         }
                     if (++n[r - 1][s - 1][j] < ns)
diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
index 4ff70803e..40645f9a0 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
@@ -1613,8 +1613,8 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x,
                             /* double-differenced ionospheric delay term */
                             if (opt->ionoopt == IONOOPT_EST)
                                 {
-                                    fi = lami / lam_carr[0];
-                                    fj = lamj / lam_carr[0];
+                                    fi = lami / LAM_CARR[0];
+                                    fj = lamj / LAM_CARR[0];
                                     didxi = (f < nf ? -1.0 : 1.0) * fi * fi * im[i];
                                     didxj = (f < nf ? -1.0 : 1.0) * fj * fj * im[j];
                                     v[nv] -= didxi * x[II_RTK(sat[i], opt)] - didxj * x[II_RTK(sat[j], opt)];
diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
index a86425dbb..8b2e00833 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc
@@ -35,7 +35,7 @@ void saveoutbuf(rtksvr_t *svr, unsigned char *buff, int n, int index)
 /* write solution to output stream -------------------------------------------*/
 void writesol(rtksvr_t *svr, int index)
 {
-    solopt_t solopt = solopt_default;
+    solopt_t solopt = SOLOPT_DEFAULT;
     unsigned char buff[1024];
     int i, n;
 
@@ -672,10 +672,10 @@ int rtksvrinit(rtksvr_t *svr)
         }
     for (i = 0; i < 2; i++)
         {
-            svr->solopt[i] = solopt_default;
+            svr->solopt[i] = SOLOPT_DEFAULT;
         }
     svr->navsel = svr->nsbs = svr->nsol = 0;
-    rtkinit(&svr->rtk, &prcopt_default);
+    rtkinit(&svr->rtk, &PRCOPT_DEFAULT);
     for (i = 0; i < 3; i++)
         {
             svr->nb[i] = 0;
diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.h b/src/algorithms/libs/rtklib/rtklib_rtksvr.h
index d5edbd252..9d84b13c9 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtksvr.h
+++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.h
@@ -57,7 +57,7 @@
 #include "rtklib.h"
 
 
-const solopt_t solopt_default = {
+const solopt_t SOLOPT_DEFAULT = {
     /* defaults solution output options */
     SOLF_LLH, TIMES_GPST, 1, 3, /* posf, times, timef, timeu */
     0, 1, 0, 0, 0, 0,           /* degf, outhead, outopt, datum, height, geoid */
@@ -66,7 +66,7 @@ const solopt_t solopt_default = {
     " ", "", 0                  /* separator/program name */
 };
 
-const prcopt_t prcopt_default = {            /* defaults processing options */
+const prcopt_t PRCOPT_DEFAULT = {            /* defaults processing options */
     PMODE_SINGLE, 0, 2, SYS_GPS,             /* mode, soltype, nf, navsys */
     15.0 * D2R, {{}, {{}, {}}},              /* elmin, snrmask */
     0, 1, 1, 1,                              /* sateph, modear, glomodear, bdsmodear */
diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.cc b/src/algorithms/libs/rtklib/rtklib_sbas.cc
index 4f63cb40a..943b271f0 100644
--- a/src/algorithms/libs/rtklib/rtklib_sbas.cc
+++ b/src/algorithms/libs/rtklib/rtklib_sbas.cc
@@ -319,12 +319,12 @@ int decode_sbstype18(const sbsmsg_t *msg, sbsion_t *sbsion)
 
     if (0 <= band && band <= 8)
         {
-            p = igpband1[band];
+            p = IGPBAND1[band];
             m = 8;
         }
     else if (9 <= band && band <= 10)
         {
-            p = igpband2[band - 9];
+            p = IGPBAND2[band - 9];
             m = 5;
         }
     else
diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.h b/src/algorithms/libs/rtklib/rtklib_sbas.h
index 1ff7bf6ad..801df1202 100644
--- a/src/algorithms/libs/rtklib/rtklib_sbas.h
+++ b/src/algorithms/libs/rtklib/rtklib_sbas.h
@@ -70,50 +70,50 @@ const int WEEKOFFSET = 1024; /* gps week offset for NovAtel OEM-3 */
 
 /* sbas igp definition -------------------------------------------------------*/
 static const short
-    x1[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
+    X1[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
         25, 30, 35, 40, 45, 50, 55, 65, 75, 85},
-    x2[] = {-55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30,
+    X2[] = {-55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30,
         35, 40, 45, 50, 55},
-    x3[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
+    X3[] = {-75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20,
         25, 30, 35, 40, 45, 50, 55, 65, 75},
-    x4[] = {-85, -75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15,
+    X4[] = {-85, -75, -65, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15,
         20, 25, 30, 35, 40, 45, 50, 55, 65, 75},
-    x5[] = {-180, -175, -170, -165, -160, -155, -150, -145, -140, -135, -130, -125, -120, -115,
+    X5[] = {-180, -175, -170, -165, -160, -155, -150, -145, -140, -135, -130, -125, -120, -115,
         -110, -105, -100, -95, -90, -85, -80, -75, -70, -65, -60, -55, -50, -45,
         -40, -35, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25,
         30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95,
         100, 105, 110, 115, 120, 125, 130, 135, 140, 145, 150, 155, 160, 165,
         170, 175},
-    x6[] = {-180, -170, -160, -150, -140, -130, -120, -110, -100, -90, -80, -70, -60, -50,
+    X6[] = {-180, -170, -160, -150, -140, -130, -120, -110, -100, -90, -80, -70, -60, -50,
         -40, -30, -20, -10, 0, 10, 20, 30, 40, 50, 60, 70, 80, 90,
         100, 110, 120, 130, 140, 150, 160, 170},
-    x7[] = {-180, -150, -120, -90, -60, -30, 0, 30, 60, 90, 120, 150},
-    x8[] = {-170, -140, -110, -80, -50, -20, 10, 40, 70, 100, 130, 160};
+    X7[] = {-180, -150, -120, -90, -60, -30, 0, 30, 60, 90, 120, 150},
+    X8[] = {-170, -140, -110, -80, -50, -20, 10, 40, 70, 100, 130, 160};
 
-const sbsigpband_t igpband1[9][8] = {/* band 0-8 */
-    {{-180, x1, 1, 28}, {-175, x2, 29, 51}, {-170, x3, 52, 78}, {-165, x2, 79, 101},
-        {-160, x3, 102, 128}, {-155, x2, 129, 151}, {-150, x3, 152, 178}, {-145, x2, 179, 201}},
-    {{-140, x4, 1, 28}, {-135, x2, 29, 51}, {-130, x3, 52, 78}, {-125, x2, 79, 101},
-        {-120, x3, 102, 128}, {-115, x2, 129, 151}, {-110, x3, 152, 178}, {-105, x2, 179, 201}},
-    {{-100, x3, 1, 27}, {-95, x2, 28, 50}, {-90, x1, 51, 78}, {-85, x2, 79, 101},
-        {-80, x3, 102, 128}, {-75, x2, 129, 151}, {-70, x3, 152, 178}, {-65, x2, 179, 201}},
-    {{-60, x3, 1, 27}, {-55, x2, 28, 50}, {-50, x4, 51, 78}, {-45, x2, 79, 101},
-        {-40, x3, 102, 128}, {-35, x2, 129, 151}, {-30, x3, 152, 178}, {-25, x2, 179, 201}},
-    {{-20, x3, 1, 27}, {-15, x2, 28, 50}, {-10, x3, 51, 77}, {-5, x2, 78, 100},
-        {0, x1, 101, 128}, {5, x2, 129, 151}, {10, x3, 152, 178}, {15, x2, 179, 201}},
-    {{20, x3, 1, 27}, {25, x2, 28, 50}, {30, x3, 51, 77}, {35, x2, 78, 100},
-        {40, x4, 101, 128}, {45, x2, 129, 151}, {50, x3, 152, 178}, {55, x2, 179, 201}},
-    {{60, x3, 1, 27}, {65, x2, 28, 50}, {70, x3, 51, 77}, {75, x2, 78, 100},
-        {80, x3, 101, 127}, {85, x2, 128, 150}, {90, x1, 151, 178}, {95, x2, 179, 201}},
-    {{100, x3, 1, 27}, {105, x2, 28, 50}, {110, x3, 51, 77}, {115, x2, 78, 100},
-        {120, x3, 101, 127}, {125, x2, 128, 150}, {130, x4, 151, 178}, {135, x2, 179, 201}},
-    {{140, x3, 1, 27}, {145, x2, 28, 50}, {150, x3, 51, 77}, {155, x2, 78, 100},
-        {160, x3, 101, 127}, {165, x2, 128, 150}, {170, x3, 151, 177}, {175, x2, 178, 200}}};
-const sbsigpband_t igpband2[2][5] = {/* band 9-10 */
-    {{60, x5, 1, 72}, {65, x6, 73, 108}, {70, x6, 109, 144}, {75, x6, 145, 180},
-        {85, x7, 181, 192}},
-    {{-60, x5, 1, 72}, {-65, x6, 73, 108}, {-70, x6, 109, 144}, {-75, x6, 145, 180},
-        {-85, x8, 181, 192}}};
+const sbsigpband_t IGPBAND1[9][8] = {/* band 0-8 */
+    {{-180, X1, 1, 28}, {-175, X2, 29, 51}, {-170, X3, 52, 78}, {-165, X2, 79, 101},
+        {-160, X3, 102, 128}, {-155, X2, 129, 151}, {-150, X3, 152, 178}, {-145, X2, 179, 201}},
+    {{-140, X4, 1, 28}, {-135, X2, 29, 51}, {-130, X3, 52, 78}, {-125, X2, 79, 101},
+        {-120, X3, 102, 128}, {-115, X2, 129, 151}, {-110, X3, 152, 178}, {-105, X2, 179, 201}},
+    {{-100, X3, 1, 27}, {-95, X2, 28, 50}, {-90, X1, 51, 78}, {-85, X2, 79, 101},
+        {-80, X3, 102, 128}, {-75, X2, 129, 151}, {-70, X3, 152, 178}, {-65, X2, 179, 201}},
+    {{-60, X3, 1, 27}, {-55, X2, 28, 50}, {-50, X4, 51, 78}, {-45, X2, 79, 101},
+        {-40, X3, 102, 128}, {-35, X2, 129, 151}, {-30, X3, 152, 178}, {-25, X2, 179, 201}},
+    {{-20, X3, 1, 27}, {-15, X2, 28, 50}, {-10, X3, 51, 77}, {-5, X2, 78, 100},
+        {0, X1, 101, 128}, {5, X2, 129, 151}, {10, X3, 152, 178}, {15, X2, 179, 201}},
+    {{20, X3, 1, 27}, {25, X2, 28, 50}, {30, X3, 51, 77}, {35, X2, 78, 100},
+        {40, X4, 101, 128}, {45, X2, 129, 151}, {50, X3, 152, 178}, {55, X2, 179, 201}},
+    {{60, X3, 1, 27}, {65, X2, 28, 50}, {70, X3, 51, 77}, {75, X2, 78, 100},
+        {80, X3, 101, 127}, {85, X2, 128, 150}, {90, X1, 151, 178}, {95, X2, 179, 201}},
+    {{100, X3, 1, 27}, {105, X2, 28, 50}, {110, X3, 51, 77}, {115, X2, 78, 100},
+        {120, X3, 101, 127}, {125, X2, 128, 150}, {130, X4, 151, 178}, {135, X2, 179, 201}},
+    {{140, X3, 1, 27}, {145, X2, 28, 50}, {150, X3, 51, 77}, {155, X2, 78, 100},
+        {160, X3, 101, 127}, {165, X2, 128, 150}, {170, X3, 151, 177}, {175, X2, 178, 200}}};
+const sbsigpband_t IGPBAND2[2][5] = {/* band 9-10 */
+    {{60, X5, 1, 72}, {65, X6, 73, 108}, {70, X6, 109, 144}, {75, X6, 145, 180},
+        {85, X7, 181, 192}},
+    {{-60, X5, 1, 72}, {-65, X6, 73, 108}, {-70, X6, 109, 144}, {-75, X6, 145, 180},
+        {-85, X8, 181, 192}}};
 
 
 char *getfield(char *p, int pos);
diff --git a/src/algorithms/libs/rtklib/rtklib_solution.cc b/src/algorithms/libs/rtklib/rtklib_solution.cc
index 96ba51b1e..ab7c6a72e 100644
--- a/src/algorithms/libs/rtklib/rtklib_solution.cc
+++ b/src/algorithms/libs/rtklib/rtklib_solution.cc
@@ -67,7 +67,7 @@ const int MAXFIELD = 64; /* max number of fields in a record */
 
 const double KNOT2M = 0.514444444; /* m/knot */
 
-static const int solq_nmea[] = {/* nmea quality flags to rtklib sol quality */
+static const int SOLQ_NMEA[] = {/* nmea quality flags to rtklib sol quality */
     /* nmea 0183 v.2.3 quality flags: */
     /*  0=invalid, 1=gps fix (sps), 2=dgps fix, 3=pps fix, 4=rtk, 5=float rtk */
     /*  6=estimated (dead reckoning), 7=manual input, 8=simulation */
@@ -326,7 +326,7 @@ int decode_nmeagga(char **val, int n, sol_t *sol)
             sol->time = time;
         }
     pos2ecef(pos, sol->rr);
-    sol->stat = 0 <= solq && solq <= 8 ? solq_nmea[solq] : SOLQ_NONE;
+    sol->stat = 0 <= solq && solq <= 8 ? SOLQ_NMEA[solq] : SOLQ_NONE;
     sol->ns = nrcv;
 
     sol->type = 0; /* position type = xyz */
@@ -1005,7 +1005,7 @@ int readsolt(char *files[], int nfile, gtime_t ts, gtime_t te,
     double tint, int qflag, solbuf_t *solbuf)
 {
     FILE *fp;
-    solopt_t opt = solopt_default;
+    solopt_t opt = SOLOPT_DEFAULT;
     int i;
 
     trace(3, "readsolt: nfile=%d\n", nfile);
@@ -1537,7 +1537,7 @@ int outnmea_gga(unsigned char *buff, const sol_t *sol)
         }
     for (solq = 0; solq < 8; solq++)
         {
-            if (solq_nmea[solq] == sol->stat)
+            if (SOLQ_NMEA[solq] == sol->stat)
                 {
                     break;
                 }
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index f90982965..429931dd0 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
@@ -482,9 +482,9 @@ void hybrid_observables_cc::compute_pranges(std::vector<Gnss_Synchro> &data)
         {
             if (it->Flag_valid_word)
                 {
-                    double traveltime_s = (static_cast<double>(T_rx_TOW_ms) - it->interp_TOW_ms + GPS_STARTOFFSET_ms) / 1000.0;
+                    double traveltime_s = (static_cast<double>(T_rx_TOW_ms) - it->interp_TOW_ms + GPS_STARTOFFSET_MS) / 1000.0;
                     //todo: check what happens during the week rollover (TOW rollover at 604800000s)
-                    it->RX_time = (static_cast<double>(T_rx_TOW_ms) + GPS_STARTOFFSET_ms) / 1000.0;
+                    it->RX_time = (static_cast<double>(T_rx_TOW_ms) + GPS_STARTOFFSET_MS) / 1000.0;
                     it->Pseudorange_m = traveltime_s * SPEED_OF_LIGHT;
                     it->Flag_valid_pseudorange = true;
                     // debug code
diff --git a/src/algorithms/signal_generator/adapters/signal_generator.cc b/src/algorithms/signal_generator/adapters/signal_generator.cc
index 91536357a..8a4d5ab8e 100644
--- a/src/algorithms/signal_generator/adapters/signal_generator.cc
+++ b/src/algorithms/signal_generator/adapters/signal_generator.cc
@@ -90,11 +90,11 @@ SignalGenerator::SignalGenerator(ConfigurationInterface* configuration,
         {
             if (signal1[0].at(0) == '5')
                 {
-                    vector_length = round(static_cast<float>(fs_in) / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS));
+                    vector_length = round(static_cast<float>(fs_in) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS));
                 }
             else
                 {
-                    vector_length = round(static_cast<float>(fs_in) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)) * Galileo_E1_C_SECONDARY_CODE_LENGTH;
+                    vector_length = round(static_cast<float>(fs_in) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)) * GALILEO_E1_C_SECONDARY_CODE_LENGTH;
                 }
         }
     else if (std::find(system.begin(), system.end(), "G") != system.end())
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
index 84a90d555..37c3ca36f 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -107,39 +107,39 @@ void signal_generator_c::init()
             current_data_bit_int_.push_back(1);
             current_data_bits_.emplace_back(1, 0);
             ms_counter_.push_back(0);
-            data_modulation_.push_back((Galileo_E5a_I_SECONDARY_CODE.at(0) == '0' ? 1 : -1));
-            pilot_modulation_.push_back((Galileo_E5a_Q_SECONDARY_CODE[PRN_[sat]].at(0) == '0' ? 1 : -1));
+            data_modulation_.push_back((GALILEO_E5A_I_SECONDARY_CODE.at(0) == '0' ? 1 : -1));
+            pilot_modulation_.push_back((GALILEO_E5A_Q_SECONDARY_CODE[PRN_[sat]].at(0) == '0' ? 1 : -1));
 
             if (system_[sat] == "G")
                 {
                     samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)));
 
-                    num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(Galileo_E1_C_SECONDARY_CODE_LENGTH) : 1);
+                    num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(GALILEO_E1_C_SECONDARY_CODE_LENGTH) : 1);
                     data_bit_duration_ms_.push_back(1e3 / GPS_CA_TELEMETRY_RATE_BITS_SECOND);
                 }
             else if (system_[sat] == "R")
                 {
                     samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GLONASS_L1_CA_CODE_RATE_HZ / GLONASS_L1_CA_CODE_LENGTH_CHIPS)));
 
-                    num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(Galileo_E1_C_SECONDARY_CODE_LENGTH) : 1);
+                    num_of_codes_per_vector_.push_back(galileo_signal ? 4 * static_cast<int>(GALILEO_E1_C_SECONDARY_CODE_LENGTH) : 1);
                     data_bit_duration_ms_.push_back(1e3 / GLONASS_GNAV_TELEMETRY_RATE_BITS_SECOND);
                 }
             else if (system_[sat] == "E")
                 {
                     if (signal_[sat].at(0) == '5')
                         {
-                            int codelen = static_cast<int>(Galileo_E5a_CODE_LENGTH_CHIPS);
-                            samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (Galileo_E5a_CODE_CHIP_RATE_HZ / codelen)));
+                            int codelen = static_cast<int>(GALILEO_E5A_CODE_LENGTH_CHIPS);
+                            samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GALILEO_E5A_CODE_CHIP_RATE_HZ / codelen)));
                             num_of_codes_per_vector_.push_back(1);
 
-                            data_bit_duration_ms_.push_back(1e3 / Galileo_E5a_SYMBOL_RATE_BPS);
+                            data_bit_duration_ms_.push_back(1e3 / GALILEO_E5A_SYMBOL_RATE_BPS);
                         }
                     else
                         {
-                            samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+                            samples_per_code_.push_back(round(static_cast<float>(fs_in_) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
 
-                            num_of_codes_per_vector_.push_back(static_cast<int>(Galileo_E1_C_SECONDARY_CODE_LENGTH));
-                            data_bit_duration_ms_.push_back(1e3 / Galileo_E1_B_SYMBOL_RATE_BPS);
+                            num_of_codes_per_vector_.push_back(static_cast<int>(GALILEO_E1_C_SECONDARY_CODE_LENGTH));
+                            data_bit_duration_ms_.push_back(1e3 / GALILEO_E1_B_SYMBOL_RATE_BPS);
                         }
                 }
         }
@@ -212,7 +212,7 @@ void signal_generator_c::generate_codes()
                             strcpy(signal, "5X");
 
                             galileo_e5_a_code_gen_complex_sampled(sampled_code_data_[sat], signal, PRN_[sat], fs_in_,
-                                static_cast<int>(Galileo_E5a_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
+                                static_cast<int>(GALILEO_E5A_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
                             //noise
                             if (noise_flag_)
                                 {
@@ -230,7 +230,7 @@ void signal_generator_c::generate_codes()
                             strcpy(signal, "1B");
 
                             galileo_e1_code_gen_complex_sampled(code, signal, cboc, PRN_[sat], fs_in_,
-                                static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
+                                static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat]);
 
                             // Obtain the desired CN0 assuming that Pn = 1.
                             if (noise_flag_)
@@ -254,7 +254,7 @@ void signal_generator_c::generate_codes()
                             strcpy(signal, "1C");
 
                             galileo_e1_code_gen_complex_sampled(sampled_code_pilot_[sat], signal, cboc, PRN_[sat], fs_in_,
-                                static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat], true);
+                                static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) - delay_chips_[sat], true);
 
                             // Obtain the desired CN0 assuming that Pn = 1.
                             if (noise_flag_)
@@ -380,7 +380,7 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
                     if (signal_[sat].at(0) == '5')
                         {
                             // EACH WORK outputs 1 modulated primary code
-                            int codelen = static_cast<int>(Galileo_E5a_CODE_LENGTH_CHIPS);
+                            int codelen = static_cast<int>(GALILEO_E5A_CODE_LENGTH_CHIPS);
                             unsigned int delay_samples = (delay_chips_[sat] % codelen) * samples_per_code_[sat] / codelen;
                             for (k = 0; k < delay_samples; k++)
                                 {
@@ -395,10 +395,10 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
                                     // New random data bit
                                     current_data_bit_int_[sat] = (uniform_dist(e1) % 2) == 0 ? 1 : -1;
                                 }
-                            data_modulation_[sat] = current_data_bit_int_[sat] * (Galileo_E5a_I_SECONDARY_CODE.at((ms_counter_[sat] + delay_sec_[sat]) % 20) == '0' ? 1 : -1);
-                            pilot_modulation_[sat] = (Galileo_E5a_Q_SECONDARY_CODE[PRN_[sat] - 1].at((ms_counter_[sat] + delay_sec_[sat]) % 100) == '0' ? 1 : -1);
+                            data_modulation_[sat] = current_data_bit_int_[sat] * (GALILEO_E5A_I_SECONDARY_CODE.at((ms_counter_[sat] + delay_sec_[sat]) % 20) == '0' ? 1 : -1);
+                            pilot_modulation_[sat] = (GALILEO_E5A_Q_SECONDARY_CODE[PRN_[sat] - 1].at((ms_counter_[sat] + delay_sec_[sat]) % 100) == '0' ? 1 : -1);
 
-                            ms_counter_[sat] = ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E5a_CODE_PERIOD));
+                            ms_counter_[sat] = ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E5A_CODE_PERIOD));
 
                             for (k = delay_samples; k < samples_per_code_[sat]; k++)
                                 {
@@ -410,7 +410,7 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
                         }
                     else
                         {
-                            unsigned int delay_samples = (delay_chips_[sat] % static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * samples_per_code_[sat] / Galileo_E1_B_CODE_LENGTH_CHIPS;
+                            unsigned int delay_samples = (delay_chips_[sat] % static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * samples_per_code_[sat] / GALILEO_E1_B_CODE_LENGTH_CHIPS;
 
                             for (i = 0; i < num_of_codes_per_vector_[sat]; i++)
                                 {
@@ -432,7 +432,7 @@ int signal_generator_c::general_work(int noutput_items __attribute__((unused)),
                                             out_idx++;
                                         }
 
-                                    ms_counter_[sat] = (ms_counter_[sat] + static_cast<int>(round(1e3 * Galileo_E1_CODE_PERIOD))) % data_bit_duration_ms_[sat];
+                                    ms_counter_[sat] = (ms_counter_[sat] + static_cast<int>(round(1e3 * GALILEO_E1_CODE_PERIOD))) % data_bit_duration_ms_[sat];
                                 }
                         }
                 }
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
index 5e40880a5..5450a4377 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
@@ -222,7 +222,7 @@ void rtl_tcp_signal_source_c::set_if_gain(int gain)
     {
         double start, stop, step;
     };
-    if (info_.get_tuner_type() != rtl_tcp_dongle_info::TUNER_E4000)
+    if (info_.get_tuner_type() != Rtl_Tcp_Dongle_Info::TUNER_E4000)
         {
             return;
         }
diff --git a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
index d685b26a1..2edbf9db0 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.h
@@ -88,7 +88,7 @@ private:
         int16_t port,
         bool flip_iq);
 
-    rtl_tcp_dongle_info info_;
+    Rtl_Tcp_Dongle_Info info_;
 
     // IO members
     boost::asio::io_service io_service_;
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
index 992507cd7..5e0d6f4cd 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.cc
@@ -39,7 +39,7 @@
 #include <cstring>    // for memcpy
 #include <utility>
 
-gnss_sdr_valve::gnss_sdr_valve(size_t sizeof_stream_item,
+Gnss_Sdr_Valve::Gnss_Sdr_Valve(size_t sizeof_stream_item,
     uint64_t nitems,
     gr::msg_queue::sptr queue,
     bool stop_flowgraph) : gr::sync_block("valve",
@@ -56,25 +56,25 @@ gnss_sdr_valve::gnss_sdr_valve(size_t sizeof_stream_item,
 
 boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, gr::msg_queue::sptr queue, bool stop_flowgraph)
 {
-    boost::shared_ptr<gnss_sdr_valve> valve_(new gnss_sdr_valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
+    boost::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), stop_flowgraph));
     return valve_;
 }
 
 
 boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item, uint64_t nitems, gr::msg_queue::sptr queue)
 {
-    boost::shared_ptr<gnss_sdr_valve> valve_(new gnss_sdr_valve(sizeof_stream_item, nitems, std::move(queue), true));
+    boost::shared_ptr<Gnss_Sdr_Valve> valve_(new Gnss_Sdr_Valve(sizeof_stream_item, nitems, std::move(queue), true));
     return valve_;
 }
 
 
-void gnss_sdr_valve::open_valve()
+void Gnss_Sdr_Valve::open_valve()
 {
     d_open_valve = true;
 }
 
 
-int gnss_sdr_valve::work(int noutput_items,
+int Gnss_Sdr_Valve::work(int noutput_items,
     gr_vector_const_void_star &input_items,
     gr_vector_void_star &output_items)
 {
diff --git a/src/algorithms/signal_source/libs/gnss_sdr_valve.h b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
index 19c104b99..16a141cd4 100644
--- a/src/algorithms/signal_source/libs/gnss_sdr_valve.h
+++ b/src/algorithms/signal_source/libs/gnss_sdr_valve.h
@@ -52,7 +52,7 @@ boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
  * \brief Implementation of a GNU Radio block that sends a STOP message to the
  * control queue right after a specific number of samples have passed through it.
  */
-class gnss_sdr_valve : public gr::sync_block
+class Gnss_Sdr_Valve : public gr::sync_block
 {
     friend boost::shared_ptr<gr::block> gnss_sdr_make_valve(size_t sizeof_stream_item,
         uint64_t nitems,
@@ -69,7 +69,7 @@ class gnss_sdr_valve : public gr::sync_block
     bool d_open_valve;
 
 public:
-    gnss_sdr_valve(size_t sizeof_stream_item,
+    Gnss_Sdr_Valve(size_t sizeof_stream_item,
         uint64_t nitems,
         gr::msg_queue::sptr queue, bool stop_flowgraph);
     void open_valve();
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
index c359b6d35..09abb26db 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.cc
@@ -37,13 +37,13 @@
 
 using boost::asio::ip::tcp;
 
-rtl_tcp_dongle_info::rtl_tcp_dongle_info() : tuner_type_(0), tuner_gain_count_(0)
+Rtl_Tcp_Dongle_Info::Rtl_Tcp_Dongle_Info() : tuner_type_(0), tuner_gain_count_(0)
 {
     std::memset(magic_, 0, sizeof(magic_));
 }
 
 
-boost::system::error_code rtl_tcp_dongle_info::read(boost::asio::ip::tcp::socket &socket)
+boost::system::error_code Rtl_Tcp_Dongle_Info::read(boost::asio::ip::tcp::socket &socket)
 {
     boost::system::error_code ec;
 
@@ -67,7 +67,7 @@ boost::system::error_code rtl_tcp_dongle_info::read(boost::asio::ip::tcp::socket
 }
 
 
-const char *rtl_tcp_dongle_info::get_type_name() const
+const char *Rtl_Tcp_Dongle_Info::get_type_name() const
 {
     switch (get_tuner_type())
         {
@@ -89,7 +89,7 @@ const char *rtl_tcp_dongle_info::get_type_name() const
 }
 
 
-double rtl_tcp_dongle_info::clip_gain(int gain) const
+double Rtl_Tcp_Dongle_Info::clip_gain(int gain) const
 {
     // the following gain values have been copied from librtlsdr
     // all gain values are expressed in tenths of a dB
@@ -146,7 +146,7 @@ double rtl_tcp_dongle_info::clip_gain(int gain) const
 }
 
 
-bool rtl_tcp_dongle_info::is_valid() const
+bool Rtl_Tcp_Dongle_Info::is_valid() const
 {
     return std::memcmp(magic_, "RTL0", 4) == 0;
 }
diff --git a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
index 983b94a29..e7ac9eb94 100644
--- a/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
+++ b/src/algorithms/signal_source/libs/rtl_tcp_dongle_info.h
@@ -39,7 +39,7 @@
  * \brief This class represents the dongle information
  * which is sent by rtl_tcp.
  */
-class rtl_tcp_dongle_info
+class Rtl_Tcp_Dongle_Info
 {
 private:
     char magic_[4]{};
@@ -58,7 +58,7 @@ public:
         TUNER_R828D
     };
 
-    rtl_tcp_dongle_info();
+    Rtl_Tcp_Dongle_Info();
 
     boost::system::error_code read(boost::asio::ip::tcp::socket &socket);
 
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
index bece79c18..cf794ca49 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_cc.cc
@@ -88,8 +88,8 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
         {
         case 1:  // INAV
             {
-                d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E1_CODE_PERIOD_MS);
-                d_samples_per_symbol = Galileo_E1_B_SAMPLES_PER_SYMBOL;
+                d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);
+                d_samples_per_symbol = GALILEO_E1_B_SAMPLES_PER_SYMBOL;
                 d_bits_per_preamble = GALILEO_INAV_PREAMBLE_LENGTH_BITS;
                 // set the preamble
                 d_samples_per_preamble = GALILEO_INAV_PREAMBLE_LENGTH_BITS * d_samples_per_symbol;
@@ -105,7 +105,7 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
             }
         case 2:  // FNAV
             {
-                d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E5a_CODE_PERIOD_MS);
+                d_PRN_code_period_ms = static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);
                 d_samples_per_symbol = GALILEO_FNAV_CODES_PER_SYMBOL;
                 d_bits_per_preamble = GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
                 // set the preamble
@@ -114,13 +114,13 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
                 d_required_symbols = static_cast<uint32_t>(GALILEO_FNAV_SYMBOLS_PER_PAGE) * d_samples_per_symbol + d_samples_per_preamble;
                 // preamble bits to sampled symbols
                 d_preamble_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(d_samples_per_preamble * sizeof(int32_t), volk_gnsssdr_get_alignment()));
-                d_secondary_code_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(Galileo_E5a_I_SECONDARY_CODE_LENGTH * sizeof(int32_t), volk_gnsssdr_get_alignment()));
+                d_secondary_code_samples = static_cast<int32_t *>(volk_gnsssdr_malloc(GALILEO_E5A_I_SECONDARY_CODE_LENGTH * sizeof(int32_t), volk_gnsssdr_get_alignment()));
                 d_frame_length_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
                 CodeLength = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
                 DataLength = (CodeLength / nn) - mm;
-                for (int32_t i = 0; i < Galileo_E5a_I_SECONDARY_CODE_LENGTH; i++)
+                for (int32_t i = 0; i < GALILEO_E5A_I_SECONDARY_CODE_LENGTH; i++)
                     {
-                        if (Galileo_E5a_I_SECONDARY_CODE.at(i) == '1')
+                        if (GALILEO_E5A_I_SECONDARY_CODE.at(i) == '1')
                             {
                                 d_secondary_code_samples[i] = 1;
                             }
@@ -183,7 +183,7 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
                                         d_preamble_samples[n] = d_secondary_code_samples[m];
                                         n++;
                                         m++;
-                                        m = m % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+                                        m = m % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
                                     }
                             }
                         else
@@ -193,7 +193,7 @@ galileo_telemetry_decoder_cc::galileo_telemetry_decoder_cc(
                                         d_preamble_samples[n] = -d_secondary_code_samples[m];
                                         n++;
                                         m++;
-                                        m = m % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+                                        m = m % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
                                     }
                             }
                         break;
@@ -563,7 +563,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
                                                     {
                                                         d_page_part_symbols[i] += static_cast<float>(d_secondary_code_samples[k]) * d_symbol_history.at(i * d_samples_per_symbol + d_samples_per_preamble + m);  // because last symbol of the preamble is just received now!
                                                         k++;
-                                                        k = k % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+                                                        k = k % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
                                                     }
                                             }
                                     }
@@ -577,7 +577,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
                                                     {
                                                         d_page_part_symbols[i] -= static_cast<float>(d_secondary_code_samples[k]) * d_symbol_history.at(i * d_samples_per_symbol + d_samples_per_preamble + m);  // because last symbol of the preamble is just received now!
                                                         k++;
-                                                        k = k % Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+                                                        k = k % GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
                                                     }
                                             }
                                     }
@@ -634,7 +634,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
                                     {
                                         // TOW_5 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay
                                         d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_inav_nav.TOW_5 * 1000.0);
-                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E1_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
                                         d_inav_nav.flag_TOW_5 = false;
                                     }
 
@@ -642,13 +642,13 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
                                     {
                                         // TOW_6 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay
                                         d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_inav_nav.TOW_6 * 1000.0);
-                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E1_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
                                         d_inav_nav.flag_TOW_6 = false;
                                     }
                                 else
                                     {
                                         // this page has no timing information
-                                        d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E1_CODE_PERIOD_MS);  // + GALILEO_INAV_PAGE_PART_SYMBOLS*GALILEO_E1_CODE_PERIOD;
+                                        d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);  // + GALILEO_INAV_PAGE_PART_SYMBOLS*GALILEO_E1_CODE_PERIOD;
                                     }
                             }
                         break;
@@ -660,7 +660,7 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
                                 if (d_fnav_nav.flag_TOW_1 == true)
                                     {
                                         d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_1 * 1000.0);
-                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
                                         //d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
                                         d_fnav_nav.flag_TOW_1 = false;
                                     }
@@ -668,26 +668,26 @@ int galileo_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
                                     {
                                         d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_2 * 1000.0);
                                         //d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
-                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
                                         d_fnav_nav.flag_TOW_2 = false;
                                     }
                                 else if (d_fnav_nav.flag_TOW_3 == true)
                                     {
                                         d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_3 * 1000.0);
                                         //d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
-                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
                                         d_fnav_nav.flag_TOW_3 = false;
                                     }
                                 else if (d_fnav_nav.flag_TOW_4 == true)
                                     {
                                         d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_fnav_nav.FNAV_TOW_4 * 1000.0);
                                         //d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((GALILEO_FNAV_CODES_PER_PAGE + GALILEO_FNAV_CODES_PER_PREAMBLE) * GALILEO_E5a_CODE_PERIOD_MS);
-                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5a_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>((d_required_symbols + 1) * GALILEO_E5A_CODE_PERIOD_MS);
                                         d_fnav_nav.flag_TOW_4 = false;
                                     }
                                 else
                                     {
-                                        d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E5a_CODE_PERIOD_MS);
+                                        d_TOW_at_current_symbol_ms += static_cast<uint32_t>(GALILEO_E5A_CODE_PERIOD_MS);
                                     }
                                 break;
                             }
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
index 76e64eaaf..a0b54b74d 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.cc
@@ -68,9 +68,9 @@ gps_l5_telemetry_decoder_cc::gps_l5_telemetry_decoder_cc(
     d_TOW_at_Preamble_ms = 0U;
     // initialize the CNAV frame decoder (libswiftcnav)
     cnav_msg_decoder_init(&d_cnav_decoder);
-    for (int32_t aux = 0; aux < GPS_L5i_NH_CODE_LENGTH; aux++)
+    for (int32_t aux = 0; aux < GPS_L5I_NH_CODE_LENGTH; aux++)
         {
-            if (GPS_L5i_NH_CODE[aux] == 0)
+            if (GPS_L5I_NH_CODE[aux] == 0)
                 {
                     bits_NH[aux] = -1.0;
                 }
@@ -154,9 +154,9 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
     int32_t symbol_value = 0;
 
     // Search correlation with Neuman-Hofman Code (see IS-GPS-705D)
-    if (sym_hist.size() == GPS_L5i_NH_CODE_LENGTH)
+    if (sym_hist.size() == GPS_L5I_NH_CODE_LENGTH)
         {
-            for (int32_t i = 0; i < GPS_L5i_NH_CODE_LENGTH; i++)
+            for (int32_t i = 0; i < GPS_L5I_NH_CODE_LENGTH; i++)
                 {
                     if ((bits_NH[i] * sym_hist.at(i)) > 0.0)
                         {
@@ -167,7 +167,7 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
                             corr_NH -= 1;
                         }
                 }
-            if (abs(corr_NH) == GPS_L5i_NH_CODE_LENGTH)
+            if (abs(corr_NH) == GPS_L5I_NH_CODE_LENGTH)
                 {
                     sync_NH = true;
                     if (corr_NH > 0)
@@ -241,12 +241,12 @@ int gps_l5_telemetry_decoder_cc::general_work(int noutput_items __attribute__((u
             // delay by the formulae:
             // \code
             // symbolTime_ms = msg->tow * 6000 + *pdelay * 10 + (12 * 10); 12 symbols of the encoder's transitory
-            d_TOW_at_current_symbol_ms = msg.tow * 6000 + (delay + 12) * GPS_L5i_SYMBOL_PERIOD_MS;
+            d_TOW_at_current_symbol_ms = msg.tow * 6000 + (delay + 12) * GPS_L5I_SYMBOL_PERIOD_MS;
             d_flag_valid_word = true;
         }
     else
         {
-            d_TOW_at_current_symbol_ms += GPS_L5i_PERIOD_MS;
+            d_TOW_at_current_symbol_ms += GPS_L5I_PERIOD_MS;
             if (current_synchro_data.Flag_valid_symbol_output == false)
                 {
                     d_flag_valid_word = false;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
index 2414343ee..d28e8b58f 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l5_telemetry_decoder_cc.h
@@ -90,7 +90,7 @@ private:
     bool d_flag_valid_word;
 
     Gps_CNAV_Navigation_Message d_CNAV_Message;
-    double bits_NH[GPS_L5i_NH_CODE_LENGTH]{};
+    double bits_NH[GPS_L5I_NH_CODE_LENGTH]{};
     std::deque<double> sym_hist;
     bool sync_NH;
     bool new_sym;
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
index 552a0f398..8a3628cbd 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.cc
@@ -64,7 +64,7 @@ sbas_l1_telemetry_decoder_cc::sbas_l1_telemetry_decoder_cc(
     d_dump = dump;
     d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
     LOG(INFO) << "SBAS L1 TELEMETRY PROCESSING: satellite " << d_satellite;
-    d_block_size = d_samples_per_symbol * d_symbols_per_bit * d_block_size_in_bits;
+    d_block_size = D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * D_BLOCK_SIZE_IN_BITS;
     d_channel = 0;
     set_output_multiple(1);
 }
@@ -101,7 +101,7 @@ void sbas_l1_telemetry_decoder_cc::set_channel(int32_t channel)
 
 
 // ### helper class for sample alignment ###
-sbas_l1_telemetry_decoder_cc::sample_aligner::sample_aligner()
+sbas_l1_telemetry_decoder_cc::Sample_Aligner::Sample_Aligner()
 {
     d_n_smpls_in_history = 3;
     d_iir_par = 0.05;
@@ -109,10 +109,10 @@ sbas_l1_telemetry_decoder_cc::sample_aligner::sample_aligner()
 }
 
 
-sbas_l1_telemetry_decoder_cc::sample_aligner::~sample_aligner() = default;
+sbas_l1_telemetry_decoder_cc::Sample_Aligner::~Sample_Aligner() = default;
 
 
-void sbas_l1_telemetry_decoder_cc::sample_aligner::reset()
+void sbas_l1_telemetry_decoder_cc::Sample_Aligner::reset()
 {
     d_past_sample = 0;
     d_corr_paired = 0;
@@ -124,7 +124,7 @@ void sbas_l1_telemetry_decoder_cc::sample_aligner::reset()
 /*
  * samples length must be a multiple of two
  */
-bool sbas_l1_telemetry_decoder_cc::sample_aligner::get_symbols(const std::vector<double> &samples, std::vector<double> &symbols)
+bool sbas_l1_telemetry_decoder_cc::Sample_Aligner::get_symbols(const std::vector<double> &samples, std::vector<double> &symbols)
 {
     double smpls[3] = {};
     double corr_diff;
@@ -134,12 +134,12 @@ bool sbas_l1_telemetry_decoder_cc::sample_aligner::get_symbols(const std::vector
     VLOG(FLOW) << "get_symbols(): "
                << "d_past_sample=" << d_past_sample << "\tsamples size=" << samples.size();
 
-    for (uint32_t i_sym = 0; i_sym < samples.size() / sbas_l1_telemetry_decoder_cc::d_samples_per_symbol; i_sym++)
+    for (uint32_t i_sym = 0; i_sym < samples.size() / sbas_l1_telemetry_decoder_cc::D_SAMPLES_PER_SYMBOL; i_sym++)
         {
             // get the next samples
             for (int32_t i = 0; i < d_n_smpls_in_history; i++)
                 {
-                    smpls[i] = static_cast<int32_t>(i_sym) * sbas_l1_telemetry_decoder_cc::d_samples_per_symbol + i - 1 == -1 ? d_past_sample : samples[i_sym * sbas_l1_telemetry_decoder_cc::d_samples_per_symbol + i - 1];
+                    smpls[i] = static_cast<int32_t>(i_sym) * sbas_l1_telemetry_decoder_cc::D_SAMPLES_PER_SYMBOL + i - 1 == -1 ? d_past_sample : samples[i_sym * sbas_l1_telemetry_decoder_cc::D_SAMPLES_PER_SYMBOL + i - 1];
                 }
 
             // update the pseudo correlations (IIR method) of the two possible alignments
@@ -182,7 +182,7 @@ bool sbas_l1_telemetry_decoder_cc::sample_aligner::get_symbols(const std::vector
 
 
 // ### helper class for symbol alignment and viterbi decoding ###
-sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::symbol_aligner_and_decoder()
+sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::Symbol_Aligner_And_Decoder()
 {
     // convolutional code properties
     d_KK = 7;
@@ -197,14 +197,14 @@ sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::symbol_aligner_and_dec
 }
 
 
-sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::~symbol_aligner_and_decoder()
+sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::~Symbol_Aligner_And_Decoder()
 {
     delete d_vd1;
     delete d_vd2;
 }
 
 
-void sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::reset()
+void sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::reset()
 {
     d_past_symbol = 0;
     d_vd1->reset();
@@ -212,10 +212,10 @@ void sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::reset()
 }
 
 
-bool sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::get_bits(const std::vector<double> &symbols, std::vector<int32_t> &bits)
+bool sbas_l1_telemetry_decoder_cc::Symbol_Aligner_And_Decoder::get_bits(const std::vector<double> &symbols, std::vector<int32_t> &bits)
 {
     const int32_t traceback_depth = 5 * d_KK;
-    int32_t nbits_requested = symbols.size() / d_symbols_per_bit;
+    int32_t nbits_requested = symbols.size() / D_SYMBOLS_PER_BIT;
     int32_t nbits_decoded;
     // fill two vectors with the two possible symbol alignments
     std::vector<double> symbols_vd1(symbols);  // aligned symbol vector -> copy input symbol vector
@@ -251,13 +251,13 @@ bool sbas_l1_telemetry_decoder_cc::symbol_aligner_and_decoder::get_bits(const st
 
 
 // ### helper class for detecting the preamble and collect the corresponding message candidates ###
-void sbas_l1_telemetry_decoder_cc::frame_detector::reset()
+void sbas_l1_telemetry_decoder_cc::Frame_Detector::reset()
 {
     d_buffer.clear();
 }
 
 
-void sbas_l1_telemetry_decoder_cc::frame_detector::get_frame_candidates(const std::vector<int32_t> &bits, std::vector<std::pair<int32_t, std::vector<int32_t>>> &msg_candidates)
+void sbas_l1_telemetry_decoder_cc::Frame_Detector::get_frame_candidates(const std::vector<int32_t> &bits, std::vector<std::pair<int32_t, std::vector<int32_t>>> &msg_candidates)
 {
     std::stringstream ss;
     uint32_t sbas_msg_length = 250;
@@ -321,12 +321,12 @@ void sbas_l1_telemetry_decoder_cc::frame_detector::get_frame_candidates(const st
 
 
 // ### helper class for checking the CRC of the message candidates ###
-void sbas_l1_telemetry_decoder_cc::crc_verifier::reset()
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::reset()
 {
 }
 
 
-void sbas_l1_telemetry_decoder_cc::crc_verifier::get_valid_frames(const std::vector<msg_candiate_int_t> &msg_candidates, std::vector<msg_candiate_char_t> &valid_msgs)
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::get_valid_frames(const std::vector<msg_candiate_int_t> &msg_candidates, std::vector<msg_candiate_char_t> &valid_msgs)
 {
     std::stringstream ss;
     VLOG(FLOW) << "get_valid_frames(): "
@@ -364,7 +364,7 @@ void sbas_l1_telemetry_decoder_cc::crc_verifier::get_valid_frames(const std::vec
 }
 
 
-void sbas_l1_telemetry_decoder_cc::crc_verifier::zerropad_back_and_convert_to_bytes(const std::vector<int> &msg_candidate, std::vector<uint8_t> &bytes)
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::zerropad_back_and_convert_to_bytes(const std::vector<int> &msg_candidate, std::vector<uint8_t> &bytes)
 {
     std::stringstream ss;
     const size_t bits_per_byte = 8;
@@ -391,7 +391,7 @@ void sbas_l1_telemetry_decoder_cc::crc_verifier::zerropad_back_and_convert_to_by
 }
 
 
-void sbas_l1_telemetry_decoder_cc::crc_verifier::zerropad_front_and_convert_to_bytes(const std::vector<int32_t> &msg_candidate, std::vector<uint8_t> &bytes)
+void sbas_l1_telemetry_decoder_cc::Crc_Verifier::zerropad_front_and_convert_to_bytes(const std::vector<int32_t> &msg_candidate, std::vector<uint8_t> &bytes)
 {
     std::stringstream ss;
     const size_t bits_per_byte = 8;
@@ -466,7 +466,7 @@ int sbas_l1_telemetry_decoder_cc::general_work(int noutput_items __attribute__((
             for (const auto &valid_msg : valid_msgs)
                 {
                     int32_t message_sample_offset =
-                        (sample_alignment ? 0 : -1) + d_samples_per_symbol * (symbol_alignment ? -1 : 0) + d_samples_per_symbol * d_symbols_per_bit * valid_msg.first;
+                        (sample_alignment ? 0 : -1) + D_SAMPLES_PER_SYMBOL * (symbol_alignment ? -1 : 0) + D_SAMPLES_PER_SYMBOL * D_SYMBOLS_PER_BIT * valid_msg.first;
                     double message_sample_stamp = sample_stamp + static_cast<double>(message_sample_offset) / 1000.0;
                     VLOG(EVENT) << "message_sample_stamp=" << message_sample_stamp
                                 << " (sample_stamp=" << sample_stamp
diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
index c1956d5e4..f1188737b 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h
@@ -76,9 +76,9 @@ private:
     void viterbi_decoder(double *page_part_symbols, int32_t *page_part_bits);
     void align_samples();
 
-    static const int32_t d_samples_per_symbol = 2;
-    static const int32_t d_symbols_per_bit = 2;
-    static const int32_t d_block_size_in_bits = 30;
+    static const int32_t D_SAMPLES_PER_SYMBOL = 2;
+    static const int32_t D_SYMBOLS_PER_BIT = 2;
+    static const int32_t D_BLOCK_SIZE_IN_BITS = 30;
 
     bool d_dump;
     Gnss_Satellite d_satellite;
@@ -94,11 +94,11 @@ private:
     typedef std::pair<int32_t, std::vector<uint8_t>> msg_candiate_char_t;
 
     // helper class for sample alignment
-    class sample_aligner
+    class Sample_Aligner
     {
     public:
-        sample_aligner();
-        ~sample_aligner();
+        Sample_Aligner();
+        ~Sample_Aligner();
         void reset();
         /*
          * samples length must be a multiple of two
@@ -116,11 +116,11 @@ private:
     } d_sample_aligner;
 
     // helper class for symbol alignment and Viterbi decoding
-    class symbol_aligner_and_decoder
+    class Symbol_Aligner_And_Decoder
     {
     public:
-        symbol_aligner_and_decoder();
-        ~symbol_aligner_and_decoder();
+        Symbol_Aligner_And_Decoder();
+        ~Symbol_Aligner_And_Decoder();
         void reset();
         bool get_bits(const std::vector<double> &symbols, std::vector<int32_t> &bits);
 
@@ -133,7 +133,7 @@ private:
 
 
     // helper class for detecting the preamble and collect the corresponding message candidates
-    class frame_detector
+    class Frame_Detector
     {
     public:
         void reset();
@@ -145,7 +145,7 @@ private:
 
 
     // helper class for checking the CRC of the message candidates
-    class crc_verifier
+    class Crc_Verifier
     {
     public:
         void reset();
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
index 207c7fb94..acfe434ff 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
@@ -34,7 +34,7 @@
 #include <string.h>
 
 
-static const u8 bitn[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+static const u8 BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
 
 /** \defgroup bits Bit Utils
  * Bit field packing, unpacking and utility functions.
@@ -249,7 +249,7 @@ u8 count_bits_u64(u64 v, u8 bv)
     int i = 0;
     for (i = 0; i < 16; i++)
         {
-            r += bitn[(v >> (i * 4)) & 0xf];
+            r += BITN[(v >> (i * 4)) & 0xf];
         }
     return bv == 1 ? r : 64 - r;
 }
@@ -268,7 +268,7 @@ u8 count_bits_u32(u32 v, u8 bv)
     int i = 0;
     for (i = 0; i < 8; i++)
         {
-            r += bitn[(v >> (i * 4)) & 0xf];
+            r += BITN[(v >> (i * 4)) & 0xf];
         }
     return bv == 1 ? r : 32 - r;
 }
@@ -287,7 +287,7 @@ u8 count_bits_u16(u16 v, u8 bv)
     int i = 0;
     for (i = 0; i < 4; i++)
         {
-            r += bitn[(v >> (i * 4)) & 0xf];
+            r += BITN[(v >> (i * 4)) & 0xf];
         }
     return bv == 1 ? r : 16 - r;
 }
@@ -306,7 +306,7 @@ u8 count_bits_u8(u8 v, u8 bv)
     int i = 0;
     for (i = 0; i < 2; i++)
         {
-            r += bitn[(v >> (i * 4)) & 0xf];
+            r += BITN[(v >> (i * 4)) & 0xf];
         }
     return bv == 1 ? r : 8 - r;
 }
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
index b5f3623a2..27b669932 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
@@ -39,7 +39,7 @@
  * Cyclic redundancy checks.
  * \{ */
 
-static const u32 crc24qtab[256] = {
+static const u32 CRC24QTAB[256] = {
     0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
     0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
     0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
@@ -93,7 +93,7 @@ u32 crc24q(const u8 *buf, u32 len, u32 crc)
     u32 i = 0;
     for (i = 0; i < len; i++)
         {
-            crc = ((crc << 8) & 0xFFFFFF) ^ crc24qtab[((crc >> 16) ^ buf[i]) & 0xff];
+            crc = ((crc << 8) & 0xFFFFFF) ^ CRC24QTAB[((crc >> 16) ^ buf[i]) & 0xff];
         }
     return crc;
 }
@@ -128,7 +128,7 @@ u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
                     acc ^= 0xFFu;
                 }
             b = (acc >> shift) & 0xFFu;
-            crc = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
+            crc = ((crc << 8) & 0xFFFFFFu) ^ CRC24QTAB[((crc >> 16) ^ b) & 0xFFu];
         }
     acc = (acc << 8) | *buf;
     if (invert)
@@ -136,7 +136,7 @@ u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
             acc ^= 0xFFu;
         }
     b = (acc >> shift) & 0xFFu;
-    crc = ((crc << 8) & 0xFFFFFFu) ^ crc24qtab[((crc >> 16) ^ b) & 0xFFu];
+    crc = ((crc << 8) & 0xFFFFFFu) ^ CRC24QTAB[((crc >> 16) ^ b) & 0xFFu];
 
     return crc;
 }
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index 4912bd093..6c2bc02d0 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -117,7 +117,7 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
         }
     trk_param.track_pilot = track_pilot;
     trk_param.extend_correlation_symbols = extend_correlation_symbols;
-    int vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+    int vector_length = std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
     trk_param.vector_length = vector_length;
     trk_param.system = 'E';
     char sig_[3] = "1B";
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index 358e952c9..be3a99f0c 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -82,7 +82,7 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
     port_ch0 = configuration->property(role + ".port_ch0", 2060);
     std::string default_dump_filename = "./track_ch";
     dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
-    vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+    vector_length = std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
 
     //################# MAKE TRACKING GNURadio object ###################
     if (item_type == "gr_complex")
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index 78a497755..8e5fe8314 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -93,7 +93,7 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
     trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param.early_late_space_chips = early_late_space_chips;
-    int vector_length = std::round(fs_in / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS));
+    int vector_length = std::round(fs_in / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS));
     trk_param.vector_length = vector_length;
     int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
     float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -104,9 +104,9 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
             extend_correlation_symbols = 1;
             std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
         }
-    else if (!track_pilot and extend_correlation_symbols > Galileo_E5a_I_SECONDARY_CODE_LENGTH)
+    else if (!track_pilot and extend_correlation_symbols > GALILEO_E5A_I_SECONDARY_CODE_LENGTH)
         {
-            extend_correlation_symbols = Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+            extend_correlation_symbols = GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
             std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be lower than 21 when tracking the data component. Coherent integration has been set to 20 symbols (20 ms)" << TEXT_RESET << std::endl;
         }
     if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
index f0fbcd37a..1fdba0405 100644
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking.cc
@@ -93,7 +93,7 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
     trk_param.dll_bw_narrow_hz = dll_bw_narrow_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param.early_late_space_chips = early_late_space_chips;
-    int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5i_CODE_RATE_HZ) / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS)));
+    int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5I_CODE_RATE_HZ) / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS)));
     trk_param.vector_length = vector_length;
     int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
     float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -104,9 +104,9 @@ GpsL5DllPllTracking::GpsL5DllPllTracking(
             extend_correlation_symbols = 1;
             std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
         }
-    else if (!track_pilot and extend_correlation_symbols > GPS_L5i_NH_CODE_LENGTH)
+    else if (!track_pilot and extend_correlation_symbols > GPS_L5I_NH_CODE_LENGTH)
         {
-            extend_correlation_symbols = GPS_L5i_NH_CODE_LENGTH;
+            extend_correlation_symbols = GPS_L5I_NH_CODE_LENGTH;
             std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be lower than 11 when tracking the data component. Coherent integration has been set to 10 symbols (10 ms)" << TEXT_RESET << std::endl;
         }
     if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
index 36fdaed0e..033e49493 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
@@ -173,24 +173,24 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
             else if (signal_type == "L5")
                 {
                     d_signal_carrier_freq = GPS_L5_FREQ_HZ;
-                    d_code_period = GPS_L5i_PERIOD;
-                    d_code_chip_rate = GPS_L5i_CODE_RATE_HZ;
+                    d_code_period = GPS_L5I_PERIOD;
+                    d_code_chip_rate = GPS_L5I_CODE_RATE_HZ;
                     d_symbols_per_bit = GPS_L5_SAMPLES_PER_SYMBOL;
                     d_correlation_length_ms = 1;
                     d_code_samples_per_chip = 1;
-                    d_code_length_chips = static_cast<uint32_t>(GPS_L5i_CODE_LENGTH_CHIPS);
+                    d_code_length_chips = static_cast<uint32_t>(GPS_L5I_CODE_LENGTH_CHIPS);
                     d_secondary = true;
                     if (trk_parameters.track_pilot)
                         {
-                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5q_NH_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5q_NH_CODE_STR);
+                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5Q_NH_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5Q_NH_CODE_STR);
                             signal_pretty_name = signal_pretty_name + "Q";
                             interchange_iq = true;
                         }
                     else
                         {
-                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5i_NH_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5i_NH_CODE_STR);
+                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5I_NH_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5I_NH_CODE_STR);
                             signal_pretty_name = signal_pretty_name + "I";
                             interchange_iq = false;
                         }
@@ -214,10 +214,10 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
             systemName = "Galileo";
             if (signal_type == "1B")
                 {
-                    d_signal_carrier_freq = Galileo_E1_FREQ_HZ;
-                    d_code_period = Galileo_E1_CODE_PERIOD;
-                    d_code_chip_rate = Galileo_E1_CODE_CHIP_RATE_HZ;
-                    d_code_length_chips = static_cast<uint32_t>(Galileo_E1_B_CODE_LENGTH_CHIPS);
+                    d_signal_carrier_freq = GALILEO_E1_FREQ_HZ;
+                    d_code_period = GALILEO_E1_CODE_PERIOD;
+                    d_code_chip_rate = GALILEO_E1_CODE_CHIP_RATE_HZ;
+                    d_code_length_chips = static_cast<uint32_t>(GALILEO_E1_B_CODE_LENGTH_CHIPS);
                     d_symbols_per_bit = 1;
                     d_correlation_length_ms = 4;
                     d_code_samples_per_chip = 2;  // CBOC disabled: 2 samples per chip. CBOC enabled: 12 samples per chip
@@ -225,8 +225,8 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
                     if (trk_parameters.track_pilot)
                         {
                             d_secondary = true;
-                            d_secondary_code_length = static_cast<uint32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&Galileo_E1_C_SECONDARY_CODE);
+                            d_secondary_code_length = static_cast<uint32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GALILEO_E1_C_SECONDARY_CODE);
                             signal_pretty_name = signal_pretty_name + "C";
                         }
                     else
@@ -238,18 +238,18 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_) : gr::bl
                 }
             else if (signal_type == "5X")
                 {
-                    d_signal_carrier_freq = Galileo_E5a_FREQ_HZ;
-                    d_code_period = GALILEO_E5a_CODE_PERIOD;
-                    d_code_chip_rate = Galileo_E5a_CODE_CHIP_RATE_HZ;
+                    d_signal_carrier_freq = GALILEO_E5A_FREQ_HZ;
+                    d_code_period = GALILEO_E5A_CODE_PERIOD;
+                    d_code_chip_rate = GALILEO_E5A_CODE_CHIP_RATE_HZ;
                     d_symbols_per_bit = 20;
                     d_correlation_length_ms = 1;
                     d_code_samples_per_chip = 1;
-                    d_code_length_chips = static_cast<uint32_t>(Galileo_E5a_CODE_LENGTH_CHIPS);
+                    d_code_length_chips = static_cast<uint32_t>(GALILEO_E5A_CODE_LENGTH_CHIPS);
 
                     if (trk_parameters.track_pilot)
                         {
                             d_secondary = true;
-                            d_secondary_code_length = static_cast<uint32_t>(Galileo_E5a_Q_SECONDARY_CODE_LENGTH);
+                            d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_Q_SECONDARY_CODE_LENGTH);
                             signal_pretty_name = signal_pretty_name + "Q";
                             interchange_iq = true;
                         }
@@ -554,7 +554,7 @@ void dll_pll_veml_tracking::start_tracking()
             galileo_e5_a_code_gen_complex_primary(aux_code, d_acquisition_gnss_synchro->PRN, const_cast<char *>(signal_type.c_str()));
             if (trk_parameters.track_pilot)
                 {
-                    d_secondary_code_string = const_cast<std::string *>(&Galileo_E5a_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
+                    d_secondary_code_string = const_cast<std::string *>(&GALILEO_E5A_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
                     for (uint32_t i = 0; i < d_code_length_chips; i++)
                         {
                             d_tracking_code[i] = aux_code[i].imag();
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
index 484f0b63c..477880b03 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.h
@@ -121,8 +121,8 @@ private:
     float *d_data_code;
     float *d_local_code_shift_chips;
     float *d_prompt_data_shift;
-    cpu_multicorrelator_real_codes multicorrelator_cpu;
-    cpu_multicorrelator_real_codes correlator_data_cpu;  //for data channel
+    Cpu_Multicorrelator_Real_Codes multicorrelator_cpu;
+    Cpu_Multicorrelator_Real_Codes correlator_data_cpu;  //for data channel
     /*  TODO: currently the multicorrelator does not support adding extra correlator
         with different local code, thus we need extra multicorrelator instance.
         Implement this functionality inside multicorrelator class
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index 36fae9906..e6177bbe7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
@@ -116,7 +116,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
 
     // Initialization of local code replica
     // Get space for a vector with the sinboc(1,1) replica sampled 2x/chip
-    d_ca_code = static_cast<gr_complex *>(volk_gnsssdr_malloc((2 * Galileo_E1_B_CODE_LENGTH_CHIPS) * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
+    d_ca_code = static_cast<gr_complex *>(volk_gnsssdr_malloc((2 * GALILEO_E1_B_CODE_LENGTH_CHIPS) * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
 
     // correlator outputs (scalar)
     d_n_correlator_taps = 5;  // Very-Early, Early, Prompt, Late, Very-Late
@@ -146,7 +146,7 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
 
     //--- Perform initializations ------------------------------
     // define initial code frequency basis of NCO
-    d_code_freq_chips = Galileo_E1_CODE_CHIP_RATE_HZ;
+    d_code_freq_chips = GALILEO_E1_CODE_CHIP_RATE_HZ;
     // define residual code phase (in chips)
     d_rem_code_phase_samples = 0.0;
     // define residual carrier phase
@@ -194,10 +194,10 @@ void Galileo_E1_Tcp_Connector_Tracking_cc::start_tracking()
         d_acquisition_gnss_synchro->Signal,
         false,
         d_acquisition_gnss_synchro->PRN,
-        2 * Galileo_E1_CODE_CHIP_RATE_HZ,
+        2 * GALILEO_E1_CODE_CHIP_RATE_HZ,
         0);
 
-    multicorrelator_cpu.set_local_code_and_taps(static_cast<int32_t>(2 * Galileo_E1_B_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
+    multicorrelator_cpu.set_local_code_and_taps(static_cast<int32_t>(2 * GALILEO_E1_B_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
     for (int32_t n = 0; n < d_n_correlator_taps; n++)
         {
             d_correlator_outs[n] = gr_complex(0, 0);
@@ -302,7 +302,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
     float carr_error_filt_hz = 0.0;
     float code_error_filt_chips = 0.0;
 
-    tcp_packet_data tcp_data;
+    Tcp_Packet_Data tcp_data;
     // GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
     Gnss_Synchro current_synchro_data = Gnss_Synchro();
     // Block input data and block output stream pointers
@@ -372,11 +372,11 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
             // New carrier Doppler frequency estimation
             d_carrier_doppler_hz = d_acq_carrier_doppler_hz + carr_error_filt_hz;
             // New code Doppler frequency estimation
-            d_code_freq_chips = Galileo_E1_CODE_CHIP_RATE_HZ + ((d_carrier_doppler_hz * Galileo_E1_CODE_CHIP_RATE_HZ) / Galileo_E1_FREQ_HZ);
+            d_code_freq_chips = GALILEO_E1_CODE_CHIP_RATE_HZ + ((d_carrier_doppler_hz * GALILEO_E1_CODE_CHIP_RATE_HZ) / GALILEO_E1_FREQ_HZ);
             //carrier phase accumulator for (K) doppler estimation
-            d_acc_carrier_phase_rad -= GPS_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
+            d_acc_carrier_phase_rad -= GPS_TWO_PI * d_carrier_doppler_hz * GALILEO_E1_CODE_PERIOD;
             //remnant carrier phase to prevent overflow in the code NCO
-            d_rem_carr_phase_rad = d_rem_carr_phase_rad + GPS_TWO_PI * d_carrier_doppler_hz * Galileo_E1_CODE_PERIOD;
+            d_rem_carr_phase_rad = d_rem_carr_phase_rad + GPS_TWO_PI * d_carrier_doppler_hz * GALILEO_E1_CODE_PERIOD;
             d_rem_carr_phase_rad = fmod(d_rem_carr_phase_rad, GPS_TWO_PI);
 
             // ################## DLL ##########################################################
@@ -384,7 +384,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
             code_error_filt_chips = tcp_data.proc_pack_code_error;
             //Code phase accumulator
             float code_error_filt_secs;
-            code_error_filt_secs = (Galileo_E1_CODE_PERIOD * code_error_filt_chips) / Galileo_E1_CODE_CHIP_RATE_HZ;  //[seconds]
+            code_error_filt_secs = (GALILEO_E1_CODE_PERIOD * code_error_filt_chips) / GALILEO_E1_CODE_CHIP_RATE_HZ;  //[seconds]
             d_acc_code_phase_secs = d_acc_code_phase_secs + code_error_filt_secs;
 
             // ################## CARRIER AND CODE NCO BUFFER ALIGNMENT #######################
@@ -395,7 +395,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
             double K_blk_samples;
             // Compute the next buffer length based in the new period of the PRN sequence and the code phase error estimation
             T_chip_seconds = 1 / static_cast<double>(d_code_freq_chips);
-            T_prn_seconds = T_chip_seconds * Galileo_E1_B_CODE_LENGTH_CHIPS;
+            T_prn_seconds = T_chip_seconds * GALILEO_E1_B_CODE_LENGTH_CHIPS;
             T_prn_samples = T_prn_seconds * static_cast<double>(d_fs_in);
             K_blk_samples = T_prn_samples + d_rem_code_phase_samples + code_error_filt_secs * static_cast<double>(d_fs_in);
             d_current_prn_length_samples = round(K_blk_samples);  //round to a discrete samples
@@ -413,7 +413,7 @@ int Galileo_E1_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attri
                     d_cn0_estimation_counter = 0;
 
                     // Code lock indicator
-                    d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, FLAGS_cn0_samples, Galileo_E1_CODE_PERIOD);
+                    d_CN0_SNV_dB_Hz = cn0_svn_estimator(d_Prompt_buffer, FLAGS_cn0_samples, GALILEO_E1_CODE_PERIOD);
 
                     // Carrier lock indicator
                     d_carrier_lock_test = carrier_lock_detector(d_Prompt_buffer, FLAGS_cn0_samples);
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
index ff14ab9cb..423eef516 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
@@ -142,7 +142,7 @@ private:
     // correlator
     float *d_local_code_shift_chips;
     gr_complex *d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
     // tracking vars
     double d_code_freq_chips;
@@ -154,7 +154,7 @@ private:
     size_t d_port;
     int32_t d_listen_connection;
     float d_control_id;
-    tcp_communication d_tcp_com;
+    Tcp_Communication d_tcp_com;
 
     //PRN period in samples
     int32_t d_current_prn_length_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
index 2a5102942..93c43c35a 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -125,7 +125,7 @@ private:
     gr_complex* d_ca_code;
     float* d_local_code_shift_chips;
     gr_complex* d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
index 54c30e270..a58fee4aa 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -129,7 +129,7 @@ private:
     //gr_complex* d_correlator_outs;
     lv_16sc_t* d_correlator_outs_16sc;
     //cpu_multicorrelator multicorrelator_cpu;
-    cpu_multicorrelator_16sc multicorrelator_cpu_16sc;
+    Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
index 15bc1c90f..158eaa761 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_tracking_cc.h
@@ -126,7 +126,7 @@ private:
     gr_complex* d_ca_code;
     float* d_local_code_shift_chips;
     gr_complex* d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
 
     // tracking vars
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
index 1be8d3c7f..44b711243 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_cc.h
@@ -123,7 +123,7 @@ private:
     gr_complex* d_ca_code;
     float* d_local_code_shift_chips;
     gr_complex* d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
index 3b2618eb9..d451da17b 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h
@@ -127,7 +127,7 @@ private:
     //gr_complex* d_correlator_outs;
     lv_16sc_t* d_correlator_outs_16sc;
     //cpu_multicorrelator multicorrelator_cpu;
-    cpu_multicorrelator_16sc multicorrelator_cpu_16sc;
+    Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
index 29f6bb077..d72137d29 100644
--- a/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_tracking_cc.h
@@ -124,7 +124,7 @@ private:
     gr_complex* d_ca_code;
     float* d_local_code_shift_chips;
     gr_complex* d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
 
     // tracking vars
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
index ecbe2c15f..dc9283932 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.h
@@ -121,7 +121,7 @@ private:
     gr_complex* d_ca_code;
     float* d_local_code_shift_chips;
     gr_complex* d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
index 6b67fa09b..9aec25252 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h
@@ -126,7 +126,7 @@ private:
     //gr_complex* d_correlator_outs;
     lv_16sc_t* d_correlator_outs_16sc;
     //cpu_multicorrelator multicorrelator_cpu;
-    cpu_multicorrelator_16sc multicorrelator_cpu_16sc;
+    Cpu_Multicorrelator_16sc multicorrelator_cpu_16sc;
 
     // remaining code phase and carrier phase between tracking loops
     double d_rem_code_phase_samples;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
index 96305fc0b..e2faa339c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_kf_tracking_cc.h
@@ -173,7 +173,7 @@ private:
     float* d_ca_code;
     float* d_local_code_shift_chips;
     gr_complex* d_correlator_outs;
-    cpu_multicorrelator_real_codes multicorrelator_cpu;
+    Cpu_Multicorrelator_Real_Codes multicorrelator_cpu;
 
     // tracking vars
     double d_code_freq_chips;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 51c8d20fc..8521314b4 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
@@ -334,7 +334,7 @@ int Gps_L1_Ca_Tcp_Connector_Tracking_cc::general_work(int noutput_items __attrib
     float code_error = 0.0;
     float code_nco = 0.0;
 
-    tcp_packet_data tcp_data;
+    Tcp_Packet_Data tcp_data;
     // GNSS_SYNCHRO OBJECT to interchange data between tracking->telemetry_decoder
     Gnss_Synchro current_synchro_data = Gnss_Synchro();
 
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
index a4a1c82e7..3fa928a4d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
@@ -128,7 +128,7 @@ private:
     // correlator
     float *d_local_code_shift_chips;
     gr_complex *d_correlator_outs;
-    cpu_multicorrelator multicorrelator_cpu;
+    Cpu_Multicorrelator multicorrelator_cpu;
 
     // tracking vars
     double d_code_freq_hz;
@@ -139,7 +139,7 @@ private:
     size_t d_port;
     int32_t d_listen_connection;
     float d_control_id;
-    tcp_communication d_tcp_com;
+    Tcp_Communication d_tcp_com;
 
     //PRN period in samples
     int32_t d_current_prn_length_samples;
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.cc b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
index 0e30856ce..c201a5df7 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.cc
@@ -37,7 +37,7 @@
 #include <cmath>
 
 
-cpu_multicorrelator::cpu_multicorrelator()
+Cpu_Multicorrelator::Cpu_Multicorrelator()
 {
     d_sig_in = nullptr;
     d_local_code_in = nullptr;
@@ -49,16 +49,16 @@ cpu_multicorrelator::cpu_multicorrelator()
 }
 
 
-cpu_multicorrelator::~cpu_multicorrelator()
+Cpu_Multicorrelator::~Cpu_Multicorrelator()
 {
     if (d_local_codes_resampled != nullptr)
         {
-            cpu_multicorrelator::free();
+            Cpu_Multicorrelator::free();
         }
 }
 
 
-bool cpu_multicorrelator::init(
+bool Cpu_Multicorrelator::init(
     int max_signal_length_samples,
     int n_correlators)
 {
@@ -75,7 +75,7 @@ bool cpu_multicorrelator::init(
 }
 
 
-bool cpu_multicorrelator::set_local_code_and_taps(
+bool Cpu_Multicorrelator::set_local_code_and_taps(
     int code_length_chips,
     const std::complex<float>* local_code_in,
     float* shifts_chips)
@@ -87,7 +87,7 @@ bool cpu_multicorrelator::set_local_code_and_taps(
 }
 
 
-bool cpu_multicorrelator::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
+bool Cpu_Multicorrelator::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
 {
     // Save CPU pointers
     d_sig_in = sig_in;
@@ -96,7 +96,7 @@ bool cpu_multicorrelator::set_input_output_vectors(std::complex<float>* corr_out
 }
 
 
-void cpu_multicorrelator::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
+void Cpu_Multicorrelator::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
 {
     volk_gnsssdr_32fc_xn_resampler_32fc_xn(d_local_codes_resampled,
         d_local_code_in,
@@ -109,7 +109,7 @@ void cpu_multicorrelator::update_local_code(int correlator_length_samples, float
 }
 
 
-bool cpu_multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
     float rem_carrier_phase_in_rad,
     float phase_step_rad,
     float rem_code_phase_chips,
@@ -126,7 +126,7 @@ bool cpu_multicorrelator::Carrier_wipeoff_multicorrelator_resampler(
 }
 
 
-bool cpu_multicorrelator::free()
+bool Cpu_Multicorrelator::free()
 {
     // Free memory
     if (d_local_codes_resampled != nullptr)
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator.h b/src/algorithms/tracking/libs/cpu_multicorrelator.h
index 8dab4c4a4..d0f73d616 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator.h
@@ -41,11 +41,11 @@
 /*!
  * \brief Class that implements carrier wipe-off and correlators.
  */
-class cpu_multicorrelator
+class Cpu_Multicorrelator
 {
 public:
-    cpu_multicorrelator();
-    ~cpu_multicorrelator();
+    Cpu_Multicorrelator();
+    ~Cpu_Multicorrelator();
     bool init(int max_signal_length_samples, int n_correlators);
     bool set_local_code_and_taps(int code_length_chips, const std::complex<float> *local_code_in, float *shifts_chips);
     bool set_input_output_vectors(std::complex<float> *corr_out, const std::complex<float> *sig_in);
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
index e57d1c2eb..107a38f7d 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.cc
@@ -36,7 +36,7 @@
 #include <cmath>
 
 
-bool cpu_multicorrelator_16sc::init(
+bool Cpu_Multicorrelator_16sc::init(
     int max_signal_length_samples,
     int n_correlators)
 {
@@ -54,7 +54,7 @@ bool cpu_multicorrelator_16sc::init(
 }
 
 
-bool cpu_multicorrelator_16sc::set_local_code_and_taps(
+bool Cpu_Multicorrelator_16sc::set_local_code_and_taps(
     int code_length_chips,
     const lv_16sc_t* local_code_in,
     float* shifts_chips)
@@ -66,7 +66,7 @@ bool cpu_multicorrelator_16sc::set_local_code_and_taps(
 }
 
 
-bool cpu_multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in)
+bool Cpu_Multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, const lv_16sc_t* sig_in)
 {
     // Save CPU pointers
     d_sig_in = sig_in;
@@ -75,7 +75,7 @@ bool cpu_multicorrelator_16sc::set_input_output_vectors(lv_16sc_t* corr_out, con
 }
 
 
-void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
+void Cpu_Multicorrelator_16sc::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips)
 {
     volk_gnsssdr_16ic_xn_resampler_16ic_xn(d_local_codes_resampled,
         d_local_code_in,
@@ -88,7 +88,7 @@ void cpu_multicorrelator_16sc::update_local_code(int correlator_length_samples,
 }
 
 
-bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
     float rem_carrier_phase_in_rad,
     float phase_step_rad,
     float rem_code_phase_chips,
@@ -105,7 +105,7 @@ bool cpu_multicorrelator_16sc::Carrier_wipeoff_multicorrelator_resampler(
 }
 
 
-cpu_multicorrelator_16sc::cpu_multicorrelator_16sc()
+Cpu_Multicorrelator_16sc::Cpu_Multicorrelator_16sc()
 {
     d_sig_in = nullptr;
     d_local_code_in = nullptr;
@@ -117,16 +117,16 @@ cpu_multicorrelator_16sc::cpu_multicorrelator_16sc()
 }
 
 
-cpu_multicorrelator_16sc::~cpu_multicorrelator_16sc()
+Cpu_Multicorrelator_16sc::~Cpu_Multicorrelator_16sc()
 {
     if (d_local_codes_resampled != nullptr)
         {
-            cpu_multicorrelator_16sc::free();
+            Cpu_Multicorrelator_16sc::free();
         }
 }
 
 
-bool cpu_multicorrelator_16sc::free()
+bool Cpu_Multicorrelator_16sc::free()
 {
     // Free memory
     if (d_local_codes_resampled != nullptr)
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
index 16881ca07..7ef9549e8 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_16sc.h
@@ -41,11 +41,11 @@
 /*!
  * \brief Class that implements carrier wipe-off and correlators.
  */
-class cpu_multicorrelator_16sc
+class Cpu_Multicorrelator_16sc
 {
 public:
-    cpu_multicorrelator_16sc();
-    ~cpu_multicorrelator_16sc();
+    Cpu_Multicorrelator_16sc();
+    ~Cpu_Multicorrelator_16sc();
     bool init(int max_signal_length_samples, int n_correlators);
     bool set_local_code_and_taps(int code_length_chips, const lv_16sc_t *local_code_in, float *shifts_chips);
     bool set_input_output_vectors(lv_16sc_t *corr_out, const lv_16sc_t *sig_in);
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
index f23537fad..46475c286 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.cc
@@ -37,7 +37,7 @@
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cmath>
 
-cpu_multicorrelator_real_codes::cpu_multicorrelator_real_codes()
+Cpu_Multicorrelator_Real_Codes::Cpu_Multicorrelator_Real_Codes()
 {
     d_sig_in = nullptr;
     d_local_code_in = nullptr;
@@ -50,16 +50,16 @@ cpu_multicorrelator_real_codes::cpu_multicorrelator_real_codes()
 }
 
 
-cpu_multicorrelator_real_codes::~cpu_multicorrelator_real_codes()
+Cpu_Multicorrelator_Real_Codes::~Cpu_Multicorrelator_Real_Codes()
 {
     if (d_local_codes_resampled != nullptr)
         {
-            cpu_multicorrelator_real_codes::free();
+            Cpu_Multicorrelator_Real_Codes::free();
         }
 }
 
 
-bool cpu_multicorrelator_real_codes::init(
+bool Cpu_Multicorrelator_Real_Codes::init(
     int max_signal_length_samples,
     int n_correlators)
 {
@@ -76,7 +76,7 @@ bool cpu_multicorrelator_real_codes::init(
 }
 
 
-bool cpu_multicorrelator_real_codes::set_local_code_and_taps(
+bool Cpu_Multicorrelator_Real_Codes::set_local_code_and_taps(
     int code_length_chips,
     const float* local_code_in,
     float* shifts_chips)
@@ -89,7 +89,7 @@ bool cpu_multicorrelator_real_codes::set_local_code_and_taps(
 }
 
 
-bool cpu_multicorrelator_real_codes::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
+bool Cpu_Multicorrelator_Real_Codes::set_input_output_vectors(std::complex<float>* corr_out, const std::complex<float>* sig_in)
 {
     // Save CPU pointers
     d_sig_in = sig_in;
@@ -98,7 +98,7 @@ bool cpu_multicorrelator_real_codes::set_input_output_vectors(std::complex<float
 }
 
 
-void cpu_multicorrelator_real_codes::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips, float code_phase_rate_step_chips)
+void Cpu_Multicorrelator_Real_Codes::update_local_code(int correlator_length_samples, float rem_code_phase_chips, float code_phase_step_chips, float code_phase_rate_step_chips)
 {
     if (d_use_high_dynamics_resampler)
         {
@@ -126,7 +126,7 @@ void cpu_multicorrelator_real_codes::update_local_code(int correlator_length_sam
 }
 
 // Overload Carrier_wipeoff_multicorrelator_resampler to ensure back compatibility
-bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator_Real_Codes::Carrier_wipeoff_multicorrelator_resampler(
     float rem_carrier_phase_in_rad,
     float phase_step_rad,
     float phase_rate_step_rad,
@@ -151,7 +151,7 @@ bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
     return true;
 }
 // Overload Carrier_wipeoff_multicorrelator_resampler to ensure back compatibility
-bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
+bool Cpu_Multicorrelator_Real_Codes::Carrier_wipeoff_multicorrelator_resampler(
     float rem_carrier_phase_in_rad,
     float phase_step_rad,
     float rem_code_phase_chips,
@@ -169,7 +169,7 @@ bool cpu_multicorrelator_real_codes::Carrier_wipeoff_multicorrelator_resampler(
 }
 
 
-bool cpu_multicorrelator_real_codes::free()
+bool Cpu_Multicorrelator_Real_Codes::free()
 {
     // Free memory
     if (d_local_codes_resampled != nullptr)
@@ -185,7 +185,7 @@ bool cpu_multicorrelator_real_codes::free()
 }
 
 
-void cpu_multicorrelator_real_codes::set_high_dynamics_resampler(
+void Cpu_Multicorrelator_Real_Codes::set_high_dynamics_resampler(
     bool use_high_dynamics_resampler)
 {
     d_use_high_dynamics_resampler = use_high_dynamics_resampler;
diff --git a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h
index a4dfdd5f0..ecaad4a00 100644
--- a/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h
+++ b/src/algorithms/tracking/libs/cpu_multicorrelator_real_codes.h
@@ -42,12 +42,12 @@
 /*!
  * \brief Class that implements carrier wipe-off and correlators.
  */
-class cpu_multicorrelator_real_codes
+class Cpu_Multicorrelator_Real_Codes
 {
 public:
-    cpu_multicorrelator_real_codes();
+    Cpu_Multicorrelator_Real_Codes();
     void set_high_dynamics_resampler(bool use_high_dynamics_resampler);
-    ~cpu_multicorrelator_real_codes();
+    ~Cpu_Multicorrelator_Real_Codes();
     bool init(int max_signal_length_samples, int n_correlators);
     bool set_local_code_and_taps(int code_length_chips, const float *local_code_in, float *shifts_chips);
     bool set_input_output_vectors(std::complex<float> *corr_out, const std::complex<float> *sig_in);
diff --git a/src/algorithms/tracking/libs/tcp_communication.cc b/src/algorithms/tracking/libs/tcp_communication.cc
index 8ca6fde27..40cf6bb55 100644
--- a/src/algorithms/tracking/libs/tcp_communication.cc
+++ b/src/algorithms/tracking/libs/tcp_communication.cc
@@ -35,13 +35,13 @@
 #include <string>
 
 
-tcp_communication::tcp_communication() : tcp_socket_(io_service_) {}  // NOLINT
+Tcp_Communication::Tcp_Communication() : tcp_socket_(io_service_) {}  // NOLINT
 
 
-tcp_communication::~tcp_communication() = default;
+Tcp_Communication::~Tcp_Communication() = default;
 
 
-int tcp_communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
+int Tcp_Communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
 {
     try
         {
@@ -73,7 +73,7 @@ int tcp_communication::listen_tcp_connection(size_t d_port_, size_t d_port_ch0_)
 }
 
 
-void tcp_communication::send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, tcp_packet_data* tcp_data_)
+void Tcp_Communication::send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, Tcp_Packet_Data* tcp_data_)
 {
     int controlc = 0;
     boost::array<float, NUM_RX_VARIABLES> readbuf;
@@ -108,7 +108,7 @@ void tcp_communication::send_receive_tcp_packet_galileo_e1(boost::array<float, N
 }
 
 
-void tcp_communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, tcp_packet_data* tcp_data_)
+void Tcp_Communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, Tcp_Packet_Data* tcp_data_)
 {
     int controlc = 0;
     boost::array<float, NUM_RX_VARIABLES> readbuf;
@@ -143,7 +143,7 @@ void tcp_communication::send_receive_tcp_packet_gps_l1_ca(boost::array<float, NU
 }
 
 
-void tcp_communication::close_tcp_connection(size_t d_port_)
+void Tcp_Communication::close_tcp_connection(size_t d_port_)
 {
     // Close the TCP connection
     tcp_socket_.close();
diff --git a/src/algorithms/tracking/libs/tcp_communication.h b/src/algorithms/tracking/libs/tcp_communication.h
index 1a36d8212..d293fa97a 100644
--- a/src/algorithms/tracking/libs/tcp_communication.h
+++ b/src/algorithms/tracking/libs/tcp_communication.h
@@ -43,15 +43,15 @@
 /*!
  * \brief TCP communication class
  */
-class tcp_communication
+class Tcp_Communication
 {
 public:
-    tcp_communication();
-    ~tcp_communication();
+    Tcp_Communication();
+    ~Tcp_Communication();
 
     int listen_tcp_connection(size_t d_port_, size_t d_port_ch0_);
-    void send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, tcp_packet_data *tcp_data_);
-    void send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, tcp_packet_data *tcp_data_);
+    void send_receive_tcp_packet_galileo_e1(boost::array<float, NUM_TX_VARIABLES_GALILEO_E1> buf, Tcp_Packet_Data *tcp_data_);
+    void send_receive_tcp_packet_gps_l1_ca(boost::array<float, NUM_TX_VARIABLES_GPS_L1_CA> buf, Tcp_Packet_Data *tcp_data_);
     void close_tcp_connection(size_t d_port_);
 
 private:
diff --git a/src/algorithms/tracking/libs/tcp_packet_data.cc b/src/algorithms/tracking/libs/tcp_packet_data.cc
index eb53ff59b..a48c3631a 100644
--- a/src/algorithms/tracking/libs/tcp_packet_data.cc
+++ b/src/algorithms/tracking/libs/tcp_packet_data.cc
@@ -30,11 +30,11 @@
  */
 #include "tcp_packet_data.h"
 
-tcp_packet_data::tcp_packet_data()
+Tcp_Packet_Data::Tcp_Packet_Data()
 {
     proc_pack_code_error = 0;
     proc_pack_carr_error = 0;
     proc_pack_carrier_doppler_hz = 0;
 }
 
-tcp_packet_data::~tcp_packet_data() = default;
+Tcp_Packet_Data::~Tcp_Packet_Data() = default;
diff --git a/src/algorithms/tracking/libs/tcp_packet_data.h b/src/algorithms/tracking/libs/tcp_packet_data.h
index c803fa936..44eb4346e 100644
--- a/src/algorithms/tracking/libs/tcp_packet_data.h
+++ b/src/algorithms/tracking/libs/tcp_packet_data.h
@@ -35,11 +35,11 @@
 /*!
  * \brief Class that implements a TCP data packet
  */
-class tcp_packet_data
+class Tcp_Packet_Data
 {
 public:
-    tcp_packet_data();
-    ~tcp_packet_data();
+    Tcp_Packet_Data();
+    ~Tcp_Packet_Data();
     float proc_pack_code_error;
     float proc_pack_carr_error;
     float proc_pack_carrier_doppler_hz;
diff --git a/src/core/interfaces/acquisition_interface.h b/src/core/interfaces/acquisition_interface.h
index 794748175..7067d403a 100644
--- a/src/core/interfaces/acquisition_interface.h
+++ b/src/core/interfaces/acquisition_interface.h
@@ -42,7 +42,7 @@
 #include "gnss_synchro.h"
 
 template <typename Data>
-class concurrent_queue;
+class Concurrent_Queue;
 
 /*! \brief This abstract class represents an interface to an acquisition GNSS block.
  *
diff --git a/src/core/interfaces/tracking_interface.h b/src/core/interfaces/tracking_interface.h
index da2b3c41b..406c5748d 100644
--- a/src/core/interfaces/tracking_interface.h
+++ b/src/core/interfaces/tracking_interface.h
@@ -41,7 +41,7 @@
 #include "gnss_synchro.h"
 
 template <typename Data>
-class concurrent_queue;
+class Concurrent_Queue;
 
 /*!
  * \brief This abstract class represents an interface to a tracking block.
diff --git a/src/core/libs/gnss_sdr_supl_client.cc b/src/core/libs/gnss_sdr_supl_client.cc
index 7f211aa86..366d628ae 100644
--- a/src/core/libs/gnss_sdr_supl_client.cc
+++ b/src/core/libs/gnss_sdr_supl_client.cc
@@ -37,7 +37,7 @@
 #include <cmath>
 #include <utility>
 
-gnss_sdr_supl_client::gnss_sdr_supl_client()
+Gnss_Sdr_Supl_Client::Gnss_Sdr_Supl_Client()
 {
     mcc = 0;
     mns = 0;
@@ -50,10 +50,10 @@ gnss_sdr_supl_client::gnss_sdr_supl_client()
 }
 
 
-gnss_sdr_supl_client::~gnss_sdr_supl_client() = default;
+Gnss_Sdr_Supl_Client::~Gnss_Sdr_Supl_Client() = default;
 
 
-void gnss_sdr_supl_client::print_assistance()
+void Gnss_Sdr_Supl_Client::print_assistance()
 {
     if (assist.set & SUPL_RRLP_ASSIST_REFTIME)
         {
@@ -152,7 +152,7 @@ void gnss_sdr_supl_client::print_assistance()
 }
 
 
-int gnss_sdr_supl_client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_ci)
+int Gnss_Sdr_Supl_Client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_ci)
 {
     // SET SUPL CLIENT INFORMATION
     // GSM CELL PARAMETERS
@@ -194,7 +194,7 @@ int gnss_sdr_supl_client::get_assistance(int i_mcc, int i_mns, int i_lac, int i_
 }
 
 
-void gnss_sdr_supl_client::read_supl_data()
+void Gnss_Sdr_Supl_Client::read_supl_data()
 {
     // READ REFERENCE LOCATION
     if (assist.set & SUPL_RRLP_ASSIST_REFLOC)
@@ -370,7 +370,7 @@ void gnss_sdr_supl_client::read_supl_data()
 }
 
 
-bool gnss_sdr_supl_client::load_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_ephemeris_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -390,7 +390,7 @@ bool gnss_sdr_supl_client::load_ephemeris_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_Ephemeris> eph_map)
+bool Gnss_Sdr_Supl_Client::save_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps_Ephemeris> eph_map)
 {
     if (eph_map.empty() == false)
         {
@@ -417,7 +417,7 @@ bool gnss_sdr_supl_client::save_ephemeris_map_xml(const std::string& file_name,
 }
 
 
-bool gnss_sdr_supl_client::load_gal_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_ephemeris_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -464,7 +464,7 @@ bool save_gal_ephemeris_map_xml(const std::string& file_name, std::map<int, Gali
 }
 
 
-bool gnss_sdr_supl_client::load_cnav_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_cnav_ephemeris_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -511,7 +511,7 @@ bool save_cnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Gps
 }
 
 
-bool gnss_sdr_supl_client::load_gnav_ephemeris_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gnav_ephemeris_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -558,7 +558,7 @@ bool save_gnav_ephemeris_map_xml(const std::string& file_name, std::map<int, Glo
 }
 
 
-bool gnss_sdr_supl_client::load_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_utc_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -577,7 +577,7 @@ bool gnss_sdr_supl_client::load_utc_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_utc_xml(const std::string& file_name, Gps_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_utc_xml(const std::string& file_name, Gps_Utc_Model& utc)
 {
     if (utc.valid)
         {
@@ -604,7 +604,7 @@ bool gnss_sdr_supl_client::save_utc_xml(const std::string& file_name, Gps_Utc_Mo
 }
 
 
-bool gnss_sdr_supl_client::load_cnav_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_cnav_utc_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -623,7 +623,7 @@ bool gnss_sdr_supl_client::load_cnav_utc_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_cnav_utc_xml(const std::string& file_name, Gps_CNAV_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_cnav_utc_xml(const std::string& file_name, Gps_CNAV_Utc_Model& utc)
 {
     if (utc.valid)
         {
@@ -650,7 +650,7 @@ bool gnss_sdr_supl_client::save_cnav_utc_xml(const std::string& file_name, Gps_C
 }
 
 
-bool gnss_sdr_supl_client::load_gal_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_utc_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -669,7 +669,7 @@ bool gnss_sdr_supl_client::load_gal_utc_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_gal_utc_xml(const std::string& file_name, Galileo_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_gal_utc_xml(const std::string& file_name, Galileo_Utc_Model& utc)
 {
     if (utc.flag_utc_model)
         {
@@ -696,7 +696,7 @@ bool gnss_sdr_supl_client::save_gal_utc_xml(const std::string& file_name, Galile
 }
 
 
-bool gnss_sdr_supl_client::load_iono_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_iono_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -715,7 +715,7 @@ bool gnss_sdr_supl_client::load_iono_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_iono_xml(const std::string& file_name, Gps_Iono& iono)
+bool Gnss_Sdr_Supl_Client::save_iono_xml(const std::string& file_name, Gps_Iono& iono)
 {
     if (iono.valid)
         {
@@ -742,7 +742,7 @@ bool gnss_sdr_supl_client::save_iono_xml(const std::string& file_name, Gps_Iono&
 }
 
 
-bool gnss_sdr_supl_client::load_gal_iono_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_iono_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -761,7 +761,7 @@ bool gnss_sdr_supl_client::load_gal_iono_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_gal_iono_xml(const std::string& file_name, Galileo_Iono& iono)
+bool Gnss_Sdr_Supl_Client::save_gal_iono_xml(const std::string& file_name, Galileo_Iono& iono)
 {
     if (iono.ai0_5 != 0.0)
         {
@@ -788,7 +788,7 @@ bool gnss_sdr_supl_client::save_gal_iono_xml(const std::string& file_name, Galil
 }
 
 
-bool gnss_sdr_supl_client::load_gps_almanac_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gps_almanac_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -808,7 +808,7 @@ bool gnss_sdr_supl_client::load_gps_almanac_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_gps_almanac_xml(const std::string& file_name, std::map<int, Gps_Almanac> gps_almanac_map)
+bool Gnss_Sdr_Supl_Client::save_gps_almanac_xml(const std::string& file_name, std::map<int, Gps_Almanac> gps_almanac_map)
 {
     if (gps_almanac_map.empty() == false)
         {
@@ -835,7 +835,7 @@ bool gnss_sdr_supl_client::save_gps_almanac_xml(const std::string& file_name, st
 }
 
 
-bool gnss_sdr_supl_client::load_gal_almanac_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_gal_almanac_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -855,7 +855,7 @@ bool gnss_sdr_supl_client::load_gal_almanac_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::read_gal_almanac_from_gsa(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::read_gal_almanac_from_gsa(const std::string& file_name)
 {
     pugi::xml_document doc;
     pugi::xml_parse_result result = doc.load_file(file_name.c_str());
@@ -905,7 +905,7 @@ bool gnss_sdr_supl_client::read_gal_almanac_from_gsa(const std::string& file_nam
 }
 
 
-bool gnss_sdr_supl_client::save_gal_almanac_xml(const std::string& file_name, std::map<int, Galileo_Almanac> gal_almanac_map)
+bool Gnss_Sdr_Supl_Client::save_gal_almanac_xml(const std::string& file_name, std::map<int, Galileo_Almanac> gal_almanac_map)
 {
     if (gal_almanac_map.empty() == false)
         {
@@ -932,7 +932,7 @@ bool gnss_sdr_supl_client::save_gal_almanac_xml(const std::string& file_name, st
 }
 
 
-bool gnss_sdr_supl_client::load_glo_utc_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_glo_utc_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -951,7 +951,7 @@ bool gnss_sdr_supl_client::load_glo_utc_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_glo_utc_xml(const std::string& file_name, Glonass_Gnav_Utc_Model& utc)
+bool Gnss_Sdr_Supl_Client::save_glo_utc_xml(const std::string& file_name, Glonass_Gnav_Utc_Model& utc)
 {
     if (utc.valid)
         {
@@ -978,7 +978,7 @@ bool gnss_sdr_supl_client::save_glo_utc_xml(const std::string& file_name, Glonas
 }
 
 
-bool gnss_sdr_supl_client::load_ref_time_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_ref_time_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -997,7 +997,7 @@ bool gnss_sdr_supl_client::load_ref_time_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_ref_time_xml(const std::string& file_name, Agnss_Ref_Time& ref_time)
+bool Gnss_Sdr_Supl_Client::save_ref_time_xml(const std::string& file_name, Agnss_Ref_Time& ref_time)
 {
     if (ref_time.valid == true)
         {
@@ -1024,7 +1024,7 @@ bool gnss_sdr_supl_client::save_ref_time_xml(const std::string& file_name, Agnss
 }
 
 
-bool gnss_sdr_supl_client::load_ref_location_xml(const std::string& file_name)
+bool Gnss_Sdr_Supl_Client::load_ref_location_xml(const std::string& file_name)
 {
     std::ifstream ifs;
     try
@@ -1043,7 +1043,7 @@ bool gnss_sdr_supl_client::load_ref_location_xml(const std::string& file_name)
 }
 
 
-bool gnss_sdr_supl_client::save_ref_location_xml(const std::string& file_name, Agnss_Ref_Location& ref_location)
+bool Gnss_Sdr_Supl_Client::save_ref_location_xml(const std::string& file_name, Agnss_Ref_Location& ref_location)
 {
     if (ref_location.valid == true)
         {
diff --git a/src/core/libs/gnss_sdr_supl_client.h b/src/core/libs/gnss_sdr_supl_client.h
index 3e0a72a3f..af78c9f16 100644
--- a/src/core/libs/gnss_sdr_supl_client.h
+++ b/src/core/libs/gnss_sdr_supl_client.h
@@ -64,7 +64,7 @@ extern "C"
 /*!
  * \brief class that implements a C++ interface to external Secure User Location Protocol (SUPL) client library..
  */
-class gnss_sdr_supl_client
+class Gnss_Sdr_Supl_Client
 {
 private:
     // GSM CELL INFO
@@ -274,8 +274,8 @@ public:
      */
     void print_assistance();
 
-    gnss_sdr_supl_client();
-    ~gnss_sdr_supl_client();
+    Gnss_Sdr_Supl_Client();
+    ~Gnss_Sdr_Supl_Client();
 };
 
 #endif
diff --git a/src/core/libs/supl/asn-rrlp/Accuracy.c b/src/core/libs/supl/asn-rrlp/Accuracy.c
index b3609c7ef..a51a2e12c 100644
--- a/src/core/libs/supl/asn-rrlp/Accuracy.c
+++ b/src/core/libs/supl/asn-rrlp/Accuracy.c
@@ -111,7 +111,7 @@ Accuracy_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_Accuracy_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ACCURACY_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_Accuracy = {
 	asn_DEF_Accuracy_tags_1,	/* Same as above */
 	sizeof(asn_DEF_Accuracy_tags_1)
 		/sizeof(asn_DEF_Accuracy_tags_1[0]), /* 1 */
-	&asn_PER_type_Accuracy_constr_1,
+	&ASN_PER_TYPE_ACCURACY_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/AcquisElement.c b/src/core/libs/supl/asn-rrlp/AcquisElement.c
index 506e7ad3a..a3fd8b936 100644
--- a/src/core/libs/supl/asn-rrlp/AcquisElement.c
+++ b/src/core/libs/supl/asn-rrlp/AcquisElement.c
@@ -131,27 +131,27 @@ memb_codePhaseSearchWindow_constraint_1(asn_TYPE_descriptor_t *td, const void *s
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_doppler0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER0_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 12,  12, -2048,  2047 }	/* (-2048..2047) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_codePhase_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1022 }	/* (0..1022) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_intCodePhase_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  19 }	/* (0..19) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_gpsBitNumber_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_BIT_NUMBER_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_codePhaseSearchWindow_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 4,  4,  0,  15 }	/* (0..15) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_doppler0_constraint_1,
-		&asn_PER_memb_doppler0_constr_3,
+		&ASN_PER_MEMB_DOPPLER0_CONSTR_3,
 		0,
 		"doppler0"
 		},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_codePhase_constraint_1,
-		&asn_PER_memb_codePhase_constr_5,
+		&ASN_PER_MEMB_CODE_PHASE_CONSTR_5,
 		0,
 		"codePhase"
 		},
@@ -198,7 +198,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_intCodePhase_constraint_1,
-		&asn_PER_memb_intCodePhase_constr_6,
+		&ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6,
 		0,
 		"intCodePhase"
 		},
@@ -207,7 +207,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gpsBitNumber_constraint_1,
-		&asn_PER_memb_gpsBitNumber_constr_7,
+		&ASN_PER_MEMB_GPS_BIT_NUMBER_CONSTR_7,
 		0,
 		"gpsBitNumber"
 		},
@@ -216,7 +216,7 @@ static asn_TYPE_member_t asn_MBR_AcquisElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_codePhaseSearchWindow_constraint_1,
-		&asn_PER_memb_codePhaseSearchWindow_constr_8,
+		&ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_8,
 		0,
 		"codePhaseSearchWindow"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c b/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c
index 5de86fe61..d7a16c0a0 100644
--- a/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c
+++ b/src/core/libs/supl/asn-rrlp/AddionalAngleFields.c
@@ -56,12 +56,12 @@ memb_elevation_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_azimuth_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_AZIMUTH_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_elevation_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_ELEVATION_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_AddionalAngleFields_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_azimuth_constraint_1,
-		&asn_PER_memb_azimuth_constr_2,
+		&ASN_PER_MEMB_AZIMUTH_CONSTR_2,
 		0,
 		"azimuth"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_AddionalAngleFields_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_elevation_constraint_1,
-		&asn_PER_memb_elevation_constr_3,
+		&ASN_PER_MEMB_ELEVATION_CONSTR_3,
 		0,
 		"elevation"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c b/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c
index 4b0b58a30..69f732dbb 100644
--- a/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c
+++ b/src/core/libs/supl/asn-rrlp/AddionalDopplerFields.c
@@ -56,12 +56,12 @@ memb_dopplerUncertainty_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_doppler1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER1_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_dopplerUncertainty_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_AddionalDopplerFields_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_doppler1_constraint_1,
-		&asn_PER_memb_doppler1_constr_2,
+		&ASN_PER_MEMB_DOPPLER1_CONSTR_2,
 		0,
 		"doppler1"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_AddionalDopplerFields_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_dopplerUncertainty_constraint_1,
-		&asn_PER_memb_dopplerUncertainty_constr_3,
+		&ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3,
 		0,
 		"dopplerUncertainty"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c b/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c
index e62840073..3dbce8753 100644
--- a/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c
+++ b/src/core/libs/supl/asn-rrlp/AdditionalDopplerFields.c
@@ -56,12 +56,12 @@ memb_dopplerUncertainty_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_doppler1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER1_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_dopplerUncertainty_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  4 }	/* (0..4) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_AdditionalDopplerFields_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_doppler1_constraint_1,
-		&asn_PER_memb_doppler1_constr_2,
+		&ASN_PER_MEMB_DOPPLER1_CONSTR_2,
 		0,
 		"doppler1"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_AdditionalDopplerFields_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_dopplerUncertainty_constraint_1,
-		&asn_PER_memb_dopplerUncertainty_constr_3,
+		&ASN_PER_MEMB_DOPPLER_UNCERTAINTY_CONSTR_3,
 		0,
 		"dopplerUncertainty"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/AlertFlag.c b/src/core/libs/supl/asn-rrlp/AlertFlag.c
index 52eaeeadb..a7c3f41eb 100644
--- a/src/core/libs/supl/asn-rrlp/AlertFlag.c
+++ b/src/core/libs/supl/asn-rrlp/AlertFlag.c
@@ -111,7 +111,7 @@ AlertFlag_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_AlertFlag_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ALERT_FLAG_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_AlertFlag = {
 	asn_DEF_AlertFlag_tags_1,	/* Same as above */
 	sizeof(asn_DEF_AlertFlag_tags_1)
 		/sizeof(asn_DEF_AlertFlag_tags_1[0]), /* 1 */
-	&asn_PER_type_AlertFlag_constr_1,
+	&ASN_PER_TYPE_ALERT_FLAG_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c b/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c
index c63036c97..2093a44e6 100644
--- a/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c
+++ b/src/core/libs/supl/asn-rrlp/Almanac-KeplerianSet.c
@@ -256,52 +256,52 @@ memb_kepAlmanacAF1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_kepAlmanacE_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_E_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 11,  11,  0,  2047 }	/* (0..2047) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacDeltaI_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_DELTA_I_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 11,  11, -1024,  1023 }	/* (-1024..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacOmegaDot_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_OMEGA_DOT_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 11,  11, -1024,  1023 }	/* (-1024..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepSVHealth_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_SV_HEALTH_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 4,  4,  0,  15 }	/* (0..15) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacAPowerHalf_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_A_POWER_HALF_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 17, -1, -65536,  65535 }	/* (-65536..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacOmega0_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_OMEGA0_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacW_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_W_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacM0_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_M0_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacAF0_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_A_F0_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 14,  14, -8192,  8191 }	/* (-8192..8191) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_kepAlmanacAF1_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEP_ALMANAC_A_F1_CONSTR_11 = {
 	{ APC_CONSTRAINED,	 11,  11, -1024,  1023 }	/* (-1024..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -312,7 +312,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacE_constraint_1,
-		&asn_PER_memb_kepAlmanacE_constr_2,
+		&ASN_PER_MEMB_KEP_ALMANAC_E_CONSTR_2,
 		0,
 		"kepAlmanacE"
 		},
@@ -321,7 +321,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacDeltaI_constraint_1,
-		&asn_PER_memb_kepAlmanacDeltaI_constr_3,
+		&ASN_PER_MEMB_KEP_ALMANAC_DELTA_I_CONSTR_3,
 		0,
 		"kepAlmanacDeltaI"
 		},
@@ -330,7 +330,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacOmegaDot_constraint_1,
-		&asn_PER_memb_kepAlmanacOmegaDot_constr_4,
+		&ASN_PER_MEMB_KEP_ALMANAC_OMEGA_DOT_CONSTR_4,
 		0,
 		"kepAlmanacOmegaDot"
 		},
@@ -339,7 +339,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepSVHealth_constraint_1,
-		&asn_PER_memb_kepSVHealth_constr_5,
+		&ASN_PER_MEMB_KEP_SV_HEALTH_CONSTR_5,
 		0,
 		"kepSVHealth"
 		},
@@ -348,7 +348,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacAPowerHalf_constraint_1,
-		&asn_PER_memb_kepAlmanacAPowerHalf_constr_6,
+		&ASN_PER_MEMB_KEP_ALMANAC_A_POWER_HALF_CONSTR_6,
 		0,
 		"kepAlmanacAPowerHalf"
 		},
@@ -357,7 +357,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacOmega0_constraint_1,
-		&asn_PER_memb_kepAlmanacOmega0_constr_7,
+		&ASN_PER_MEMB_KEP_ALMANAC_OMEGA0_CONSTR_7,
 		0,
 		"kepAlmanacOmega0"
 		},
@@ -366,7 +366,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacW_constraint_1,
-		&asn_PER_memb_kepAlmanacW_constr_8,
+		&ASN_PER_MEMB_KEP_ALMANAC_W_CONSTR_8,
 		0,
 		"kepAlmanacW"
 		},
@@ -375,7 +375,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacM0_constraint_1,
-		&asn_PER_memb_kepAlmanacM0_constr_9,
+		&ASN_PER_MEMB_KEP_ALMANAC_M0_CONSTR_9,
 		0,
 		"kepAlmanacM0"
 		},
@@ -384,7 +384,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacAF0_constraint_1,
-		&asn_PER_memb_kepAlmanacAF0_constr_10,
+		&ASN_PER_MEMB_KEP_ALMANAC_A_F0_CONSTR_10,
 		0,
 		"kepAlmanacAF0"
 		},
@@ -393,7 +393,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_kepAlmanacAF1_constraint_1,
-		&asn_PER_memb_kepAlmanacAF1_constr_11,
+		&ASN_PER_MEMB_KEP_ALMANAC_A_F1_CONSTR_11,
 		0,
 		"kepAlmanacAF1"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/Almanac.c b/src/core/libs/supl/asn-rrlp/Almanac.c
index a886c36b9..7f829283d 100644
--- a/src/core/libs/supl/asn-rrlp/Almanac.c
+++ b/src/core/libs/supl/asn-rrlp/Almanac.c
@@ -31,7 +31,7 @@ memb_alamanacWNa_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_alamanacWNa_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALAMANAC_W_NA_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_Almanac_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_alamanacWNa_constraint_1,
-		&asn_PER_memb_alamanacWNa_constr_2,
+		&ASN_PER_MEMB_ALAMANAC_W_NA_CONSTR_2,
 		0,
 		"alamanacWNa"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/AlmanacElement.c b/src/core/libs/supl/asn-rrlp/AlmanacElement.c
index 702107187..848ba0af8 100644
--- a/src/core/libs/supl/asn-rrlp/AlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/AlmanacElement.c
@@ -281,57 +281,57 @@ memb_almanacAF1_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_almanacE_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_E_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_alamanacToa_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALAMANAC_TOA_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacKsii_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_KSII_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacOmegaDot_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_OMEGA_DOT_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacSVhealth_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_S_VHEALTH_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacAPowerHalf_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_A_POWER_HALF_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 24, -1,  0,  16777215 }	/* (0..16777215) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacOmega0_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_OMEGA0_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacW_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_W_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacM0_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_M0_CONSTR_11 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacAF0_constr_12 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_A_F0_CONSTR_12 = {
 	{ APC_CONSTRAINED,	 11,  11, -1024,  1023 }	/* (-1024..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_almanacAF1_constr_13 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALMANAC_A_F1_CONSTR_13 = {
 	{ APC_CONSTRAINED,	 11,  11, -1024,  1023 }	/* (-1024..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -351,7 +351,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacE_constraint_1,
-		&asn_PER_memb_almanacE_constr_3,
+		&ASN_PER_MEMB_ALMANAC_E_CONSTR_3,
 		0,
 		"almanacE"
 		},
@@ -360,7 +360,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_alamanacToa_constraint_1,
-		&asn_PER_memb_alamanacToa_constr_4,
+		&ASN_PER_MEMB_ALAMANAC_TOA_CONSTR_4,
 		0,
 		"alamanacToa"
 		},
@@ -369,7 +369,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacKsii_constraint_1,
-		&asn_PER_memb_almanacKsii_constr_5,
+		&ASN_PER_MEMB_ALMANAC_KSII_CONSTR_5,
 		0,
 		"almanacKsii"
 		},
@@ -378,7 +378,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacOmegaDot_constraint_1,
-		&asn_PER_memb_almanacOmegaDot_constr_6,
+		&ASN_PER_MEMB_ALMANAC_OMEGA_DOT_CONSTR_6,
 		0,
 		"almanacOmegaDot"
 		},
@@ -387,7 +387,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacSVhealth_constraint_1,
-		&asn_PER_memb_almanacSVhealth_constr_7,
+		&ASN_PER_MEMB_ALMANAC_S_VHEALTH_CONSTR_7,
 		0,
 		"almanacSVhealth"
 		},
@@ -396,7 +396,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacAPowerHalf_constraint_1,
-		&asn_PER_memb_almanacAPowerHalf_constr_8,
+		&ASN_PER_MEMB_ALMANAC_A_POWER_HALF_CONSTR_8,
 		0,
 		"almanacAPowerHalf"
 		},
@@ -405,7 +405,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacOmega0_constraint_1,
-		&asn_PER_memb_almanacOmega0_constr_9,
+		&ASN_PER_MEMB_ALMANAC_OMEGA0_CONSTR_9,
 		0,
 		"almanacOmega0"
 		},
@@ -414,7 +414,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacW_constraint_1,
-		&asn_PER_memb_almanacW_constr_10,
+		&ASN_PER_MEMB_ALMANAC_W_CONSTR_10,
 		0,
 		"almanacW"
 		},
@@ -423,7 +423,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacM0_constraint_1,
-		&asn_PER_memb_almanacM0_constr_11,
+		&ASN_PER_MEMB_ALMANAC_M0_CONSTR_11,
 		0,
 		"almanacM0"
 		},
@@ -432,7 +432,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacAF0_constraint_1,
-		&asn_PER_memb_almanacAF0_constr_12,
+		&ASN_PER_MEMB_ALMANAC_A_F0_CONSTR_12,
 		0,
 		"almanacAF0"
 		},
@@ -441,7 +441,7 @@ static asn_TYPE_member_t asn_MBR_AlmanacElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_almanacAF1_constraint_1,
-		&asn_PER_memb_almanacAF1_constr_13,
+		&ASN_PER_MEMB_ALMANAC_A_F1_CONSTR_13,
 		0,
 		"almanacAF1"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c b/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c
index 5b1d648b8..353a6d2c9 100644
--- a/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c
+++ b/src/core/libs/supl/asn-rrlp/AntiSpoofFlag.c
@@ -111,7 +111,7 @@ AntiSpoofFlag_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_AntiSpoofFlag_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ANTI_SPOOF_FLAG_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_AntiSpoofFlag = {
 	asn_DEF_AntiSpoofFlag_tags_1,	/* Same as above */
 	sizeof(asn_DEF_AntiSpoofFlag_tags_1)
 		/sizeof(asn_DEF_AntiSpoofFlag_tags_1[0]), /* 1 */
-	&asn_PER_type_AntiSpoofFlag_constr_1,
+	&ASN_PER_TYPE_ANTI_SPOOF_FLAG_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/BCCHCarrier.c b/src/core/libs/supl/asn-rrlp/BCCHCarrier.c
index 72388ca5b..b6e340cfb 100644
--- a/src/core/libs/supl/asn-rrlp/BCCHCarrier.c
+++ b/src/core/libs/supl/asn-rrlp/BCCHCarrier.c
@@ -111,7 +111,7 @@ BCCHCarrier_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_BCCHCarrier_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_BCCH_CARRIER_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_BCCHCarrier = {
 	asn_DEF_BCCHCarrier_tags_1,	/* Same as above */
 	sizeof(asn_DEF_BCCHCarrier_tags_1)
 		/sizeof(asn_DEF_BCCHCarrier_tags_1[0]), /* 1 */
-	&asn_PER_type_BCCHCarrier_constr_1,
+	&ASN_PER_TYPE_BCCH_CARRIER_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/BSIC.c b/src/core/libs/supl/asn-rrlp/BSIC.c
index 378aac7ab..de1ed2b8f 100644
--- a/src/core/libs/supl/asn-rrlp/BSIC.c
+++ b/src/core/libs/supl/asn-rrlp/BSIC.c
@@ -111,7 +111,7 @@ BSIC_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_BSIC_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_BSIC_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_BSIC = {
 	asn_DEF_BSIC_tags_1,	/* Same as above */
 	sizeof(asn_DEF_BSIC_tags_1)
 		/sizeof(asn_DEF_BSIC_tags_1[0]), /* 1 */
-	&asn_PER_type_BSIC_constr_1,
+	&ASN_PER_TYPE_BSIC_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/BadSignalElement.c b/src/core/libs/supl/asn-rrlp/BadSignalElement.c
index b0ff80566..e162e0b3d 100644
--- a/src/core/libs/supl/asn-rrlp/BadSignalElement.c
+++ b/src/core/libs/supl/asn-rrlp/BadSignalElement.c
@@ -31,7 +31,7 @@ memb_badSignalID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_badSignalID_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_BAD_SIGNAL_ID_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -51,7 +51,7 @@ static asn_TYPE_member_t asn_MBR_BadSignalElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_badSignalID_constraint_1,
-		&asn_PER_memb_badSignalID_constr_3,
+		&ASN_PER_MEMB_BAD_SIGNAL_ID_CONSTR_3,
 		0,
 		"badSignalID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/BitNumber.c b/src/core/libs/supl/asn-rrlp/BitNumber.c
index 36c17f637..0a430f9fa 100644
--- a/src/core/libs/supl/asn-rrlp/BitNumber.c
+++ b/src/core/libs/supl/asn-rrlp/BitNumber.c
@@ -111,7 +111,7 @@ BitNumber_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_BitNumber_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_BIT_NUMBER_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  156 }	/* (0..156) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_BitNumber = {
 	asn_DEF_BitNumber_tags_1,	/* Same as above */
 	sizeof(asn_DEF_BitNumber_tags_1)
 		/sizeof(asn_DEF_BitNumber_tags_1[0]), /* 1 */
-	&asn_PER_type_BitNumber_constr_1,
+	&ASN_PER_TYPE_BIT_NUMBER_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/CellID.c b/src/core/libs/supl/asn-rrlp/CellID.c
index a66eca167..e412b5ff6 100644
--- a/src/core/libs/supl/asn-rrlp/CellID.c
+++ b/src/core/libs/supl/asn-rrlp/CellID.c
@@ -111,7 +111,7 @@ CellID_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_CellID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_ID_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CellID = {
 	asn_DEF_CellID_tags_1,	/* Same as above */
 	sizeof(asn_DEF_CellID_tags_1)
 		/sizeof(asn_DEF_CellID_tags_1[0]), /* 1 */
-	&asn_PER_type_CellID_constr_1,
+	&ASN_PER_TYPE_CELL_ID_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c b/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c
index 96fd70a6e..8da024839 100644
--- a/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/DGANSSSgnElement.c
@@ -106,22 +106,22 @@ memb_rangeRateCor_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_iod_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IOD_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_udre_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UDRE_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_pseudoRangeCor_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 12,  12, -2047,  2047 }	/* (-2047..2047) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_rangeRateCor_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 8,  8, -127,  127 }	/* (-127..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_iod_constraint_1,
-		&asn_PER_memb_iod_constr_3,
+		&ASN_PER_MEMB_IOD_CONSTR_3,
 		0,
 		"iod"
 		},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_udre_constraint_1,
-		&asn_PER_memb_udre_constr_4,
+		&ASN_PER_MEMB_UDRE_CONSTR_4,
 		0,
 		"udre"
 		},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_pseudoRangeCor_constraint_1,
-		&asn_PER_memb_pseudoRangeCor_constr_5,
+		&ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5,
 		0,
 		"pseudoRangeCor"
 		},
@@ -168,7 +168,7 @@ static asn_TYPE_member_t asn_MBR_DGANSSSgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_rangeRateCor_constraint_1,
-		&asn_PER_memb_rangeRateCor_constr_6,
+		&ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6,
 		0,
 		"rangeRateCor"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/DGPSCorrections.c b/src/core/libs/supl/asn-rrlp/DGPSCorrections.c
index 781d41f61..7fa907db6 100644
--- a/src/core/libs/supl/asn-rrlp/DGPSCorrections.c
+++ b/src/core/libs/supl/asn-rrlp/DGPSCorrections.c
@@ -56,12 +56,12 @@ memb_status_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_gpsTOW_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOW_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 20, -1,  0,  604799 }	/* (0..604799) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_status_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_STATUS_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_DGPSCorrections_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gpsTOW_constraint_1,
-		&asn_PER_memb_gpsTOW_constr_2,
+		&ASN_PER_MEMB_GPS_TOW_CONSTR_2,
 		0,
 		"gpsTOW"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_DGPSCorrections_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_status_constraint_1,
-		&asn_PER_memb_status_constr_3,
+		&ASN_PER_MEMB_STATUS_CONSTR_3,
 		0,
 		"status"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/EOTDQuality.c b/src/core/libs/supl/asn-rrlp/EOTDQuality.c
index 17fcacfe8..8e4454834 100644
--- a/src/core/libs/supl/asn-rrlp/EOTDQuality.c
+++ b/src/core/libs/supl/asn-rrlp/EOTDQuality.c
@@ -56,12 +56,12 @@ memb_stdOfEOTD_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_nbrOfMeasurements_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_NBR_OF_MEASUREMENTS_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stdOfEOTD_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_STD_OF_EOTD_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_EOTDQuality_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_nbrOfMeasurements_constraint_1,
-		&asn_PER_memb_nbrOfMeasurements_constr_2,
+		&ASN_PER_MEMB_NBR_OF_MEASUREMENTS_CONSTR_2,
 		0,
 		"nbrOfMeasurements"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_EOTDQuality_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stdOfEOTD_constraint_1,
-		&asn_PER_memb_stdOfEOTD_constr_3,
+		&ASN_PER_MEMB_STD_OF_EOTD_CONSTR_3,
 		0,
 		"stdOfEOTD"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c b/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c
index d3d05c10f..18e996518 100644
--- a/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c
+++ b/src/core/libs/supl/asn-rrlp/EnvironmentCharacter.c
@@ -94,7 +94,7 @@ EnvironmentCharacter_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_EnvironmentCharacter_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ENVIRONMENT_CHARACTER_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_EnvironmentCharacter = {
 	asn_DEF_EnvironmentCharacter_tags_1,	/* Same as above */
 	sizeof(asn_DEF_EnvironmentCharacter_tags_1)
 		/sizeof(asn_DEF_EnvironmentCharacter_tags_1[0]), /* 1 */
-	&asn_PER_type_EnvironmentCharacter_constr_1,
+	&ASN_PER_TYPE_ENVIRONMENT_CHARACTER_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_EnvironmentCharacter_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c b/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c
index 5177a8615..00025f2af 100644
--- a/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c
+++ b/src/core/libs/supl/asn-rrlp/EphemerisSubframe1Reserved.c
@@ -106,22 +106,22 @@ memb_reserved4_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_reserved1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED1_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 23, -1,  0,  8388607 }	/* (0..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_reserved2_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED2_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 24, -1,  0,  16777215 }	/* (0..16777215) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_reserved3_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED3_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 24, -1,  0,  16777215 }	/* (0..16777215) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_reserved4_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_RESERVED4_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_reserved1_constraint_1,
-		&asn_PER_memb_reserved1_constr_2,
+		&ASN_PER_MEMB_RESERVED1_CONSTR_2,
 		0,
 		"reserved1"
 		},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_reserved2_constraint_1,
-		&asn_PER_memb_reserved2_constr_3,
+		&ASN_PER_MEMB_RESERVED2_CONSTR_3,
 		0,
 		"reserved2"
 		},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_reserved3_constraint_1,
-		&asn_PER_memb_reserved3_constr_4,
+		&ASN_PER_MEMB_RESERVED3_CONSTR_4,
 		0,
 		"reserved3"
 		},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_EphemerisSubframe1Reserved_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_reserved4_constraint_1,
-		&asn_PER_memb_reserved4_constr_5,
+		&ASN_PER_MEMB_RESERVED4_CONSTR_5,
 		0,
 		"reserved4"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/ErrorCodes.c b/src/core/libs/supl/asn-rrlp/ErrorCodes.c
index d8b61e5d2..f8def1e38 100644
--- a/src/core/libs/supl/asn-rrlp/ErrorCodes.c
+++ b/src/core/libs/supl/asn-rrlp/ErrorCodes.c
@@ -94,7 +94,7 @@ ErrorCodes_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_ErrorCodes_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ERROR_CODES_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  5 }	/* (0..5,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -148,7 +148,7 @@ asn_TYPE_descriptor_t asn_DEF_ErrorCodes = {
 	asn_DEF_ErrorCodes_tags_1,	/* Same as above */
 	sizeof(asn_DEF_ErrorCodes_tags_1)
 		/sizeof(asn_DEF_ErrorCodes_tags_1[0]), /* 1 */
-	&asn_PER_type_ErrorCodes_constr_1,
+	&ASN_PER_TYPE_ERROR_CODES_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_ErrorCodes_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c b/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c
index ff557e3d1..3f35cbf60 100644
--- a/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c
+++ b/src/core/libs/supl/asn-rrlp/ExpOTDUncertainty.c
@@ -111,7 +111,7 @@ ExpOTDUncertainty_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_ExpOTDUncertainty_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_EXP_OTD_UNCERTAINTY_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_ExpOTDUncertainty = {
 	asn_DEF_ExpOTDUncertainty_tags_1,	/* Same as above */
 	sizeof(asn_DEF_ExpOTDUncertainty_tags_1)
 		/sizeof(asn_DEF_ExpOTDUncertainty_tags_1[0]), /* 1 */
-	&asn_PER_type_ExpOTDUncertainty_constr_1,
+	&ASN_PER_TYPE_EXP_OTD_UNCERTAINTY_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/ExpectedOTD.c b/src/core/libs/supl/asn-rrlp/ExpectedOTD.c
index 947c22734..7b14272b0 100644
--- a/src/core/libs/supl/asn-rrlp/ExpectedOTD.c
+++ b/src/core/libs/supl/asn-rrlp/ExpectedOTD.c
@@ -111,7 +111,7 @@ ExpectedOTD_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_ExpectedOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_EXPECTED_OTD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 11,  11,  0,  1250 }	/* (0..1250) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_ExpectedOTD = {
 	asn_DEF_ExpectedOTD_tags_1,	/* Same as above */
 	sizeof(asn_DEF_ExpectedOTD_tags_1)
 		/sizeof(asn_DEF_ExpectedOTD_tags_1[0]), /* 1 */
-	&asn_PER_type_ExpectedOTD_constr_1,
+	&ASN_PER_TYPE_EXPECTED_OTD_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c b/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c
index 9df50f61d..4007fc852 100644
--- a/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c
+++ b/src/core/libs/supl/asn-rrlp/Ext-GeographicalInformation.c
@@ -112,7 +112,7 @@ Ext_GeographicalInformation_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_Ext_GeographicalInformation_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_EXT_GEOGRAPHICAL_INFORMATION_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 5,  5,  1,  20 }	/* (SIZE(1..20)) */,
 	0, 0	/* No PER value map */
@@ -139,7 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_Ext_GeographicalInformation = {
 	asn_DEF_Ext_GeographicalInformation_tags_1,	/* Same as above */
 	sizeof(asn_DEF_Ext_GeographicalInformation_tags_1)
 		/sizeof(asn_DEF_Ext_GeographicalInformation_tags_1[0]), /* 1 */
-	&asn_PER_type_Ext_GeographicalInformation_constr_1,
+	&ASN_PER_TYPE_EXT_GEOGRAPHICAL_INFORMATION_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/Extended-reference.c b/src/core/libs/supl/asn-rrlp/Extended-reference.c
index 12ca01ebe..198fbffe3 100644
--- a/src/core/libs/supl/asn-rrlp/Extended-reference.c
+++ b/src/core/libs/supl/asn-rrlp/Extended-reference.c
@@ -56,12 +56,12 @@ memb_transaction_ID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_smlc_code_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SMLC_CODE_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_transaction_ID_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_TRANSACTION_ID_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 18, -1,  0,  262143 }	/* (0..262143) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_Extended_reference_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_smlc_code_constraint_1,
-		&asn_PER_memb_smlc_code_constr_2,
+		&ASN_PER_MEMB_SMLC_CODE_CONSTR_2,
 		0,
 		"smlc-code"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_Extended_reference_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_transaction_ID_constraint_1,
-		&asn_PER_memb_transaction_ID_constr_3,
+		&ASN_PER_MEMB_TRANSACTION_ID_CONSTR_3,
 		0,
 		"transaction-ID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/FineRTD.c b/src/core/libs/supl/asn-rrlp/FineRTD.c
index 6a31fa718..a692cc908 100644
--- a/src/core/libs/supl/asn-rrlp/FineRTD.c
+++ b/src/core/libs/supl/asn-rrlp/FineRTD.c
@@ -111,7 +111,7 @@ FineRTD_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_FineRTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FINE_RTD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FineRTD = {
 	asn_DEF_FineRTD_tags_1,	/* Same as above */
 	sizeof(asn_DEF_FineRTD_tags_1)
 		/sizeof(asn_DEF_FineRTD_tags_1[0]), /* 1 */
-	&asn_PER_type_FineRTD_constr_1,
+	&ASN_PER_TYPE_FINE_RTD_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/FixType.c b/src/core/libs/supl/asn-rrlp/FixType.c
index d413f29c7..17c34842b 100644
--- a/src/core/libs/supl/asn-rrlp/FixType.c
+++ b/src/core/libs/supl/asn-rrlp/FixType.c
@@ -111,7 +111,7 @@ FixType_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_FixType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FIX_TYPE_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FixType = {
 	asn_DEF_FixType_tags_1,	/* Same as above */
 	sizeof(asn_DEF_FixType_tags_1)
 		/sizeof(asn_DEF_FixType_tags_1[0]), /* 1 */
-	&asn_PER_type_FixType_constr_1,
+	&ASN_PER_TYPE_FIX_TYPE_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/FrameDrift.c b/src/core/libs/supl/asn-rrlp/FrameDrift.c
index 0a0238c9f..ae533e585 100644
--- a/src/core/libs/supl/asn-rrlp/FrameDrift.c
+++ b/src/core/libs/supl/asn-rrlp/FrameDrift.c
@@ -111,7 +111,7 @@ FrameDrift_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_FrameDrift_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FRAME_DRIFT_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7, -64,  63 }	/* (-64..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FrameDrift = {
 	asn_DEF_FrameDrift_tags_1,	/* Same as above */
 	sizeof(asn_DEF_FrameDrift_tags_1)
 		/sizeof(asn_DEF_FrameDrift_tags_1[0]), /* 1 */
-	&asn_PER_type_FrameDrift_constr_1,
+	&ASN_PER_TYPE_FRAME_DRIFT_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/FrameNumber.c b/src/core/libs/supl/asn-rrlp/FrameNumber.c
index b8778f7f8..b028e5903 100644
--- a/src/core/libs/supl/asn-rrlp/FrameNumber.c
+++ b/src/core/libs/supl/asn-rrlp/FrameNumber.c
@@ -111,7 +111,7 @@ FrameNumber_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_FrameNumber_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FRAME_NUMBER_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 21, -1,  0,  2097151 }	/* (0..2097151) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_FrameNumber = {
 	asn_DEF_FrameNumber_tags_1,	/* Same as above */
 	sizeof(asn_DEF_FrameNumber_tags_1)
 		/sizeof(asn_DEF_FrameNumber_tags_1[0]), /* 1 */
-	&asn_PER_type_FrameNumber_constr_1,
+	&ASN_PER_TYPE_FRAME_NUMBER_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c
index 229783ca8..f6cf5ba0f 100644
--- a/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSS-MsrSetElement.c
@@ -31,7 +31,7 @@ memb_deltaGNASSTOD_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_deltaGNASSTOD_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_GNASSTOD_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -60,7 +60,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_MsrSetElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_deltaGNASSTOD_constraint_1,
-		&asn_PER_memb_deltaGNASSTOD_constr_4,
+		&ASN_PER_MEMB_DELTA_GNASSTOD_CONSTR_4,
 		0,
 		"deltaGNASSTOD"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c b/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c
index 6f31ab9b9..302a2fc62 100644
--- a/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSS-SgnElement.c
@@ -181,37 +181,37 @@ memb_adr_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_cNo_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_C_NO_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_carrierQualityInd_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_CARRIER_QUALITY_IND_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_codePhase_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 21, -1,  0,  2097151 }	/* (0..2097151) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_integerCodePhase_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_INTEGER_CODE_PHASE_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_codePhaseRMSError_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_RMS_ERROR_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_doppler_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_adr_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_ADR_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 25, -1,  0,  33554431 }	/* (0..33554431) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -231,7 +231,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_cNo_constraint_1,
-		&asn_PER_memb_cNo_constr_3,
+		&ASN_PER_MEMB_C_NO_CONSTR_3,
 		0,
 		"cNo"
 		},
@@ -249,7 +249,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_carrierQualityInd_constraint_1,
-		&asn_PER_memb_carrierQualityInd_constr_5,
+		&ASN_PER_MEMB_CARRIER_QUALITY_IND_CONSTR_5,
 		0,
 		"carrierQualityInd"
 		},
@@ -258,7 +258,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_codePhase_constraint_1,
-		&asn_PER_memb_codePhase_constr_6,
+		&ASN_PER_MEMB_CODE_PHASE_CONSTR_6,
 		0,
 		"codePhase"
 		},
@@ -267,7 +267,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_integerCodePhase_constraint_1,
-		&asn_PER_memb_integerCodePhase_constr_7,
+		&ASN_PER_MEMB_INTEGER_CODE_PHASE_CONSTR_7,
 		0,
 		"integerCodePhase"
 		},
@@ -276,7 +276,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_codePhaseRMSError_constraint_1,
-		&asn_PER_memb_codePhaseRMSError_constr_8,
+		&ASN_PER_MEMB_CODE_PHASE_RMS_ERROR_CONSTR_8,
 		0,
 		"codePhaseRMSError"
 		},
@@ -285,7 +285,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_doppler_constraint_1,
-		&asn_PER_memb_doppler_constr_9,
+		&ASN_PER_MEMB_DOPPLER_CONSTR_9,
 		0,
 		"doppler"
 		},
@@ -294,7 +294,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_adr_constraint_1,
-		&asn_PER_memb_adr_constr_10,
+		&ASN_PER_MEMB_ADR_CONSTR_10,
 		0,
 		"adr"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c b/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c
index cffb812c8..fce8af4e8 100644
--- a/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSS-SgnTypeElement.c
@@ -31,7 +31,7 @@ memb_ganssSignalID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssSignalID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 4,  4,  0,  15 }	/* (0..15) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSS_SgnTypeElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssSignalID_constraint_1,
-		&asn_PER_memb_ganssSignalID_constr_2,
+		&ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2,
 		0,
 		"ganssSignalID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c b/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c
index c41627282..906260ab4 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.c
@@ -6,7 +6,7 @@
 
 #include "GANSSAlmanacElement.h"
 
-static asn_per_constraints_t asn_PER_type_GANSSAlmanacElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_ALMANAC_ELEMENT_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -52,7 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSAlmanacElement = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_GANSSAlmanacElement_constr_1,
+	&ASN_PER_TYPE_GANSS_ALMANAC_ELEMENT_CONSTR_1,
 	asn_MBR_GANSSAlmanacElement_1,
 	1,	/* Elements count */
 	&asn_SPC_GANSSAlmanacElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c b/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c
index 3fb9dff20..77630b337 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSAlmanacModel.c
@@ -81,17 +81,17 @@ memb_ioda_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_weekNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_WEEK_NUMBER_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_toa_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_TOA_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ioda_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_IODA_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GANSSAlmanacModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_weekNumber_constraint_1,
-		&asn_PER_memb_weekNumber_constr_2,
+		&ASN_PER_MEMB_WEEK_NUMBER_CONSTR_2,
 		0,
 		"weekNumber"
 		},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GANSSAlmanacModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_toa_constraint_1,
-		&asn_PER_memb_toa_constr_4,
+		&ASN_PER_MEMB_TOA_CONSTR_4,
 		0,
 		"toa"
 		},
@@ -129,7 +129,7 @@ static asn_TYPE_member_t asn_MBR_GANSSAlmanacModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ioda_constraint_1,
-		&asn_PER_memb_ioda_constr_5,
+		&ASN_PER_MEMB_IODA_CONSTR_5,
 		0,
 		"ioda"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c b/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c
index dbf9340b3..8d6fda870 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSAssistanceData.c
@@ -112,7 +112,7 @@ GANSSAssistanceData_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSAssistanceData_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_ASSISTANCE_DATA_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  40 }	/* (SIZE(1..40)) */,
 	0, 0	/* No PER value map */
@@ -139,7 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSAssistanceData = {
 	asn_DEF_GANSSAssistanceData_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSAssistanceData_tags_1)
 		/sizeof(asn_DEF_GANSSAssistanceData_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSAssistanceData_constr_1,
+	&ASN_PER_TYPE_GANSS_ASSISTANCE_DATA_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSClockModel.c b/src/core/libs/supl/asn-rrlp/GANSSClockModel.c
index 3dd4501e7..bfe58654d 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSClockModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSClockModel.c
@@ -6,7 +6,7 @@
 
 #include "GANSSClockModel.h"
 
-static asn_per_constraints_t asn_PER_type_GANSSClockModel_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_CLOCK_MODEL_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -52,7 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSClockModel = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_GANSSClockModel_constr_1,
+	&ASN_PER_TYPE_GANSS_CLOCK_MODEL_CONSTR_1,
 	asn_MBR_GANSSClockModel_1,
 	1,	/* Elements count */
 	&asn_SPC_GANSSClockModel_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GANSSDataBit.c b/src/core/libs/supl/asn-rrlp/GANSSDataBit.c
index 67e8a5f0a..5f1ab2f6a 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSDataBit.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSDataBit.c
@@ -111,7 +111,7 @@ GANSSDataBit_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSDataBit_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_DATA_BIT_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSDataBit = {
 	asn_DEF_GANSSDataBit_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSDataBit_tags_1)
 		/sizeof(asn_DEF_GANSSDataBit_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSDataBit_constr_1,
+	&ASN_PER_TYPE_GANSS_DATA_BIT_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c b/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c
index 83aae91c6..29945a448 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSDataBitAssist.c
@@ -56,12 +56,12 @@ memb_ganssDataTypeID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssTOD_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TOD_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  59 }	/* (0..59) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssDataTypeID_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_DATA_TYPE_ID_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  2 }	/* (0..2) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_GANSSDataBitAssist_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssTOD_constraint_1,
-		&asn_PER_memb_ganssTOD_constr_2,
+		&ASN_PER_MEMB_GANSS_TOD_CONSTR_2,
 		0,
 		"ganssTOD"
 		},
@@ -90,7 +90,7 @@ static asn_TYPE_member_t asn_MBR_GANSSDataBitAssist_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssDataTypeID_constraint_1,
-		&asn_PER_memb_ganssDataTypeID_constr_4,
+		&ASN_PER_MEMB_GANSS_DATA_TYPE_ID_CONSTR_4,
 		0,
 		"ganssDataTypeID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c b/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c
index 4492d1eba..ded9c4b2f 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSDiffCorrections.c
@@ -31,7 +31,7 @@ memb_dganssRefTime_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_dganssRefTime_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_DGANSS_REF_TIME_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  119 }	/* (0..119) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSSDiffCorrections_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_dganssRefTime_constraint_1,
-		&asn_PER_memb_dganssRefTime_constr_2,
+		&ASN_PER_MEMB_DGANSS_REF_TIME_CONSTR_2,
 		0,
 		"dganssRefTime"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c b/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c
index f9ee75d4f..abc4c3225 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSGenericAssistDataElement.c
@@ -31,7 +31,7 @@ memb_ganssID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_ID_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSSGenericAssistDataElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssID_constraint_1,
-		&asn_PER_memb_ganssID_constr_2,
+		&ASN_PER_MEMB_GANSS_ID_CONSTR_2,
 		0,
 		"ganssID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c b/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c
index 9f5ad93bc..0ca6bbf45 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSIonoStormFlags.c
@@ -131,27 +131,27 @@ memb_ionoStormFlag5_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG1_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag2_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG2_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag3_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG3_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag4_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG4_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ionoStormFlag5_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_IONO_STORM_FLAG5_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -162,7 +162,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ionoStormFlag1_constraint_1,
-		&asn_PER_memb_ionoStormFlag1_constr_2,
+		&ASN_PER_MEMB_IONO_STORM_FLAG1_CONSTR_2,
 		0,
 		"ionoStormFlag1"
 		},
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ionoStormFlag2_constraint_1,
-		&asn_PER_memb_ionoStormFlag2_constr_3,
+		&ASN_PER_MEMB_IONO_STORM_FLAG2_CONSTR_3,
 		0,
 		"ionoStormFlag2"
 		},
@@ -180,7 +180,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ionoStormFlag3_constraint_1,
-		&asn_PER_memb_ionoStormFlag3_constr_4,
+		&ASN_PER_MEMB_IONO_STORM_FLAG3_CONSTR_4,
 		0,
 		"ionoStormFlag3"
 		},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ionoStormFlag4_constraint_1,
-		&asn_PER_memb_ionoStormFlag4_constr_5,
+		&ASN_PER_MEMB_IONO_STORM_FLAG4_CONSTR_5,
 		0,
 		"ionoStormFlag4"
 		},
@@ -198,7 +198,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonoStormFlags_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ionoStormFlag5_constraint_1,
-		&asn_PER_memb_ionoStormFlag5_constr_6,
+		&ASN_PER_MEMB_IONO_STORM_FLAG5_CONSTR_6,
 		0,
 		"ionoStormFlag5"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c b/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c
index 10e7c67f0..5390b0def 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSIonosphereModel.c
@@ -81,17 +81,17 @@ memb_ai2_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ai0_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_AI0_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 12,  12,  0,  4095 }	/* (0..4095) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ai1_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_AI1_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 12,  12,  0,  4095 }	/* (0..4095) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ai2_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_AI2_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 12,  12,  0,  4095 }	/* (0..4095) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonosphereModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ai0_constraint_1,
-		&asn_PER_memb_ai0_constr_2,
+		&ASN_PER_MEMB_AI0_CONSTR_2,
 		0,
 		"ai0"
 		},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonosphereModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ai1_constraint_1,
-		&asn_PER_memb_ai1_constr_3,
+		&ASN_PER_MEMB_AI1_CONSTR_3,
 		0,
 		"ai1"
 		},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GANSSIonosphereModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ai2_constraint_1,
-		&asn_PER_memb_ai2_constr_4,
+		&ASN_PER_MEMB_AI2_CONSTR_4,
 		0,
 		"ai2"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c b/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c
index c98360895..3dbae18cf 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSLocationInfo.c
@@ -81,17 +81,17 @@ memb_stationaryIndication_constraint_1(asn_TYPE_descriptor_t *td, const void *sp
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssTODFrac_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TOD_FRAC_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 15,  15,  0,  16384 }	/* (0..16384) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssTimeID_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stationaryIndication_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_STATIONARY_INDICATION_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GANSSLocationInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssTODFrac_constraint_1,
-		&asn_PER_memb_ganssTODFrac_constr_4,
+		&ASN_PER_MEMB_GANSS_TOD_FRAC_CONSTR_4,
 		0,
 		"ganssTODFrac"
 		},
@@ -138,7 +138,7 @@ static asn_TYPE_member_t asn_MBR_GANSSLocationInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssTimeID_constraint_1,
-		&asn_PER_memb_ganssTimeID_constr_6,
+		&ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_6,
 		0,
 		"ganssTimeID"
 		},
@@ -165,7 +165,7 @@ static asn_TYPE_member_t asn_MBR_GANSSLocationInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stationaryIndication_constraint_1,
-		&asn_PER_memb_stationaryIndication_constr_9,
+		&ASN_PER_MEMB_STATIONARY_INDICATION_CONSTR_9,
 		0,
 		"stationaryIndication"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSNavModel.c b/src/core/libs/supl/asn-rrlp/GANSSNavModel.c
index 46c7cc984..1d9b2cb66 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSNavModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSNavModel.c
@@ -106,22 +106,22 @@ memb_sqrtAMBS_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_nonBroadcastIndFlag_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_NON_BROADCAST_IND_FLAG_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_toeMSB_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_TOE_MSB_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_eMSB_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_E_MSB_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_sqrtAMBS_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_SQRT_AMBS_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_nonBroadcastIndFlag_constraint_1,
-		&asn_PER_memb_nonBroadcastIndFlag_constr_2,
+		&ASN_PER_MEMB_NON_BROADCAST_IND_FLAG_CONSTR_2,
 		0,
 		"nonBroadcastIndFlag"
 		},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_toeMSB_constraint_1,
-		&asn_PER_memb_toeMSB_constr_3,
+		&ASN_PER_MEMB_TOE_MSB_CONSTR_3,
 		0,
 		"toeMSB"
 		},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_eMSB_constraint_1,
-		&asn_PER_memb_eMSB_constr_4,
+		&ASN_PER_MEMB_E_MSB_CONSTR_4,
 		0,
 		"eMSB"
 		},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_GANSSNavModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_sqrtAMBS_constraint_1,
-		&asn_PER_memb_sqrtAMBS_constr_5,
+		&ASN_PER_MEMB_SQRT_AMBS_CONSTR_5,
 		0,
 		"sqrtAMBS"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c b/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c
index 5bd45837a..ff3bba79c 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.c
@@ -6,7 +6,7 @@
 
 #include "GANSSOrbitModel.h"
 
-static asn_per_constraints_t asn_PER_type_GANSSOrbitModel_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_ORBIT_MODEL_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0,  0 }	/* (0..0,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -52,7 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSOrbitModel = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_GANSSOrbitModel_constr_1,
+	&ASN_PER_TYPE_GANSS_ORBIT_MODEL_CONSTR_1,
 	asn_MBR_GANSSOrbitModel_1,
 	1,	/* Elements count */
 	&asn_SPC_GANSSOrbitModel_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c b/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c
index aaff620c7..77f16b6d7 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSPositioningMethod.c
@@ -117,7 +117,7 @@ GANSSPositioningMethod_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSPositioningMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_POSITIONING_METHOD_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  2,  16 }	/* (SIZE(2..16)) */,
 	0, 0	/* No PER value map */
@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSPositioningMethod = {
 	asn_DEF_GANSSPositioningMethod_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSPositioningMethod_tags_1)
 		/sizeof(asn_DEF_GANSSPositioningMethod_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSPositioningMethod_constr_1,
+	&ASN_PER_TYPE_GANSS_POSITIONING_METHOD_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c
index 9a5a09290..28f7fb4ed 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementAssist.c
@@ -31,7 +31,7 @@ memb_ganssSignalID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssSignalID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementAssist_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssSignalID_constraint_1,
-		&asn_PER_memb_ganssSignalID_constr_2,
+		&ASN_PER_MEMB_GANSS_SIGNAL_ID_CONSTR_2,
 		0,
 		"ganssSignalID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c
index f67633244..c527baf5a 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSRefMeasurementElement.c
@@ -106,22 +106,22 @@ memb_codePhaseSearchWindow_constraint_1(asn_TYPE_descriptor_t *td, const void *s
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_doppler0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER0_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 12,  12, -2048,  2047 }	/* (-2048..2047) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_codePhase_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1022 }	/* (0..1022) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_intCodePhase_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_codePhaseSearchWindow_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_doppler0_constraint_1,
-		&asn_PER_memb_doppler0_constr_3,
+		&ASN_PER_MEMB_DOPPLER0_CONSTR_3,
 		0,
 		"doppler0"
 		},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_codePhase_constraint_1,
-		&asn_PER_memb_codePhase_constr_5,
+		&ASN_PER_MEMB_CODE_PHASE_CONSTR_5,
 		0,
 		"codePhase"
 		},
@@ -168,7 +168,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_intCodePhase_constraint_1,
-		&asn_PER_memb_intCodePhase_constr_6,
+		&ASN_PER_MEMB_INT_CODE_PHASE_CONSTR_6,
 		0,
 		"intCodePhase"
 		},
@@ -177,7 +177,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefMeasurementElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_codePhaseSearchWindow_constraint_1,
-		&asn_PER_memb_codePhaseSearchWindow_constr_7,
+		&ASN_PER_MEMB_CODE_PHASE_SEARCH_WINDOW_CONSTR_7,
 		0,
 		"codePhaseSearchWindow"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c b/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c
index 406523ba9..c1bd034fe 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSRefTimeInfo.c
@@ -56,12 +56,12 @@ memb_ganssTimeID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssDay_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_DAY_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 13,  13,  0,  8191 }	/* (0..8191) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssTimeID_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefTimeInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssDay_constraint_1,
-		&asn_PER_memb_ganssDay_constr_2,
+		&ASN_PER_MEMB_GANSS_DAY_CONSTR_2,
 		0,
 		"ganssDay"
 		},
@@ -99,7 +99,7 @@ static asn_TYPE_member_t asn_MBR_GANSSRefTimeInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssTimeID_constraint_1,
-		&asn_PER_memb_ganssTimeID_constr_5,
+		&ASN_PER_MEMB_GANSS_TIME_ID_CONSTR_5,
 		0,
 		"ganssTimeID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c b/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c
index d32e86bf5..67367ff6f 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSSatelliteElement.c
@@ -56,12 +56,12 @@ memb_iod_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_svHealth_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_SV_HEALTH_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 5,  5, -7,  13 }	/* (-7..13) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_iod_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_IOD_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_GANSSSatelliteElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_svHealth_constraint_1,
-		&asn_PER_memb_svHealth_constr_3,
+		&ASN_PER_MEMB_SV_HEALTH_CONSTR_3,
 		0,
 		"svHealth"
 		},
@@ -90,7 +90,7 @@ static asn_TYPE_member_t asn_MBR_GANSSSatelliteElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_iod_constraint_1,
-		&asn_PER_memb_iod_constr_4,
+		&ASN_PER_MEMB_IOD_CONSTR_4,
 		0,
 		"iod"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSSignalID.c b/src/core/libs/supl/asn-rrlp/GANSSSignalID.c
index dfcdb15da..05ddb3db6 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSSignalID.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSSignalID.c
@@ -111,7 +111,7 @@ GANSSSignalID_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSSignalID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSS_SIGNAL_ID_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSSignalID = {
 	asn_DEF_GANSSSignalID_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSSignalID_tags_1)
 		/sizeof(asn_DEF_GANSSSignalID_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSSignalID_constr_1,
+	&ASN_PER_TYPE_GANSS_SIGNAL_ID_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTOD.c b/src/core/libs/supl/asn-rrlp/GANSSTOD.c
index b2007aaa9..5022d5bd3 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTOD.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTOD.c
@@ -111,7 +111,7 @@ GANSSTOD_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSTOD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSSTOD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 17, -1,  0,  86399 }	/* (0..86399) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSTOD = {
 	asn_DEF_GANSSTOD_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSTOD_tags_1)
 		/sizeof(asn_DEF_GANSSTOD_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSTOD_constr_1,
+	&ASN_PER_TYPE_GANSSTOD_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c b/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c
index a07695911..72519d28c 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTODUncertainty.c
@@ -111,7 +111,7 @@ GANSSTODUncertainty_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSTODUncertainty_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSSTOD_UNCERTAINTY_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSTODUncertainty = {
 	asn_DEF_GANSSTODUncertainty_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSTODUncertainty_tags_1)
 		/sizeof(asn_DEF_GANSSTODUncertainty_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSTODUncertainty_constr_1,
+	&ASN_PER_TYPE_GANSSTOD_UNCERTAINTY_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTODm.c b/src/core/libs/supl/asn-rrlp/GANSSTODm.c
index 02a84dfe7..2bc765980 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTODm.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTODm.c
@@ -111,7 +111,7 @@ GANSSTODm_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GANSSTODm_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GANSSTO_DM_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 22, -1,  0,  3599999 }	/* (0..3599999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GANSSTODm = {
 	asn_DEF_GANSSTODm_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GANSSTODm_tags_1)
 		/sizeof(asn_DEF_GANSSTODm_tags_1[0]), /* 1 */
-	&asn_PER_type_GANSSTODm_constr_1,
+	&ASN_PER_TYPE_GANSSTO_DM_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c b/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c
index 6ba69bb30..cd993b5e5 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSTimeModelElement.c
@@ -81,17 +81,17 @@ memb_weekNumber_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssTimeModelRefTime_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_TIME_MODEL_REF_TIME_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_gnssTOID_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_GNSS_TOID_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_weekNumber_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_WEEK_NUMBER_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 13,  13,  0,  8191 }	/* (0..8191) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GANSSTimeModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssTimeModelRefTime_constraint_1,
-		&asn_PER_memb_ganssTimeModelRefTime_constr_2,
+		&ASN_PER_MEMB_GANSS_TIME_MODEL_REF_TIME_CONSTR_2,
 		0,
 		"ganssTimeModelRefTime"
 		},
@@ -138,7 +138,7 @@ static asn_TYPE_member_t asn_MBR_GANSSTimeModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gnssTOID_constraint_1,
-		&asn_PER_memb_gnssTOID_constr_6,
+		&ASN_PER_MEMB_GNSS_TOID_CONSTR_6,
 		0,
 		"gnssTOID"
 		},
@@ -147,7 +147,7 @@ static asn_TYPE_member_t asn_MBR_GANSSTimeModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_weekNumber_constraint_1,
-		&asn_PER_memb_weekNumber_constr_7,
+		&ASN_PER_MEMB_WEEK_NUMBER_CONSTR_7,
 		0,
 		"weekNumber"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c b/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c
index 5366ea85d..8d37ddc7a 100644
--- a/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c
+++ b/src/core/libs/supl/asn-rrlp/GANSSUTCModel.c
@@ -206,42 +206,42 @@ memb_ganssUtcDeltaTlsf_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssUtcA1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_A1_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcA0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_A0_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcTot_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_TOT_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcWNt_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_W_NT_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcDeltaTls_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_DELTA_TLS_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcWNlsf_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_W_NLSF_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcDN_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_DN_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ganssUtcDeltaTlsf_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_UTC_DELTA_TLSF_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcA1_constraint_1,
-		&asn_PER_memb_ganssUtcA1_constr_2,
+		&ASN_PER_MEMB_GANSS_UTC_A1_CONSTR_2,
 		0,
 		"ganssUtcA1"
 		},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcA0_constraint_1,
-		&asn_PER_memb_ganssUtcA0_constr_3,
+		&ASN_PER_MEMB_GANSS_UTC_A0_CONSTR_3,
 		0,
 		"ganssUtcA0"
 		},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcTot_constraint_1,
-		&asn_PER_memb_ganssUtcTot_constr_4,
+		&ASN_PER_MEMB_GANSS_UTC_TOT_CONSTR_4,
 		0,
 		"ganssUtcTot"
 		},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcWNt_constraint_1,
-		&asn_PER_memb_ganssUtcWNt_constr_5,
+		&ASN_PER_MEMB_GANSS_UTC_W_NT_CONSTR_5,
 		0,
 		"ganssUtcWNt"
 		},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcDeltaTls_constraint_1,
-		&asn_PER_memb_ganssUtcDeltaTls_constr_6,
+		&ASN_PER_MEMB_GANSS_UTC_DELTA_TLS_CONSTR_6,
 		0,
 		"ganssUtcDeltaTls"
 		},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcWNlsf_constraint_1,
-		&asn_PER_memb_ganssUtcWNlsf_constr_7,
+		&ASN_PER_MEMB_GANSS_UTC_W_NLSF_CONSTR_7,
 		0,
 		"ganssUtcWNlsf"
 		},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcDN_constraint_1,
-		&asn_PER_memb_ganssUtcDN_constr_8,
+		&ASN_PER_MEMB_GANSS_UTC_DN_CONSTR_8,
 		0,
 		"ganssUtcDN"
 		},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_GANSSUTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssUtcDeltaTlsf_constraint_1,
-		&asn_PER_memb_ganssUtcDeltaTlsf_constr_9,
+		&ASN_PER_MEMB_GANSS_UTC_DELTA_TLSF_CONSTR_9,
 		0,
 		"ganssUtcDeltaTlsf"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c b/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c
index 96d4d1de7..756a7f54e 100644
--- a/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c
+++ b/src/core/libs/supl/asn-rrlp/GPS-MsrElement.c
@@ -131,27 +131,27 @@ memb_pseuRangeRMSErr_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_cNo_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_C_NO_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_doppler_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_DOPPLER_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_wholeChips_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_WHOLE_CHIPS_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1022 }	/* (0..1022) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_fracChips_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_FRAC_CHIPS_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 11,  11,  0,  1024 }	/* (0..1024) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_pseuRangeRMSErr_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_PSEU_RANGE_RMS_ERR_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_cNo_constraint_1,
-		&asn_PER_memb_cNo_constr_3,
+		&ASN_PER_MEMB_C_NO_CONSTR_3,
 		0,
 		"cNo"
 		},
@@ -180,7 +180,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_doppler_constraint_1,
-		&asn_PER_memb_doppler_constr_4,
+		&ASN_PER_MEMB_DOPPLER_CONSTR_4,
 		0,
 		"doppler"
 		},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_wholeChips_constraint_1,
-		&asn_PER_memb_wholeChips_constr_5,
+		&ASN_PER_MEMB_WHOLE_CHIPS_CONSTR_5,
 		0,
 		"wholeChips"
 		},
@@ -198,7 +198,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_fracChips_constraint_1,
-		&asn_PER_memb_fracChips_constr_6,
+		&ASN_PER_MEMB_FRAC_CHIPS_CONSTR_6,
 		0,
 		"fracChips"
 		},
@@ -216,7 +216,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_pseuRangeRMSErr_constraint_1,
-		&asn_PER_memb_pseuRangeRMSErr_constr_8,
+		&ASN_PER_MEMB_PSEU_RANGE_RMS_ERR_CONSTR_8,
 		0,
 		"pseuRangeRMSErr"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c
index 91c0ce711..c1aec7065 100644
--- a/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/GPS-MsrSetElement.c
@@ -31,7 +31,7 @@ memb_refFrame_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refFrame_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_GPS_MsrSetElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refFrame_constraint_1,
-		&asn_PER_memb_refFrame_constr_2,
+		&ASN_PER_MEMB_REF_FRAME_CONSTR_2,
 		0,
 		"refFrame"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c b/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c
index f2604dbcf..6f93d65f3 100644
--- a/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c
+++ b/src/core/libs/supl/asn-rrlp/GPSAssistanceData.c
@@ -112,7 +112,7 @@ GPSAssistanceData_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GPSAssistanceData_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPS_ASSISTANCE_DATA_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  40 }	/* (SIZE(1..40)) */,
 	0, 0	/* No PER value map */
@@ -139,7 +139,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSAssistanceData = {
 	asn_DEF_GPSAssistanceData_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GPSAssistanceData_tags_1)
 		/sizeof(asn_DEF_GPSAssistanceData_tags_1[0]), /* 1 */
-	&asn_PER_type_GPSAssistanceData_constr_1,
+	&ASN_PER_TYPE_GPS_ASSISTANCE_DATA_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c b/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c
index 1250731f0..c80de1dad 100644
--- a/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c
+++ b/src/core/libs/supl/asn-rrlp/GPSReferenceTimeUncertainty.c
@@ -111,7 +111,7 @@ GPSReferenceTimeUncertainty_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GPSReferenceTimeUncertainty_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPS_REFERENCE_TIME_UNCERTAINTY_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSReferenceTimeUncertainty = {
 	asn_DEF_GPSReferenceTimeUncertainty_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GPSReferenceTimeUncertainty_tags_1)
 		/sizeof(asn_DEF_GPSReferenceTimeUncertainty_tags_1[0]), /* 1 */
-	&asn_PER_type_GPSReferenceTimeUncertainty_constr_1,
+	&ASN_PER_TYPE_GPS_REFERENCE_TIME_UNCERTAINTY_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GPSTOW23b.c b/src/core/libs/supl/asn-rrlp/GPSTOW23b.c
index 8ad2591cb..fe1c9d773 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTOW23b.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTOW23b.c
@@ -111,7 +111,7 @@ GPSTOW23b_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GPSTOW23b_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPSTO_W23B_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 23, -1,  0,  7559999 }	/* (0..7559999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSTOW23b = {
 	asn_DEF_GPSTOW23b_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GPSTOW23b_tags_1)
 		/sizeof(asn_DEF_GPSTOW23b_tags_1[0]), /* 1 */
-	&asn_PER_type_GPSTOW23b_constr_1,
+	&ASN_PER_TYPE_GPSTO_W23B_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GPSTOW24b.c b/src/core/libs/supl/asn-rrlp/GPSTOW24b.c
index 6a110adac..805fe2577 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTOW24b.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTOW24b.c
@@ -111,7 +111,7 @@ GPSTOW24b_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GPSTOW24b_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPSTO_W24B_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 24, -1,  0,  14399999 }	/* (0..14399999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSTOW24b = {
 	asn_DEF_GPSTOW24b_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GPSTOW24b_tags_1)
 		/sizeof(asn_DEF_GPSTOW24b_tags_1[0]), /* 1 */
-	&asn_PER_type_GPSTOW24b_constr_1,
+	&ASN_PER_TYPE_GPSTO_W24B_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c b/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c
index aac3de697..0ce4905d9 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTOWAssist.c
@@ -6,7 +6,7 @@
 
 #include "GPSTOWAssist.h"
 
-static asn_per_constraints_t asn_PER_type_GPSTOWAssist_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPSTOW_ASSIST_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  12 }	/* (SIZE(1..12)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSTOWAssist = {
 	asn_DEF_GPSTOWAssist_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GPSTOWAssist_tags_1)
 		/sizeof(asn_DEF_GPSTOWAssist_tags_1[0]), /* 1 */
-	&asn_PER_type_GPSTOWAssist_constr_1,
+	&ASN_PER_TYPE_GPSTOW_ASSIST_CONSTR_1,
 	asn_MBR_GPSTOWAssist_1,
 	1,	/* Single element */
 	&asn_SPC_GPSTOWAssist_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c b/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c
index 6e7fe01d8..67ef9b1a3 100644
--- a/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c
+++ b/src/core/libs/supl/asn-rrlp/GPSTimeAssistanceMeasurements.c
@@ -81,17 +81,17 @@ memb_deltaTow_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_referenceFrameMSB_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_FRAME_MSB_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_gpsTowSubms_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOW_SUBMS_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 14,  14,  0,  9999 }	/* (0..9999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_deltaTow_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_TOW_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_GPSTimeAssistanceMeasurements_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_referenceFrameMSB_constraint_1,
-		&asn_PER_memb_referenceFrameMSB_constr_2,
+		&ASN_PER_MEMB_REFERENCE_FRAME_MSB_CONSTR_2,
 		0,
 		"referenceFrameMSB"
 		},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_GPSTimeAssistanceMeasurements_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gpsTowSubms_constraint_1,
-		&asn_PER_memb_gpsTowSubms_constr_3,
+		&ASN_PER_MEMB_GPS_TOW_SUBMS_CONSTR_3,
 		0,
 		"gpsTowSubms"
 		},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_GPSTimeAssistanceMeasurements_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_deltaTow_constraint_1,
-		&asn_PER_memb_deltaTow_constr_4,
+		&ASN_PER_MEMB_DELTA_TOW_CONSTR_4,
 		0,
 		"deltaTow"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/GPSWeek.c b/src/core/libs/supl/asn-rrlp/GPSWeek.c
index 33cb12809..0b312cb38 100644
--- a/src/core/libs/supl/asn-rrlp/GPSWeek.c
+++ b/src/core/libs/supl/asn-rrlp/GPSWeek.c
@@ -111,7 +111,7 @@ GPSWeek_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_GPSWeek_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_GPS_WEEK_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_GPSWeek = {
 	asn_DEF_GPSWeek_tags_1,	/* Same as above */
 	sizeof(asn_DEF_GPSWeek_tags_1)
 		/sizeof(asn_DEF_GPSWeek_tags_1[0]), /* 1 */
-	&asn_PER_type_GPSWeek_constr_1,
+	&ASN_PER_TYPE_GPS_WEEK_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/IonosphericModel.c b/src/core/libs/supl/asn-rrlp/IonosphericModel.c
index 552004de2..bafe72b87 100644
--- a/src/core/libs/supl/asn-rrlp/IonosphericModel.c
+++ b/src/core/libs/supl/asn-rrlp/IonosphericModel.c
@@ -206,42 +206,42 @@ memb_beta3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_alfa0_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA0_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_alfa1_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA1_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_alfa2_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA2_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_alfa3_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALFA3_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_beta0_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA0_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_beta1_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA1_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_beta2_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA2_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_beta3_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_BETA3_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_alfa0_constraint_1,
-		&asn_PER_memb_alfa0_constr_2,
+		&ASN_PER_MEMB_ALFA0_CONSTR_2,
 		0,
 		"alfa0"
 		},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_alfa1_constraint_1,
-		&asn_PER_memb_alfa1_constr_3,
+		&ASN_PER_MEMB_ALFA1_CONSTR_3,
 		0,
 		"alfa1"
 		},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_alfa2_constraint_1,
-		&asn_PER_memb_alfa2_constr_4,
+		&ASN_PER_MEMB_ALFA2_CONSTR_4,
 		0,
 		"alfa2"
 		},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_alfa3_constraint_1,
-		&asn_PER_memb_alfa3_constr_5,
+		&ASN_PER_MEMB_ALFA3_CONSTR_5,
 		0,
 		"alfa3"
 		},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_beta0_constraint_1,
-		&asn_PER_memb_beta0_constr_6,
+		&ASN_PER_MEMB_BETA0_CONSTR_6,
 		0,
 		"beta0"
 		},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_beta1_constraint_1,
-		&asn_PER_memb_beta1_constr_7,
+		&ASN_PER_MEMB_BETA1_CONSTR_7,
 		0,
 		"beta1"
 		},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_beta2_constraint_1,
-		&asn_PER_memb_beta2_constr_8,
+		&ASN_PER_MEMB_BETA2_CONSTR_8,
 		0,
 		"beta2"
 		},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_IonosphericModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_beta3_constraint_1,
-		&asn_PER_memb_beta3_constr_9,
+		&ASN_PER_MEMB_BETA3_CONSTR_9,
 		0,
 		"beta3"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/LAC.c b/src/core/libs/supl/asn-rrlp/LAC.c
index e15942e24..d6de9a0ae 100644
--- a/src/core/libs/supl/asn-rrlp/LAC.c
+++ b/src/core/libs/supl/asn-rrlp/LAC.c
@@ -111,7 +111,7 @@ LAC_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_LAC_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_LAC_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_LAC = {
 	asn_DEF_LAC_tags_1,	/* Same as above */
 	sizeof(asn_DEF_LAC_tags_1)
 		/sizeof(asn_DEF_LAC_tags_1[0]), /* 1 */
-	&asn_PER_type_LAC_constr_1,
+	&ASN_PER_TYPE_LAC_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/LocErrorReason.c b/src/core/libs/supl/asn-rrlp/LocErrorReason.c
index 2d98516db..217112048 100644
--- a/src/core/libs/supl/asn-rrlp/LocErrorReason.c
+++ b/src/core/libs/supl/asn-rrlp/LocErrorReason.c
@@ -94,7 +94,7 @@ LocErrorReason_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_LocErrorReason_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_LOC_ERROR_REASON_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  4,  4,  0,  10 }	/* (0..10,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -164,7 +164,7 @@ asn_TYPE_descriptor_t asn_DEF_LocErrorReason = {
 	asn_DEF_LocErrorReason_tags_1,	/* Same as above */
 	sizeof(asn_DEF_LocErrorReason_tags_1)
 		/sizeof(asn_DEF_LocErrorReason_tags_1[0]), /* 1 */
-	&asn_PER_type_LocErrorReason_constr_1,
+	&ASN_PER_TYPE_LOC_ERROR_REASON_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_LocErrorReason_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/LocationInfo.c b/src/core/libs/supl/asn-rrlp/LocationInfo.c
index 92d0990f6..53a747679 100644
--- a/src/core/libs/supl/asn-rrlp/LocationInfo.c
+++ b/src/core/libs/supl/asn-rrlp/LocationInfo.c
@@ -56,12 +56,12 @@ memb_gpsTOW_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refFrame_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_gpsTOW_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOW_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 24, -1,  0,  14399999 }	/* (0..14399999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_LocationInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refFrame_constraint_1,
-		&asn_PER_memb_refFrame_constr_2,
+		&ASN_PER_MEMB_REF_FRAME_CONSTR_2,
 		0,
 		"refFrame"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_LocationInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gpsTOW_constraint_1,
-		&asn_PER_memb_gpsTOW_constr_3,
+		&ASN_PER_MEMB_GPS_TOW_CONSTR_3,
 		0,
 		"gpsTOW"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c b/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c
index 808aef74c..f46280af2 100644
--- a/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c
+++ b/src/core/libs/supl/asn-rrlp/MeasureResponseTime.c
@@ -111,7 +111,7 @@ MeasureResponseTime_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_MeasureResponseTime_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MEASURE_RESPONSE_TIME_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_MeasureResponseTime = {
 	asn_DEF_MeasureResponseTime_tags_1,	/* Same as above */
 	sizeof(asn_DEF_MeasureResponseTime_tags_1)
 		/sizeof(asn_DEF_MeasureResponseTime_tags_1[0]), /* 1 */
-	&asn_PER_type_MeasureResponseTime_constr_1,
+	&ASN_PER_TYPE_MEASURE_RESPONSE_TIME_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/MethodType.c b/src/core/libs/supl/asn-rrlp/MethodType.c
index 7a2b9ecfa..dc7782e8e 100644
--- a/src/core/libs/supl/asn-rrlp/MethodType.c
+++ b/src/core/libs/supl/asn-rrlp/MethodType.c
@@ -6,7 +6,7 @@
 
 #include "MethodType.h"
 
-static asn_per_constraints_t asn_PER_type_MethodType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_METHOD_TYPE_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -82,7 +82,7 @@ asn_TYPE_descriptor_t asn_DEF_MethodType = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_MethodType_constr_1,
+	&ASN_PER_TYPE_METHOD_TYPE_CONSTR_1,
 	asn_MBR_MethodType_1,
 	4,	/* Elements count */
 	&asn_SPC_MethodType_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c b/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c
index bf42ed64a..b14a2967f 100644
--- a/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c
+++ b/src/core/libs/supl/asn-rrlp/ModuloTimeSlot.c
@@ -111,7 +111,7 @@ ModuloTimeSlot_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_ModuloTimeSlot_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MODULO_TIME_SLOT_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_ModuloTimeSlot = {
 	asn_DEF_ModuloTimeSlot_tags_1,	/* Same as above */
 	sizeof(asn_DEF_ModuloTimeSlot_tags_1)
 		/sizeof(asn_DEF_ModuloTimeSlot_tags_1[0]), /* 1 */
-	&asn_PER_type_ModuloTimeSlot_constr_1,
+	&ASN_PER_TYPE_MODULO_TIME_SLOT_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c b/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c
index b2a849cb5..dd107752c 100644
--- a/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c
+++ b/src/core/libs/supl/asn-rrlp/MoreAssDataToBeSent.c
@@ -94,7 +94,7 @@ MoreAssDataToBeSent_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_MoreAssDataToBeSent_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MORE_ASS_DATA_TO_BE_SENT_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_MoreAssDataToBeSent = {
 	asn_DEF_MoreAssDataToBeSent_tags_1,	/* Same as above */
 	sizeof(asn_DEF_MoreAssDataToBeSent_tags_1)
 		/sizeof(asn_DEF_MoreAssDataToBeSent_tags_1[0]), /* 1 */
-	&asn_PER_type_MoreAssDataToBeSent_constr_1,
+	&ASN_PER_TYPE_MORE_ASS_DATA_TO_BE_SENT_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_MoreAssDataToBeSent_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/MpathIndic.c b/src/core/libs/supl/asn-rrlp/MpathIndic.c
index 8a1a0a280..67e26d4b0 100644
--- a/src/core/libs/supl/asn-rrlp/MpathIndic.c
+++ b/src/core/libs/supl/asn-rrlp/MpathIndic.c
@@ -94,7 +94,7 @@ MpathIndic_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_MpathIndic_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MPATH_INDIC_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_MpathIndic = {
 	asn_DEF_MpathIndic_tags_1,	/* Same as above */
 	sizeof(asn_DEF_MpathIndic_tags_1)
 		/sizeof(asn_DEF_MpathIndic_tags_1[0]), /* 1 */
-	&asn_PER_type_MpathIndic_constr_1,
+	&ASN_PER_TYPE_MPATH_INDIC_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_MpathIndic_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c b/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c
index 8d9149817..297d81b3f 100644
--- a/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c
+++ b/src/core/libs/supl/asn-rrlp/MultiFrameOffset.c
@@ -111,7 +111,7 @@ MultiFrameOffset_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_MultiFrameOffset_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MULTI_FRAME_OFFSET_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  51 }	/* (0..51) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_MultiFrameOffset = {
 	asn_DEF_MultiFrameOffset_tags_1,	/* Same as above */
 	sizeof(asn_DEF_MultiFrameOffset_tags_1)
 		/sizeof(asn_DEF_MultiFrameOffset_tags_1[0]), /* 1 */
-	&asn_PER_type_MultiFrameOffset_constr_1,
+	&ASN_PER_TYPE_MULTI_FRAME_OFFSET_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/MultipleSets.c b/src/core/libs/supl/asn-rrlp/MultipleSets.c
index cce55bd21..7199ac11d 100644
--- a/src/core/libs/supl/asn-rrlp/MultipleSets.c
+++ b/src/core/libs/supl/asn-rrlp/MultipleSets.c
@@ -56,12 +56,12 @@ memb_nbrOfReferenceBTSs_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_nbrOfSets_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_NBR_OF_SETS_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 1,  1,  2,  3 }	/* (2..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_nbrOfReferenceBTSs_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_NBR_OF_REFERENCE_BT_SS_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 2,  2,  1,  3 }	/* (1..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_MultipleSets_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_nbrOfSets_constraint_1,
-		&asn_PER_memb_nbrOfSets_constr_2,
+		&ASN_PER_MEMB_NBR_OF_SETS_CONSTR_2,
 		0,
 		"nbrOfSets"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_MultipleSets_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_nbrOfReferenceBTSs_constraint_1,
-		&asn_PER_memb_nbrOfReferenceBTSs_constr_3,
+		&ASN_PER_MEMB_NBR_OF_REFERENCE_BT_SS_CONSTR_3,
 		0,
 		"nbrOfReferenceBTSs"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c b/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c
index 1b2ae3a79..4dcb8a6ec 100644
--- a/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c
+++ b/src/core/libs/supl/asn-rrlp/NavModel-KeplerianSet.c
@@ -406,82 +406,82 @@ memb_keplerCuc_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_keplerToeLSB_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_TOE_LSB_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 9,  9,  0,  511 }	/* (0..511) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerW_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_W_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerDeltaN_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_DELTA_N_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerM0_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_M0_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerOmegaDot_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_OMEGA_DOT_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerELSB_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_ELSB_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 25, -1,  0,  33554431 }	/* (0..33554431) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerIDot_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_I_DOT_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 14,  14, -8192,  8191 }	/* (-8192..8191) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerAPowerHalfLSB_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_A_POWER_HALF_LSB_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 26, -1,  0,  67108863 }	/* (0..67108863) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerI0_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_I0_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerOmega0_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_OMEGA0_CONSTR_11 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerCrs_constr_12 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CRS_CONSTR_12 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerCis_constr_13 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CIS_CONSTR_13 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerCus_constr_14 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CUS_CONSTR_14 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerCrc_constr_15 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CRC_CONSTR_15 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerCic_constr_16 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CIC_CONSTR_16 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_keplerCuc_constr_17 = {
+static asn_per_constraints_t ASN_PER_MEMB_KEPLER_CUC_CONSTR_17 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -492,7 +492,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerToeLSB_constraint_1,
-		&asn_PER_memb_keplerToeLSB_constr_2,
+		&ASN_PER_MEMB_KEPLER_TOE_LSB_CONSTR_2,
 		0,
 		"keplerToeLSB"
 		},
@@ -501,7 +501,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerW_constraint_1,
-		&asn_PER_memb_keplerW_constr_3,
+		&ASN_PER_MEMB_KEPLER_W_CONSTR_3,
 		0,
 		"keplerW"
 		},
@@ -510,7 +510,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerDeltaN_constraint_1,
-		&asn_PER_memb_keplerDeltaN_constr_4,
+		&ASN_PER_MEMB_KEPLER_DELTA_N_CONSTR_4,
 		0,
 		"keplerDeltaN"
 		},
@@ -519,7 +519,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerM0_constraint_1,
-		&asn_PER_memb_keplerM0_constr_5,
+		&ASN_PER_MEMB_KEPLER_M0_CONSTR_5,
 		0,
 		"keplerM0"
 		},
@@ -528,7 +528,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerOmegaDot_constraint_1,
-		&asn_PER_memb_keplerOmegaDot_constr_6,
+		&ASN_PER_MEMB_KEPLER_OMEGA_DOT_CONSTR_6,
 		0,
 		"keplerOmegaDot"
 		},
@@ -537,7 +537,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerELSB_constraint_1,
-		&asn_PER_memb_keplerELSB_constr_7,
+		&ASN_PER_MEMB_KEPLER_ELSB_CONSTR_7,
 		0,
 		"keplerELSB"
 		},
@@ -546,7 +546,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerIDot_constraint_1,
-		&asn_PER_memb_keplerIDot_constr_8,
+		&ASN_PER_MEMB_KEPLER_I_DOT_CONSTR_8,
 		0,
 		"keplerIDot"
 		},
@@ -555,7 +555,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerAPowerHalfLSB_constraint_1,
-		&asn_PER_memb_keplerAPowerHalfLSB_constr_9,
+		&ASN_PER_MEMB_KEPLER_A_POWER_HALF_LSB_CONSTR_9,
 		0,
 		"keplerAPowerHalfLSB"
 		},
@@ -564,7 +564,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerI0_constraint_1,
-		&asn_PER_memb_keplerI0_constr_10,
+		&ASN_PER_MEMB_KEPLER_I0_CONSTR_10,
 		0,
 		"keplerI0"
 		},
@@ -573,7 +573,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerOmega0_constraint_1,
-		&asn_PER_memb_keplerOmega0_constr_11,
+		&ASN_PER_MEMB_KEPLER_OMEGA0_CONSTR_11,
 		0,
 		"keplerOmega0"
 		},
@@ -582,7 +582,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerCrs_constraint_1,
-		&asn_PER_memb_keplerCrs_constr_12,
+		&ASN_PER_MEMB_KEPLER_CRS_CONSTR_12,
 		0,
 		"keplerCrs"
 		},
@@ -591,7 +591,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerCis_constraint_1,
-		&asn_PER_memb_keplerCis_constr_13,
+		&ASN_PER_MEMB_KEPLER_CIS_CONSTR_13,
 		0,
 		"keplerCis"
 		},
@@ -600,7 +600,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerCus_constraint_1,
-		&asn_PER_memb_keplerCus_constr_14,
+		&ASN_PER_MEMB_KEPLER_CUS_CONSTR_14,
 		0,
 		"keplerCus"
 		},
@@ -609,7 +609,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerCrc_constraint_1,
-		&asn_PER_memb_keplerCrc_constr_15,
+		&ASN_PER_MEMB_KEPLER_CRC_CONSTR_15,
 		0,
 		"keplerCrc"
 		},
@@ -618,7 +618,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerCic_constraint_1,
-		&asn_PER_memb_keplerCic_constr_16,
+		&ASN_PER_MEMB_KEPLER_CIC_CONSTR_16,
 		0,
 		"keplerCic"
 		},
@@ -627,7 +627,7 @@ static asn_TYPE_member_t asn_MBR_NavModel_KeplerianSet_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_keplerCuc_constraint_1,
-		&asn_PER_memb_keplerCuc_constr_17,
+		&ASN_PER_MEMB_KEPLER_CUC_CONSTR_17,
 		0,
 		"keplerCuc"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/NeighborIdentity.c b/src/core/libs/supl/asn-rrlp/NeighborIdentity.c
index 624b5cec2..4c6a649bb 100644
--- a/src/core/libs/supl/asn-rrlp/NeighborIdentity.c
+++ b/src/core/libs/supl/asn-rrlp/NeighborIdentity.c
@@ -6,7 +6,7 @@
 
 #include "NeighborIdentity.h"
 
-static asn_per_constraints_t asn_PER_type_NeighborIdentity_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NEIGHBOR_IDENTITY_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  5 }	/* (0..5) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ asn_TYPE_descriptor_t asn_DEF_NeighborIdentity = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_NeighborIdentity_constr_1,
+	&ASN_PER_TYPE_NEIGHBOR_IDENTITY_CONSTR_1,
 	asn_MBR_NeighborIdentity_1,
 	6,	/* Elements count */
 	&asn_SPC_NeighborIdentity_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c b/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c
index 1f748f2cc..047b97557 100644
--- a/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c
+++ b/src/core/libs/supl/asn-rrlp/NumOfMeasurements.c
@@ -111,7 +111,7 @@ NumOfMeasurements_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_NumOfMeasurements_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NUM_OF_MEASUREMENTS_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_NumOfMeasurements = {
 	asn_DEF_NumOfMeasurements_tags_1,	/* Same as above */
 	sizeof(asn_DEF_NumOfMeasurements_tags_1)
 		/sizeof(asn_DEF_NumOfMeasurements_tags_1[0]), /* 1 */
-	&asn_PER_type_NumOfMeasurements_constr_1,
+	&ASN_PER_TYPE_NUM_OF_MEASUREMENTS_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/OCTET_STRING.c b/src/core/libs/supl/asn-rrlp/OCTET_STRING.c
index bd2d1d845..98aebb3bf 100644
--- a/src/core/libs/supl/asn-rrlp/OCTET_STRING.c
+++ b/src/core/libs/supl/asn-rrlp/OCTET_STRING.c
@@ -19,7 +19,7 @@ static asn_OCTET_STRING_specifics_t asn_DEF_OCTET_STRING_specs = {
 	offsetof(OCTET_STRING_t, _asn_ctx),
 	ASN_OSUBV_STR
 };
-static asn_per_constraints_t asn_DEF_OCTET_STRING_constraints = {
+static asn_per_constraints_t ASN_DEF_OCTET_STRING_CONSTRAINTS = {
 	{ APC_CONSTRAINED, 8, 8, 0, 255 },
 	{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 },
 	0, 0
@@ -1351,8 +1351,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
 		cval = &pc->value;
 		csiz = &pc->size;
 	} else {
-		cval = &asn_DEF_OCTET_STRING_constraints.value;
-		csiz = &asn_DEF_OCTET_STRING_constraints.size;
+		cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+		csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
 	}
 
 	switch(specs->subvariant) {
@@ -1400,8 +1400,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
 		int inext = per_get_few_bits(pd, 1);
 		if(inext < 0) RETURN(RC_WMORE);
 		if(inext) {
-			csiz = &asn_DEF_OCTET_STRING_constraints.size;
-			cval = &asn_DEF_OCTET_STRING_constraints.value;
+			csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
+			cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
 			unit_bits = canonical_unit_bits;
 		}
 	}
@@ -1526,8 +1526,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
 		cval = &pc->value;
 		csiz = &pc->size;
 	} else {
-		cval = &asn_DEF_OCTET_STRING_constraints.value;
-		csiz = &asn_DEF_OCTET_STRING_constraints.size;
+		cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+		csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
 	}
 	ct_extensible = csiz->flags & APC_EXTENSIBLE;
 
@@ -1577,8 +1577,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
 		if((int)sizeinunits < csiz->lower_bound
 		|| (int)sizeinunits > csiz->upper_bound) {
 			if(ct_extensible) {
-				cval = &asn_DEF_OCTET_STRING_constraints.value;
-				csiz = &asn_DEF_OCTET_STRING_constraints.size;
+				cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+				csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
 				unit_bits = canonical_unit_bits;
 				inext = 1;
 			} else
diff --git a/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c b/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c
index 5a55a2d96..a61d02dc6 100644
--- a/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c
+++ b/src/core/libs/supl/asn-rrlp/OTD-MsrElementFirst.c
@@ -56,12 +56,12 @@ memb_taCorrection_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refFrameNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  42431 }	/* (0..42431) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_taCorrection_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_TA_CORRECTION_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  960 }	/* (0..960) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementFirst_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refFrameNumber_constraint_1,
-		&asn_PER_memb_refFrameNumber_constr_2,
+		&ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2,
 		0,
 		"refFrameNumber"
 		},
@@ -108,7 +108,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementFirst_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_taCorrection_constraint_1,
-		&asn_PER_memb_taCorrection_constr_6,
+		&ASN_PER_MEMB_TA_CORRECTION_CONSTR_6,
 		0,
 		"taCorrection"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c b/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c
index d779dab1d..ad523960e 100644
--- a/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c
+++ b/src/core/libs/supl/asn-rrlp/OTD-MsrElementRest.c
@@ -56,12 +56,12 @@ memb_taCorrection_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refFrameNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  42431 }	/* (0..42431) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_taCorrection_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_TA_CORRECTION_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  960 }	/* (0..960) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementRest_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refFrameNumber_constraint_1,
-		&asn_PER_memb_refFrameNumber_constr_2,
+		&ASN_PER_MEMB_REF_FRAME_NUMBER_CONSTR_2,
 		0,
 		"refFrameNumber"
 		},
@@ -108,7 +108,7 @@ static asn_TYPE_member_t asn_MBR_OTD_MsrElementRest_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_taCorrection_constraint_1,
-		&asn_PER_memb_taCorrection_constr_6,
+		&ASN_PER_MEMB_TA_CORRECTION_CONSTR_6,
 		0,
 		"taCorrection"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c b/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c
index a331cc268..d018129ab 100644
--- a/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c
+++ b/src/core/libs/supl/asn-rrlp/OTD-MsrsOfOtherSets.c
@@ -6,7 +6,7 @@
 
 #include "OTD-MsrsOfOtherSets.h"
 
-static asn_per_constraints_t asn_PER_type_OTD_MsrsOfOtherSets_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_OTD_MSRS_OF_OTHER_SETS_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_OTD_MsrsOfOtherSets = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_OTD_MsrsOfOtherSets_constr_1,
+	&ASN_PER_TYPE_OTD_MSRS_OF_OTHER_SETS_CONSTR_1,
 	asn_MBR_OTD_MsrsOfOtherSets_1,
 	2,	/* Elements count */
 	&asn_SPC_OTD_MsrsOfOtherSets_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/OTDValue.c b/src/core/libs/supl/asn-rrlp/OTDValue.c
index 28ae50d85..4f837f8c9 100644
--- a/src/core/libs/supl/asn-rrlp/OTDValue.c
+++ b/src/core/libs/supl/asn-rrlp/OTDValue.c
@@ -111,7 +111,7 @@ OTDValue_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_OTDValue_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_OTD_VALUE_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  39999 }	/* (0..39999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_OTDValue = {
 	asn_DEF_OTDValue_tags_1,	/* Same as above */
 	sizeof(asn_DEF_OTDValue_tags_1)
 		/sizeof(asn_DEF_OTDValue_tags_1[0]), /* 1 */
-	&asn_PER_type_OTDValue_constr_1,
+	&ASN_PER_TYPE_OTD_VALUE_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/PDU.c b/src/core/libs/supl/asn-rrlp/PDU.c
index ae0cceeed..bf4708ddd 100644
--- a/src/core/libs/supl/asn-rrlp/PDU.c
+++ b/src/core/libs/supl/asn-rrlp/PDU.c
@@ -31,7 +31,7 @@ memb_referenceNumber_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_referenceNumber_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_NUMBER_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_PDU_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_referenceNumber_constraint_1,
-		&asn_PER_memb_referenceNumber_constr_2,
+		&ASN_PER_MEMB_REFERENCE_NUMBER_CONSTR_2,
 		0,
 		"referenceNumber"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/PositionData.c b/src/core/libs/supl/asn-rrlp/PositionData.c
index 7f53011b8..249c4bf46 100644
--- a/src/core/libs/supl/asn-rrlp/PositionData.c
+++ b/src/core/libs/supl/asn-rrlp/PositionData.c
@@ -117,7 +117,7 @@ PositionData_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_PositionData_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POSITION_DATA_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  3,  16 }	/* (SIZE(3..16)) */,
 	0, 0	/* No PER value map */
@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_PositionData = {
 	asn_DEF_PositionData_tags_1,	/* Same as above */
 	sizeof(asn_DEF_PositionData_tags_1)
 		/sizeof(asn_DEF_PositionData_tags_1[0]), /* 1 */
-	&asn_PER_type_PositionData_constr_1,
+	&ASN_PER_TYPE_POSITION_DATA_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/PositionMethod.c b/src/core/libs/supl/asn-rrlp/PositionMethod.c
index 07e07f2a3..b1c3df488 100644
--- a/src/core/libs/supl/asn-rrlp/PositionMethod.c
+++ b/src/core/libs/supl/asn-rrlp/PositionMethod.c
@@ -94,7 +94,7 @@ PositionMethod_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_PositionMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POSITION_METHOD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  2 }	/* (0..2) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -140,7 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_PositionMethod = {
 	asn_DEF_PositionMethod_tags_1,	/* Same as above */
 	sizeof(asn_DEF_PositionMethod_tags_1)
 		/sizeof(asn_DEF_PositionMethod_tags_1[0]), /* 1 */
-	&asn_PER_type_PositionMethod_constr_1,
+	&ASN_PER_TYPE_POSITION_METHOD_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_PositionMethod_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/RRLP-Component.c b/src/core/libs/supl/asn-rrlp/RRLP-Component.c
index e587f7de4..fe8f448a7 100644
--- a/src/core/libs/supl/asn-rrlp/RRLP-Component.c
+++ b/src/core/libs/supl/asn-rrlp/RRLP-Component.c
@@ -6,7 +6,7 @@
 
 #include "RRLP-Component.h"
 
-static asn_per_constraints_t asn_PER_type_RRLP_Component_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_RRLP_COMPONENT_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  4 }	/* (0..4,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -92,7 +92,7 @@ asn_TYPE_descriptor_t asn_DEF_RRLP_Component = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_RRLP_Component_constr_1,
+	&ASN_PER_TYPE_RRLP_COMPONENT_CONSTR_1,
 	asn_MBR_RRLP_Component_1,
 	5,	/* Elements count */
 	&asn_SPC_RRLP_Component_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/RefQuality.c b/src/core/libs/supl/asn-rrlp/RefQuality.c
index f64877ef4..0b4fd5c23 100644
--- a/src/core/libs/supl/asn-rrlp/RefQuality.c
+++ b/src/core/libs/supl/asn-rrlp/RefQuality.c
@@ -111,7 +111,7 @@ RefQuality_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_RefQuality_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REF_QUALITY_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RefQuality = {
 	asn_DEF_RefQuality_tags_1,	/* Same as above */
 	sizeof(asn_DEF_RefQuality_tags_1)
 		/sizeof(asn_DEF_RefQuality_tags_1[0]), /* 1 */
-	&asn_PER_type_RefQuality_constr_1,
+	&ASN_PER_TYPE_REF_QUALITY_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/ReferenceFrame.c b/src/core/libs/supl/asn-rrlp/ReferenceFrame.c
index 56c1bbc50..96d482637 100644
--- a/src/core/libs/supl/asn-rrlp/ReferenceFrame.c
+++ b/src/core/libs/supl/asn-rrlp/ReferenceFrame.c
@@ -56,12 +56,12 @@ memb_referenceFNMSB_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_referenceFN_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_FN_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_referenceFNMSB_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REFERENCE_FNMSB_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_ReferenceFrame_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_referenceFN_constraint_1,
-		&asn_PER_memb_referenceFN_constr_2,
+		&ASN_PER_MEMB_REFERENCE_FN_CONSTR_2,
 		0,
 		"referenceFN"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_ReferenceFrame_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_referenceFNMSB_constraint_1,
-		&asn_PER_memb_referenceFNMSB_constr_3,
+		&ASN_PER_MEMB_REFERENCE_FNMSB_CONSTR_3,
 		0,
 		"referenceFNMSB"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c b/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c
index d36515591..95e47ecb4 100644
--- a/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c
+++ b/src/core/libs/supl/asn-rrlp/ReferenceIdentityType.c
@@ -6,7 +6,7 @@
 
 #include "ReferenceIdentityType.h"
 
-static asn_per_constraints_t asn_PER_type_ReferenceIdentityType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REFERENCE_IDENTITY_TYPE_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  4 }	/* (0..4) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -92,7 +92,7 @@ asn_TYPE_descriptor_t asn_DEF_ReferenceIdentityType = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_ReferenceIdentityType_constr_1,
+	&ASN_PER_TYPE_REFERENCE_IDENTITY_TYPE_CONSTR_1,
 	asn_MBR_ReferenceIdentityType_1,
 	5,	/* Elements count */
 	&asn_SPC_ReferenceIdentityType_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/ReferenceRelation.c b/src/core/libs/supl/asn-rrlp/ReferenceRelation.c
index 931e2c477..c4497a860 100644
--- a/src/core/libs/supl/asn-rrlp/ReferenceRelation.c
+++ b/src/core/libs/supl/asn-rrlp/ReferenceRelation.c
@@ -94,7 +94,7 @@ ReferenceRelation_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_ReferenceRelation_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REFERENCE_RELATION_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  2 }	/* (0..2) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -140,7 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_ReferenceRelation = {
 	asn_DEF_ReferenceRelation_tags_1,	/* Same as above */
 	sizeof(asn_DEF_ReferenceRelation_tags_1)
 		/sizeof(asn_DEF_ReferenceRelation_tags_1[0]), /* 1 */
-	&asn_PER_type_ReferenceRelation_constr_1,
+	&ASN_PER_TYPE_REFERENCE_RELATION_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_ReferenceRelation_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/RelDistance.c b/src/core/libs/supl/asn-rrlp/RelDistance.c
index a444e3f70..8273278e4 100644
--- a/src/core/libs/supl/asn-rrlp/RelDistance.c
+++ b/src/core/libs/supl/asn-rrlp/RelDistance.c
@@ -111,7 +111,7 @@ RelDistance_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_RelDistance_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REL_DISTANCE_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 19, -1, -200000,  200000 }	/* (-200000..200000) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RelDistance = {
 	asn_DEF_RelDistance_tags_1,	/* Same as above */
 	sizeof(asn_DEF_RelDistance_tags_1)
 		/sizeof(asn_DEF_RelDistance_tags_1[0]), /* 1 */
-	&asn_PER_type_RelDistance_constr_1,
+	&ASN_PER_TYPE_REL_DISTANCE_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/RelativeAlt.c b/src/core/libs/supl/asn-rrlp/RelativeAlt.c
index c65d44aa1..78cc612e4 100644
--- a/src/core/libs/supl/asn-rrlp/RelativeAlt.c
+++ b/src/core/libs/supl/asn-rrlp/RelativeAlt.c
@@ -111,7 +111,7 @@ RelativeAlt_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_RelativeAlt_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_RELATIVE_ALT_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 13,  13, -4000,  4000 }	/* (-4000..4000) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RelativeAlt = {
 	asn_DEF_RelativeAlt_tags_1,	/* Same as above */
 	sizeof(asn_DEF_RelativeAlt_tags_1)
 		/sizeof(asn_DEF_RelativeAlt_tags_1[0]), /* 1 */
-	&asn_PER_type_RelativeAlt_constr_1,
+	&ASN_PER_TYPE_RELATIVE_ALT_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/RequestIndex.c b/src/core/libs/supl/asn-rrlp/RequestIndex.c
index 6d481f20f..f238a32f6 100644
--- a/src/core/libs/supl/asn-rrlp/RequestIndex.c
+++ b/src/core/libs/supl/asn-rrlp/RequestIndex.c
@@ -111,7 +111,7 @@ RequestIndex_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_RequestIndex_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REQUEST_INDEX_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (1..16) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RequestIndex = {
 	asn_DEF_RequestIndex_tags_1,	/* Same as above */
 	sizeof(asn_DEF_RequestIndex_tags_1)
 		/sizeof(asn_DEF_RequestIndex_tags_1[0]), /* 1 */
-	&asn_PER_type_RequestIndex_constr_1,
+	&ASN_PER_TYPE_REQUEST_INDEX_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c b/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c
index 52aff059d..89fd8b230 100644
--- a/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c
+++ b/src/core/libs/supl/asn-rrlp/RequiredResponseTime.c
@@ -111,7 +111,7 @@ RequiredResponseTime_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_RequiredResponseTime_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_REQUIRED_RESPONSE_TIME_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  1,  128 }	/* (1..128) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RequiredResponseTime = {
 	asn_DEF_RequiredResponseTime_tags_1,	/* Same as above */
 	sizeof(asn_DEF_RequiredResponseTime_tags_1)
 		/sizeof(asn_DEF_RequiredResponseTime_tags_1[0]), /* 1 */
-	&asn_PER_type_RequiredResponseTime_constr_1,
+	&ASN_PER_TYPE_REQUIRED_RESPONSE_TIME_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/RoughRTD.c b/src/core/libs/supl/asn-rrlp/RoughRTD.c
index db420b619..d9222b869 100644
--- a/src/core/libs/supl/asn-rrlp/RoughRTD.c
+++ b/src/core/libs/supl/asn-rrlp/RoughRTD.c
@@ -111,7 +111,7 @@ RoughRTD_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_RoughRTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ROUGH_RTD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 11,  11,  0,  1250 }	/* (0..1250) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_RoughRTD = {
 	asn_DEF_RoughRTD_tags_1,	/* Same as above */
 	sizeof(asn_DEF_RoughRTD_tags_1)
 		/sizeof(asn_DEF_RoughRTD_tags_1[0]), /* 1 */
-	&asn_PER_type_RoughRTD_constr_1,
+	&ASN_PER_TYPE_ROUGH_RTD_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/SVID.c b/src/core/libs/supl/asn-rrlp/SVID.c
index 5a9adbd3a..ab082f9c0 100644
--- a/src/core/libs/supl/asn-rrlp/SVID.c
+++ b/src/core/libs/supl/asn-rrlp/SVID.c
@@ -111,7 +111,7 @@ SVID_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_SVID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SVID_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SVID = {
 	asn_DEF_SVID_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SVID_tags_1)
 		/sizeof(asn_DEF_SVID_tags_1[0]), /* 1 */
-	&asn_PER_type_SVID_constr_1,
+	&ASN_PER_TYPE_SVID_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/SVIDMASK.c b/src/core/libs/supl/asn-rrlp/SVIDMASK.c
index 7c2c1a590..9791443d6 100644
--- a/src/core/libs/supl/asn-rrlp/SVIDMASK.c
+++ b/src/core/libs/supl/asn-rrlp/SVIDMASK.c
@@ -117,7 +117,7 @@ SVIDMASK_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_SVIDMASK_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SVIDMASK_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  36 }	/* (SIZE(1..36)) */,
 	0, 0	/* No PER value map */
@@ -144,7 +144,7 @@ asn_TYPE_descriptor_t asn_DEF_SVIDMASK = {
 	asn_DEF_SVIDMASK_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SVIDMASK_tags_1)
 		/sizeof(asn_DEF_SVIDMASK_tags_1[0]), /* 1 */
-	&asn_PER_type_SVIDMASK_constr_1,
+	&ASN_PER_TYPE_SVIDMASK_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/SatElement.c b/src/core/libs/supl/asn-rrlp/SatElement.c
index 5a3eaf8e1..bab8b9de3 100644
--- a/src/core/libs/supl/asn-rrlp/SatElement.c
+++ b/src/core/libs/supl/asn-rrlp/SatElement.c
@@ -206,42 +206,42 @@ memb_deltaRangeRateCor3_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_iode_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IODE_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  239 }	/* (0..239) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_udre_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UDRE_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_pseudoRangeCor_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 12,  12, -2047,  2047 }	/* (-2047..2047) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_rangeRateCor_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 8,  8, -127,  127 }	/* (-127..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_deltaPseudoRangeCor2_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR2_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 8,  8, -127,  127 }	/* (-127..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_deltaRangeRateCor2_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_RANGE_RATE_COR2_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 4,  4, -7,  7 }	/* (-7..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_deltaPseudoRangeCor3_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR3_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 8,  8, -127,  127 }	/* (-127..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_deltaRangeRateCor3_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELTA_RANGE_RATE_COR3_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 4,  4, -7,  7 }	/* (-7..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_iode_constraint_1,
-		&asn_PER_memb_iode_constr_3,
+		&ASN_PER_MEMB_IODE_CONSTR_3,
 		0,
 		"iode"
 		},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_udre_constraint_1,
-		&asn_PER_memb_udre_constr_4,
+		&ASN_PER_MEMB_UDRE_CONSTR_4,
 		0,
 		"udre"
 		},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_pseudoRangeCor_constraint_1,
-		&asn_PER_memb_pseudoRangeCor_constr_5,
+		&ASN_PER_MEMB_PSEUDO_RANGE_COR_CONSTR_5,
 		0,
 		"pseudoRangeCor"
 		},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_rangeRateCor_constraint_1,
-		&asn_PER_memb_rangeRateCor_constr_6,
+		&ASN_PER_MEMB_RANGE_RATE_COR_CONSTR_6,
 		0,
 		"rangeRateCor"
 		},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_deltaPseudoRangeCor2_constraint_1,
-		&asn_PER_memb_deltaPseudoRangeCor2_constr_7,
+		&ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR2_CONSTR_7,
 		0,
 		"deltaPseudoRangeCor2"
 		},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_deltaRangeRateCor2_constraint_1,
-		&asn_PER_memb_deltaRangeRateCor2_constr_8,
+		&ASN_PER_MEMB_DELTA_RANGE_RATE_COR2_CONSTR_8,
 		0,
 		"deltaRangeRateCor2"
 		},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_deltaPseudoRangeCor3_constraint_1,
-		&asn_PER_memb_deltaPseudoRangeCor3_constr_9,
+		&ASN_PER_MEMB_DELTA_PSEUDO_RANGE_COR3_CONSTR_9,
 		0,
 		"deltaPseudoRangeCor3"
 		},
@@ -324,7 +324,7 @@ static asn_TYPE_member_t asn_MBR_SatElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_deltaRangeRateCor3_constraint_1,
-		&asn_PER_memb_deltaRangeRateCor3_constr_10,
+		&ASN_PER_MEMB_DELTA_RANGE_RATE_COR3_CONSTR_10,
 		0,
 		"deltaRangeRateCor3"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/SatStatus.c b/src/core/libs/supl/asn-rrlp/SatStatus.c
index b92afe853..4f7306873 100644
--- a/src/core/libs/supl/asn-rrlp/SatStatus.c
+++ b/src/core/libs/supl/asn-rrlp/SatStatus.c
@@ -6,7 +6,7 @@
 
 #include "SatStatus.h"
 
-static asn_per_constraints_t asn_PER_type_SatStatus_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SAT_STATUS_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ asn_TYPE_descriptor_t asn_DEF_SatStatus = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_SatStatus_constr_1,
+	&ASN_PER_TYPE_SAT_STATUS_CONSTR_1,
 	asn_MBR_SatStatus_1,
 	3,	/* Elements count */
 	&asn_SPC_SatStatus_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SatelliteID.c b/src/core/libs/supl/asn-rrlp/SatelliteID.c
index 84951ec1a..9d95fda67 100644
--- a/src/core/libs/supl/asn-rrlp/SatelliteID.c
+++ b/src/core/libs/supl/asn-rrlp/SatelliteID.c
@@ -111,7 +111,7 @@ SatelliteID_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_SatelliteID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SATELLITE_ID_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SatelliteID = {
 	asn_DEF_SatelliteID_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SatelliteID_tags_1)
 		/sizeof(asn_DEF_SatelliteID_tags_1[0]), /* 1 */
-	&asn_PER_type_SatelliteID_constr_1,
+	&ASN_PER_TYPE_SATELLITE_ID_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c b/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c
index 7425bba8d..867b4dbae 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOf-BadSatelliteSet.c
@@ -6,7 +6,7 @@
 
 #include "SeqOf-BadSatelliteSet.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOf_BadSatelliteSet_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_BAD_SATELLITE_SET_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOf_BadSatelliteSet = {
 	asn_DEF_SeqOf_BadSatelliteSet_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOf_BadSatelliteSet_tags_1)
 		/sizeof(asn_DEF_SeqOf_BadSatelliteSet_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOf_BadSatelliteSet_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_BAD_SATELLITE_SET_CONSTR_1,
 	asn_MBR_SeqOf_BadSatelliteSet_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOf_BadSatelliteSet_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c b/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c
index 2347dbef1..c613f6ea8 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOf-GANSSDataBits.c
@@ -6,7 +6,7 @@
 
 #include "SeqOf-GANSSDataBits.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOf_GANSSDataBits_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_DATA_BITS_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 10,  10,  1,  1024 }	/* (SIZE(1..1024)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOf_GANSSDataBits = {
 	asn_DEF_SeqOf_GANSSDataBits_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOf_GANSSDataBits_tags_1)
 		/sizeof(asn_DEF_SeqOf_GANSSDataBits_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOf_GANSSDataBits_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_DATA_BITS_CONSTR_1,
 	asn_MBR_SeqOf_GANSSDataBits_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOf_GANSSDataBits_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c b/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c
index 4084ecaf0..a52a77112 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfAcquisElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfAcquisElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfAcquisElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_ACQUIS_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfAcquisElement = {
 	asn_DEF_SeqOfAcquisElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfAcquisElement_tags_1)
 		/sizeof(asn_DEF_SeqOfAcquisElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfAcquisElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_ACQUIS_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfAcquisElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfAcquisElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c b/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c
index 33843ff27..3d030ddc1 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfAlmanacElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfAlmanacElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfAlmanacElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_ALMANAC_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  64 }	/* (SIZE(1..64)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfAlmanacElement = {
 	asn_DEF_SeqOfAlmanacElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfAlmanacElement_tags_1)
 		/sizeof(asn_DEF_SeqOfAlmanacElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfAlmanacElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_ALMANAC_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfAlmanacElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfAlmanacElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c b/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c
index 1e77ca7ff..61e5d3c6f 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfBadSignalElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfBadSignalElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfBadSignalElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_BAD_SIGNAL_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfBadSignalElement = {
 	asn_DEF_SeqOfBadSignalElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfBadSignalElement_tags_1)
 		/sizeof(asn_DEF_SeqOfBadSignalElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfBadSignalElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_BAD_SIGNAL_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfBadSignalElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfBadSignalElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c b/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c
index e65dcad05..d53e83fe1 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfDGANSSSgnElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfDGANSSSgnElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfDGANSSSgnElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_DGANSS_SGN_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfDGANSSSgnElement = {
 	asn_DEF_SeqOfDGANSSSgnElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfDGANSSSgnElement_tags_1)
 		/sizeof(asn_DEF_SeqOfDGANSSSgnElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfDGANSSSgnElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_DGANSS_SGN_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfDGANSSSgnElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfDGANSSSgnElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c
index 689475fdd..066acec5a 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-MsrSetElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSS-MsrSetElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSS_MsrSetElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_MSR_SET_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 2,  2,  1,  3 }	/* (SIZE(1..3)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSS_MsrSetElement = {
 	asn_DEF_SeqOfGANSS_MsrSetElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSS_MsrSetElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSS_MsrSetElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSS_MsrSetElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_MSR_SET_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSS_MsrSetElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSS_MsrSetElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c
index 8543904c5..e77545690 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSS-SgnElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSS_SgnElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_SGN_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSS_SgnElement = {
 	asn_DEF_SeqOfGANSS_SgnElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSS_SgnElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSS_SgnElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSS_SgnElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_SGN_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSS_SgnElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSS_SgnElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c
index 706d36493..4144d9ae6 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSS-SgnTypeElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSS-SgnTypeElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSS_SgnTypeElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_SGN_TYPE_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 3,  3,  1,  6 }	/* (SIZE(1..6)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSS_SgnTypeElement = {
 	asn_DEF_SeqOfGANSS_SgnTypeElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSS_SgnTypeElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSS_SgnTypeElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSS_SgnTypeElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_SGN_TYPE_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSS_SgnTypeElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSS_SgnTypeElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c
index 1b6a339f8..18eb57152 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSAlmanacElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSSAlmanacElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSAlmanacElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_ALMANAC_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  36 }	/* (SIZE(1..36)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSAlmanacElement = {
 	asn_DEF_SeqOfGANSSAlmanacElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSSAlmanacElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSSAlmanacElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSSAlmanacElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_ALMANAC_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSSAlmanacElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSSAlmanacElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c
index 737ab2623..56bdf4074 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSGenericAssistDataElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSSGenericAssistDataElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSGenericAssistDataElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_GENERIC_ASSIST_DATA_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 3,  3,  1,  8 }	/* (SIZE(1..8)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSGenericAssistDataElement = {
 	asn_DEF_SeqOfGANSSGenericAssistDataElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSSGenericAssistDataElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSSGenericAssistDataElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSSGenericAssistDataElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_GENERIC_ASSIST_DATA_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSSGenericAssistDataElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSSGenericAssistDataElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c
index 8e9a1bf16..f38140eec 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSRefMeasurementElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSSRefMeasurementElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSRefMeasurementElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_REF_MEASUREMENT_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSRefMeasurementElement = {
 	asn_DEF_SeqOfGANSSRefMeasurementElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSSRefMeasurementElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSSRefMeasurementElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSSRefMeasurementElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_REF_MEASUREMENT_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSSRefMeasurementElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSSRefMeasurementElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c
index 5c9c95fa5..21c130866 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSSatelliteElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSSSatelliteElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSSatelliteElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_SATELLITE_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 5,  5,  1,  32 }	/* (SIZE(1..32)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSSatelliteElement = {
 	asn_DEF_SeqOfGANSSSatelliteElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSSSatelliteElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSSSatelliteElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSSSatelliteElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_SATELLITE_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGANSSSatelliteElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSSSatelliteElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c b/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c
index d3a923f23..e3341bd4d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGANSSTimeModel.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGANSSTimeModel.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGANSSTimeModel_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GANSS_TIME_MODEL_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 3,  3,  1,  7 }	/* (SIZE(1..7)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGANSSTimeModel = {
 	asn_DEF_SeqOfGANSSTimeModel_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGANSSTimeModel_tags_1)
 		/sizeof(asn_DEF_SeqOfGANSSTimeModel_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGANSSTimeModel_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GANSS_TIME_MODEL_CONSTR_1,
 	asn_MBR_SeqOfGANSSTimeModel_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGANSSTimeModel_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c
index c66328606..16637c8b6 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGPS-MsrElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGPS_MsrElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GPS_MSR_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGPS_MsrElement = {
 	asn_DEF_SeqOfGPS_MsrElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGPS_MsrElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGPS_MsrElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGPS_MsrElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GPS_MSR_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGPS_MsrElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGPS_MsrElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c
index b9f6297a5..ab5c3a559 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfGPS-MsrSetElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfGPS-MsrSetElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfGPS_MsrSetElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_GPS_MSR_SET_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 2,  2,  1,  3 }	/* (SIZE(1..3)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfGPS_MsrSetElement = {
 	asn_DEF_SeqOfGPS_MsrSetElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfGPS_MsrSetElement_tags_1)
 		/sizeof(asn_DEF_SeqOfGPS_MsrSetElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfGPS_MsrSetElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_GPS_MSR_SET_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfGPS_MsrSetElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfGPS_MsrSetElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c
index 15f1cefff..60bd0348d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS-R98-ExpOTD.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfMsrAssistBTS-R98-ExpOTD.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfMsrAssistBTS_R98_ExpOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_R98_EXP_OTD_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  15 }	/* (SIZE(1..15)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD = {
 	asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD_tags_1)
 		/sizeof(asn_DEF_SeqOfMsrAssistBTS_R98_ExpOTD_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfMsrAssistBTS_R98_ExpOTD_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_R98_EXP_OTD_CONSTR_1,
 	asn_MBR_SeqOfMsrAssistBTS_R98_ExpOTD_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfMsrAssistBTS_R98_ExpOTD_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c
index fb1b5638e..27bff4abf 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfMsrAssistBTS.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfMsrAssistBTS.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfMsrAssistBTS_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  15 }	/* (SIZE(1..15)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfMsrAssistBTS = {
 	asn_DEF_SeqOfMsrAssistBTS_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfMsrAssistBTS_tags_1)
 		/sizeof(asn_DEF_SeqOfMsrAssistBTS_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfMsrAssistBTS_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_MSR_ASSIST_BTS_CONSTR_1,
 	asn_MBR_SeqOfMsrAssistBTS_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfMsrAssistBTS_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c b/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c
index d28ec04a2..1606f1a20 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfNavModelElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfNavModelElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfNavModelElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_NAV_MODEL_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfNavModelElement = {
 	asn_DEF_SeqOfNavModelElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfNavModelElement_tags_1)
 		/sizeof(asn_DEF_SeqOfNavModelElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfNavModelElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_NAV_MODEL_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfNavModelElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfNavModelElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c
index ace76ee1a..5e2bb795d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs-R98-Ext.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfOTD-FirstSetMsrs-R98-Ext.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_FirstSetMsrs_R98_Ext_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_R98_EXT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 3,  3,  1,  5 }	/* (SIZE(1..5)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext = {
 	asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext_tags_1)
 		/sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_R98_Ext_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfOTD_FirstSetMsrs_R98_Ext_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_R98_EXT_CONSTR_1,
 	asn_MBR_SeqOfOTD_FirstSetMsrs_R98_Ext_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfOTD_FirstSetMsrs_R98_Ext_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c
index d3f9263f8..bfebd113d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-FirstSetMsrs.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfOTD-FirstSetMsrs.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_FirstSetMsrs_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  10 }	/* (SIZE(1..10)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_FirstSetMsrs = {
 	asn_DEF_SeqOfOTD_FirstSetMsrs_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_tags_1)
 		/sizeof(asn_DEF_SeqOfOTD_FirstSetMsrs_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfOTD_FirstSetMsrs_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_OTD_FIRST_SET_MSRS_CONSTR_1,
 	asn_MBR_SeqOfOTD_FirstSetMsrs_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfOTD_FirstSetMsrs_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c
index 27c86b0a5..dae155d61 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrElementRest.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfOTD-MsrElementRest.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_MsrElementRest_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_MSR_ELEMENT_REST_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 1,  1,  1,  2 }	/* (SIZE(1..2)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_MsrElementRest = {
 	asn_DEF_SeqOfOTD_MsrElementRest_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfOTD_MsrElementRest_tags_1)
 		/sizeof(asn_DEF_SeqOfOTD_MsrElementRest_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfOTD_MsrElementRest_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_OTD_MSR_ELEMENT_REST_CONSTR_1,
 	asn_MBR_SeqOfOTD_MsrElementRest_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfOTD_MsrElementRest_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c
index 51b804707..2c7b3b47d 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfOTD-MsrsOfOtherSets.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfOTD-MsrsOfOtherSets.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfOTD_MsrsOfOtherSets_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_OTD_MSRS_OF_OTHER_SETS_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  10 }	/* (SIZE(1..10)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfOTD_MsrsOfOtherSets = {
 	asn_DEF_SeqOfOTD_MsrsOfOtherSets_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfOTD_MsrsOfOtherSets_tags_1)
 		/sizeof(asn_DEF_SeqOfOTD_MsrsOfOtherSets_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfOTD_MsrsOfOtherSets_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_OTD_MSRS_OF_OTHER_SETS_CONSTR_1,
 	asn_MBR_SeqOfOTD_MsrsOfOtherSets_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfOTD_MsrsOfOtherSets_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c b/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c
index e02edb83c..9e55174be 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfReferenceIdentityType.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfReferenceIdentityType.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfReferenceIdentityType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_REFERENCE_IDENTITY_TYPE_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 2,  2,  1,  3 }	/* (SIZE(1..3)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfReferenceIdentityType = {
 	asn_DEF_SeqOfReferenceIdentityType_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfReferenceIdentityType_tags_1)
 		/sizeof(asn_DEF_SeqOfReferenceIdentityType_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfReferenceIdentityType_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_REFERENCE_IDENTITY_TYPE_CONSTR_1,
 	asn_MBR_SeqOfReferenceIdentityType_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfReferenceIdentityType_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c b/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c
index c70089990..2e8aaa42c 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSatElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfSatElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfSatElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SAT_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  16 }	/* (SIZE(1..16)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSatElement = {
 	asn_DEF_SeqOfSatElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfSatElement_tags_1)
 		/sizeof(asn_DEF_SeqOfSatElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfSatElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_SAT_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfSatElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfSatElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c b/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c
index 36a8f243a..23920f7fc 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSgnTypeElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfSgnTypeElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfSgnTypeElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SGN_TYPE_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 2,  2,  1,  3 }	/* (SIZE(1..3)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSgnTypeElement = {
 	asn_DEF_SeqOfSgnTypeElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfSgnTypeElement_tags_1)
 		/sizeof(asn_DEF_SeqOfSgnTypeElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfSgnTypeElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_SGN_TYPE_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfSgnTypeElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfSgnTypeElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c b/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c
index 4ecbbcbb7..43c0778d7 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfStandardClockModelElement.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfStandardClockModelElement.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfStandardClockModelElement_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_STANDARD_CLOCK_MODEL_ELEMENT_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 1,  1,  1,  2 }	/* (SIZE(1..2)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfStandardClockModelElement = {
 	asn_DEF_SeqOfStandardClockModelElement_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfStandardClockModelElement_tags_1)
 		/sizeof(asn_DEF_SeqOfStandardClockModelElement_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfStandardClockModelElement_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_STANDARD_CLOCK_MODEL_ELEMENT_CONSTR_1,
 	asn_MBR_SeqOfStandardClockModelElement_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfStandardClockModelElement_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c
index ae77b5fee..0f53a336b 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS-R98-ExpOTD.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfSystemInfoAssistBTS-R98-ExpOTD.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfSystemInfoAssistBTS_R98_ExpOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 5,  5,  1,  32 }	/* (SIZE(1..32)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD = {
 	asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD_tags_1)
 		/sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_R98_ExpOTD_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfSystemInfoAssistBTS_R98_ExpOTD_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1,
 	asn_MBR_SeqOfSystemInfoAssistBTS_R98_ExpOTD_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfSystemInfoAssistBTS_R98_ExpOTD_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c
index a728a3bde..9a0af489a 100644
--- a/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c
+++ b/src/core/libs/supl/asn-rrlp/SeqOfSystemInfoAssistBTS.c
@@ -6,7 +6,7 @@
 
 #include "SeqOfSystemInfoAssistBTS.h"
 
-static asn_per_constraints_t asn_PER_type_SeqOfSystemInfoAssistBTS_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 5,  5,  1,  32 }	/* (SIZE(1..32)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SeqOfSystemInfoAssistBTS = {
 	asn_DEF_SeqOfSystemInfoAssistBTS_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_tags_1)
 		/sizeof(asn_DEF_SeqOfSystemInfoAssistBTS_tags_1[0]), /* 1 */
-	&asn_PER_type_SeqOfSystemInfoAssistBTS_constr_1,
+	&ASN_PER_TYPE_SEQ_OF_SYSTEM_INFO_ASSIST_BTS_CONSTR_1,
 	asn_MBR_SeqOfSystemInfoAssistBTS_1,
 	1,	/* Single element */
 	&asn_SPC_SeqOfSystemInfoAssistBTS_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SgnTypeElement.c b/src/core/libs/supl/asn-rrlp/SgnTypeElement.c
index fa49b6689..946abbe38 100644
--- a/src/core/libs/supl/asn-rrlp/SgnTypeElement.c
+++ b/src/core/libs/supl/asn-rrlp/SgnTypeElement.c
@@ -31,7 +31,7 @@ memb_ganssStatusHealth_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_ganssStatusHealth_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GANSS_STATUS_HEALTH_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -51,7 +51,7 @@ static asn_TYPE_member_t asn_MBR_SgnTypeElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ganssStatusHealth_constraint_1,
-		&asn_PER_memb_ganssStatusHealth_constr_3,
+		&ASN_PER_MEMB_GANSS_STATUS_HEALTH_CONSTR_3,
 		0,
 		"ganssStatusHealth"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c b/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c
index e04f2b6c0..2e17a8a54 100644
--- a/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c
+++ b/src/core/libs/supl/asn-rrlp/StandardClockModelElement.c
@@ -156,32 +156,32 @@ memb_stanModelID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_stanClockTocLSB_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_TOC_LSB_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 9,  9,  0,  511 }	/* (0..511) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stanClockAF2_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_A_F2_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 12,  12, -2048,  2047 }	/* (-2048..2047) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stanClockAF1_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_A_F1_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 18, -1, -131072,  131071 }	/* (-131072..131071) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stanClockAF0_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_A_F0_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 28, -1, -134217728,  134217727 }	/* (-134217728..134217727) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stanClockTgd_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_CLOCK_TGD_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 10,  10, -512,  511 }	/* (-512..511) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_stanModelID_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_STAN_MODEL_ID_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -192,7 +192,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stanClockTocLSB_constraint_1,
-		&asn_PER_memb_stanClockTocLSB_constr_2,
+		&ASN_PER_MEMB_STAN_CLOCK_TOC_LSB_CONSTR_2,
 		0,
 		"stanClockTocLSB"
 		},
@@ -201,7 +201,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stanClockAF2_constraint_1,
-		&asn_PER_memb_stanClockAF2_constr_3,
+		&ASN_PER_MEMB_STAN_CLOCK_A_F2_CONSTR_3,
 		0,
 		"stanClockAF2"
 		},
@@ -210,7 +210,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stanClockAF1_constraint_1,
-		&asn_PER_memb_stanClockAF1_constr_4,
+		&ASN_PER_MEMB_STAN_CLOCK_A_F1_CONSTR_4,
 		0,
 		"stanClockAF1"
 		},
@@ -219,7 +219,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stanClockAF0_constraint_1,
-		&asn_PER_memb_stanClockAF0_constr_5,
+		&ASN_PER_MEMB_STAN_CLOCK_A_F0_CONSTR_5,
 		0,
 		"stanClockAF0"
 		},
@@ -228,7 +228,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stanClockTgd_constraint_1,
-		&asn_PER_memb_stanClockTgd_constr_6,
+		&ASN_PER_MEMB_STAN_CLOCK_TGD_CONSTR_6,
 		0,
 		"stanClockTgd"
 		},
@@ -237,7 +237,7 @@ static asn_TYPE_member_t asn_MBR_StandardClockModelElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_stanModelID_constraint_1,
-		&asn_PER_memb_stanModelID_constr_7,
+		&ASN_PER_MEMB_STAN_MODEL_ID_CONSTR_7,
 		0,
 		"stanModelID"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/StdResolution.c b/src/core/libs/supl/asn-rrlp/StdResolution.c
index b5dd33517..574f0af9a 100644
--- a/src/core/libs/supl/asn-rrlp/StdResolution.c
+++ b/src/core/libs/supl/asn-rrlp/StdResolution.c
@@ -111,7 +111,7 @@ StdResolution_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_StdResolution_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_STD_RESOLUTION_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_StdResolution = {
 	asn_DEF_StdResolution_tags_1,	/* Same as above */
 	sizeof(asn_DEF_StdResolution_tags_1)
 		/sizeof(asn_DEF_StdResolution_tags_1[0]), /* 1 */
-	&asn_PER_type_StdResolution_constr_1,
+	&ASN_PER_TYPE_STD_RESOLUTION_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c
index a7e14dce0..e0d73b1ff 100644
--- a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c
+++ b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS-R98-ExpOTD.c
@@ -6,7 +6,7 @@
 
 #include "SystemInfoAssistBTS-R98-ExpOTD.h"
 
-static asn_per_constraints_t asn_PER_type_SystemInfoAssistBTS_R98_ExpOTD_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_SystemInfoAssistBTS_R98_ExpOTD = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_SystemInfoAssistBTS_R98_ExpOTD_constr_1,
+	&ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_R98_EXP_OTD_CONSTR_1,
 	asn_MBR_SystemInfoAssistBTS_R98_ExpOTD_1,
 	2,	/* Elements count */
 	&asn_SPC_SystemInfoAssistBTS_R98_ExpOTD_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c
index 30a007816..3b7d17674 100644
--- a/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c
+++ b/src/core/libs/supl/asn-rrlp/SystemInfoAssistBTS.c
@@ -6,7 +6,7 @@
 
 #include "SystemInfoAssistBTS.h"
 
-static asn_per_constraints_t asn_PER_type_SystemInfoAssistBTS_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_SystemInfoAssistBTS = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_SystemInfoAssistBTS_constr_1,
+	&ASN_PER_TYPE_SYSTEM_INFO_ASSIST_BTS_CONSTR_1,
 	asn_MBR_SystemInfoAssistBTS_1,
 	2,	/* Elements count */
 	&asn_SPC_SystemInfoAssistBTS_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c b/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c
index 713303193..68c0b86bd 100644
--- a/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c
+++ b/src/core/libs/supl/asn-rrlp/SystemInfoIndex.c
@@ -111,7 +111,7 @@ SystemInfoIndex_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_SystemInfoIndex_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SYSTEM_INFO_INDEX_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 5,  5,  1,  32 }	/* (1..32) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SystemInfoIndex = {
 	asn_DEF_SystemInfoIndex_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SystemInfoIndex_tags_1)
 		/sizeof(asn_DEF_SystemInfoIndex_tags_1[0]), /* 1 */
-	&asn_PER_type_SystemInfoIndex_constr_1,
+	&ASN_PER_TYPE_SYSTEM_INFO_INDEX_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TA0.c b/src/core/libs/supl/asn-rrlp/TA0.c
index c6e6e0a14..1879f9e19 100644
--- a/src/core/libs/supl/asn-rrlp/TA0.c
+++ b/src/core/libs/supl/asn-rrlp/TA0.c
@@ -111,7 +111,7 @@ TA0_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TA0_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_T_A0_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TA0 = {
 	asn_DEF_TA0_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TA0_tags_1)
 		/sizeof(asn_DEF_TA0_tags_1[0]), /* 1 */
-	&asn_PER_type_TA0_constr_1,
+	&ASN_PER_TYPE_T_A0_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TA1.c b/src/core/libs/supl/asn-rrlp/TA1.c
index d118cab48..43b3fb216 100644
--- a/src/core/libs/supl/asn-rrlp/TA1.c
+++ b/src/core/libs/supl/asn-rrlp/TA1.c
@@ -111,7 +111,7 @@ TA1_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TA1_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_T_A1_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TA1 = {
 	asn_DEF_TA1_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TA1_tags_1)
 		/sizeof(asn_DEF_TA1_tags_1[0]), /* 1 */
-	&asn_PER_type_TA1_constr_1,
+	&ASN_PER_TYPE_T_A1_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TA2.c b/src/core/libs/supl/asn-rrlp/TA2.c
index 9d4ba1f9d..f86657377 100644
--- a/src/core/libs/supl/asn-rrlp/TA2.c
+++ b/src/core/libs/supl/asn-rrlp/TA2.c
@@ -111,7 +111,7 @@ TA2_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TA2_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_T_A2_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7, -64,  63 }	/* (-64..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TA2 = {
 	asn_DEF_TA2_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TA2_tags_1)
 		/sizeof(asn_DEF_TA2_tags_1[0]), /* 1 */
-	&asn_PER_type_TA2_constr_1,
+	&ASN_PER_TYPE_T_A2_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TLMReservedBits.c b/src/core/libs/supl/asn-rrlp/TLMReservedBits.c
index 5493ac422..cac6e5f46 100644
--- a/src/core/libs/supl/asn-rrlp/TLMReservedBits.c
+++ b/src/core/libs/supl/asn-rrlp/TLMReservedBits.c
@@ -111,7 +111,7 @@ TLMReservedBits_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TLMReservedBits_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TLM_RESERVED_BITS_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TLMReservedBits = {
 	asn_DEF_TLMReservedBits_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TLMReservedBits_tags_1)
 		/sizeof(asn_DEF_TLMReservedBits_tags_1[0]), /* 1 */
-	&asn_PER_type_TLMReservedBits_constr_1,
+	&ASN_PER_TYPE_TLM_RESERVED_BITS_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TLMWord.c b/src/core/libs/supl/asn-rrlp/TLMWord.c
index 08495fde8..1bd83baaf 100644
--- a/src/core/libs/supl/asn-rrlp/TLMWord.c
+++ b/src/core/libs/supl/asn-rrlp/TLMWord.c
@@ -111,7 +111,7 @@ TLMWord_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TLMWord_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TLM_WORD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 14,  14,  0,  16383 }	/* (0..16383) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TLMWord = {
 	asn_DEF_TLMWord_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TLMWord_tags_1)
 		/sizeof(asn_DEF_TLMWord_tags_1[0]), /* 1 */
-	&asn_PER_type_TLMWord_constr_1,
+	&ASN_PER_TYPE_TLM_WORD_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TimeSlot.c b/src/core/libs/supl/asn-rrlp/TimeSlot.c
index f879e587c..e9f8728d7 100644
--- a/src/core/libs/supl/asn-rrlp/TimeSlot.c
+++ b/src/core/libs/supl/asn-rrlp/TimeSlot.c
@@ -111,7 +111,7 @@ TimeSlot_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TimeSlot_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIME_SLOT_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeSlot = {
 	asn_DEF_TimeSlot_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TimeSlot_tags_1)
 		/sizeof(asn_DEF_TimeSlot_tags_1[0]), /* 1 */
-	&asn_PER_type_TimeSlot_constr_1,
+	&ASN_PER_TYPE_TIME_SLOT_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c b/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c
index dc0d3ca0f..347b073f7 100644
--- a/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c
+++ b/src/core/libs/supl/asn-rrlp/TimeSlotScheme.c
@@ -94,7 +94,7 @@ TimeSlotScheme_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TimeSlotScheme_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIME_SLOT_SCHEME_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeSlotScheme = {
 	asn_DEF_TimeSlotScheme_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TimeSlotScheme_tags_1)
 		/sizeof(asn_DEF_TimeSlotScheme_tags_1[0]), /* 1 */
-	&asn_PER_type_TimeSlotScheme_constr_1,
+	&ASN_PER_TYPE_TIME_SLOT_SCHEME_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_TimeSlotScheme_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/UTCModel.c b/src/core/libs/supl/asn-rrlp/UTCModel.c
index 73a0520d6..a8d0557e1 100644
--- a/src/core/libs/supl/asn-rrlp/UTCModel.c
+++ b/src/core/libs/supl/asn-rrlp/UTCModel.c
@@ -206,42 +206,42 @@ memb_utcDeltaTlsf_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_utcA1_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_A1_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcA0_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_A0_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcTot_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_TOT_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcWNt_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_W_NT_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcDeltaTls_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_DELTA_TLS_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcWNlsf_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_W_NLSF_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcDN_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_DN_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_utcDeltaTlsf_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_UTC_DELTA_TLSF_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcA1_constraint_1,
-		&asn_PER_memb_utcA1_constr_2,
+		&ASN_PER_MEMB_UTC_A1_CONSTR_2,
 		0,
 		"utcA1"
 		},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcA0_constraint_1,
-		&asn_PER_memb_utcA0_constr_3,
+		&ASN_PER_MEMB_UTC_A0_CONSTR_3,
 		0,
 		"utcA0"
 		},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcTot_constraint_1,
-		&asn_PER_memb_utcTot_constr_4,
+		&ASN_PER_MEMB_UTC_TOT_CONSTR_4,
 		0,
 		"utcTot"
 		},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcWNt_constraint_1,
-		&asn_PER_memb_utcWNt_constr_5,
+		&ASN_PER_MEMB_UTC_W_NT_CONSTR_5,
 		0,
 		"utcWNt"
 		},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcDeltaTls_constraint_1,
-		&asn_PER_memb_utcDeltaTls_constr_6,
+		&ASN_PER_MEMB_UTC_DELTA_TLS_CONSTR_6,
 		0,
 		"utcDeltaTls"
 		},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcWNlsf_constraint_1,
-		&asn_PER_memb_utcWNlsf_constr_7,
+		&ASN_PER_MEMB_UTC_W_NLSF_CONSTR_7,
 		0,
 		"utcWNlsf"
 		},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcDN_constraint_1,
-		&asn_PER_memb_utcDN_constr_8,
+		&ASN_PER_MEMB_UTC_DN_CONSTR_8,
 		0,
 		"utcDN"
 		},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_UTCModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_utcDeltaTlsf_constraint_1,
-		&asn_PER_memb_utcDeltaTlsf_constr_9,
+		&ASN_PER_MEMB_UTC_DELTA_TLSF_CONSTR_9,
 		0,
 		"utcDeltaTlsf"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c b/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c
index 9b2c5278c..28d2189fc 100644
--- a/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c
+++ b/src/core/libs/supl/asn-rrlp/UlPseudoSegInd.c
@@ -94,7 +94,7 @@ UlPseudoSegInd_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_UlPseudoSegInd_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_UL_PSEUDO_SEG_IND_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UlPseudoSegInd = {
 	asn_DEF_UlPseudoSegInd_tags_1,	/* Same as above */
 	sizeof(asn_DEF_UlPseudoSegInd_tags_1)
 		/sizeof(asn_DEF_UlPseudoSegInd_tags_1[0]), /* 1 */
-	&asn_PER_type_UlPseudoSegInd_constr_1,
+	&ASN_PER_TYPE_UL_PSEUDO_SEG_IND_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_UlPseudoSegInd_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c b/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c
index 07896a408..c367db368 100644
--- a/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c
+++ b/src/core/libs/supl/asn-rrlp/UncompressedEphemeris.c
@@ -888,152 +888,152 @@ memb_ephemIDot_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_type_ephemE_constr_17 = {
+static asn_per_constraints_t ASN_PER_TYPE_EPHEM_E_CONSTR_17 = {
 	{ APC_CONSTRAINED,	 32, -1,  0,  4294967295 }	/* (0..4294967295) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_type_ephemAPowerHalf_constr_19 = {
+static asn_per_constraints_t ASN_PER_TYPE_EPHEM_A_POWER_HALF_CONSTR_19 = {
 	{ APC_CONSTRAINED,	 32, -1,  0,  4294967295 }	/* (0..4294967295) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCodeOnL2_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CODE_ON_L2_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  3 }	/* (0..3) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemURA_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_URA_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 4,  4,  0,  15 }	/* (0..15) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemSVhealth_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_S_VHEALTH_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemIODC_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_IODC_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemL2Pflag_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_L2_PFLAG_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemTgd_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_TGD_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemToc_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_TOC_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  37799 }	/* (0..37799) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemAF2_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_F2_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 8,  8, -128,  127 }	/* (-128..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemAF1_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_F1_CONSTR_11 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemAF0_constr_12 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_F0_CONSTR_12 = {
 	{ APC_CONSTRAINED,	 22, -1, -2097152,  2097151 }	/* (-2097152..2097151) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCrs_constr_13 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CRS_CONSTR_13 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemDeltaN_constr_14 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_DELTA_N_CONSTR_14 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemM0_constr_15 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_M0_CONSTR_15 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCuc_constr_16 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CUC_CONSTR_16 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemE_constr_17 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_E_CONSTR_17 = {
 	{ APC_CONSTRAINED,	 32, -1,  0,  4294967295 }	/* (0..4294967295) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCus_constr_18 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CUS_CONSTR_18 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemAPowerHalf_constr_19 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_A_POWER_HALF_CONSTR_19 = {
 	{ APC_CONSTRAINED,	 32, -1,  0,  4294967295 }	/* (0..4294967295) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemToe_constr_20 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_TOE_CONSTR_20 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  37799 }	/* (0..37799) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemFitFlag_constr_21 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_FIT_FLAG_CONSTR_21 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemAODA_constr_22 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_AODA_CONSTR_22 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCic_constr_23 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CIC_CONSTR_23 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemOmegaA0_constr_24 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_OMEGA_A0_CONSTR_24 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCis_constr_25 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CIS_CONSTR_25 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemI0_constr_26 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_I0_CONSTR_26 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemCrc_constr_27 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_CRC_CONSTR_27 = {
 	{ APC_CONSTRAINED,	 16,  16, -32768,  32767 }	/* (-32768..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemW_constr_28 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_W_CONSTR_28 = {
 	{ APC_CONSTRAINED,	 32, -1, (-2147483647L - 1),  2147483647 }	/* (-2147483648..2147483647) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemOmegaADot_constr_29 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_OMEGA_A_DOT_CONSTR_29 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ephemIDot_constr_30 = {
+static asn_per_constraints_t ASN_PER_MEMB_EPHEM_I_DOT_CONSTR_30 = {
 	{ APC_CONSTRAINED,	 14,  14, -8192,  8191 }	/* (-8192..8191) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -1067,7 +1067,7 @@ asn_TYPE_descriptor_t asn_DEF_ephemE_17 = {
 	asn_DEF_ephemE_tags_17,	/* Same as above */
 	sizeof(asn_DEF_ephemE_tags_17)
 		/sizeof(asn_DEF_ephemE_tags_17[0]), /* 2 */
-	&asn_PER_type_ephemE_constr_17,
+	&ASN_PER_TYPE_EPHEM_E_CONSTR_17,
 	0, 0,	/* No members */
 	&asn_SPC_ephemE_specs_17	/* Additional specs */
 };
@@ -1101,7 +1101,7 @@ asn_TYPE_descriptor_t asn_DEF_ephemAPowerHalf_19 = {
 	asn_DEF_ephemAPowerHalf_tags_19,	/* Same as above */
 	sizeof(asn_DEF_ephemAPowerHalf_tags_19)
 		/sizeof(asn_DEF_ephemAPowerHalf_tags_19[0]), /* 2 */
-	&asn_PER_type_ephemAPowerHalf_constr_19,
+	&ASN_PER_TYPE_EPHEM_A_POWER_HALF_CONSTR_19,
 	0, 0,	/* No members */
 	&asn_SPC_ephemAPowerHalf_specs_19	/* Additional specs */
 };
@@ -1112,7 +1112,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCodeOnL2_constraint_1,
-		&asn_PER_memb_ephemCodeOnL2_constr_2,
+		&ASN_PER_MEMB_EPHEM_CODE_ON_L2_CONSTR_2,
 		0,
 		"ephemCodeOnL2"
 		},
@@ -1121,7 +1121,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemURA_constraint_1,
-		&asn_PER_memb_ephemURA_constr_3,
+		&ASN_PER_MEMB_EPHEM_URA_CONSTR_3,
 		0,
 		"ephemURA"
 		},
@@ -1130,7 +1130,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemSVhealth_constraint_1,
-		&asn_PER_memb_ephemSVhealth_constr_4,
+		&ASN_PER_MEMB_EPHEM_S_VHEALTH_CONSTR_4,
 		0,
 		"ephemSVhealth"
 		},
@@ -1139,7 +1139,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemIODC_constraint_1,
-		&asn_PER_memb_ephemIODC_constr_5,
+		&ASN_PER_MEMB_EPHEM_IODC_CONSTR_5,
 		0,
 		"ephemIODC"
 		},
@@ -1148,7 +1148,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemL2Pflag_constraint_1,
-		&asn_PER_memb_ephemL2Pflag_constr_6,
+		&ASN_PER_MEMB_EPHEM_L2_PFLAG_CONSTR_6,
 		0,
 		"ephemL2Pflag"
 		},
@@ -1166,7 +1166,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemTgd_constraint_1,
-		&asn_PER_memb_ephemTgd_constr_8,
+		&ASN_PER_MEMB_EPHEM_TGD_CONSTR_8,
 		0,
 		"ephemTgd"
 		},
@@ -1175,7 +1175,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemToc_constraint_1,
-		&asn_PER_memb_ephemToc_constr_9,
+		&ASN_PER_MEMB_EPHEM_TOC_CONSTR_9,
 		0,
 		"ephemToc"
 		},
@@ -1184,7 +1184,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemAF2_constraint_1,
-		&asn_PER_memb_ephemAF2_constr_10,
+		&ASN_PER_MEMB_EPHEM_A_F2_CONSTR_10,
 		0,
 		"ephemAF2"
 		},
@@ -1193,7 +1193,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemAF1_constraint_1,
-		&asn_PER_memb_ephemAF1_constr_11,
+		&ASN_PER_MEMB_EPHEM_A_F1_CONSTR_11,
 		0,
 		"ephemAF1"
 		},
@@ -1202,7 +1202,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemAF0_constraint_1,
-		&asn_PER_memb_ephemAF0_constr_12,
+		&ASN_PER_MEMB_EPHEM_A_F0_CONSTR_12,
 		0,
 		"ephemAF0"
 		},
@@ -1211,7 +1211,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCrs_constraint_1,
-		&asn_PER_memb_ephemCrs_constr_13,
+		&ASN_PER_MEMB_EPHEM_CRS_CONSTR_13,
 		0,
 		"ephemCrs"
 		},
@@ -1220,7 +1220,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemDeltaN_constraint_1,
-		&asn_PER_memb_ephemDeltaN_constr_14,
+		&ASN_PER_MEMB_EPHEM_DELTA_N_CONSTR_14,
 		0,
 		"ephemDeltaN"
 		},
@@ -1229,7 +1229,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemM0_constraint_1,
-		&asn_PER_memb_ephemM0_constr_15,
+		&ASN_PER_MEMB_EPHEM_M0_CONSTR_15,
 		0,
 		"ephemM0"
 		},
@@ -1238,7 +1238,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCuc_constraint_1,
-		&asn_PER_memb_ephemCuc_constr_16,
+		&ASN_PER_MEMB_EPHEM_CUC_CONSTR_16,
 		0,
 		"ephemCuc"
 		},
@@ -1247,7 +1247,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_ephemE_17,
 		memb_ephemE_constraint_1,
-		&asn_PER_memb_ephemE_constr_17,
+		&ASN_PER_MEMB_EPHEM_E_CONSTR_17,
 		0,
 		"ephemE"
 		},
@@ -1256,7 +1256,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCus_constraint_1,
-		&asn_PER_memb_ephemCus_constr_18,
+		&ASN_PER_MEMB_EPHEM_CUS_CONSTR_18,
 		0,
 		"ephemCus"
 		},
@@ -1265,7 +1265,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_ephemAPowerHalf_19,
 		memb_ephemAPowerHalf_constraint_1,
-		&asn_PER_memb_ephemAPowerHalf_constr_19,
+		&ASN_PER_MEMB_EPHEM_A_POWER_HALF_CONSTR_19,
 		0,
 		"ephemAPowerHalf"
 		},
@@ -1274,7 +1274,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemToe_constraint_1,
-		&asn_PER_memb_ephemToe_constr_20,
+		&ASN_PER_MEMB_EPHEM_TOE_CONSTR_20,
 		0,
 		"ephemToe"
 		},
@@ -1283,7 +1283,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemFitFlag_constraint_1,
-		&asn_PER_memb_ephemFitFlag_constr_21,
+		&ASN_PER_MEMB_EPHEM_FIT_FLAG_CONSTR_21,
 		0,
 		"ephemFitFlag"
 		},
@@ -1292,7 +1292,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemAODA_constraint_1,
-		&asn_PER_memb_ephemAODA_constr_22,
+		&ASN_PER_MEMB_EPHEM_AODA_CONSTR_22,
 		0,
 		"ephemAODA"
 		},
@@ -1301,7 +1301,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCic_constraint_1,
-		&asn_PER_memb_ephemCic_constr_23,
+		&ASN_PER_MEMB_EPHEM_CIC_CONSTR_23,
 		0,
 		"ephemCic"
 		},
@@ -1310,7 +1310,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemOmegaA0_constraint_1,
-		&asn_PER_memb_ephemOmegaA0_constr_24,
+		&ASN_PER_MEMB_EPHEM_OMEGA_A0_CONSTR_24,
 		0,
 		"ephemOmegaA0"
 		},
@@ -1319,7 +1319,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCis_constraint_1,
-		&asn_PER_memb_ephemCis_constr_25,
+		&ASN_PER_MEMB_EPHEM_CIS_CONSTR_25,
 		0,
 		"ephemCis"
 		},
@@ -1328,7 +1328,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemI0_constraint_1,
-		&asn_PER_memb_ephemI0_constr_26,
+		&ASN_PER_MEMB_EPHEM_I0_CONSTR_26,
 		0,
 		"ephemI0"
 		},
@@ -1337,7 +1337,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemCrc_constraint_1,
-		&asn_PER_memb_ephemCrc_constr_27,
+		&ASN_PER_MEMB_EPHEM_CRC_CONSTR_27,
 		0,
 		"ephemCrc"
 		},
@@ -1346,7 +1346,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemW_constraint_1,
-		&asn_PER_memb_ephemW_constr_28,
+		&ASN_PER_MEMB_EPHEM_W_CONSTR_28,
 		0,
 		"ephemW"
 		},
@@ -1355,7 +1355,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemOmegaADot_constraint_1,
-		&asn_PER_memb_ephemOmegaADot_constr_29,
+		&ASN_PER_MEMB_EPHEM_OMEGA_A_DOT_CONSTR_29,
 		0,
 		"ephemOmegaADot"
 		},
@@ -1364,7 +1364,7 @@ static asn_TYPE_member_t asn_MBR_UncompressedEphemeris_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_ephemIDot_constraint_1,
-		&asn_PER_memb_ephemIDot_constr_30,
+		&ASN_PER_MEMB_EPHEM_I_DOT_CONSTR_30,
 		0,
 		"ephemIDot"
 		},
diff --git a/src/core/libs/supl/asn-rrlp/UseMultipleSets.c b/src/core/libs/supl/asn-rrlp/UseMultipleSets.c
index 59c95ffc7..35b9b1164 100644
--- a/src/core/libs/supl/asn-rrlp/UseMultipleSets.c
+++ b/src/core/libs/supl/asn-rrlp/UseMultipleSets.c
@@ -94,7 +94,7 @@ UseMultipleSets_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_UseMultipleSets_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_USE_MULTIPLE_SETS_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UseMultipleSets = {
 	asn_DEF_UseMultipleSets_tags_1,	/* Same as above */
 	sizeof(asn_DEF_UseMultipleSets_tags_1)
 		/sizeof(asn_DEF_UseMultipleSets_tags_1[0]), /* 1 */
-	&asn_PER_type_UseMultipleSets_constr_1,
+	&ASN_PER_TYPE_USE_MULTIPLE_SETS_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_UseMultipleSets_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/AltitudeInfo.c b/src/core/libs/supl/asn-supl/AltitudeInfo.c
index 70f48f49c..531988546 100644
--- a/src/core/libs/supl/asn-supl/AltitudeInfo.c
+++ b/src/core/libs/supl/asn-supl/AltitudeInfo.c
@@ -144,17 +144,17 @@ memb_altUncertainty_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_type_altitudeDirection_constr_2 = {
+static asn_per_constraints_t ASN_PER_TYPE_ALTITUDE_DIRECTION_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_altitude_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALTITUDE_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 15,  15,  0,  32767 }	/* (0..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_altUncertainty_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_ALT_UNCERTAINTY_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -200,7 +200,7 @@ asn_TYPE_descriptor_t asn_DEF_altitudeDirection_2 = {
 	asn_DEF_altitudeDirection_tags_2,	/* Same as above */
 	sizeof(asn_DEF_altitudeDirection_tags_2)
 		/sizeof(asn_DEF_altitudeDirection_tags_2[0]), /* 2 */
-	&asn_PER_type_altitudeDirection_constr_2,
+	&ASN_PER_TYPE_ALTITUDE_DIRECTION_CONSTR_2,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_altitudeDirection_specs_2	/* Additional specs */
 };
@@ -220,7 +220,7 @@ static asn_TYPE_member_t asn_MBR_AltitudeInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_altitude_constraint_1,
-		&asn_PER_memb_altitude_constr_5,
+		&ASN_PER_MEMB_ALTITUDE_CONSTR_5,
 		0,
 		"altitude"
 		},
@@ -229,7 +229,7 @@ static asn_TYPE_member_t asn_MBR_AltitudeInfo_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_altUncertainty_constraint_1,
-		&asn_PER_memb_altUncertainty_constr_6,
+		&ASN_PER_MEMB_ALT_UNCERTAINTY_CONSTR_6,
 		0,
 		"altUncertainty"
 		},
diff --git a/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c b/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c
index 0445a22cb..3ccbebf84 100644
--- a/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c
+++ b/src/core/libs/supl/asn-supl/CPICH-Ec-N0.c
@@ -111,7 +111,7 @@ CPICH_Ec_N0_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_CPICH_Ec_N0_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CPICH_EC_N0_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CPICH_Ec_N0 = {
 	asn_DEF_CPICH_Ec_N0_tags_1,	/* Same as above */
 	sizeof(asn_DEF_CPICH_Ec_N0_tags_1)
 		/sizeof(asn_DEF_CPICH_Ec_N0_tags_1[0]), /* 1 */
-	&asn_PER_type_CPICH_Ec_N0_constr_1,
+	&ASN_PER_TYPE_CPICH_EC_N0_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/CPICH-RSCP.c b/src/core/libs/supl/asn-supl/CPICH-RSCP.c
index 81726e708..92e525704 100644
--- a/src/core/libs/supl/asn-supl/CPICH-RSCP.c
+++ b/src/core/libs/supl/asn-supl/CPICH-RSCP.c
@@ -111,7 +111,7 @@ CPICH_RSCP_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_CPICH_RSCP_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CPICH_RSCP_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CPICH_RSCP = {
 	asn_DEF_CPICH_RSCP_tags_1,	/* Same as above */
 	sizeof(asn_DEF_CPICH_RSCP_tags_1)
 		/sizeof(asn_DEF_CPICH_RSCP_tags_1[0]), /* 1 */
-	&asn_PER_type_CPICH_RSCP_constr_1,
+	&ASN_PER_TYPE_CPICH_RSCP_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/CdmaCellInformation.c b/src/core/libs/supl/asn-supl/CdmaCellInformation.c
index d08ecc007..aba676872 100644
--- a/src/core/libs/supl/asn-supl/CdmaCellInformation.c
+++ b/src/core/libs/supl/asn-supl/CdmaCellInformation.c
@@ -206,42 +206,42 @@ memb_refSeconds_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refNID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_NID_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refSID_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_SID_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 15,  15,  0,  32767 }	/* (0..32767) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refBASEID_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_BASEID_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refBASELAT_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_BASELAT_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 22, -1,  0,  4194303 }	/* (0..4194303) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_reBASELONG_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_RE_BASELONG_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 23, -1,  0,  8388607 }	/* (0..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refREFPN_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_REFPN_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 9,  9,  0,  511 }	/* (0..511) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refWeekNumber_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_WEEK_NUMBER_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refSeconds_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_SECONDS_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 22, -1,  0,  4194303 }	/* (0..4194303) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refNID_constraint_1,
-		&asn_PER_memb_refNID_constr_2,
+		&ASN_PER_MEMB_REF_NID_CONSTR_2,
 		0,
 		"refNID"
 		},
@@ -261,7 +261,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refSID_constraint_1,
-		&asn_PER_memb_refSID_constr_3,
+		&ASN_PER_MEMB_REF_SID_CONSTR_3,
 		0,
 		"refSID"
 		},
@@ -270,7 +270,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refBASEID_constraint_1,
-		&asn_PER_memb_refBASEID_constr_4,
+		&ASN_PER_MEMB_REF_BASEID_CONSTR_4,
 		0,
 		"refBASEID"
 		},
@@ -279,7 +279,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refBASELAT_constraint_1,
-		&asn_PER_memb_refBASELAT_constr_5,
+		&ASN_PER_MEMB_REF_BASELAT_CONSTR_5,
 		0,
 		"refBASELAT"
 		},
@@ -288,7 +288,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_reBASELONG_constraint_1,
-		&asn_PER_memb_reBASELONG_constr_6,
+		&ASN_PER_MEMB_RE_BASELONG_CONSTR_6,
 		0,
 		"reBASELONG"
 		},
@@ -297,7 +297,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refREFPN_constraint_1,
-		&asn_PER_memb_refREFPN_constr_7,
+		&ASN_PER_MEMB_REF_REFPN_CONSTR_7,
 		0,
 		"refREFPN"
 		},
@@ -306,7 +306,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refWeekNumber_constraint_1,
-		&asn_PER_memb_refWeekNumber_constr_8,
+		&ASN_PER_MEMB_REF_WEEK_NUMBER_CONSTR_8,
 		0,
 		"refWeekNumber"
 		},
@@ -315,7 +315,7 @@ static asn_TYPE_member_t asn_MBR_CdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refSeconds_constraint_1,
-		&asn_PER_memb_refSeconds_constr_9,
+		&ASN_PER_MEMB_REF_SECONDS_CONSTR_9,
 		0,
 		"refSeconds"
 		},
diff --git a/src/core/libs/supl/asn-supl/CellInfo.c b/src/core/libs/supl/asn-supl/CellInfo.c
index 77eb080ba..469d624c3 100644
--- a/src/core/libs/supl/asn-supl/CellInfo.c
+++ b/src/core/libs/supl/asn-supl/CellInfo.c
@@ -6,7 +6,7 @@
 
 #include "CellInfo.h"
 
-static asn_per_constraints_t asn_PER_type_CellInfo_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_INFO_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ asn_TYPE_descriptor_t asn_DEF_CellInfo = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_CellInfo_constr_1,
+	&ASN_PER_TYPE_CELL_INFO_CONSTR_1,
 	asn_MBR_CellInfo_1,
 	3,	/* Elements count */
 	&asn_SPC_CellInfo_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/CellMeasuredResults.c b/src/core/libs/supl/asn-supl/CellMeasuredResults.c
index 0b1a9f7c1..10760d310 100644
--- a/src/core/libs/supl/asn-supl/CellMeasuredResults.c
+++ b/src/core/libs/supl/asn-supl/CellMeasuredResults.c
@@ -31,12 +31,12 @@ memb_cellIdentity_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_type_modeSpecificInfo_constr_3 = {
+static asn_per_constraints_t ASN_PER_TYPE_MODE_SPECIFIC_INFO_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_cellIdentity_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_CELL_IDENTITY_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 28, -1,  0,  268435455 }	/* (0..268435455) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -273,7 +273,7 @@ asn_TYPE_descriptor_t asn_DEF_modeSpecificInfo_3 = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_modeSpecificInfo_constr_3,
+	&ASN_PER_TYPE_MODE_SPECIFIC_INFO_CONSTR_3,
 	asn_MBR_modeSpecificInfo_3,
 	2,	/* Elements count */
 	&asn_SPC_modeSpecificInfo_specs_3	/* Additional specs */
@@ -285,7 +285,7 @@ static asn_TYPE_member_t asn_MBR_CellMeasuredResults_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_cellIdentity_constraint_1,
-		&asn_PER_memb_cellIdentity_constr_2,
+		&ASN_PER_MEMB_CELL_IDENTITY_CONSTR_2,
 		0,
 		"cellIdentity"
 		},
diff --git a/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c b/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c
index 567dcf35f..ecbb9da57 100644
--- a/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c
+++ b/src/core/libs/supl/asn-supl/CellMeasuredResultsList.c
@@ -6,7 +6,7 @@
 
 #include "CellMeasuredResultsList.h"
 
-static asn_per_constraints_t asn_PER_type_CellMeasuredResultsList_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_MEASURED_RESULTS_LIST_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 5,  5,  1,  32 }	/* (SIZE(1..32)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_CellMeasuredResultsList = {
 	asn_DEF_CellMeasuredResultsList_tags_1,	/* Same as above */
 	sizeof(asn_DEF_CellMeasuredResultsList_tags_1)
 		/sizeof(asn_DEF_CellMeasuredResultsList_tags_1[0]), /* 1 */
-	&asn_PER_type_CellMeasuredResultsList_constr_1,
+	&ASN_PER_TYPE_CELL_MEASURED_RESULTS_LIST_CONSTR_1,
 	asn_MBR_CellMeasuredResultsList_1,
 	1,	/* Single element */
 	&asn_SPC_CellMeasuredResultsList_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/CellParametersID.c b/src/core/libs/supl/asn-supl/CellParametersID.c
index 4092e8585..8cc4a66b3 100644
--- a/src/core/libs/supl/asn-supl/CellParametersID.c
+++ b/src/core/libs/supl/asn-supl/CellParametersID.c
@@ -111,7 +111,7 @@ CellParametersID_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_CellParametersID_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_CELL_PARAMETERS_ID_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_CellParametersID = {
 	asn_DEF_CellParametersID_tags_1,	/* Same as above */
 	sizeof(asn_DEF_CellParametersID_tags_1)
 		/sizeof(asn_DEF_CellParametersID_tags_1[0]), /* 1 */
-	&asn_PER_type_CellParametersID_constr_1,
+	&ASN_PER_TYPE_CELL_PARAMETERS_ID_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/EncodingType.c b/src/core/libs/supl/asn-supl/EncodingType.c
index ff25bfa80..db0ad1ea7 100644
--- a/src/core/libs/supl/asn-supl/EncodingType.c
+++ b/src/core/libs/supl/asn-supl/EncodingType.c
@@ -94,7 +94,7 @@ EncodingType_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_EncodingType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ENCODING_TYPE_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_EncodingType = {
 	asn_DEF_EncodingType_tags_1,	/* Same as above */
 	sizeof(asn_DEF_EncodingType_tags_1)
 		/sizeof(asn_DEF_EncodingType_tags_1[0]), /* 1 */
-	&asn_PER_type_EncodingType_constr_1,
+	&ASN_PER_TYPE_ENCODING_TYPE_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_EncodingType_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/FQDN.c b/src/core/libs/supl/asn-supl/FQDN.c
index 84c9d1f0a..1d4f501a2 100644
--- a/src/core/libs/supl/asn-supl/FQDN.c
+++ b/src/core/libs/supl/asn-supl/FQDN.c
@@ -155,7 +155,7 @@ FQDN_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_FQDN_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FQDN_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 6,  6,  45,  122 }	/* (45..122) */,
 	{ APC_CONSTRAINED,	 8,  8,  1,  255 }	/* (SIZE(1..255)) */,
 	asn_PER_MAP_FQDN_1_v2c,	/* Value to PER code map */
@@ -183,7 +183,7 @@ asn_TYPE_descriptor_t asn_DEF_FQDN = {
 	asn_DEF_FQDN_tags_1,	/* Same as above */
 	sizeof(asn_DEF_FQDN_tags_1)
 		/sizeof(asn_DEF_FQDN_tags_1[0]), /* 1 */
-	&asn_PER_type_FQDN_constr_1,
+	&ASN_PER_TYPE_FQDN_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/FormatIndicator.c b/src/core/libs/supl/asn-supl/FormatIndicator.c
index 9a17c684c..61c2ce2b8 100644
--- a/src/core/libs/supl/asn-supl/FormatIndicator.c
+++ b/src/core/libs/supl/asn-supl/FormatIndicator.c
@@ -94,7 +94,7 @@ FormatIndicator_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_FormatIndicator_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_FORMAT_INDICATOR_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  7 }	/* (0..7,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -152,7 +152,7 @@ asn_TYPE_descriptor_t asn_DEF_FormatIndicator = {
 	asn_DEF_FormatIndicator_tags_1,	/* Same as above */
 	sizeof(asn_DEF_FormatIndicator_tags_1)
 		/sizeof(asn_DEF_FormatIndicator_tags_1[0]), /* 1 */
-	&asn_PER_type_FormatIndicator_constr_1,
+	&ASN_PER_TYPE_FORMAT_INDICATOR_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_FormatIndicator_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/FrequencyInfo.c b/src/core/libs/supl/asn-supl/FrequencyInfo.c
index 6aa75a010..d0ebd64fb 100644
--- a/src/core/libs/supl/asn-supl/FrequencyInfo.c
+++ b/src/core/libs/supl/asn-supl/FrequencyInfo.c
@@ -6,7 +6,7 @@
 
 #include "FrequencyInfo.h"
 
-static asn_per_constraints_t asn_PER_type_fmodeSpecificInfo_constr_2 = {
+static asn_per_constraints_t ASN_PER_TYPE_FMODE_SPECIFIC_INFO_CONSTR_2 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0,  1 }	/* (0..1,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -63,7 +63,7 @@ asn_TYPE_descriptor_t asn_DEF_fmodeSpecificInfo_2 = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_fmodeSpecificInfo_constr_2,
+	&ASN_PER_TYPE_FMODE_SPECIFIC_INFO_CONSTR_2,
 	asn_MBR_fmodeSpecificInfo_2,
 	2,	/* Elements count */
 	&asn_SPC_fmodeSpecificInfo_specs_2	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/GeneralizedTime.c b/src/core/libs/supl/asn-supl/GeneralizedTime.c
index 3007af94e..ec23c6836 100644
--- a/src/core/libs/supl/asn-supl/GeneralizedTime.c
+++ b/src/core/libs/supl/asn-supl/GeneralizedTime.c
@@ -152,7 +152,7 @@ static ber_tlv_tag_t asn_DEF_GeneralizedTime_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (26 << 2)),  /* [UNIVERSAL 26] IMPLICIT ...*/
 	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))    /* ... OCTET STRING */
 };
-static asn_per_constraints_t asn_DEF_GeneralizedTime_constraints = {
+static asn_per_constraints_t ASN_DEF_GENERALIZED_TIME_CONSTRAINTS = {
 	{ APC_CONSTRAINED, 7, 7, 0x20, 0x7e },  /* Value */
 	{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 }, /* Size */
 	0, 0
@@ -176,7 +176,7 @@ asn_TYPE_descriptor_t asn_DEF_GeneralizedTime = {
 	asn_DEF_GeneralizedTime_tags,
 	sizeof(asn_DEF_GeneralizedTime_tags)
 	  / sizeof(asn_DEF_GeneralizedTime_tags[0]),
-	&asn_DEF_GeneralizedTime_constraints,
+	&ASN_DEF_GENERALIZED_TIME_CONSTRAINTS,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/GsmCellInformation.c b/src/core/libs/supl/asn-supl/GsmCellInformation.c
index 14aed828a..f43919e0f 100644
--- a/src/core/libs/supl/asn-supl/GsmCellInformation.c
+++ b/src/core/libs/supl/asn-supl/GsmCellInformation.c
@@ -131,27 +131,27 @@ memb_tA_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refMCC_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MCC_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  999 }	/* (0..999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refMNC_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MNC_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  999 }	/* (0..999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refLAC_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_LAC_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refCI_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_CI_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_tA_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_T_A_CONSTR_7 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -162,7 +162,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refMCC_constraint_1,
-		&asn_PER_memb_refMCC_constr_2,
+		&ASN_PER_MEMB_REF_MCC_CONSTR_2,
 		0,
 		"refMCC"
 		},
@@ -171,7 +171,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refMNC_constraint_1,
-		&asn_PER_memb_refMNC_constr_3,
+		&ASN_PER_MEMB_REF_MNC_CONSTR_3,
 		0,
 		"refMNC"
 		},
@@ -180,7 +180,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refLAC_constraint_1,
-		&asn_PER_memb_refLAC_constr_4,
+		&ASN_PER_MEMB_REF_LAC_CONSTR_4,
 		0,
 		"refLAC"
 		},
@@ -189,7 +189,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refCI_constraint_1,
-		&asn_PER_memb_refCI_constr_5,
+		&ASN_PER_MEMB_REF_CI_CONSTR_5,
 		0,
 		"refCI"
 		},
@@ -207,7 +207,7 @@ static asn_TYPE_member_t asn_MBR_GsmCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_tA_constraint_1,
-		&asn_PER_memb_tA_constr_7,
+		&ASN_PER_MEMB_T_A_CONSTR_7,
 		0,
 		"tA"
 		},
diff --git a/src/core/libs/supl/asn-supl/Horandveruncert.c b/src/core/libs/supl/asn-supl/Horandveruncert.c
index a73928d71..73ba2b860 100644
--- a/src/core/libs/supl/asn-supl/Horandveruncert.c
+++ b/src/core/libs/supl/asn-supl/Horandveruncert.c
@@ -240,32 +240,32 @@ memb_veruncertspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_verdirect_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERDIRECT_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 1, 1} /* (SIZE(1..1)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_bearing_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_4 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_verspeed_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERSPEED_CONSTR_5 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_horuncertspeed_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORUNCERTSPEED_CONSTR_6 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_veruncertspeed_constr_7 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERUNCERTSPEED_CONSTR_7 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
@@ -276,7 +276,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_verdirect_constraint_1,
-        &asn_PER_memb_verdirect_constr_2,
+        &ASN_PER_MEMB_VERDIRECT_CONSTR_2,
         0,
         "verdirect"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, bearing),
@@ -284,7 +284,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_bearing_constraint_1,
-        &asn_PER_memb_bearing_constr_3,
+        &ASN_PER_MEMB_BEARING_CONSTR_3,
         0,
         "bearing"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, horspeed),
@@ -292,7 +292,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_horspeed_constraint_1,
-        &asn_PER_memb_horspeed_constr_4,
+        &ASN_PER_MEMB_HORSPEED_CONSTR_4,
         0,
         "horspeed"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, verspeed),
@@ -300,7 +300,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_verspeed_constraint_1,
-        &asn_PER_memb_verspeed_constr_5,
+        &ASN_PER_MEMB_VERSPEED_CONSTR_5,
         0,
         "verspeed"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, horuncertspeed),
@@ -308,7 +308,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_horuncertspeed_constraint_1,
-        &asn_PER_memb_horuncertspeed_constr_6,
+        &ASN_PER_MEMB_HORUNCERTSPEED_CONSTR_6,
         0,
         "horuncertspeed"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandveruncert, veruncertspeed),
@@ -316,7 +316,7 @@ static asn_TYPE_member_t asn_MBR_Horandveruncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_veruncertspeed_constraint_1,
-        &asn_PER_memb_veruncertspeed_constr_7,
+        &ASN_PER_MEMB_VERUNCERTSPEED_CONSTR_7,
         0,
         "veruncertspeed"},
 };
diff --git a/src/core/libs/supl/asn-supl/Horandvervel.c b/src/core/libs/supl/asn-supl/Horandvervel.c
index b91d072e1..6f8b3bc5c 100644
--- a/src/core/libs/supl/asn-supl/Horandvervel.c
+++ b/src/core/libs/supl/asn-supl/Horandvervel.c
@@ -162,22 +162,22 @@ memb_verspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_verdirect_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERDIRECT_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 1, 1} /* (SIZE(1..1)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_bearing_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_4 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_verspeed_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERSPEED_CONSTR_5 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
@@ -188,7 +188,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_verdirect_constraint_1,
-        &asn_PER_memb_verdirect_constr_2,
+        &ASN_PER_MEMB_VERDIRECT_CONSTR_2,
         0,
         "verdirect"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandvervel, bearing),
@@ -196,7 +196,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_bearing_constraint_1,
-        &asn_PER_memb_bearing_constr_3,
+        &ASN_PER_MEMB_BEARING_CONSTR_3,
         0,
         "bearing"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandvervel, horspeed),
@@ -204,7 +204,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_horspeed_constraint_1,
-        &asn_PER_memb_horspeed_constr_4,
+        &ASN_PER_MEMB_HORSPEED_CONSTR_4,
         0,
         "horspeed"},
     {ATF_NOFLAGS, 0, offsetof(struct Horandvervel, verspeed),
@@ -212,7 +212,7 @@ static asn_TYPE_member_t asn_MBR_Horandvervel_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_verspeed_constraint_1,
-        &asn_PER_memb_verspeed_constr_5,
+        &ASN_PER_MEMB_VERSPEED_CONSTR_5,
         0,
         "verspeed"},
 };
diff --git a/src/core/libs/supl/asn-supl/Horvel.c b/src/core/libs/supl/asn-supl/Horvel.c
index 7c2080fff..fb8f8502c 100644
--- a/src/core/libs/supl/asn-supl/Horvel.c
+++ b/src/core/libs/supl/asn-supl/Horvel.c
@@ -84,12 +84,12 @@ memb_horspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_bearing_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
     0, 0 /* No PER value map */
@@ -100,7 +100,7 @@ static asn_TYPE_member_t asn_MBR_Horvel_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_bearing_constraint_1,
-        &asn_PER_memb_bearing_constr_2,
+        &ASN_PER_MEMB_BEARING_CONSTR_2,
         0,
         "bearing"},
     {ATF_NOFLAGS, 0, offsetof(struct Horvel, horspeed),
@@ -108,7 +108,7 @@ static asn_TYPE_member_t asn_MBR_Horvel_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_horspeed_constraint_1,
-        &asn_PER_memb_horspeed_constr_3,
+        &ASN_PER_MEMB_HORSPEED_CONSTR_3,
         0,
         "horspeed"},
 };
diff --git a/src/core/libs/supl/asn-supl/Horveluncert.c b/src/core/libs/supl/asn-supl/Horveluncert.c
index b3983f3f6..3e00aee15 100644
--- a/src/core/libs/supl/asn-supl/Horveluncert.c
+++ b/src/core/libs/supl/asn-supl/Horveluncert.c
@@ -123,17 +123,17 @@ memb_uncertspeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_bearing_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_BEARING_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 9, 9} /* (SIZE(9..9)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_horspeed_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORSPEED_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_uncertspeed_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_UNCERTSPEED_CONSTR_4 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
@@ -144,7 +144,7 @@ static asn_TYPE_member_t asn_MBR_Horveluncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_bearing_constraint_1,
-        &asn_PER_memb_bearing_constr_2,
+        &ASN_PER_MEMB_BEARING_CONSTR_2,
         0,
         "bearing"},
     {ATF_NOFLAGS, 0, offsetof(struct Horveluncert, horspeed),
@@ -152,7 +152,7 @@ static asn_TYPE_member_t asn_MBR_Horveluncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_horspeed_constraint_1,
-        &asn_PER_memb_horspeed_constr_3,
+        &ASN_PER_MEMB_HORSPEED_CONSTR_3,
         0,
         "horspeed"},
     {ATF_NOFLAGS, 0, offsetof(struct Horveluncert, uncertspeed),
@@ -160,7 +160,7 @@ static asn_TYPE_member_t asn_MBR_Horveluncert_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_uncertspeed_constraint_1,
-        &asn_PER_memb_uncertspeed_constr_4,
+        &ASN_PER_MEMB_UNCERTSPEED_CONSTR_4,
         0,
         "uncertspeed"},
 };
diff --git a/src/core/libs/supl/asn-supl/IA5String.c b/src/core/libs/supl/asn-supl/IA5String.c
index 02ecd3ee7..c404406d4 100644
--- a/src/core/libs/supl/asn-supl/IA5String.c
+++ b/src/core/libs/supl/asn-supl/IA5String.c
@@ -12,7 +12,7 @@ static ber_tlv_tag_t asn_DEF_IA5String_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (22 << 2)),	/* [UNIVERSAL 22] IMPLICIT ...*/
 	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))	/* ... OCTET STRING */
 };
-static asn_per_constraints_t asn_DEF_IA5String_constraints = {
+static asn_per_constraints_t ASN_DEF_I_A5_STRING_CONSTRAINTS = {
 	{ APC_CONSTRAINED, 7, 7, 0, 0x7f },	/* Value */
 	{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 },	/* Size */
 	0, 0
@@ -36,7 +36,7 @@ asn_TYPE_descriptor_t asn_DEF_IA5String = {
 	asn_DEF_IA5String_tags,
 	sizeof(asn_DEF_IA5String_tags)
 	  / sizeof(asn_DEF_IA5String_tags[0]),
-	&asn_DEF_IA5String_constraints,
+	&ASN_DEF_I_A5_STRING_CONSTRAINTS,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/IPAddress.c b/src/core/libs/supl/asn-supl/IPAddress.c
index f1861adac..1da24fbd8 100644
--- a/src/core/libs/supl/asn-supl/IPAddress.c
+++ b/src/core/libs/supl/asn-supl/IPAddress.c
@@ -68,17 +68,17 @@ memb_ipv6Address_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_ipv4Address_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_IPV4_ADDRESS_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 4, 4} /* (SIZE(4..4)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_ipv6Address_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_IPV6_ADDRESS_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 16, 16} /* (SIZE(16..16)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_type_IPAddress_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_IP_ADDRESS_CONSTR_1 = {
     {APC_CONSTRAINED, 1, 1, 0, 1} /* (0..1) */,
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     0, 0 /* No PER value map */
@@ -89,7 +89,7 @@ static asn_TYPE_member_t asn_MBR_IPAddress_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_OCTET_STRING,
         memb_ipv4Address_constraint_1,
-        &asn_PER_memb_ipv4Address_constr_2,
+        &ASN_PER_MEMB_IPV4_ADDRESS_CONSTR_2,
         0,
         "ipv4Address"},
     {ATF_NOFLAGS, 0, offsetof(struct IPAddress, choice.ipv6Address),
@@ -97,7 +97,7 @@ static asn_TYPE_member_t asn_MBR_IPAddress_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_OCTET_STRING,
         memb_ipv6Address_constraint_1,
-        &asn_PER_memb_ipv6Address_constr_3,
+        &ASN_PER_MEMB_IPV6_ADDRESS_CONSTR_3,
         0,
         "ipv6Address"},
 };
@@ -132,7 +132,7 @@ asn_TYPE_descriptor_t asn_DEF_IPAddress = {
     0, /* No effective tags (count) */
     0, /* No tags (pointer) */
     0, /* No tags (count) */
-    &asn_PER_type_IPAddress_constr_1,
+    &ASN_PER_TYPE_IP_ADDRESS_CONSTR_1,
     asn_MBR_IPAddress_1,
     2,                         /* Elements count */
     &asn_SPC_IPAddress_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/KeyIdentity.c b/src/core/libs/supl/asn-supl/KeyIdentity.c
index 49104664a..cb4081683 100644
--- a/src/core/libs/supl/asn-supl/KeyIdentity.c
+++ b/src/core/libs/supl/asn-supl/KeyIdentity.c
@@ -131,7 +131,7 @@ KeyIdentity_encode_uper(asn_TYPE_descriptor_t *td,
     return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_KeyIdentity_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_KEY_IDENTITY_CONSTR_1 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 128, 128} /* (SIZE(128..128)) */,
     0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_KeyIdentity = {
     sizeof(asn_DEF_KeyIdentity_tags_1) / sizeof(asn_DEF_KeyIdentity_tags_1[0]), /* 1 */
     asn_DEF_KeyIdentity_tags_1,                                                 /* Same as above */
     sizeof(asn_DEF_KeyIdentity_tags_1) / sizeof(asn_DEF_KeyIdentity_tags_1[0]), /* 1 */
-    &asn_PER_type_KeyIdentity_constr_1,
+    &ASN_PER_TYPE_KEY_IDENTITY_CONSTR_1,
     0, 0, /* No members */
     0     /* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/KeyIdentity4.c b/src/core/libs/supl/asn-supl/KeyIdentity4.c
index ef652c319..55c90f14e 100644
--- a/src/core/libs/supl/asn-supl/KeyIdentity4.c
+++ b/src/core/libs/supl/asn-supl/KeyIdentity4.c
@@ -131,7 +131,7 @@ KeyIdentity4_encode_uper(asn_TYPE_descriptor_t *td,
     return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_KeyIdentity4_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_KEY_IDENTITY4_CONSTR_1 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 128, 128} /* (SIZE(128..128)) */,
     0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_KeyIdentity4 = {
     sizeof(asn_DEF_KeyIdentity4_tags_1) / sizeof(asn_DEF_KeyIdentity4_tags_1[0]), /* 1 */
     asn_DEF_KeyIdentity4_tags_1,                                                  /* Same as above */
     sizeof(asn_DEF_KeyIdentity4_tags_1) / sizeof(asn_DEF_KeyIdentity4_tags_1[0]), /* 1 */
-    &asn_PER_type_KeyIdentity4_constr_1,
+    &ASN_PER_TYPE_KEY_IDENTITY4_CONSTR_1,
     0, 0, /* No members */
     0     /* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/MAC.c b/src/core/libs/supl/asn-supl/MAC.c
index 5592eaf53..2fe9de455 100644
--- a/src/core/libs/supl/asn-supl/MAC.c
+++ b/src/core/libs/supl/asn-supl/MAC.c
@@ -131,7 +131,7 @@ MAC_encode_uper(asn_TYPE_descriptor_t *td,
     return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_MAC_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MAC_CONSTR_1 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 64, 64} /* (SIZE(64..64)) */,
     0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_MAC = {
     sizeof(asn_DEF_MAC_tags_1) / sizeof(asn_DEF_MAC_tags_1[0]), /* 1 */
     asn_DEF_MAC_tags_1,                                         /* Same as above */
     sizeof(asn_DEF_MAC_tags_1) / sizeof(asn_DEF_MAC_tags_1[0]), /* 1 */
-    &asn_PER_type_MAC_constr_1,
+    &ASN_PER_TYPE_MAC_CONSTR_1,
     0, 0, /* No members */
     0     /* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/MeasuredResultsList.c b/src/core/libs/supl/asn-supl/MeasuredResultsList.c
index 1108ef45e..dd653c7a2 100644
--- a/src/core/libs/supl/asn-supl/MeasuredResultsList.c
+++ b/src/core/libs/supl/asn-supl/MeasuredResultsList.c
@@ -6,7 +6,7 @@
 
 #include "MeasuredResultsList.h"
 
-static asn_per_constraints_t asn_PER_type_MeasuredResultsList_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_MEASURED_RESULTS_LIST_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 3,  3,  1,  8 }	/* (SIZE(1..8)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_MeasuredResultsList = {
 	asn_DEF_MeasuredResultsList_tags_1,	/* Same as above */
 	sizeof(asn_DEF_MeasuredResultsList_tags_1)
 		/sizeof(asn_DEF_MeasuredResultsList_tags_1[0]), /* 1 */
-	&asn_PER_type_MeasuredResultsList_constr_1,
+	&ASN_PER_TYPE_MEASURED_RESULTS_LIST_CONSTR_1,
 	asn_MBR_MeasuredResultsList_1,
 	1,	/* Single element */
 	&asn_SPC_MeasuredResultsList_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/NMR.c b/src/core/libs/supl/asn-supl/NMR.c
index f64caffbe..f9fff612e 100644
--- a/src/core/libs/supl/asn-supl/NMR.c
+++ b/src/core/libs/supl/asn-supl/NMR.c
@@ -6,7 +6,7 @@
 
 #include "NMR.h"
 
-static asn_per_constraints_t asn_PER_type_NMR_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NMR_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  15 }	/* (SIZE(1..15)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_NMR = {
 	asn_DEF_NMR_tags_1,	/* Same as above */
 	sizeof(asn_DEF_NMR_tags_1)
 		/sizeof(asn_DEF_NMR_tags_1[0]), /* 1 */
-	&asn_PER_type_NMR_constr_1,
+	&ASN_PER_TYPE_NMR_CONSTR_1,
 	asn_MBR_NMR_1,
 	1,	/* Single element */
 	&asn_SPC_NMR_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/NMRelement.c b/src/core/libs/supl/asn-supl/NMRelement.c
index 79d122d82..ae64a2e78 100644
--- a/src/core/libs/supl/asn-supl/NMRelement.c
+++ b/src/core/libs/supl/asn-supl/NMRelement.c
@@ -81,17 +81,17 @@ memb_rxLev_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_aRFCN_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_A_RFCN_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_bSIC_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_B_SIC_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_rxLev_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_RX_LEV_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_NMRelement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_aRFCN_constraint_1,
-		&asn_PER_memb_aRFCN_constr_2,
+		&ASN_PER_MEMB_A_RFCN_CONSTR_2,
 		0,
 		"aRFCN"
 		},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_NMRelement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_bSIC_constraint_1,
-		&asn_PER_memb_bSIC_constr_3,
+		&ASN_PER_MEMB_B_SIC_CONSTR_3,
 		0,
 		"bSIC"
 		},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_NMRelement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_rxLev_constraint_1,
-		&asn_PER_memb_rxLev_constr_4,
+		&ASN_PER_MEMB_RX_LEV_CONSTR_4,
 		0,
 		"rxLev"
 		},
diff --git a/src/core/libs/supl/asn-supl/Notification.c b/src/core/libs/supl/asn-supl/Notification.c
index 7643e9048..c8d4c280e 100644
--- a/src/core/libs/supl/asn-supl/Notification.c
+++ b/src/core/libs/supl/asn-supl/Notification.c
@@ -58,12 +58,12 @@ memb_clientName_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_requestorId_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REQUESTOR_ID_CONSTR_4 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  50 }	/* (SIZE(1..50)) */,
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_clientName_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_CLIENT_NAME_CONSTR_6 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 6,  6,  1,  50 }	/* (SIZE(1..50)) */,
 	0, 0	/* No PER value map */
@@ -92,7 +92,7 @@ static asn_TYPE_member_t asn_MBR_Notification_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		memb_requestorId_constraint_1,
-		&asn_PER_memb_requestorId_constr_4,
+		&ASN_PER_MEMB_REQUESTOR_ID_CONSTR_4,
 		0,
 		"requestorId"
 		},
@@ -110,7 +110,7 @@ static asn_TYPE_member_t asn_MBR_Notification_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		memb_clientName_constraint_1,
-		&asn_PER_memb_clientName_constr_6,
+		&ASN_PER_MEMB_CLIENT_NAME_CONSTR_6,
 		0,
 		"clientName"
 		},
diff --git a/src/core/libs/supl/asn-supl/NotificationType.c b/src/core/libs/supl/asn-supl/NotificationType.c
index 8c1178a98..e6b591c40 100644
--- a/src/core/libs/supl/asn-supl/NotificationType.c
+++ b/src/core/libs/supl/asn-supl/NotificationType.c
@@ -94,7 +94,7 @@ NotificationType_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_NotificationType_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_NOTIFICATION_TYPE_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  4 }	/* (0..4,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -146,7 +146,7 @@ asn_TYPE_descriptor_t asn_DEF_NotificationType = {
 	asn_DEF_NotificationType_tags_1,	/* Same as above */
 	sizeof(asn_DEF_NotificationType_tags_1)
 		/sizeof(asn_DEF_NotificationType_tags_1[0]), /* 1 */
-	&asn_PER_type_NotificationType_constr_1,
+	&ASN_PER_TYPE_NOTIFICATION_TYPE_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_NotificationType_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/OCTET_STRING.c b/src/core/libs/supl/asn-supl/OCTET_STRING.c
index bd2d1d845..98aebb3bf 100644
--- a/src/core/libs/supl/asn-supl/OCTET_STRING.c
+++ b/src/core/libs/supl/asn-supl/OCTET_STRING.c
@@ -19,7 +19,7 @@ static asn_OCTET_STRING_specifics_t asn_DEF_OCTET_STRING_specs = {
 	offsetof(OCTET_STRING_t, _asn_ctx),
 	ASN_OSUBV_STR
 };
-static asn_per_constraints_t asn_DEF_OCTET_STRING_constraints = {
+static asn_per_constraints_t ASN_DEF_OCTET_STRING_CONSTRAINTS = {
 	{ APC_CONSTRAINED, 8, 8, 0, 255 },
 	{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 },
 	0, 0
@@ -1351,8 +1351,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
 		cval = &pc->value;
 		csiz = &pc->size;
 	} else {
-		cval = &asn_DEF_OCTET_STRING_constraints.value;
-		csiz = &asn_DEF_OCTET_STRING_constraints.size;
+		cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+		csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
 	}
 
 	switch(specs->subvariant) {
@@ -1400,8 +1400,8 @@ OCTET_STRING_decode_uper(asn_codec_ctx_t *opt_codec_ctx,
 		int inext = per_get_few_bits(pd, 1);
 		if(inext < 0) RETURN(RC_WMORE);
 		if(inext) {
-			csiz = &asn_DEF_OCTET_STRING_constraints.size;
-			cval = &asn_DEF_OCTET_STRING_constraints.value;
+			csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
+			cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
 			unit_bits = canonical_unit_bits;
 		}
 	}
@@ -1526,8 +1526,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
 		cval = &pc->value;
 		csiz = &pc->size;
 	} else {
-		cval = &asn_DEF_OCTET_STRING_constraints.value;
-		csiz = &asn_DEF_OCTET_STRING_constraints.size;
+		cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+		csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
 	}
 	ct_extensible = csiz->flags & APC_EXTENSIBLE;
 
@@ -1577,8 +1577,8 @@ OCTET_STRING_encode_uper(asn_TYPE_descriptor_t *td,
 		if((int)sizeinunits < csiz->lower_bound
 		|| (int)sizeinunits > csiz->upper_bound) {
 			if(ct_extensible) {
-				cval = &asn_DEF_OCTET_STRING_constraints.value;
-				csiz = &asn_DEF_OCTET_STRING_constraints.size;
+				cval = &ASN_DEF_OCTET_STRING_CONSTRAINTS.value;
+				csiz = &ASN_DEF_OCTET_STRING_CONSTRAINTS.size;
 				unit_bits = canonical_unit_bits;
 				inext = 1;
 			} else
diff --git a/src/core/libs/supl/asn-supl/Pathloss.c b/src/core/libs/supl/asn-supl/Pathloss.c
index 3bbec50fb..ddeca35b9 100644
--- a/src/core/libs/supl/asn-supl/Pathloss.c
+++ b/src/core/libs/supl/asn-supl/Pathloss.c
@@ -111,7 +111,7 @@ Pathloss_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_Pathloss_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_PATHLOSS_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  46,  173 }	/* (46..173) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_Pathloss = {
 	asn_DEF_Pathloss_tags_1,	/* Same as above */
 	sizeof(asn_DEF_Pathloss_tags_1)
 		/sizeof(asn_DEF_Pathloss_tags_1[0]), /* 1 */
-	&asn_PER_type_Pathloss_constr_1,
+	&ASN_PER_TYPE_PATHLOSS_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/PosMethod.c b/src/core/libs/supl/asn-supl/PosMethod.c
index d65c13b6f..b720df296 100644
--- a/src/core/libs/supl/asn-supl/PosMethod.c
+++ b/src/core/libs/supl/asn-supl/PosMethod.c
@@ -94,7 +94,7 @@ PosMethod_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_PosMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POS_METHOD_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  4,  4,  0,  9 }	/* (0..9,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -156,7 +156,7 @@ asn_TYPE_descriptor_t asn_DEF_PosMethod = {
 	asn_DEF_PosMethod_tags_1,	/* Same as above */
 	sizeof(asn_DEF_PosMethod_tags_1)
 		/sizeof(asn_DEF_PosMethod_tags_1[0]), /* 1 */
-	&asn_PER_type_PosMethod_constr_1,
+	&ASN_PER_TYPE_POS_METHOD_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_PosMethod_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/PosPayLoad.c b/src/core/libs/supl/asn-supl/PosPayLoad.c
index b12f05e74..ebb173c43 100644
--- a/src/core/libs/supl/asn-supl/PosPayLoad.c
+++ b/src/core/libs/supl/asn-supl/PosPayLoad.c
@@ -84,22 +84,22 @@ memb_rrlpPayload_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_tia801payload_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_TIA801PAYLOAD_CONSTR_2 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 13,  13,  1,  8192 }	/* (SIZE(1..8192)) */,
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_rrcPayload_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_RRC_PAYLOAD_CONSTR_3 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 13,  13,  1,  8192 }	/* (SIZE(1..8192)) */,
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_rrlpPayload_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_RRLP_PAYLOAD_CONSTR_4 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 13,  13,  1,  8192 }	/* (SIZE(1..8192)) */,
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_type_PosPayLoad_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_POS_PAY_LOAD_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -110,7 +110,7 @@ static asn_TYPE_member_t asn_MBR_PosPayLoad_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		memb_tia801payload_constraint_1,
-		&asn_PER_memb_tia801payload_constr_2,
+		&ASN_PER_MEMB_TIA801PAYLOAD_CONSTR_2,
 		0,
 		"tia801payload"
 		},
@@ -119,7 +119,7 @@ static asn_TYPE_member_t asn_MBR_PosPayLoad_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		memb_rrcPayload_constraint_1,
-		&asn_PER_memb_rrcPayload_constr_3,
+		&ASN_PER_MEMB_RRC_PAYLOAD_CONSTR_3,
 		0,
 		"rrcPayload"
 		},
@@ -128,7 +128,7 @@ static asn_TYPE_member_t asn_MBR_PosPayLoad_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_OCTET_STRING,
 		memb_rrlpPayload_constraint_1,
-		&asn_PER_memb_rrlpPayload_constr_4,
+		&ASN_PER_MEMB_RRLP_PAYLOAD_CONSTR_4,
 		0,
 		"rrlpPayload"
 		},
@@ -165,7 +165,7 @@ asn_TYPE_descriptor_t asn_DEF_PosPayLoad = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_PosPayLoad_constr_1,
+	&ASN_PER_TYPE_POS_PAY_LOAD_CONSTR_1,
 	asn_MBR_PosPayLoad_1,
 	3,	/* Elements count */
 	&asn_SPC_PosPayLoad_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/PositionEstimate.c b/src/core/libs/supl/asn-supl/PositionEstimate.c
index 4b7367af2..ee44b7a11 100644
--- a/src/core/libs/supl/asn-supl/PositionEstimate.c
+++ b/src/core/libs/supl/asn-supl/PositionEstimate.c
@@ -244,37 +244,37 @@ memb_confidence_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_type_latitudeSign_constr_2 = {
+static asn_per_constraints_t ASN_PER_TYPE_LATITUDE_SIGN_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_uncertaintySemiMajor_constr_8 = {
+static asn_per_constraints_t ASN_PER_MEMB_UNCERTAINTY_SEMI_MAJOR_CONSTR_8 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_uncertaintySemiMinor_constr_9 = {
+static asn_per_constraints_t ASN_PER_MEMB_UNCERTAINTY_SEMI_MINOR_CONSTR_9 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_orientationMajorAxis_constr_10 = {
+static asn_per_constraints_t ASN_PER_MEMB_ORIENTATION_MAJOR_AXIS_CONSTR_10 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  180 }	/* (0..180) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_latitude_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_LATITUDE_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 23, -1,  0,  8388607 }	/* (0..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_longitude_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_LONGITUDE_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 24, -1, -8388608,  8388607 }	/* (-8388608..8388607) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_confidence_constr_11 = {
+static asn_per_constraints_t ASN_PER_MEMB_CONFIDENCE_CONSTR_11 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  100 }	/* (0..100) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -320,7 +320,7 @@ asn_TYPE_descriptor_t asn_DEF_latitudeSign_2 = {
 	asn_DEF_latitudeSign_tags_2,	/* Same as above */
 	sizeof(asn_DEF_latitudeSign_tags_2)
 		/sizeof(asn_DEF_latitudeSign_tags_2[0]), /* 2 */
-	&asn_PER_type_latitudeSign_constr_2,
+	&ASN_PER_TYPE_LATITUDE_SIGN_CONSTR_2,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_latitudeSign_specs_2	/* Additional specs */
 };
@@ -331,7 +331,7 @@ static asn_TYPE_member_t asn_MBR_uncertainty_7[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_uncertaintySemiMajor_constraint_7,
-		&asn_PER_memb_uncertaintySemiMajor_constr_8,
+		&ASN_PER_MEMB_UNCERTAINTY_SEMI_MAJOR_CONSTR_8,
 		0,
 		"uncertaintySemiMajor"
 		},
@@ -340,7 +340,7 @@ static asn_TYPE_member_t asn_MBR_uncertainty_7[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_uncertaintySemiMinor_constraint_7,
-		&asn_PER_memb_uncertaintySemiMinor_constr_9,
+		&ASN_PER_MEMB_UNCERTAINTY_SEMI_MINOR_CONSTR_9,
 		0,
 		"uncertaintySemiMinor"
 		},
@@ -349,7 +349,7 @@ static asn_TYPE_member_t asn_MBR_uncertainty_7[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_orientationMajorAxis_constraint_7,
-		&asn_PER_memb_orientationMajorAxis_constr_10,
+		&ASN_PER_MEMB_ORIENTATION_MAJOR_AXIS_CONSTR_10,
 		0,
 		"orientationMajorAxis"
 		},
@@ -413,7 +413,7 @@ static asn_TYPE_member_t asn_MBR_PositionEstimate_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_latitude_constraint_1,
-		&asn_PER_memb_latitude_constr_5,
+		&ASN_PER_MEMB_LATITUDE_CONSTR_5,
 		0,
 		"latitude"
 		},
@@ -422,7 +422,7 @@ static asn_TYPE_member_t asn_MBR_PositionEstimate_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_longitude_constraint_1,
-		&asn_PER_memb_longitude_constr_6,
+		&ASN_PER_MEMB_LONGITUDE_CONSTR_6,
 		0,
 		"longitude"
 		},
@@ -440,7 +440,7 @@ static asn_TYPE_member_t asn_MBR_PositionEstimate_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_confidence_constraint_1,
-		&asn_PER_memb_confidence_constr_11,
+		&ASN_PER_MEMB_CONFIDENCE_CONSTR_11,
 		0,
 		"confidence"
 		},
diff --git a/src/core/libs/supl/asn-supl/PrefMethod.c b/src/core/libs/supl/asn-supl/PrefMethod.c
index 3949a64ec..e07280a8f 100644
--- a/src/core/libs/supl/asn-supl/PrefMethod.c
+++ b/src/core/libs/supl/asn-supl/PrefMethod.c
@@ -94,7 +94,7 @@ PrefMethod_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_PrefMethod_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_PREF_METHOD_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 2,  2,  0,  2 }	/* (0..2) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -140,7 +140,7 @@ asn_TYPE_descriptor_t asn_DEF_PrefMethod = {
 	asn_DEF_PrefMethod_tags_1,	/* Same as above */
 	sizeof(asn_DEF_PrefMethod_tags_1)
 		/sizeof(asn_DEF_PrefMethod_tags_1[0]), /* 1 */
-	&asn_PER_type_PrefMethod_constr_1,
+	&ASN_PER_TYPE_PREF_METHOD_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_PrefMethod_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c b/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c
index ea2ce5877..1c7d91177 100644
--- a/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c
+++ b/src/core/libs/supl/asn-supl/PrimaryCCPCH-RSCP.c
@@ -111,7 +111,7 @@ PrimaryCCPCH_RSCP_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_PrimaryCCPCH_RSCP_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_PRIMARY_CCPCH_RSCP_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_PrimaryCCPCH_RSCP = {
 	asn_DEF_PrimaryCCPCH_RSCP_tags_1,	/* Same as above */
 	sizeof(asn_DEF_PrimaryCCPCH_RSCP_tags_1)
 		/sizeof(asn_DEF_PrimaryCCPCH_RSCP_tags_1[0]), /* 1 */
-	&asn_PER_type_PrimaryCCPCH_RSCP_constr_1,
+	&ASN_PER_TYPE_PRIMARY_CCPCH_RSCP_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c b/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c
index 62efe3f10..f7afc5b7c 100644
--- a/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c
+++ b/src/core/libs/supl/asn-supl/PrimaryCPICH-Info.c
@@ -31,7 +31,7 @@ memb_primaryScramblingCode_constraint_1(asn_TYPE_descriptor_t *td, const void *s
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_primaryScramblingCode_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 9,  9,  0,  511 }	/* (0..511) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_PrimaryCPICH_Info_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_primaryScramblingCode_constraint_1,
-		&asn_PER_memb_primaryScramblingCode_constr_2,
+		&ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_2,
 		0,
 		"primaryScramblingCode"
 		},
diff --git a/src/core/libs/supl/asn-supl/QoP.c b/src/core/libs/supl/asn-supl/QoP.c
index 5591c9f49..9bc7e6372 100644
--- a/src/core/libs/supl/asn-supl/QoP.c
+++ b/src/core/libs/supl/asn-supl/QoP.c
@@ -106,22 +106,22 @@ memb_delay_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_horacc_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_HORACC_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_veracc_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_VERACC_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_maxLocAge_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_MAX_LOC_AGE_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_delay_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_DELAY_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 3,  3,  0,  7 }	/* (0..7) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_horacc_constraint_1,
-		&asn_PER_memb_horacc_constr_2,
+		&ASN_PER_MEMB_HORACC_CONSTR_2,
 		0,
 		"horacc"
 		},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_veracc_constraint_1,
-		&asn_PER_memb_veracc_constr_3,
+		&ASN_PER_MEMB_VERACC_CONSTR_3,
 		0,
 		"veracc"
 		},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_maxLocAge_constraint_1,
-		&asn_PER_memb_maxLocAge_constr_4,
+		&ASN_PER_MEMB_MAX_LOC_AGE_CONSTR_4,
 		0,
 		"maxLocAge"
 		},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_QoP_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_delay_constraint_1,
-		&asn_PER_memb_delay_constr_5,
+		&ASN_PER_MEMB_DELAY_CONSTR_5,
 		0,
 		"delay"
 		},
diff --git a/src/core/libs/supl/asn-supl/SETAuthKey.c b/src/core/libs/supl/asn-supl/SETAuthKey.c
index 3069866a2..7918881de 100644
--- a/src/core/libs/supl/asn-supl/SETAuthKey.c
+++ b/src/core/libs/supl/asn-supl/SETAuthKey.c
@@ -84,17 +84,17 @@ memb_longKey_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_shortKey_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SHORT_KEY_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 128, 128} /* (SIZE(128..128)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_longKey_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_LONG_KEY_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 256, 256} /* (SIZE(256..256)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_type_SETAuthKey_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SET_AUTH_KEY_CONSTR_1 = {
     {APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1} /* (0..1,...) */,
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     0, 0 /* No PER value map */
@@ -105,7 +105,7 @@ static asn_TYPE_member_t asn_MBR_SETAuthKey_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_shortKey_constraint_1,
-        &asn_PER_memb_shortKey_constr_2,
+        &ASN_PER_MEMB_SHORT_KEY_CONSTR_2,
         0,
         "shortKey"},
     {ATF_NOFLAGS, 0, offsetof(struct SETAuthKey, choice.longKey),
@@ -113,7 +113,7 @@ static asn_TYPE_member_t asn_MBR_SETAuthKey_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_longKey_constraint_1,
-        &asn_PER_memb_longKey_constr_3,
+        &ASN_PER_MEMB_LONG_KEY_CONSTR_3,
         0,
         "longKey"},
 };
@@ -148,7 +148,7 @@ asn_TYPE_descriptor_t asn_DEF_SETAuthKey = {
     0, /* No effective tags (count) */
     0, /* No tags (pointer) */
     0, /* No tags (count) */
-    &asn_PER_type_SETAuthKey_constr_1,
+    &ASN_PER_TYPE_SET_AUTH_KEY_CONSTR_1,
     asn_MBR_SETAuthKey_1,
     2,                          /* Elements count */
     &asn_SPC_SETAuthKey_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SETId.c b/src/core/libs/supl/asn-supl/SETId.c
index 93a635e23..ec2936fb5 100644
--- a/src/core/libs/supl/asn-supl/SETId.c
+++ b/src/core/libs/supl/asn-supl/SETId.c
@@ -184,32 +184,32 @@ memb_nai_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_msisdn_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_MSISDN_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_mdn_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_MDN_CONSTR_3 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_min_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_MIN_CONSTR_4 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 34, 34} /* (SIZE(34..34)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_imsi_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_IMSI_CONSTR_5 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 8, 8} /* (SIZE(8..8)) */,
     0, 0 /* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_nai_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_NAI_CONSTR_6 = {
     {APC_CONSTRAINED, 7, 7, 0, 127} /* (0..127) */,
     {APC_CONSTRAINED, 10, 10, 1, 1000} /* (SIZE(1..1000)) */,
     0, 0 /* No PER character map necessary */
 };
-static asn_per_constraints_t asn_PER_type_SETId_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SET_ID_CONSTR_1 = {
     {APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 5} /* (0..5,...) */,
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     0, 0 /* No PER value map */
@@ -220,7 +220,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_OCTET_STRING,
         memb_msisdn_constraint_1,
-        &asn_PER_memb_msisdn_constr_2,
+        &ASN_PER_MEMB_MSISDN_CONSTR_2,
         0,
         "msisdn"},
     {ATF_NOFLAGS, 0, offsetof(struct SETId, choice.mdn),
@@ -228,7 +228,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_OCTET_STRING,
         memb_mdn_constraint_1,
-        &asn_PER_memb_mdn_constr_3,
+        &ASN_PER_MEMB_MDN_CONSTR_3,
         0,
         "mdn"},
     {ATF_NOFLAGS, 0, offsetof(struct SETId, choice.min),
@@ -236,7 +236,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_BIT_STRING,
         memb_min_constraint_1,
-        &asn_PER_memb_min_constr_4,
+        &ASN_PER_MEMB_MIN_CONSTR_4,
         0,
         "min"},
     {ATF_NOFLAGS, 0, offsetof(struct SETId, choice.imsi),
@@ -244,7 +244,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_OCTET_STRING,
         memb_imsi_constraint_1,
-        &asn_PER_memb_imsi_constr_5,
+        &ASN_PER_MEMB_IMSI_CONSTR_5,
         0,
         "imsi"},
     {ATF_NOFLAGS, 0, offsetof(struct SETId, choice.nai),
@@ -252,7 +252,7 @@ static asn_TYPE_member_t asn_MBR_SETId_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_IA5String,
         memb_nai_constraint_1,
-        &asn_PER_memb_nai_constr_6,
+        &ASN_PER_MEMB_NAI_CONSTR_6,
         0,
         "nai"},
     {ATF_NOFLAGS, 0, offsetof(struct SETId, choice.iPAddress),
@@ -299,7 +299,7 @@ asn_TYPE_descriptor_t asn_DEF_SETId = {
     0, /* No effective tags (count) */
     0, /* No tags (pointer) */
     0, /* No tags (count) */
-    &asn_PER_type_SETId_constr_1,
+    &ASN_PER_TYPE_SET_ID_CONSTR_1,
     asn_MBR_SETId_1,
     6,                     /* Elements count */
     &asn_SPC_SETId_specs_1 /* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SLPAddress.c b/src/core/libs/supl/asn-supl/SLPAddress.c
index d123057c7..ece16a747 100644
--- a/src/core/libs/supl/asn-supl/SLPAddress.c
+++ b/src/core/libs/supl/asn-supl/SLPAddress.c
@@ -6,7 +6,7 @@
 
 #include "SLPAddress.h"
 
-static asn_per_constraints_t asn_PER_type_SLPAddress_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SLP_ADDRESS_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0,  1 }	/* (0..1,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -62,7 +62,7 @@ asn_TYPE_descriptor_t asn_DEF_SLPAddress = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_SLPAddress_constr_1,
+	&ASN_PER_TYPE_SLP_ADDRESS_CONSTR_1,
 	asn_MBR_SLPAddress_1,
 	2,	/* Elements count */
 	&asn_SPC_SLPAddress_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SLPMode.c b/src/core/libs/supl/asn-supl/SLPMode.c
index f01e1f89a..79bf7a835 100644
--- a/src/core/libs/supl/asn-supl/SLPMode.c
+++ b/src/core/libs/supl/asn-supl/SLPMode.c
@@ -94,7 +94,7 @@ SLPMode_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_SLPMode_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SLP_MODE_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 1,  1,  0,  1 }	/* (0..1) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_SLPMode = {
 	asn_DEF_SLPMode_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SLPMode_tags_1)
 		/sizeof(asn_DEF_SLPMode_tags_1[0]), /* 1 */
-	&asn_PER_type_SLPMode_constr_1,
+	&ASN_PER_TYPE_SLP_MODE_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_SLPMode_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/SatelliteInfo.c b/src/core/libs/supl/asn-supl/SatelliteInfo.c
index b32a55b86..428a1c2a0 100644
--- a/src/core/libs/supl/asn-supl/SatelliteInfo.c
+++ b/src/core/libs/supl/asn-supl/SatelliteInfo.c
@@ -6,7 +6,7 @@
 
 #include "SatelliteInfo.h"
 
-static asn_per_constraints_t asn_PER_type_SatelliteInfo_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_SATELLITE_INFO_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 5,  5,  1,  31 }	/* (SIZE(1..31)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_SatelliteInfo = {
 	asn_DEF_SatelliteInfo_tags_1,	/* Same as above */
 	sizeof(asn_DEF_SatelliteInfo_tags_1)
 		/sizeof(asn_DEF_SatelliteInfo_tags_1[0]), /* 1 */
-	&asn_PER_type_SatelliteInfo_constr_1,
+	&ASN_PER_TYPE_SATELLITE_INFO_CONSTR_1,
 	asn_MBR_SatelliteInfo_1,
 	1,	/* Single element */
 	&asn_SPC_SatelliteInfo_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/SatelliteInfoElement.c b/src/core/libs/supl/asn-supl/SatelliteInfoElement.c
index 0590d6e3b..3580d65e4 100644
--- a/src/core/libs/supl/asn-supl/SatelliteInfoElement.c
+++ b/src/core/libs/supl/asn-supl/SatelliteInfoElement.c
@@ -56,12 +56,12 @@ memb_iODE_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_satId_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SAT_ID_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 6,  6,  0,  63 }	/* (0..63) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_iODE_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_I_ODE_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -72,7 +72,7 @@ static asn_TYPE_member_t asn_MBR_SatelliteInfoElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_satId_constraint_1,
-		&asn_PER_memb_satId_constr_2,
+		&ASN_PER_MEMB_SAT_ID_CONSTR_2,
 		0,
 		"satId"
 		},
@@ -81,7 +81,7 @@ static asn_TYPE_member_t asn_MBR_SatelliteInfoElement_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_iODE_constraint_1,
-		&asn_PER_memb_iODE_constr_3,
+		&ASN_PER_MEMB_I_ODE_CONSTR_3,
 		0,
 		"iODE"
 		},
diff --git a/src/core/libs/supl/asn-supl/SetSessionID.c b/src/core/libs/supl/asn-supl/SetSessionID.c
index 5adf6d09e..11a122d2b 100644
--- a/src/core/libs/supl/asn-supl/SetSessionID.c
+++ b/src/core/libs/supl/asn-supl/SetSessionID.c
@@ -31,7 +31,7 @@ memb_sessionId_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_sessionId_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SESSION_ID_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_SetSessionID_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_sessionId_constraint_1,
-		&asn_PER_memb_sessionId_constr_2,
+		&ASN_PER_MEMB_SESSION_ID_CONSTR_2,
 		0,
 		"sessionId"
 		},
diff --git a/src/core/libs/supl/asn-supl/SlpSessionID.c b/src/core/libs/supl/asn-supl/SlpSessionID.c
index 0e52d2d34..aed350daa 100644
--- a/src/core/libs/supl/asn-supl/SlpSessionID.c
+++ b/src/core/libs/supl/asn-supl/SlpSessionID.c
@@ -37,7 +37,7 @@ memb_sessionID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
         }
 }
 
-static asn_per_constraints_t asn_PER_memb_sessionID_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_SESSION_ID_CONSTR_2 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 4, 4} /* (SIZE(4..4)) */,
     0, 0 /* No PER value map */
@@ -48,7 +48,7 @@ static asn_TYPE_member_t asn_MBR_SlpSessionID_1[] = {
         -1, /* IMPLICIT tag at current level */
         &asn_DEF_OCTET_STRING,
         memb_sessionID_constraint_1,
-        &asn_PER_memb_sessionID_constr_2,
+        &ASN_PER_MEMB_SESSION_ID_CONSTR_2,
         0,
         "sessionID"},
     {ATF_NOFLAGS, 0, offsetof(struct SlpSessionID, slpId),
diff --git a/src/core/libs/supl/asn-supl/Status.c b/src/core/libs/supl/asn-supl/Status.c
index 5637fd918..acb84c342 100644
--- a/src/core/libs/supl/asn-supl/Status.c
+++ b/src/core/libs/supl/asn-supl/Status.c
@@ -94,7 +94,7 @@ Status_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_Status_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_STATUS_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  2 }	/* (0..2,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -142,7 +142,7 @@ asn_TYPE_descriptor_t asn_DEF_Status = {
 	asn_DEF_Status_tags_1,	/* Same as above */
 	sizeof(asn_DEF_Status_tags_1)
 		/sizeof(asn_DEF_Status_tags_1[0]), /* 1 */
-	&asn_PER_type_Status_constr_1,
+	&ASN_PER_TYPE_STATUS_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_Status_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/StatusCode.c b/src/core/libs/supl/asn-supl/StatusCode.c
index 3edb52a21..e4828f47f 100644
--- a/src/core/libs/supl/asn-supl/StatusCode.c
+++ b/src/core/libs/supl/asn-supl/StatusCode.c
@@ -94,7 +94,7 @@ StatusCode_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_StatusCode_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_STATUS_CODE_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  5,  5,  0,  19 }	/* (0..19,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -176,7 +176,7 @@ asn_TYPE_descriptor_t asn_DEF_StatusCode = {
 	asn_DEF_StatusCode_tags_1,	/* Same as above */
 	sizeof(asn_DEF_StatusCode_tags_1)
 		/sizeof(asn_DEF_StatusCode_tags_1[0]), /* 1 */
-	&asn_PER_type_StatusCode_constr_1,
+	&ASN_PER_TYPE_STATUS_CODE_CONSTR_1,
 	0, 0,	/* Defined elsewhere */
 	&asn_SPC_StatusCode_specs_1	/* Additional specs */
 };
diff --git a/src/core/libs/supl/asn-supl/TGSN.c b/src/core/libs/supl/asn-supl/TGSN.c
index 2da645c36..36f840d4e 100644
--- a/src/core/libs/supl/asn-supl/TGSN.c
+++ b/src/core/libs/supl/asn-supl/TGSN.c
@@ -111,7 +111,7 @@ TGSN_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TGSN_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TGSN_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 4,  4,  0,  14 }	/* (0..14) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TGSN = {
 	asn_DEF_TGSN_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TGSN_tags_1)
 		/sizeof(asn_DEF_TGSN_tags_1[0]), /* 1 */
-	&asn_PER_type_TGSN_constr_1,
+	&ASN_PER_TYPE_TGSN_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/TimeslotISCP-List.c b/src/core/libs/supl/asn-supl/TimeslotISCP-List.c
index cd5e6bd0f..02831de49 100644
--- a/src/core/libs/supl/asn-supl/TimeslotISCP-List.c
+++ b/src/core/libs/supl/asn-supl/TimeslotISCP-List.c
@@ -6,7 +6,7 @@
 
 #include "TimeslotISCP-List.h"
 
-static asn_per_constraints_t asn_PER_type_TimeslotISCP_List_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIMESLOT_ISCP_LIST_CONSTR_1 = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	{ APC_CONSTRAINED,	 4,  4,  1,  14 }	/* (SIZE(1..14)) */,
 	0, 0	/* No PER value map */
@@ -49,7 +49,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeslotISCP_List = {
 	asn_DEF_TimeslotISCP_List_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TimeslotISCP_List_tags_1)
 		/sizeof(asn_DEF_TimeslotISCP_List_tags_1[0]), /* 1 */
-	&asn_PER_type_TimeslotISCP_List_constr_1,
+	&ASN_PER_TYPE_TIMESLOT_ISCP_LIST_CONSTR_1,
 	asn_MBR_TimeslotISCP_List_1,
 	1,	/* Single element */
 	&asn_SPC_TimeslotISCP_List_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/TimeslotISCP.c b/src/core/libs/supl/asn-supl/TimeslotISCP.c
index d0a155752..411f73f71 100644
--- a/src/core/libs/supl/asn-supl/TimeslotISCP.c
+++ b/src/core/libs/supl/asn-supl/TimeslotISCP.c
@@ -111,7 +111,7 @@ TimeslotISCP_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_TimeslotISCP_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_TIMESLOT_ISCP_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_TimeslotISCP = {
 	asn_DEF_TimeslotISCP_tags_1,	/* Same as above */
 	sizeof(asn_DEF_TimeslotISCP_tags_1)
 		/sizeof(asn_DEF_TimeslotISCP_tags_1[0]), /* 1 */
-	&asn_PER_type_TimeslotISCP_constr_1,
+	&ASN_PER_TYPE_TIMESLOT_ISCP_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/UARFCN.c b/src/core/libs/supl/asn-supl/UARFCN.c
index 5a703b7ce..96bd38dbd 100644
--- a/src/core/libs/supl/asn-supl/UARFCN.c
+++ b/src/core/libs/supl/asn-supl/UARFCN.c
@@ -111,7 +111,7 @@ UARFCN_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_UARFCN_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_UARFCN_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 14,  14,  0,  16383 }	/* (0..16383) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UARFCN = {
 	asn_DEF_UARFCN_tags_1,	/* Same as above */
 	sizeof(asn_DEF_UARFCN_tags_1)
 		/sizeof(asn_DEF_UARFCN_tags_1[0]), /* 1 */
-	&asn_PER_type_UARFCN_constr_1,
+	&ASN_PER_TYPE_UARFCN_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/ULP-PDU.c b/src/core/libs/supl/asn-supl/ULP-PDU.c
index 75ac7fab2..a96fee787 100644
--- a/src/core/libs/supl/asn-supl/ULP-PDU.c
+++ b/src/core/libs/supl/asn-supl/ULP-PDU.c
@@ -31,7 +31,7 @@ memb_length_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_length_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_LENGTH_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 16,  16,  0,  65535 }	/* (0..65535) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -42,7 +42,7 @@ static asn_TYPE_member_t asn_MBR_ULP_PDU_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_length_constraint_1,
-		&asn_PER_memb_length_constr_2,
+		&ASN_PER_MEMB_LENGTH_CONSTR_2,
 		0,
 		"length"
 		},
diff --git a/src/core/libs/supl/asn-supl/UTCTime.c b/src/core/libs/supl/asn-supl/UTCTime.c
index 0abe1db74..a3d73e337 100644
--- a/src/core/libs/supl/asn-supl/UTCTime.c
+++ b/src/core/libs/supl/asn-supl/UTCTime.c
@@ -23,7 +23,7 @@ static ber_tlv_tag_t asn_DEF_UTCTime_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (26 << 2)),  /* [UNIVERSAL 26] IMPLICIT ...*/
 	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))    /* ... OCTET STRING */
 };
-static asn_per_constraints_t asn_DEF_UTCTime_constraints = {
+static asn_per_constraints_t ASN_DEF_UTC_TIME_CONSTRAINTS = {
         { APC_CONSTRAINED, 7, 7, 0x20, 0x7e },  /* Value */
         { APC_SEMI_CONSTRAINED, -1, -1, 0, 0 }, /* Size */
         0, 0
@@ -47,7 +47,7 @@ asn_TYPE_descriptor_t asn_DEF_UTCTime = {
 	asn_DEF_UTCTime_tags,
 	sizeof(asn_DEF_UTCTime_tags)
 	  / sizeof(asn_DEF_UTCTime_tags[0]),
-	&asn_DEF_UTCTime_constraints,
+	&ASN_DEF_UTC_TIME_CONSTRAINTS,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c b/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c
index 77b24d619..9c735eee3 100644
--- a/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c
+++ b/src/core/libs/supl/asn-supl/UTRA-CarrierRSSI.c
@@ -111,7 +111,7 @@ UTRA_CarrierRSSI_encode_uper(asn_TYPE_descriptor_t *td,
 	return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_UTRA_CarrierRSSI_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_UTRA_CARRIER_RSSI_CONSTR_1 = {
 	{ APC_CONSTRAINED,	 7,  7,  0,  127 }	/* (0..127) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -138,7 +138,7 @@ asn_TYPE_descriptor_t asn_DEF_UTRA_CarrierRSSI = {
 	asn_DEF_UTRA_CarrierRSSI_tags_1,	/* Same as above */
 	sizeof(asn_DEF_UTRA_CarrierRSSI_tags_1)
 		/sizeof(asn_DEF_UTRA_CarrierRSSI_tags_1[0]), /* 1 */
-	&asn_PER_type_UTRA_CarrierRSSI_constr_1,
+	&ASN_PER_TYPE_UTRA_CARRIER_RSSI_CONSTR_1,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/UlpMessage.c b/src/core/libs/supl/asn-supl/UlpMessage.c
index d27e05d04..8953cf17a 100644
--- a/src/core/libs/supl/asn-supl/UlpMessage.c
+++ b/src/core/libs/supl/asn-supl/UlpMessage.c
@@ -6,7 +6,7 @@
 
 #include "UlpMessage.h"
 
-static asn_per_constraints_t asn_PER_type_UlpMessage_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_ULP_MESSAGE_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0,  7 }	/* (0..7,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -122,7 +122,7 @@ asn_TYPE_descriptor_t asn_DEF_UlpMessage = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_UlpMessage_constr_1,
+	&ASN_PER_TYPE_ULP_MESSAGE_CONSTR_1,
 	asn_MBR_UlpMessage_1,
 	8,	/* Elements count */
 	&asn_SPC_UlpMessage_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/Velocity.c b/src/core/libs/supl/asn-supl/Velocity.c
index 67e4e4c66..59d08fb55 100644
--- a/src/core/libs/supl/asn-supl/Velocity.c
+++ b/src/core/libs/supl/asn-supl/Velocity.c
@@ -6,7 +6,7 @@
 
 #include "Velocity.h"
 
-static asn_per_constraints_t asn_PER_type_Velocity_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_VELOCITY_CONSTR_1 = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0,  3 }	/* (0..3,...) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -82,7 +82,7 @@ asn_TYPE_descriptor_t asn_DEF_Velocity = {
 	0,	/* No effective tags (count) */
 	0,	/* No tags (pointer) */
 	0,	/* No tags (count) */
-	&asn_PER_type_Velocity_constr_1,
+	&ASN_PER_TYPE_VELOCITY_CONSTR_1,
 	asn_MBR_Velocity_1,
 	4,	/* Elements count */
 	&asn_SPC_Velocity_specs_1	/* Additional specs */
diff --git a/src/core/libs/supl/asn-supl/Ver.c b/src/core/libs/supl/asn-supl/Ver.c
index 5c99a89fc..13a139987 100644
--- a/src/core/libs/supl/asn-supl/Ver.c
+++ b/src/core/libs/supl/asn-supl/Ver.c
@@ -131,7 +131,7 @@ Ver_encode_uper(asn_TYPE_descriptor_t *td,
     return td->uper_encoder(td, constraints, structure, per_out);
 }
 
-static asn_per_constraints_t asn_PER_type_Ver_constr_1 = {
+static asn_per_constraints_t ASN_PER_TYPE_VER_CONSTR_1 = {
     {APC_UNCONSTRAINED, -1, -1, 0, 0},
     {APC_CONSTRAINED, 0, 0, 64, 64} /* (SIZE(64..64)) */,
     0, 0 /* No PER value map */
@@ -155,7 +155,7 @@ asn_TYPE_descriptor_t asn_DEF_Ver = {
     sizeof(asn_DEF_Ver_tags_1) / sizeof(asn_DEF_Ver_tags_1[0]), /* 1 */
     asn_DEF_Ver_tags_1,                                         /* Same as above */
     sizeof(asn_DEF_Ver_tags_1) / sizeof(asn_DEF_Ver_tags_1[0]), /* 1 */
-    &asn_PER_type_Ver_constr_1,
+    &ASN_PER_TYPE_VER_CONSTR_1,
     0, 0, /* No members */
     0     /* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/Version.c b/src/core/libs/supl/asn-supl/Version.c
index 3f5d9b753..ebde033d9 100644
--- a/src/core/libs/supl/asn-supl/Version.c
+++ b/src/core/libs/supl/asn-supl/Version.c
@@ -81,17 +81,17 @@ memb_servind_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_maj_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_MAJ_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_min_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_MIN_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_servind_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_SERVIND_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  255 }	/* (0..255) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -102,7 +102,7 @@ static asn_TYPE_member_t asn_MBR_Version_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_maj_constraint_1,
-		&asn_PER_memb_maj_constr_2,
+		&ASN_PER_MEMB_MAJ_CONSTR_2,
 		0,
 		"maj"
 		},
@@ -111,7 +111,7 @@ static asn_TYPE_member_t asn_MBR_Version_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_min_constraint_1,
-		&asn_PER_memb_min_constr_3,
+		&ASN_PER_MEMB_MIN_CONSTR_3,
 		0,
 		"min"
 		},
@@ -120,7 +120,7 @@ static asn_TYPE_member_t asn_MBR_Version_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_servind_constraint_1,
-		&asn_PER_memb_servind_constr_4,
+		&ASN_PER_MEMB_SERVIND_CONSTR_4,
 		0,
 		"servind"
 		},
diff --git a/src/core/libs/supl/asn-supl/VisibleString.c b/src/core/libs/supl/asn-supl/VisibleString.c
index 3487b6f93..8ef827f35 100644
--- a/src/core/libs/supl/asn-supl/VisibleString.c
+++ b/src/core/libs/supl/asn-supl/VisibleString.c
@@ -12,7 +12,7 @@ static ber_tlv_tag_t asn_DEF_VisibleString_tags[] = {
 	(ASN_TAG_CLASS_UNIVERSAL | (26 << 2)),	/* [UNIVERSAL 26] IMPLICIT ...*/
 	(ASN_TAG_CLASS_UNIVERSAL | (4 << 2))	/* ... OCTET STRING */
 };
-static asn_per_constraints_t asn_DEF_VisibleString_constraints = {
+static asn_per_constraints_t ASN_DEF_VISIBLE_STRING_CONSTRAINTS = {
 	{ APC_CONSTRAINED, 7, 7, 0x20, 0x7e },	/* Value */
 	{ APC_SEMI_CONSTRAINED, -1, -1, 0, 0 },	/* Size */
 	0, 0
@@ -36,7 +36,7 @@ asn_TYPE_descriptor_t asn_DEF_VisibleString = {
 	asn_DEF_VisibleString_tags,
 	sizeof(asn_DEF_VisibleString_tags)
 	  / sizeof(asn_DEF_VisibleString_tags[0]),
-	&asn_DEF_VisibleString_constraints,
+	&ASN_DEF_VISIBLE_STRING_CONSTRAINTS,
 	0, 0,	/* No members */
 	0	/* No specifics */
 };
diff --git a/src/core/libs/supl/asn-supl/WcdmaCellInformation.c b/src/core/libs/supl/asn-supl/WcdmaCellInformation.c
index d4561099c..bc5b17d0f 100644
--- a/src/core/libs/supl/asn-supl/WcdmaCellInformation.c
+++ b/src/core/libs/supl/asn-supl/WcdmaCellInformation.c
@@ -106,22 +106,22 @@ memb_primaryScramblingCode_constraint_1(asn_TYPE_descriptor_t *td, const void *s
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_refMCC_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MCC_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  999 }	/* (0..999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refMNC_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_MNC_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  999 }	/* (0..999) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_refUC_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_REF_UC_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 28, -1,  0,  268435455 }	/* (0..268435455) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_primaryScramblingCode_constr_6 = {
+static asn_per_constraints_t ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_6 = {
 	{ APC_CONSTRAINED,	 9,  9,  0,  511 }	/* (0..511) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refMCC_constraint_1,
-		&asn_PER_memb_refMCC_constr_2,
+		&ASN_PER_MEMB_REF_MCC_CONSTR_2,
 		0,
 		"refMCC"
 		},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refMNC_constraint_1,
-		&asn_PER_memb_refMNC_constr_3,
+		&ASN_PER_MEMB_REF_MNC_CONSTR_3,
 		0,
 		"refMNC"
 		},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_refUC_constraint_1,
-		&asn_PER_memb_refUC_constr_4,
+		&ASN_PER_MEMB_REF_UC_CONSTR_4,
 		0,
 		"refUC"
 		},
@@ -168,7 +168,7 @@ static asn_TYPE_member_t asn_MBR_WcdmaCellInformation_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_primaryScramblingCode_constraint_1,
-		&asn_PER_memb_primaryScramblingCode_constr_6,
+		&ASN_PER_MEMB_PRIMARY_SCRAMBLING_CODE_CONSTR_6,
 		0,
 		"primaryScramblingCode"
 		},
diff --git a/src/core/libs/supl/asn-supl/XNavigationModel.c b/src/core/libs/supl/asn-supl/XNavigationModel.c
index 4440f2557..9af4d5b13 100644
--- a/src/core/libs/supl/asn-supl/XNavigationModel.c
+++ b/src/core/libs/supl/asn-supl/XNavigationModel.c
@@ -106,22 +106,22 @@ memb_toeLimit_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
 	}
 }
 
-static asn_per_constraints_t asn_PER_memb_gpsWeek_constr_2 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_WEEK_CONSTR_2 = {
 	{ APC_CONSTRAINED,	 10,  10,  0,  1023 }	/* (0..1023) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_gpsToe_constr_3 = {
+static asn_per_constraints_t ASN_PER_MEMB_GPS_TOE_CONSTR_3 = {
 	{ APC_CONSTRAINED,	 8,  8,  0,  167 }	/* (0..167) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_nSAT_constr_4 = {
+static asn_per_constraints_t ASN_PER_MEMB_N_SAT_CONSTR_4 = {
 	{ APC_CONSTRAINED,	 5,  5,  0,  31 }	/* (0..31) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
 };
-static asn_per_constraints_t asn_PER_memb_toeLimit_constr_5 = {
+static asn_per_constraints_t ASN_PER_MEMB_TOE_LIMIT_CONSTR_5 = {
 	{ APC_CONSTRAINED,	 4,  4,  0,  10 }	/* (0..10) */,
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
 	0, 0	/* No PER value map */
@@ -132,7 +132,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gpsWeek_constraint_1,
-		&asn_PER_memb_gpsWeek_constr_2,
+		&ASN_PER_MEMB_GPS_WEEK_CONSTR_2,
 		0,
 		"gpsWeek"
 		},
@@ -141,7 +141,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_gpsToe_constraint_1,
-		&asn_PER_memb_gpsToe_constr_3,
+		&ASN_PER_MEMB_GPS_TOE_CONSTR_3,
 		0,
 		"gpsToe"
 		},
@@ -150,7 +150,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_nSAT_constraint_1,
-		&asn_PER_memb_nSAT_constr_4,
+		&ASN_PER_MEMB_N_SAT_CONSTR_4,
 		0,
 		"nSAT"
 		},
@@ -159,7 +159,7 @@ static asn_TYPE_member_t asn_MBR_XNavigationModel_1[] = {
 		-1,	/* IMPLICIT tag at current level */
 		&asn_DEF_NativeInteger,
 		memb_toeLimit_constraint_1,
-		&asn_PER_memb_toeLimit_constr_5,
+		&ASN_PER_MEMB_TOE_LIMIT_CONSTR_5,
 		0,
 		"toeLimit"
 		},
diff --git a/src/core/receiver/concurrent_map.h b/src/core/receiver/concurrent_map.h
index 218030286..af3823bd1 100644
--- a/src/core/receiver/concurrent_map.h
+++ b/src/core/receiver/concurrent_map.h
@@ -43,7 +43,7 @@ template <typename Data>
  * \brief This class implements a thread-safe std::map
  *
  */
-class concurrent_map
+class Concurrent_Map
 {
     typedef typename std::map<int, Data>::iterator Data_iterator;  // iterator is scope dependent
 private:
diff --git a/src/core/receiver/concurrent_queue.h b/src/core/receiver/concurrent_queue.h
index 3a4e89190..02c6dd896 100644
--- a/src/core/receiver/concurrent_queue.h
+++ b/src/core/receiver/concurrent_queue.h
@@ -43,7 +43,7 @@ template <typename Data>
  * boost_thread to perform MUTEX based on the code available at
  * http://www.justsoftwaresolutions.co.uk/threading/implementing-a-thread-safe-queue-using-condition-variables.html
  */
-class concurrent_queue
+class Concurrent_Queue
 {
 private:
     std::queue<Data> the_queue;
diff --git a/src/core/receiver/control_message_factory.h b/src/core/receiver/control_message_factory.h
index 4ca93e725..f8a4666f6 100644
--- a/src/core/receiver/control_message_factory.h
+++ b/src/core/receiver/control_message_factory.h
@@ -36,7 +36,7 @@
 #include <vector>
 
 //! Message described by who sent it and what it says
-typedef struct ControlMessage_
+typedef struct control_message
 {
     unsigned int who;
     unsigned int what;
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index 75efbae2d..e7cd49740 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -70,8 +70,8 @@
 #include <utility>
 
 
-extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
-extern concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
+extern Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
 
 using google::LogMessage;
 
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index 590ebb622..0fe3674fc 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -122,8 +122,8 @@ private:
     void telecommand_listener();
     boost::thread cmd_interface_thread_;
     //SUPL assistance classes
-    gnss_sdr_supl_client supl_client_acquisition_;
-    gnss_sdr_supl_client supl_client_ephemeris_;
+    Gnss_Sdr_Supl_Client supl_client_acquisition_;
+    Gnss_Sdr_Supl_Client supl_client_ephemeris_;
     int supl_mcc;  // Current network MCC (Mobile country code), 3 digits.
     int supl_mns;  // Current network MNC (Mobile Network code), 2 or 3 digits.
     int supl_lac;  // Current network LAC (Location area code),16 bits, 1-65520 are valid values.
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index d88508c7b..277cad96c 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -392,10 +392,10 @@ void GNSSFlowgraph::connect()
                                             acq_fs = GPS_L1_CA_OPT_ACQ_FS_HZ;
                                             break;
                                         case evGAL_1B:
-                                            acq_fs = Galileo_E1_OPT_ACQ_FS_HZ;
+                                            acq_fs = GALILEO_E1_OPT_ACQ_FS_HZ;
                                             break;
                                         case evGAL_5X:
-                                            acq_fs = Galileo_E5a_OPT_ACQ_FS_HZ;
+                                            acq_fs = GALILEO_E5A_OPT_ACQ_FS_HZ;
                                             break;
                                         case evGLO_1G:
                                             acq_fs = fs;
diff --git a/src/core/system_parameters/Beidou_B1I.h b/src/core/system_parameters/Beidou_B1I.h
index 76ac02f2c..b31f470e9 100644
--- a/src/core/system_parameters/Beidou_B1I.h
+++ b/src/core/system_parameters/Beidou_B1I.h
@@ -38,8 +38,8 @@
 #include <vector>
 
 // Physical constants
-const double BEIDOU_C_m_s = 299792458.0;             //!< The speed of light, [m/s]
-const double BEIDOU_C_m_ms = 299792.4580;            //!< The speed of light, [m/ms]
+const double BEIDOU_C_M_S = 299792458.0;             //!< The speed of light, [m/s]
+const double BEIDOU_C_M_MS = 299792.4580;            //!< The speed of light, [m/ms]
 const double BEIDOU_PI = 3.1415926535898;            //!< Pi
 const double BEIDOU_TWO_PI = 6.283185307179586;      //!< 2Pi
 const double BEIDOU_OMEGA_EARTH_DOT = 7.2921150e-5;  //!< Earth rotation rate, [rad/s] as defined in CGCS2000
@@ -70,7 +70,7 @@ const std::string BEIDOU_B1I_D2_SECONDARY_CODE_STR = "00";
 const double BEIDOU_MAX_TOA_DELAY_MS = 20;  //******************
 
 //#define NAVIGATION_SOLUTION_RATE_MS 1000 // this cannot go here
-const double BEIDOU_STARTOFFSET_ms = 68.802;  //**************[ms] Initial sign. travel time (this cannot go here)
+const double BEIDOU_STARTOFFSET_MS = 68.802;  //**************[ms] Initial sign. travel time (this cannot go here)
 
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h
index 816b2c9aa..bcb414e48 100644
--- a/src/core/system_parameters/GLONASS_L1_L2_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h
@@ -42,13 +42,13 @@
 
 
 // Physical constants
-const double GLONASS_C_m_s = SPEED_OF_LIGHT;                   //!< The speed of light, [m/s]
-const double GLONASS_C_m_ms = 299792.4580;                     //!< The speed of light, [m/ms]
+const double GLONASS_C_M_S = SPEED_OF_LIGHT;                   //!< The speed of light, [m/s]
+const double GLONASS_C_M_MS = 299792.4580;                     //!< The speed of light, [m/ms]
 const double GLONASS_PI = 3.1415926535898;                     //!< Pi as defined in IS-GPS-200E
 const double GLONASS_TWO_PI = 6.283185307179586;               //!< 2Pi as defined in IS-GPS-200E
 const double GLONASS_OMEGA_EARTH_DOT = 7.292115e-5;            //!< Earth rotation rate, [rad/s]
 const double GLONASS_GM = 398600.4418e9;                       //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2]
-const double GLONASS_fM_a = 0.35e9;                            //!< Gravitational constant of atmosphere [m^3/s^2]
+const double GLONASS_F_M_A = 0.35e9;                            //!< Gravitational constant of atmosphere [m^3/s^2]
 const double GLONASS_SEMI_MAJOR_AXIS = 6378136;                //!< Semi-major axis of Earth [m]
 const double GLONASS_FLATTENING = 1 / 29825784;                //!< Flattening parameter
 const double GLONASS_GRAVITY = 97803284;                       //!< Equatorial acceleration of gravity [mGal]
@@ -225,7 +225,7 @@ const std::map<uint32_t, int32_t> GLONASS_PRN = {
     },         //Plane 3
     {24, 2}};  //Plane 3
 
-const double GLONASS_STARTOFFSET_ms = 68.802;  //[ms] Initial sign. travel time (this cannot go here)
+const double GLONASS_STARTOFFSET_MS = 68.802;  //[ms] Initial sign. travel time (this cannot go here)
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
 const int32_t GLONASS_L1_CA_HISTORY_DEEP = 100;
@@ -301,7 +301,7 @@ const std::vector<std::pair<int32_t, int32_t>> N({{71, 5}});
 const std::vector<std::pair<int32_t, int32_t>> M({{76, 2}});
 
 // STRING 5
-const std::vector<std::pair<int32_t, int32_t>> N_A({{6, 11}});
+const std::vector<std::pair<int32_t, int32_t>> DAY_NUMBER_A({{6, 11}});
 const std::vector<std::pair<int32_t, int32_t>> TAU_C({{17, 32}});
 const std::vector<std::pair<int32_t, int32_t>> N_4({{50, 5}});
 const std::vector<std::pair<int32_t, int32_t>> TAU_GPS({{55, 22}});
@@ -310,7 +310,7 @@ const std::vector<std::pair<int32_t, int32_t>> ALM_L_N({{77, 1}});
 // STRING 6, 8, 10, 12, 14
 const std::vector<std::pair<int32_t, int32_t>> C_N({{6, 1}});
 const std::vector<std::pair<int32_t, int32_t>> M_N_A({{7, 2}});
-const std::vector<std::pair<int32_t, int32_t>> n_A({{9, 5}});
+const std::vector<std::pair<int32_t, int32_t>> N_A({{9, 5}});
 const std::vector<std::pair<int32_t, int32_t>> TAU_N_A({{14, 10}});
 const std::vector<std::pair<int32_t, int32_t>> LAMBDA_N_A({{24, 21}});
 const std::vector<std::pair<int32_t, int32_t>> DELTA_I_N_A({{45, 18}});
diff --git a/src/core/system_parameters/GPS_L1_CA.h b/src/core/system_parameters/GPS_L1_CA.h
index 349897994..ee81a18e8 100644
--- a/src/core/system_parameters/GPS_L1_CA.h
+++ b/src/core/system_parameters/GPS_L1_CA.h
@@ -40,8 +40,8 @@
 
 
 // Physical constants
-const double GPS_C_m_s = SPEED_OF_LIGHT;                 //!< The speed of light, [m/s]
-const double GPS_C_m_ms = 299792.4580;                   //!< The speed of light, [m/ms]
+const double GPS_C_M_S = SPEED_OF_LIGHT;                 //!< The speed of light, [m/s]
+const double GPS_C_M_MS = 299792.4580;                   //!< The speed of light, [m/ms]
 const double GPS_PI = 3.1415926535898;                   //!< Pi as defined in IS-GPS-200E
 const double GPS_TWO_PI = 6.283185307179586;             //!< 2Pi as defined in IS-GPS-200E
 const double OMEGA_EARTH_DOT = DEFAULT_OMEGA_EARTH_DOT;  //!< Earth rotation rate, [rad/s]
@@ -72,7 +72,7 @@ const double MAX_TOA_DELAY_MS = 20;
 
 //#define NAVIGATION_SOLUTION_RATE_MS 1000 // this cannot go here
 //const double GPS_STARTOFFSET_ms = 68.802;  //[ms] Initial sign. travel time (this cannot go here)
-const double GPS_STARTOFFSET_ms = 60.0;
+const double GPS_STARTOFFSET_MS = 60.0;
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
 const int32_t GPS_L1_CA_HISTORY_DEEP = 100;
diff --git a/src/core/system_parameters/GPS_L2C.h b/src/core/system_parameters/GPS_L2C.h
index 40986fd5b..95542e2e2 100644
--- a/src/core/system_parameters/GPS_L2C.h
+++ b/src/core/system_parameters/GPS_L2C.h
@@ -42,8 +42,8 @@
 
 
 // Physical constants
-const double GPS_L2_C_m_s = 299792458.0;                //!< The speed of light, [m/s]
-const double GPS_L2_C_m_ms = 299792.4580;               //!< The speed of light, [m/ms]
+const double GPS_L2_C_M_S = 299792458.0;                //!< The speed of light, [m/s]
+const double GPS_L2_C_M_MS = 299792.4580;               //!< The speed of light, [m/ms]
 const double GPS_L2_PI = 3.1415926535898;               //!< Pi as defined in IS-GPS-200E
 const double GPS_L2_TWO_PI = 6.283185307179586;         //!< 2Pi as defined in IS-GPS-200E
 const double GPS_L2_OMEGA_EARTH_DOT = 7.2921151467e-5;  //!< Earth rotation rate, [rad/s]
diff --git a/src/core/system_parameters/GPS_L5.h b/src/core/system_parameters/GPS_L5.h
index ff669d8b0..d2fa25db3 100644
--- a/src/core/system_parameters/GPS_L5.h
+++ b/src/core/system_parameters/GPS_L5.h
@@ -40,8 +40,8 @@
 
 
 // Physical constants
-const double GPS_L5_C_m_s = 299792458.0;                //!< The speed of light, [m/s]
-const double GPS_L5_C_m_ms = 299792.4580;               //!< The speed of light, [m/ms]
+const double GPS_L5_C_M_S = 299792458.0;                //!< The speed of light, [m/s]
+const double GPS_L5_C_M_MS = 299792.4580;               //!< The speed of light, [m/ms]
 const double GPS_L5_PI = 3.1415926535898;               //!< Pi as defined in IS-GPS-200E
 const double GPS_L5_TWO_PI = 6.283185307179586;         //!< 2Pi as defined in IS-GPS-200E
 const double GPS_L5_OMEGA_EARTH_DOT = 7.2921151467e-5;  //!< Earth rotation rate, [rad/s]
@@ -51,23 +51,23 @@ const double GPS_L5_F = -4.442807633e-10;               //!< Constant, [s/(m)^(1
 // carrier and code frequencies
 const double GPS_L5_FREQ_HZ = FREQ5;  //!< L5 [Hz]
 
-const double GPS_L5i_CODE_RATE_HZ = 10.23e6;      //!< GPS L5i code rate [chips/s]
-const int32_t GPS_L5i_CODE_LENGTH_CHIPS = 10230;  //!< GPS L5i  code length [chips]
-const double GPS_L5i_PERIOD = 0.001;              //!< GPS L5 code period [seconds]
-const int32_t GPS_L5i_PERIOD_MS = 1;              //!< GPS L5 code period [ms]
-const double GPS_L5i_SYMBOL_PERIOD = 0.01;        //!< GPS L5 symbol period [seconds]
-const int32_t GPS_L5i_SYMBOL_PERIOD_MS = 10;      //!< GPS L5 symbol period [ms]
+const double GPS_L5I_CODE_RATE_HZ = 10.23e6;      //!< GPS L5i code rate [chips/s]
+const int32_t GPS_L5I_CODE_LENGTH_CHIPS = 10230;  //!< GPS L5i  code length [chips]
+const double GPS_L5I_PERIOD = 0.001;              //!< GPS L5 code period [seconds]
+const int32_t GPS_L5I_PERIOD_MS = 1;              //!< GPS L5 code period [ms]
+const double GPS_L5I_SYMBOL_PERIOD = 0.01;        //!< GPS L5 symbol period [seconds]
+const int32_t GPS_L5I_SYMBOL_PERIOD_MS = 10;      //!< GPS L5 symbol period [ms]
 
-const double GPS_L5q_CODE_RATE_HZ = 10.23e6;      //!< GPS L5i code rate [chips/s]
-const int32_t GPS_L5q_CODE_LENGTH_CHIPS = 10230;  //!< GPS L5i code length [chips]
-const double GPS_L5q_PERIOD = 0.001;              //!< GPS L5 code period [seconds]
+const double GPS_L5Q_CODE_RATE_HZ = 10.23e6;      //!< GPS L5i code rate [chips/s]
+const int32_t GPS_L5Q_CODE_LENGTH_CHIPS = 10230;  //!< GPS L5i code length [chips]
+const double GPS_L5Q_PERIOD = 0.001;              //!< GPS L5 code period [seconds]
 
 const int32_t GPS_L5_HISTORY_DEEP = 5;
 
 //optimum parameters
 const uint32_t GPS_L5_OPT_ACQ_FS_HZ = 10000000;  //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
 
-const int32_t GPS_L5i_INIT_REG[210] =
+const int32_t GPS_L5I_INIT_REG[210] =
     {266, 365, 804, 1138,
         1509, 1559, 1756, 2084,
         2170, 2303, 2527, 2687,
@@ -124,7 +124,7 @@ const int32_t GPS_L5i_INIT_REG[210] =
         5950, 5521, 1515};
 
 
-const int32_t GPS_L5q_INIT_REG[210] =
+const int32_t GPS_L5Q_INIT_REG[210] =
     {
         1701, 323, 5292, 2020,
         5429, 7136, 1041, 5947,
@@ -186,11 +186,11 @@ const int32_t GPS_L5_SYMBOLS_PER_BIT = 2;
 const int32_t GPS_L5_SAMPLES_PER_SYMBOL = 10;
 const int32_t GPS_L5_CNAV_DATA_PAGE_SYMBOLS = 600;
 const int32_t GPS_L5_CNAV_DATA_PAGE_DURATION_S = 6;
-const int32_t GPS_L5i_NH_CODE_LENGTH = 10;
-const int32_t GPS_L5i_NH_CODE[10] = {0, 0, 0, 0, 1, 1, 0, 1, 0, 1};
-const std::string GPS_L5i_NH_CODE_STR = "0000110101";
-const int32_t GPS_L5q_NH_CODE_LENGTH = 20;
-const int32_t GPS_L5q_NH_CODE[20] = {0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0};
-const std::string GPS_L5q_NH_CODE_STR = "00000100110101001110";
+const int32_t GPS_L5I_NH_CODE_LENGTH = 10;
+const int32_t GPS_L5I_NH_CODE[10] = {0, 0, 0, 0, 1, 1, 0, 1, 0, 1};
+const std::string GPS_L5I_NH_CODE_STR = "0000110101";
+const int32_t GPS_L5Q_NH_CODE_LENGTH = 20;
+const int32_t GPS_L5Q_NH_CODE[20] = {0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1, 1, 1, 0};
+const std::string GPS_L5Q_NH_CODE_STR = "00000100110101001110";
 
 #endif /* GNSS_SDR_GPS_L5_H_ */
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 4c9048c11..d54472ca2 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -46,29 +46,29 @@ const double GALILEO_PI = 3.1415926535898;               //!< Pi as defined in G
 const double GALILEO_TWO_PI = 6.283185307179600;         //!< 2*Pi as defined in GALILEO ICD
 const double GALILEO_GM = 3.986004418e14;                //!< Geocentric gravitational constant[m^3/s^2]
 const double GALILEO_OMEGA_EARTH_DOT = 7.2921151467e-5;  //!< Mean angular velocity of the Earth [rad/s]
-const double GALILEO_C_m_s = 299792458.0;                //!< The speed of light, [m/s]
-const double GALILEO_C_m_ms = 299792.4580;               //!< The speed of light, [m/ms]
+const double GALILEO_C_M_S = 299792458.0;                //!< The speed of light, [m/s]
+const double GALILEO_C_M_MS = 299792.4580;               //!< The speed of light, [m/ms]
 const double GALILEO_F = -4.442807309e-10;               //!< Constant, [s/(m)^(1/2)]
 
 // carrier and code frequencies
-const double Galileo_E1_FREQ_HZ = FREQ1;                  //!< Galileo E1 carrier frequency [Hz]
-const double Galileo_E1_CODE_CHIP_RATE_HZ = 1.023e6;      //!< Galileo E1 code rate [chips/s]
-const double Galileo_E1_CODE_PERIOD = 0.004;              //!< Galileo E1 code period [s]
-const int32_t Galileo_E1_CODE_PERIOD_MS = 4;              //!< Galileo E1 code period [ms]
-const double Galileo_E1_SUB_CARRIER_A_RATE_HZ = 1.023e6;  //!< Galileo E1 sub-carrier 'a' rate [Hz]
-const double Galileo_E1_SUB_CARRIER_B_RATE_HZ = 6.138e6;  //!< Galileo E1 sub-carrier 'b' rate [Hz]
-const double Galileo_E1_B_CODE_LENGTH_CHIPS = 4092.0;     //!< Galileo E1-B code length [chips]
-const double Galileo_E1_B_SYMBOL_RATE_BPS = 250.0;        //!< Galileo E1-B symbol rate [bits/second]
-const int32_t Galileo_E1_B_SAMPLES_PER_SYMBOL = 1;        //!< (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS) / Galileo_E1_B_SYMBOL_RATE_BPS
-const int32_t Galileo_E1_C_SECONDARY_CODE_LENGTH = 25;    //!< Galileo E1-C secondary code length [chips]
-const int32_t Galileo_E1_NUMBER_OF_CODES = 50;
+const double GALILEO_E1_FREQ_HZ = FREQ1;                  //!< Galileo E1 carrier frequency [Hz]
+const double GALILEO_E1_CODE_CHIP_RATE_HZ = 1.023e6;      //!< Galileo E1 code rate [chips/s]
+const double GALILEO_E1_CODE_PERIOD = 0.004;              //!< Galileo E1 code period [s]
+const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;              //!< Galileo E1 code period [ms]
+const double GALILEO_E1_SUB_CARRIER_A_RATE_HZ = 1.023e6;  //!< Galileo E1 sub-carrier 'a' rate [Hz]
+const double GALILEO_E1_SUB_CARRIER_B_RATE_HZ = 6.138e6;  //!< Galileo E1 sub-carrier 'b' rate [Hz]
+const double GALILEO_E1_B_CODE_LENGTH_CHIPS = 4092.0;     //!< Galileo E1-B code length [chips]
+const double GALILEO_E1_B_SYMBOL_RATE_BPS = 250.0;        //!< Galileo E1-B symbol rate [bits/second]
+const int32_t GALILEO_E1_B_SAMPLES_PER_SYMBOL = 1;        //!< (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS) / Galileo_E1_B_SYMBOL_RATE_BPS
+const int32_t GALILEO_E1_C_SECONDARY_CODE_LENGTH = 25;    //!< Galileo E1-C secondary code length [chips]
+const int32_t GALILEO_E1_NUMBER_OF_CODES = 50;
 
 
 //optimum parameters
-const uint32_t Galileo_E1_OPT_ACQ_FS_HZ = 2000000;  //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
+const uint32_t GALILEO_E1_OPT_ACQ_FS_HZ = 2000000;  //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
 
 
-const double GALILEO_STARTOFFSET_ms = 68.802;  //[ms] Initial sign. travel time (this cannot go here)
+const double GALILEO_STARTOFFSET_MS = 68.802;  //[ms] Initial sign. travel time (this cannot go here)
 
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION
@@ -79,7 +79,7 @@ const int32_t GALILEO_E1_HISTORY_DEEP = 100;
 const std::string GALILEO_INAV_PREAMBLE = {"0101100000"};
 
 const int32_t GALILEO_INAV_PREAMBLE_LENGTH_BITS = 10;
-const double GALILEO_INAV_PAGE_PART_WITH_PREABLE_SECONDS = 2.0 + GALILEO_INAV_PREAMBLE_LENGTH_BITS * Galileo_E1_CODE_PERIOD;
+const double GALILEO_INAV_PAGE_PART_WITH_PREABLE_SECONDS = 2.0 + GALILEO_INAV_PREAMBLE_LENGTH_BITS * GALILEO_E1_CODE_PERIOD;
 const int32_t GALILEO_INAV_PREAMBLE_PERIOD_SYMBOLS = 250;
 const int32_t GALILEO_INAV_PAGE_PART_SYMBOLS = 250;  //!< Each Galileo INAV pages are composed of two parts (even and odd) each of 250 symbols, including preamble. See Galileo ICD 4.3.2
 const int32_t GALILEO_INAV_PAGE_SYMBOLS = 500;       //!< The complete Galileo INAV page length
@@ -93,218 +93,218 @@ const int32_t GALILEO_PAGE_TYPE_BITS = 6;
 const int32_t GALILEO_DATA_JK_BITS = 128;
 const int32_t GALILEO_DATA_FRAME_BITS = 196;
 const int32_t GALILEO_DATA_FRAME_BYTES = 25;
-const double GALILEO_E1_CODE_PERIOD = 0.004;
-const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;
+//const double GALILEO_E1_CODE_PERIOD = 0.004;
+//const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;
 
-const std::vector<std::pair<int32_t, int32_t>> type({{1, 6}});
-const std::vector<std::pair<int32_t, int32_t>> PAGE_TYPE_bit({{1, 6}});
+const std::vector<std::pair<int32_t, int32_t>> TYPE({{1, 6}});
+const std::vector<std::pair<int32_t, int32_t>> PAGE_TYPE_BIT({{1, 6}});
 
 /*Page 1 - Word type 1: Ephemeris (1/4)*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_1_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> T0E_1_bit({{17, 14}});
-const int32_t t0e_1_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> M0_1_bit({{31, 32}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_1_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> T0_E_1_BIT({{17, 14}});
+const int32_t T0E_1_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> M0_1_BIT({{31, 32}});
 const double M0_1_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> e_1_bit({{63, 32}});
-const double e_1_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> A_1_bit({{95, 32}});
-const double A_1_LSB_gal = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> E_1_BIT({{63, 32}});
+const double E_1_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> A_1_BIT({{95, 32}});
+const double A_1_LSB_GAL = TWO_N19;
 //last two bits are reserved
 
 
 /*Page 2 - Word type 2: Ephemeris (2/4)*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_2_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> OMEGA_0_2_bit({{17, 32}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_2_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_0_2_BIT({{17, 32}});
 const double OMEGA_0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> i_0_2_bit({{49, 32}});
-const double i_0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> omega_2_bit({{81, 32}});
-const double omega_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> iDot_2_bit({{113, 14}});
-const double iDot_2_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> I_0_2_BIT({{49, 32}});
+const double I_0_2_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_2_BIT({{81, 32}});
+const double OMEGA_2_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> I_DOT_2_BIT({{113, 14}});
+const double I_DOT_2_LSB = PI_TWO_N43;
 //last two bits are reserved
 
 
 /*Word type 3: Ephemeris (3/4) and SISA*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_3_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> OMEGA_dot_3_bit({{17, 24}});
-const double OMEGA_dot_3_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> delta_n_3_bit({{41, 16}});
-const double delta_n_3_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> C_uc_3_bit({{57, 16}});
-const double C_uc_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> C_us_3_bit({{73, 16}});
-const double C_us_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> C_rc_3_bit({{89, 16}});
-const double C_rc_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> C_rs_3_bit({{105, 16}});
-const double C_rs_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> SISA_3_bit({{121, 8}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_3_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_3_BIT({{17, 24}});
+const double OMEGA_DOT_3_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_N_3_BIT({{41, 16}});
+const double DELTA_N_3_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> C_UC_3_BIT({{57, 16}});
+const double C_UC_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> C_US_3_BIT({{73, 16}});
+const double C_US_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> C_RC_3_BIT({{89, 16}});
+const double C_RC_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> C_RS_3_BIT({{105, 16}});
+const double C_RS_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> SISA_3_BIT({{121, 8}});
 
 
 /*Word type 4: Ephemeris (4/4) and Clock correction parameters*/
-const std::vector<std::pair<int32_t, int32_t>> IOD_nav_4_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> SV_ID_PRN_4_bit({{17, 6}});
-const std::vector<std::pair<int32_t, int32_t>> C_ic_4_bit({{23, 16}});
-const double C_ic_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> C_is_4_bit({{39, 16}});
-const double C_is_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> t0c_4_bit({{55, 14}});  //
-const int32_t t0c_4_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> af0_4_bit({{69, 31}});  //
-const double af0_4_LSB = TWO_N34;
-const std::vector<std::pair<int32_t, int32_t>> af1_4_bit({{100, 21}});  //
-const double af1_4_LSB = TWO_N46;
-const std::vector<std::pair<int32_t, int32_t>> af2_4_bit({{121, 6}});
-const double af2_4_LSB = TWO_N59;
-const std::vector<std::pair<int32_t, int32_t>> spare_4_bit({{127, 2}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_NAV_4_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> SV_ID_PRN_4_BIT({{17, 6}});
+const std::vector<std::pair<int32_t, int32_t>> C_IC_4_BIT({{23, 16}});
+const double C_IC_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> C_IS_4_BIT({{39, 16}});
+const double C_IS_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> T0C_4_BIT({{55, 14}});  //
+const int32_t T0C_4_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> AF0_4_BIT({{69, 31}});  //
+const double AF0_4_LSB = TWO_N34;
+const std::vector<std::pair<int32_t, int32_t>> AF1_4_BIT({{100, 21}});  //
+const double AF1_4_LSB = TWO_N46;
+const std::vector<std::pair<int32_t, int32_t>> AF2_4_BIT({{121, 6}});
+const double AF2_4_LSB = TWO_N59;
+const std::vector<std::pair<int32_t, int32_t>> SPARE_4_BIT({{127, 2}});
 //last two bits are reserved
 
 
 /*Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST*/
 /*Ionospheric correction*/
 /*Az*/
-const std::vector<std::pair<int32_t, int32_t>> ai0_5_bit({{7, 11}});  //
-const double ai0_5_LSB = TWO_N2;
-const std::vector<std::pair<int32_t, int32_t>> ai1_5_bit({{18, 11}});  //
-const double ai1_5_LSB = TWO_N8;
-const std::vector<std::pair<int32_t, int32_t>> ai2_5_bit({{29, 14}});  //
-const double ai2_5_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> AI0_5_BIT({{7, 11}});  //
+const double AI0_5_LSB = TWO_N2;
+const std::vector<std::pair<int32_t, int32_t>> AI1_5_BIT({{18, 11}});  //
+const double AI1_5_LSB = TWO_N8;
+const std::vector<std::pair<int32_t, int32_t>> AI2_5_BIT({{29, 14}});  //
+const double AI2_5_LSB = TWO_N15;
 /*Ionospheric disturbance flag*/
-const std::vector<std::pair<int32_t, int32_t>> Region1_5_bit({{43, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> Region2_5_bit({{44, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> Region3_5_bit({{45, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> Region4_5_bit({{46, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> Region5_5_bit({{47, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> BGD_E1E5a_5_bit({{48, 10}});  //
-const double BGD_E1E5a_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> BGD_E1E5b_5_bit({{58, 10}});  //
-const double BGD_E1E5b_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_5_bit({{68, 2}});   //
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_5_bit({{70, 2}});   //
-const std::vector<std::pair<int32_t, int32_t>> E5b_DVS_5_bit({{72, 1}});  //
-const std::vector<std::pair<int32_t, int32_t>> E1B_DVS_5_bit({{73, 1}});  //
+const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5A_5_BIT({{48, 10}});  //
+const double BGD_E1_E5A_5_LSB = TWO_N32;
+const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5B_5_BIT({{58, 10}});  //
+const double BGD_E1_E5B_5_LSB = TWO_N32;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}});   //
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_5_BIT({{70, 2}});   //
+const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}});  //
+const std::vector<std::pair<int32_t, int32_t>> E1_B_DVS_5_BIT({{73, 1}});  //
 /*GST*/
-const std::vector<std::pair<int32_t, int32_t>> WN_5_bit({{74, 12}});
-const std::vector<std::pair<int32_t, int32_t>> TOW_5_bit({{86, 20}});
-const std::vector<std::pair<int32_t, int32_t>> spare_5_bit({{106, 23}});
+const std::vector<std::pair<int32_t, int32_t>> WN_5_BIT({{74, 12}});
+const std::vector<std::pair<int32_t, int32_t>> TOW_5_BIT({{86, 20}});
+const std::vector<std::pair<int32_t, int32_t>> SPARE_5_BIT({{106, 23}});
 
 
 /* Page 6 */
-const std::vector<std::pair<int32_t, int32_t>> A0_6_bit({{7, 32}});
+const std::vector<std::pair<int32_t, int32_t>> A0_6_BIT({{7, 32}});
 const double A0_6_LSB = TWO_N30;
-const std::vector<std::pair<int32_t, int32_t>> A1_6_bit({{39, 24}});
+const std::vector<std::pair<int32_t, int32_t>> A1_6_BIT({{39, 24}});
 const double A1_6_LSB = TWO_N50;
-const std::vector<std::pair<int32_t, int32_t>> Delta_tLS_6_bit({{63, 8}});
-const std::vector<std::pair<int32_t, int32_t>> t0t_6_bit({{71, 8}});
-const int32_t t0t_6_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> WNot_6_bit({{79, 8}});
-const std::vector<std::pair<int32_t, int32_t>> WN_LSF_6_bit({{87, 8}});
-const std::vector<std::pair<int32_t, int32_t>> DN_6_bit({{95, 3}});
-const std::vector<std::pair<int32_t, int32_t>> Delta_tLSF_6_bit({{98, 8}});
-const std::vector<std::pair<int32_t, int32_t>> TOW_6_bit({{106, 20}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_T_LS_6_BIT({{63, 8}});
+const std::vector<std::pair<int32_t, int32_t>> T0T_6_BIT({{71, 8}});
+const int32_t T0T_6_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> W_NOT_6_BIT({{79, 8}});
+const std::vector<std::pair<int32_t, int32_t>> WN_LSF_6_BIT({{87, 8}});
+const std::vector<std::pair<int32_t, int32_t>> DN_6_BIT({{95, 3}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_T_LSF_6_BIT({{98, 8}});
+const std::vector<std::pair<int32_t, int32_t>> TOW_6_BIT({{106, 20}});
 
 
 /* Page 7 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_7_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> WN_a_7_bit({{11, 2}});
-const std::vector<std::pair<int32_t, int32_t>> t0a_7_bit({{13, 10}});
-const int32_t t0a_7_LSB = 600;
-const std::vector<std::pair<int32_t, int32_t>> SVID1_7_bit({{23, 6}});
-const std::vector<std::pair<int32_t, int32_t>> DELTA_A_7_bit({{29, 13}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_7_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> WN_A_7_BIT({{11, 2}});
+const std::vector<std::pair<int32_t, int32_t>> T0A_7_BIT({{13, 10}});
+const int32_t T0A_7_LSB = 600;
+const std::vector<std::pair<int32_t, int32_t>> SVI_D1_7_BIT({{23, 6}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_A_7_BIT({{29, 13}});
 const double DELTA_A_7_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> e_7_bit({{42, 11}});
-const double e_7_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> omega_7_bit({{53, 16}});
-const double omega_7_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> delta_i_7_bit({{69, 11}});
-const double delta_i_7_LSB = TWO_N14;
-const std::vector<std::pair<int32_t, int32_t>> Omega0_7_bit({{80, 16}});
-const double Omega0_7_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> Omega_dot_7_bit({{96, 11}});
-const double Omega_dot_7_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> M0_7_bit({{107, 16}});
+const std::vector<std::pair<int32_t, int32_t>> E_7_BIT({{42, 11}});
+const double E_7_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_7_BIT({{53, 16}});
+const double OMEGA_7_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_I_7_BIT({{69, 11}});
+const double DELTA_I_7_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA0_7_BIT({{80, 16}});
+const double OMEGA0_7_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_7_BIT({{96, 11}});
+const double OMEGA_DOT_7_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> M0_7_BIT({{107, 16}});
 const double M0_7_LSB = TWO_N15;
 
 
 /* Page 8 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_8_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> af0_8_bit({{11, 16}});
-const double af0_8_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> af1_8_bit({{27, 13}});
-const double af1_8_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_8_bit({{40, 2}});
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_8_bit({{42, 2}});
-const std::vector<std::pair<int32_t, int32_t>> SVID2_8_bit({{44, 6}});
-const std::vector<std::pair<int32_t, int32_t>> DELTA_A_8_bit({{50, 13}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_8_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> AF0_8_BIT({{11, 16}});
+const double AF0_8_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> AF1_8_BIT({{27, 13}});
+const double AF1_8_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_8_BIT({{40, 2}});
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_8_BIT({{42, 2}});
+const std::vector<std::pair<int32_t, int32_t>> SVI_D2_8_BIT({{44, 6}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_A_8_BIT({{50, 13}});
 const double DELTA_A_8_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> e_8_bit({{63, 11}});
-const double e_8_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> omega_8_bit({{74, 16}});
-const double omega_8_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> delta_i_8_bit({{90, 11}});
-const double delta_i_8_LSB = TWO_N14;
-const std::vector<std::pair<int32_t, int32_t>> Omega0_8_bit({{101, 16}});
-const double Omega0_8_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> Omega_dot_8_bit({{117, 11}});
-const double Omega_dot_8_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> E_8_BIT({{63, 11}});
+const double E_8_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_8_BIT({{74, 16}});
+const double OMEGA_8_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_I_8_BIT({{90, 11}});
+const double DELTA_I_8_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA0_8_BIT({{101, 16}});
+const double OMEGA0_8_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_8_BIT({{117, 11}});
+const double OMEGA_DOT_8_LSB = TWO_N33;
 
 
 /* Page 9 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_9_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> WN_a_9_bit({{11, 2}});
-const std::vector<std::pair<int32_t, int32_t>> t0a_9_bit({{13, 10}});
-const int32_t t0a_9_LSB = 600;
-const std::vector<std::pair<int32_t, int32_t>> M0_9_bit({{23, 16}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_9_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> WN_A_9_BIT({{11, 2}});
+const std::vector<std::pair<int32_t, int32_t>> T0A_9_BIT({{13, 10}});
+const int32_t T0A_9_LSB = 600;
+const std::vector<std::pair<int32_t, int32_t>> M0_9_BIT({{23, 16}});
 const double M0_9_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> af0_9_bit({{39, 16}});
-const double af0_9_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> af1_9_bit({{55, 13}});
-const double af1_9_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_9_bit({{68, 2}});
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_9_bit({{70, 2}});
-const std::vector<std::pair<int32_t, int32_t>> SVID3_9_bit({{72, 6}});
-const std::vector<std::pair<int32_t, int32_t>> DELTA_A_9_bit({{78, 13}});
+const std::vector<std::pair<int32_t, int32_t>> AF0_9_BIT({{39, 16}});
+const double AF0_9_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> AF1_9_BIT({{55, 13}});
+const double AF1_9_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_9_BIT({{68, 2}});
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_9_BIT({{70, 2}});
+const std::vector<std::pair<int32_t, int32_t>> SVI_D3_9_BIT({{72, 6}});
+const std::vector<std::pair<int32_t, int32_t>> DELTA_A_9_BIT({{78, 13}});
 const double DELTA_A_9_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> e_9_bit({{91, 11}});
-const double e_9_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> omega_9_bit({{102, 16}});
-const double omega_9_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> delta_i_9_bit({{118, 11}});
-const double delta_i_9_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> E_9_BIT({{91, 11}});
+const double E_9_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_9_BIT({{102, 16}});
+const double OMEGA_9_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> DELTA_I_9_BIT({{118, 11}});
+const double DELTA_I_9_LSB = TWO_N14;
 
 
 /* Page 10 */
-const std::vector<std::pair<int32_t, int32_t>> IOD_a_10_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> Omega0_10_bit({{11, 16}});
-const double Omega0_10_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> Omega_dot_10_bit({{27, 11}});
-const double Omega_dot_10_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> M0_10_bit({{38, 16}});
+const std::vector<std::pair<int32_t, int32_t>> IOD_A_10_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> OMEGA0_10_BIT({{11, 16}});
+const double OMEGA0_10_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> OMEGA_DOT_10_BIT({{27, 11}});
+const double OMEGA_DOT_10_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> M0_10_BIT({{38, 16}});
 const double M0_10_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> af0_10_bit({{54, 16}});
-const double af0_10_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> af1_10_bit({{70, 13}});
-const double af1_10_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> E5b_HS_10_bit({{83, 2}});
-const std::vector<std::pair<int32_t, int32_t>> E1B_HS_10_bit({{85, 2}});
-const std::vector<std::pair<int32_t, int32_t>> A_0G_10_bit({{87, 16}});
+const std::vector<std::pair<int32_t, int32_t>> AF0_10_BIT({{54, 16}});
+const double AF0_10_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> AF1_10_BIT({{70, 13}});
+const double AF1_10_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_10_BIT({{83, 2}});
+const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_10_BIT({{85, 2}});
+const std::vector<std::pair<int32_t, int32_t>> A_0_G_10_BIT({{87, 16}});
 const double A_0G_10_LSB = TWO_N35;
-const std::vector<std::pair<int32_t, int32_t>> A_1G_10_bit({{103, 12}});
+const std::vector<std::pair<int32_t, int32_t>> A_1_G_10_BIT({{103, 12}});
 const double A_1G_10_LSB = TWO_N51;
-const std::vector<std::pair<int32_t, int32_t>> t_0G_10_bit({{115, 8}});
-const int32_t t_0G_10_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> WN_0G_10_bit({{123, 6}});
+const std::vector<std::pair<int32_t, int32_t>> T_0_G_10_BIT({{115, 8}});
+const int32_t T_0_G_10_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> WN_0_G_10_BIT({{123, 6}});
 
 
 /* Page 0 */
-const std::vector<std::pair<int32_t, int32_t>> Time_0_bit({{7, 2}});
-const std::vector<std::pair<int32_t, int32_t>> WN_0_bit({{97, 12}});
-const std::vector<std::pair<int32_t, int32_t>> TOW_0_bit({{109, 20}});
+const std::vector<std::pair<int32_t, int32_t>> TIME_0_BIT({{7, 2}});
+const std::vector<std::pair<int32_t, int32_t>> WN_0_BIT({{97, 12}});
+const std::vector<std::pair<int32_t, int32_t>> TOW_0_BIT({{109, 20}});
 
 
 // Galileo E1 primary codes
-const std::string Galileo_E1_B_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
+const std::string GALILEO_E1_B_PRIMARY_CODE[GALILEO_E1_NUMBER_OF_CODES] = {
     "F5D710130573541B9DBD4FD9E9B20A0D59D144C54BC7935539D2E75810FB51E494093A0A19DD79C70C5A98E5657AA578097777E86BCC4651CC72F2F974DC766E07AEA3D0B557EF42FF57E6A58E805358CE9257669133B18F80FDBDFB38C5524C7FB1DE079842482990DF58F72321D9201F8979EAB159B2679C9E95AA6D53456C0DF75C2B4316D1E2309216882854253A1FA60CA2C94ECE013E2A8C943341E7D9E5A8464B3AD407E0AE465C3E3DD1BE60A8C3D50F831536401E776BE02A6042FC4A27AF653F0CFC4D4D013F115310788D68CAEAD3ECCCC5330587EB3C22A1459FC8E6FCCE9CDE849A5205E70C6D66D125814D698DD0EEBFEAE52CC65C5C84EEDF207379000E169D318426516AC5D1C31F2E18A65E07AE6E33FDD724B13098B3A444688389EFBBB5EEAB588742BB083B679D42FB26FF77919EAB21DE0389D9997498F967AE05AF0F4C7E177416E18C4D5E6987ED3590690AD127D872F14A8F4903A12329732A9768F82F295BEE391879293E3A97D51435A7F03ED7FBE275F102A83202DC3DE94AF4C712E9D006D182693E9632933E6EB773880CF147B922E74539E4582F79E39723B4C80E42EDCE4C08A8D02221BAE6D17734817D5B531C0D3C1AE723911F3FFF6AAC02E97FEA69E376AF4761E6451CA61FDB2F9187642EFCD63A09AAB680770C1593EEDD4FF4293BFFD6DD2C3367E85B14A654C834B6699421A",  // 01
     "96B856A629F581D1344FEF597835FE60434625D077ECF0D95FBE1155EA0431979E5AFF544AF591A332FDAEF98AB1EDD847A73F3AF15AAEE7E9A05C9D82C59EC325EF4CF264B8ADF2A8E8BA459354CB4B415CC50BF239ADBC31B3A9C87B0843CF3B9E6D646BA43F866276B053826F3A2334CC5E2EFB9F8F195B382E75EEA63F58A06B3F82A3B5C77C1800FD9498F803E524435B321210BB84690BED0BBBE16D363B3A90656A73720E27008852FB7DACC8284411B177728D9527C560859084A395A6F11A96AD9DB6B43E00642B000ED12BFD967868EAB1108552CD4FC89FBC408ACE7678C381EC91DD000319124EB5D5EF52C4CAC9AADEE2FA045C16CE492D7F43743CA77924C78696FCBF2F9F7F36D8E623752200C6FCBBD71ABBB6877F3C5D6E6740AB0389458A6B66440858B2D383244E853646FE2714211DEA9E6196252815BB704A20BFE556AC474F8998944E0CABBBE21A6400B87BFDCF937D12B2821D59298AF4AD378F0F42BD8C41693B8D993CF37C8B478F3BB5D33AD2A9FA24AD7B8FA895FDBC04964192F7BA3FF74E0E3A435B5DFE042E3115CACF29624C0645E9C917534A2EBC1F5665E4E1B1BC56208DBCD8A27CCB6474D5D0E20CA4072C960E5ACE41BDA3770DF3B681F2B318F6F8E1CB17C2857350FB6009AED665E13B2780D79217F73FAC7A8A48048DB0FB8A8A5007CDDC9A7B2DA8257C99F1CB605A18204",
     "E57DE19A3E4A8C122FCB1DD6584B3D2DAE364D800F9C5A9E957B38F624CBD3ACC58FA3ED070B5E44857CCB813FBC0BB83B5D157C6C562422E5963CC4DD753C45B0264F8E136A0F1774D77A543E44D51EF8C6B9408B6E3B5CEE1347A94F13ECDC94DC764976E5A50B4CB0AE7557553B47EDFE03EC2CD32EA8D125A341E1EDFC77E75330D6E7B23DC838EBCE7E5567F5B8C80C3D15E7404B4E10F0BEB0C69626A814AF91334199864FC77E0FF548DC2A6FA6A71C3C0561F2B085CC05E8512E27B9DBA60B93D114B87935776C8E9A67905C429D48BF3AB1B0A56FAFBFD5D9C8D8C8A9E5918BFF273CF5E8664FF2B90314BDBFDAD5AB8C22A0E45C104ECE75EA43FE9BDCE306A5A28AE464628163D249D8056005F1A900951808CC8620F81768153436F741667A8E271DD986C7A1E5046FCC74C7CEBBF9A1296D6CF0B2FF85BE412D87214BB368DFF462AD649D7324A117252311C664D33E4DAFBD830FBCEB6EFBDD7391D4BADA7A775FD1949D981F619655DB3C22BAC34E5AE41222905C0C7E80D6EA28471EC0468756531C09A471EDBE200472E78F1701FEE96E5769A9893C0F11E7906B064442E06E21ED8B0D70AF288690C532A2D03B373E1E0085F62F7AAA658B569C5184E3DDC40ECAA88B887118601691892F9F55E2DE79E49DFF11D434C2BA3AA6447522A7C99DC215CAD2ED0114ED62CBDAE9D315E48AE14D2014B7F8E",
@@ -357,7 +357,7 @@ const std::string Galileo_E1_B_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
     "97051FC67ACA30E8AEE73D3A8CF38BB13524D4E0EBD9BE68398C7C16227CABB1D0B0A0ABE7B6384ABA02905BA0C3C7363599D059C7B4C99DB165CD14FA12FA7912449CA7DD5E346D8010C85A757382270DAD15BA3CE36A76EF55F81A1E80BF366B37FE3A88EC722028C25E234E624040450A99CD808F942568AA7133981D72E7F2928894670AD5399482DF1B90E7E64062F830B736C79C30F36281495C76699CD48404673FA334F042F9E0E67DD7F3853BF71ABEAF6A9A5546855E840CE42B224D8F6490C6CE5FC02EBAF4FFC390107058F54CD635D4A7F2878099C1EF495750E6921BE2F39AD808C4210F287319F811A254CEF8CF153FC50AB2F3D694A530949E5F578D075DB96DDCF2BB90ED3DE09D9CA8E08662FD8982741DE1CE0A6B64C3D3D5004B5C04B2B0DFD976A20FACC94D1762D41EE03B40D2CF367612812EF4CC41D1BFE9CEB51AE3A22AF1BE7B85A057D3048D0E73FA0FDAF1119EFD76F0A41BE63128B22D64A5553E9549D411483BBCA1483EF30CF6A6D317AD2C7973EFA6D4C1121F703D2F48FCDA3177AD450D75D2A28D2C244AEA13F0E60AEED8ACBAB444D400DF5E280DB799B2D9A984DF1E2567D39D1DE58EF78CA6B4D8BC172B07DCB02D156CA96EEFAC69E556CFCE0AAB617C7FBB8C34871C1D35E74B7BD307D3F2E424C7A9AD676A1A69E0FE735EA50887A1DFAE6CA2FE4460FC7EF323ADE493020"  // 50
 };
 
-const std::string Galileo_E1_C_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
+const std::string GALILEO_E1_C_PRIMARY_CODE[GALILEO_E1_NUMBER_OF_CODES] = {
     "B39340CA1C817D81EF4FAE4E95BF3504A7709089FB48560E9E3EF802180E85EB2194E05902C6C4C52021FEB7EC64FD416BCEBC8E39D64A4B5EE345291911AB8204A888C25B1CD3D9342A56C538636D3EAB957037D09E879AE5F3A39834FBB84A3D8D5090D7814246B62E9CA68533D2EC403B4FB9488467FF9758B0D15A8CEF89187A1D5897880040B6C3C5244E85A2AD14BCF2F5ABC44A7B1D4A87E8BDA05766218773ED4F70F8D1D07CBB1E8CA6298E64EE6DC5886D37495BA2EDB3E0B0B68AD9F300310B88898DDEEFD484538C31A9BCAA76ECAD0C16607D32189058B0862EE9D70CEA9D304755CE8037BA4C46C2573181748A212E4B2BDD04F9BC240518273DC17CBAFF21A03E9120FA7DCA18D56DD1D9A7E510C90CF219104385F531F2EFAFD185ECB6B911F9B7809D98D86F15516FFDDBE9BD1CF8662EB777C3F94EA3F962D7B79449FAAD39935429E92CAE5637E9BCF4E94D413D27934952409AB536BE4055AFBC4330CD1E4B5509EFE5F8EFC9ECBE9EF377DE7E37C479BB9D3EE7745E4609B0A6D2C5D92EB3C9E2278C1F2221FF907596AA5E096ACF8990EBA907E43AD320F8019CB6355A2BA8670EE5A4F463E8E56F8F1D3E7F4922510FB668E32C4CF23AD8496399638B095B47833E0CBB34977EB3E4242EAF870D86660D6A73F83E45D6E8A41EDCA3815079649544597C5C43B6C93FEBAD5700D22EDAF431FD340",
     "A64F94BB47BD4033C76D4924305907EC1F618B43C7535F3CFC093E5AF5DDD5C4339F3BB6D835B5C2C2053CD3D5693368D4E1A7CAC59425D1FD96809C67285CFD3FC05B01053CB0773221D7205778022F487BF99D1650566BE287FD7AE882AA8E8F52E5D4E3C0C2F971C9FF70AA378691EBD8ADE45CF213822D09FD05243F9726F6C69893845E57C37A7643E16B770E26F431FF69D437271905D270EB85D8D229D7D87662121F0BEEB1E895ED9589A9CF5833408A04197AC9025D8570AD9B75DB7E192EA0A089504996E9DC652975D83633619CFF80667D8B519536B3475248BA8213C8A4C66DE69B4B3774BF9142425C57F34A27B1E288119E3FFCC6AF6A21087F9394F09DDFBD42F32D059B8CD4104A519BA640765D5CDE490E62F10E695FBFD33CBC9D2208A532C8EC25DA28B8CC1B6850AB43D9B5C00B6E74B7A148791AB07B328D347058C7E6233E18C5ED172C9F9E9ACF29D913E2A1614BFC0893D4967ED033B2B9AE6B51F908F1CED57C14FEEA85CD4D9711216BE7F79FA6721B7DCCA033C80127AC6E5FCF58EB4005EC24CB4886D787355362D5E7031B9B2AC2A86D730AD734181E723A811FF510A4DF868001973FE83288D78E6F9B9441DAF5BE2974A2848FD917C3BCD346A431922246EC852E4AAD467E60C15D61DD3BF4A207BB57DB45DCADEFE3210BE74B9DACC918A394469F2E2C95AD1E211947948FE24F5E4",
     "FD1F6976002C39C87187C44E3D224ED4DF0B67750105944C651A5E57798F168A136AC0FB5979C4E847A82B20A2E6C45DB42EF2B930A80D3257BCCC53EDA966F5DCD9AD47CFB226EED9B62A874E9F6404D4087798A1005F4131171D3A47907A3CD602B83DABE094D2CB031867DF4595F3ED59FD8C4D76EDEEE59E422CE5C7D0A5F720BE94FA24DF05F758348EADD5EFE9197C6BB2292E2B14DB8C6DB24AA94C5FF0F5106D2B566058D32C58B63A150784F7B02478D9973DD4CFD2E84059AE0F4F1320754B7EE83F04A51C67EFFC2EB1C301C0C58DBAEBE95474E3484A76500103C14C40BB0B7D3A04D8BDABB605C1EF9FD4A6564934DEC50BD5878243AEE80F9796EED70CE1B1E8B55725DF76472D12D4A7A487989F42E6705818B1F7E149E97153A7B05A82FA3FBE51763E61171A4E12931472E94CCBA74CC09483DF93623FC60945070FDDF3A00B561650427E4BD64D675B1EB398B35EF057A66FD0B48EDBABBDCD57C32ABAE46F5CDD0CB1FCF17765258236F3DE40BD5D0A3C5C978D81DEB07367AB20B2CAA9834B9576161C4F20FB9C184A01DC9021A4E92B71333354E05BBEA9015E5AC4C66312E8B79F0B92279AC7EF1936BCC30802B83DB3D113BEF64452CAD7ACF6674FDA44023A661019841A101BE80FDA4E3210AE774E433A9ABD97F2755259AECE21F7A8C3B1A3D471F874D2EEC85B9B21BC0C2E2EC9016F847C6",
@@ -409,6 +409,6 @@ const std::string Galileo_E1_C_PRIMARY_CODE[Galileo_E1_NUMBER_OF_CODES] = {
     "CD7AAC98501F29507EA4E0183E8A40D2E5117E47BB5D18D01A3732DE4C821DFE86521CBEA7DB29BE1148BD544ECC681689BCD1B41EAF755310B7659342F8EE11CB41550CC30E566E192796B66C1A83C0B28BACCFA6C393043A0A2CB89712BC1CCB174DE58E66896AF39C1CEED1E05B0435F8CF6FD920D100F51584FE24879987399481DBF27DDB6286B6353919E552E669290CE02AB4CD5113D7F484229F379C7332767EC69E4336439B05DE1C1E3563DD303A4F580BFF20A40E49CB0822F715ED0221EBCDB5DBAD751124B1715E82F37488265135B6C8BBCF4F801ECC4D3525FF189493AD4EFF0C042B070C4CA8FB1FDF43D79F06A6E4E3D35D7B07D4B728D5DC54EEDACBBBA1EDDCDC07ADF7DFCFEF835E44DF1FF66DAF2A7BAEBE218AC3B15E183044D6A8A89B3C101B40BED97ED5DF93BBC1B84931D56B8C822A6D058AC74CFA4C85D8B456698E82D5B7574C17B041E5F4BEED09F75012355CBC322B822C63F10C18A8F279E9A0E18E1FEF183D23E13894E31F6D046956FE8A647558228F6D4D6910151EC03937876B6ED7A078D33DAEB3F2239353BB8181E62B286BBC41588DE10F478A5CE5B508F205A41820356767B0A0ED4B8DB9EFE348362E9A90D6C30218B295B338B51C09239D02FC8A1E7DAAAB60AC37F5E67CFC88EEF69567B5C81A03B449F4ED38B9D295A36AA3503173F6F6F66D93CE72D753076040FACDE",
     "ADDCEDB50E907D20E826E6E8A0D30C20C74B2DF204EA784BAE9F618CAE33A3C937729DF9CB10BA2A4C33E0182A37200C0CC509729D828B8A2A20F283AC4F9306596684EA3FB5492A4C9F2DB459E7531C9F9C0950E7D9E93B3EE5912AE7E39AC8F4EC14B18F24E325003F477E347C5AC1B67CDB11AF3BBBBCD0AC3703024B5767AA67A208254F798684BFD1D3EACD757EEC77254950A146620400DB95E694574F739A991EBA771EBBDFF1056BB39A77DBE0636A032E17141332F951C57C6C90F348F165E3ABDD60D429D5D6BEC7E3E3463806F819EB2D212B3528A5EDE51F235AD100A35E890955F8A1DC51FDCB53EABCA2540997DD054C1F5B29462995B876B44D085904E55E1B838BEF600A992EB49CE078DF75AF3D0F137685AC0D07F0BE1EB87B63A41E74DDE869C8A683BDE60AF5D77FF18F7137495BCEFD0ED28F62F9C3E25D332B5F861D999FCDC0B4851A984A4DBB53401FD40351ADA4335C702BCC8D900C737507B990BDDBE91D201E3A0946DC968D43FD10D04B0B76667FF5B4291C2124B0124C6B710A6D1BCFAEB016B9DEEB0F7A4FE044CA4EA0CCD84B7682617C3A545071EC295B0663B3F577D562DE1D9DD80DE6A1EFD6D5991EB5246F1597B86D0E9A90CF6DB0EB2B8E7BAE9431E567F01AA98502C773742246467ABF911A91A51F6C1B9E0C3233DC1A37D17DB91A5F0F661B0EB5886964456C7818601BD0C"};
 
-const std::string Galileo_E1_C_SECONDARY_CODE = "0011100000001010110110010";
+const std::string GALILEO_E1_C_SECONDARY_CODE = "0011100000001010110110010";
 
 #endif /* GNSS_SDR_GALILEO_E1_H_ */
diff --git a/src/core/system_parameters/Galileo_E5a.h b/src/core/system_parameters/Galileo_E5a.h
index cf7e56ce1..19122372c 100644
--- a/src/core/system_parameters/Galileo_E5a.h
+++ b/src/core/system_parameters/Galileo_E5a.h
@@ -40,17 +40,17 @@
 
 
 // Carrier and code frequencies
-const double Galileo_E5a_FREQ_HZ = FREQ5;                 //!< Galileo E5a carrier frequency [Hz]
-const double Galileo_E5a_CODE_CHIP_RATE_HZ = 1.023e7;     //!< Galileo E5a code rate [chips/s]
-const double Galileo_E5a_I_TIERED_CODE_PERIOD = 0.020;    //!< Galileo E5a-I tiered code period [s]
-const double Galileo_E5a_Q_TIERED_CODE_PERIOD = 0.100;    //!< Galileo E5a-Q tiered code period [s]
-const int32_t Galileo_E5a_CODE_LENGTH_CHIPS = 10230;      //!< Galileo E5a primary code length [chips]
-const int32_t Galileo_E5a_I_SECONDARY_CODE_LENGTH = 20;   //!< Galileo E5a-I secondary code length [chips]
-const int32_t Galileo_E5a_Q_SECONDARY_CODE_LENGTH = 100;  //!< Galileo E5a-Q secondary code length [chips]
-const double GALILEO_E5a_CODE_PERIOD = 0.001;             //!< Galileo E1 primary code period [s]
-const int32_t GALILEO_E5a_CODE_PERIOD_MS = 1;             //!< Galileo E1 primary code period [ms]
-const int32_t Galileo_E5a_SYMBOL_RATE_BPS = 50;           //!< Galileo E5a symbol rate [bits/second]
-const int32_t Galileo_E5a_NUMBER_OF_CODES = 50;
+const double GALILEO_E5A_FREQ_HZ = FREQ5;                 //!< Galileo E5a carrier frequency [Hz]
+const double GALILEO_E5A_CODE_CHIP_RATE_HZ = 1.023e7;     //!< Galileo E5a code rate [chips/s]
+const double GALILEO_E5A_I_TIERED_CODE_PERIOD = 0.020;    //!< Galileo E5a-I tiered code period [s]
+const double GALILEO_E5A_Q_TIERED_CODE_PERIOD = 0.100;    //!< Galileo E5a-Q tiered code period [s]
+const int32_t GALILEO_E5A_CODE_LENGTH_CHIPS = 10230;      //!< Galileo E5a primary code length [chips]
+const int32_t GALILEO_E5A_I_SECONDARY_CODE_LENGTH = 20;   //!< Galileo E5a-I secondary code length [chips]
+const int32_t GALILEO_E5A_Q_SECONDARY_CODE_LENGTH = 100;  //!< Galileo E5a-Q secondary code length [chips]
+const double GALILEO_E5A_CODE_PERIOD = 0.001;             //!< Galileo E1 primary code period [s]
+const int32_t GALILEO_E5A_CODE_PERIOD_MS = 1;             //!< Galileo E1 primary code period [ms]
+const int32_t GALILEO_E5A_SYMBOL_RATE_BPS = 50;           //!< Galileo E5a symbol rate [bits/second]
+const int32_t GALILEO_E5A_NUMBER_OF_CODES = 50;
 
 
 // OBSERVABLE HISTORY DEEP FOR INTERPOLATION AND CRC ERROR LIMIT
@@ -58,7 +58,7 @@ const int32_t GALILEO_E5A_HISTORY_DEEP = 20;
 const int32_t GALILEO_E5A_CRC_ERROR_LIMIT = 6;
 
 //optimum parameters
-const uint32_t Galileo_E5a_OPT_ACQ_FS_HZ = 10000000;  //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
+const uint32_t GALILEO_E5A_OPT_ACQ_FS_HZ = 10000000;  //!< Sampling frequncy that maximizes the acquisition SNR while using a non-multiple of chip rate
 
 // F/NAV message structure
 
@@ -77,156 +77,156 @@ const int32_t GALILEO_FNAV_PAGE_TYPE_BITS = 6;
 const int32_t GALILEO_FNAV_DATA_FRAME_BITS = 214;
 const int32_t GALILEO_FNAV_DATA_FRAME_BYTES = 27;
 
-const std::vector<std::pair<int32_t, int32_t>> FNAV_PAGE_TYPE_bit({{1, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_PAGE_TYPE_BIT({{1, 6}});
 
 /* WORD 1 iono corrections. FNAV (Galileo E5a message)*/
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SV_ID_PRN_1_bit({{7, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_1_bit({{13, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0c_1_bit({{23, 14}});
-const int32_t FNAV_t0c_1_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_1_bit({{37, 31}});
-const double FNAV_af0_1_LSB = TWO_N34;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_1_bit({{68, 21}});
-const double FNAV_af1_1_LSB = TWO_N46;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af2_1_bit({{89, 6}});
-const double FNAV_af2_1_LSB = TWO_N59;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SISA_1_bit({{95, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_ai0_1_bit({{103, 11}});
-const double FNAV_ai0_1_LSB = TWO_N2;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_ai1_1_bit({{114, 11}});
-const double FNAV_ai1_1_LSB = TWO_N8;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_ai2_1_bit({{125, 14}});
-const double FNAV_ai2_1_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region1_1_bit({{139, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region2_1_bit({{140, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region3_1_bit({{141, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region4_1_bit({{142, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_region5_1_bit({{143, 1}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_BGD_1_bit({{144, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SV_ID_PRN_1_BIT({{7, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_1_BIT({{13, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0C_1_BIT({{23, 14}});
+const int32_t FNAV_T0C_1_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_1_BIT({{37, 31}});
+const double FNAV_AF0_1_LSB = TWO_N34;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_1_BIT({{68, 21}});
+const double FNAV_AF1_1_LSB = TWO_N46;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF2_1_BIT({{89, 6}});
+const double FNAV_AF2_1_LSB = TWO_N59;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SISA_1_BIT({{95, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AI0_1_BIT({{103, 11}});
+const double FNAV_AI0_1_LSB = TWO_N2;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AI1_1_BIT({{114, 11}});
+const double FNAV_AI1_1_LSB = TWO_N8;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AI2_1_BIT({{125, 14}});
+const double FNAV_AI2_1_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION1_1_BIT({{139, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION2_1_BIT({{140, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION3_1_BIT({{141, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION4_1_BIT({{142, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_REGION5_1_BIT({{143, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_BGD_1_BIT({{144, 10}});
 const double FNAV_BGD_1_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_1_bit({{154, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_1_bit({{156, 12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_1_bit({{168, 20}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5advs_1_bit({{188, 1}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_1_BIT({{154, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_1_BIT({{156, 12}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_1_BIT({{168, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ADVS_1_BIT({{188, 1}});
 
 // WORD 2 Ephemeris (1/3)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_2_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_bit({{17, 32}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_2_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_BIT({{17, 32}});
 const double FNAV_M0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_omegadot_2_bit({{49, 24}});
-const double FNAV_omegadot_2_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_2_bit({{73, 32}});
-const double FNAV_e_2_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_a12_2_bit({{105, 32}});
-const double FNAV_a12_2_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_omega0_2_bit({{137, 32}});
-const double FNAV_omega0_2_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_idot_2_bit({{169, 14}});
-const double FNAV_idot_2_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_2_bit({{183, 12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_2_bit({{195, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_2_BIT({{49, 24}});
+const double FNAV_OMEGADOT_2_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_2_BIT({{73, 32}});
+const double FNAV_E_2_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A12_2_BIT({{105, 32}});
+const double FNAV_A12_2_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGA0_2_BIT({{137, 32}});
+const double FNAV_OMEGA0_2_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IDOT_2_BIT({{169, 14}});
+const double FNAV_IDOT_2_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_2_BIT({{183, 12}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_2_BIT({{195, 20}});
 
 // WORD 3 Ephemeris (2/3)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_3_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_i0_3_bit({{17, 32}});
-const double FNAV_i0_3_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_3_bit({{49, 32}});
-const double FNAV_w_3_LSB = PI_TWO_N31;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltan_3_bit({{81, 16}});
-const double FNAV_deltan_3_LSB = PI_TWO_N43;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cuc_3_bit({{97, 16}});
-const double FNAV_Cuc_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cus_3_bit({{113, 16}});
-const double FNAV_Cus_3_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Crc_3_bit({{129, 16}});
-const double FNAV_Crc_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Crs_3_bit({{145, 16}});
-const double FNAV_Crs_3_LSB = TWO_N5;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0e_3_bit({{161, 14}});
-const int32_t FNAV_t0e_3_LSB = 60;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_3_bit({{175, 12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_3_bit({{187, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_3_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_I0_3_BIT({{17, 32}});
+const double FNAV_I0_3_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_3_BIT({{49, 32}});
+const double FNAV_W_3_LSB = PI_TWO_N31;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAN_3_BIT({{81, 16}});
+const double FNAV_DELTAN_3_LSB = PI_TWO_N43;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CUC_3_BIT({{97, 16}});
+const double FNAV_CUC_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CUS_3_BIT({{113, 16}});
+const double FNAV_CUS_3_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CRC_3_BIT({{129, 16}});
+const double FNAV_CRC_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CRS_3_BIT({{145, 16}});
+const double FNAV_CRS_3_LSB = TWO_N5;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0E_3_BIT({{161, 14}});
+const int32_t FNAV_T0E_3_LSB = 60;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_WN_3_BIT({{175, 12}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_3_BIT({{187, 20}});
 
 // WORD 4 Ephemeris (3/3)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODnav_4_bit({{7, 10}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cic_4_bit({{17, 16}});
-const double FNAV_Cic_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Cis_4_bit({{33, 16}});
-const double FNAV_Cis_4_LSB = TWO_N29;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A0_4_bit({{49, 32}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DNAV_4_BIT({{7, 10}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CIC_4_BIT({{17, 16}});
+const double FNAV_CIC_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_CIS_4_BIT({{33, 16}});
+const double FNAV_CIS_4_LSB = TWO_N29;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A0_4_BIT({{49, 32}});
 const double FNAV_A0_4_LSB = TWO_N30;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A1_4_bit({{81, 24}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A1_4_BIT({{81, 24}});
 const double FNAV_A1_4_LSB = TWO_N50;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltatls_4_bit({{105, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0t_4_bit({{113, 8}});
-const int32_t FNAV_t0t_4_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WNot_4_bit({{121, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WNlsf_4_bit({{129, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_DN_4_bit({{137, 3}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltatlsf_4_bit({{140, 8}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0g_4_bit({{148, 8}});
-const int32_t FNAV_t0g_4_LSB = 3600;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A0g_4_bit({{156, 16}});
-const double FNAV_A0g_4_LSB = TWO_N35;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_A1g_4_bit({{172, 12}});
-const double FNAV_A1g_4_LSB = TWO_N51;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WN0g_4_bit({{184, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_4_bit({{190, 20}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTATLS_4_BIT({{105, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0T_4_BIT({{113, 8}});
+const int32_t FNAV_T0T_4_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_NOT_4_BIT({{121, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_NLSF_4_BIT({{129, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DN_4_BIT({{137, 3}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTATLSF_4_BIT({{140, 8}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0G_4_BIT({{148, 8}});
+const int32_t FNAV_T0G_4_LSB = 3600;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A0G_4_BIT({{156, 16}});
+const double FNAV_A0G_4_LSB = TWO_N35;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_A1G_4_BIT({{172, 12}});
+const double FNAV_A1G_4_LSB = TWO_N51;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_N0G_4_BIT({{184, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_TOW_4_BIT({{190, 20}});
 
 // WORD 5 Almanac SVID1 SVID2(1/2)
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODa_5_bit({{7, 4}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_WNa_5_bit({{11, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_t0a_5_bit({{13, 10}});
-const int32_t FNAV_t0a_5_LSB = 600;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SVID1_5_bit({{23, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Deltaa12_1_5_bit({{29, 13}});
-const double FNAV_Deltaa12_5_LSB = TWO_N9;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_1_5_bit({{42, 11}});
-const double FNAV_e_5_LSB = TWO_N16;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_1_5_bit({{53, 16}});
-const double FNAV_w_5_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltai_1_5_bit({{69, 11}});
-const double FNAV_deltai_5_LSB = TWO_N14;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omega0_1_5_bit({{80, 16}});
-const double FNAV_Omega0_5_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omegadot_1_5_bit({{96, 11}});
-const double FNAV_Omegadot_5_LSB = TWO_N33;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_1_5_bit({{107, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DA_5_BIT({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_NA_5_BIT({{11, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_T0A_5_BIT({{13, 10}});
+const int32_t FNAV_T0A_5_LSB = 600;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SVI_D1_5_BIT({{23, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAA12_1_5_BIT({{29, 13}});
+const double FNAV_DELTAA12_5_LSB = TWO_N9;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_1_5_BIT({{42, 11}});
+const double FNAV_E_5_LSB = TWO_N16;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_1_5_BIT({{53, 16}});
+const double FNAV_W_5_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAI_1_5_BIT({{69, 11}});
+const double FNAV_DELTAI_5_LSB = TWO_N14;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGA0_1_5_BIT({{80, 16}});
+const double FNAV_OMEGA0_5_LSB = TWO_N15;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_1_5_BIT({{96, 11}});
+const double FNAV_OMEGADOT_5_LSB = TWO_N33;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_1_5_BIT({{107, 16}});
 const double FNAV_M0_5_LSB = TWO_N15;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_1_5_bit({{123, 16}});
-const double FNAV_af0_5_LSB = TWO_N19;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_1_5_bit({{139, 13}});
-const double FNAV_af1_5_LSB = TWO_N38;
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_1_5_bit({{152, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SVID2_5_bit({{154, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Deltaa12_2_5_bit({{160, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_2_5_bit({{173, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_2_5_bit({{184, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltai_2_5_bit({{200, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_1_5_BIT({{123, 16}});
+const double FNAV_AF0_5_LSB = TWO_N19;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_1_5_BIT({{139, 13}});
+const double FNAV_AF1_5_LSB = TWO_N38;
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_1_5_BIT({{152, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SVI_D2_5_BIT({{154, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAA12_2_5_BIT({{160, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_2_5_BIT({{173, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_2_5_BIT({{184, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAI_2_5_BIT({{200, 11}});
 //const std::vector<std::pair<int,int>> FNAV_Omega012_2_5_bit({{210,4}});
 
 // WORD 6 Almanac SVID2(1/2) SVID3
-const std::vector<std::pair<int32_t, int32_t>> FNAV_IODa_6_bit({{7, 4}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_IO_DA_6_BIT({{7, 4}});
 //const std::vector<std::pair<int,int>> FNAV_Omega022_2_6_bit({{10,12}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omegadot_2_6_bit({{23, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_6_bit({{34, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_2_6_bit({{50, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_2_6_bit({{66, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_2_6_bit({{79, 2}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_SVID3_6_bit({{81, 6}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Deltaa12_3_6_bit({{87, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_e_3_6_bit({{100, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_w_3_6_bit({{111, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_deltai_3_6_bit({{127, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omega0_3_6_bit({{138, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_Omegadot_3_6_bit({{154, 11}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_3_6_bit({{165, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af0_3_6_bit({{181, 16}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_af1_3_6_bit({{197, 13}});
-const std::vector<std::pair<int32_t, int32_t>> FNAV_E5ahs_3_6_bit({{210, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_2_6_BIT({{23, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_2_6_BIT({{34, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_2_6_BIT({{50, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_2_6_BIT({{66, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_2_6_BIT({{79, 2}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_SVI_D3_6_BIT({{81, 6}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAA12_3_6_BIT({{87, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E_3_6_BIT({{100, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_W_3_6_BIT({{111, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_DELTAI_3_6_BIT({{127, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGA0_3_6_BIT({{138, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_OMEGADOT_3_6_BIT({{154, 11}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_M0_3_6_BIT({{165, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF0_3_6_BIT({{181, 16}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_AF1_3_6_BIT({{197, 13}});
+const std::vector<std::pair<int32_t, int32_t>> FNAV_E5AHS_3_6_BIT({{210, 2}});
 
 // Galileo E5a-I primary codes
-const std::string Galileo_E5a_I_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
+const std::string GALILEO_E5A_I_PRIMARY_CODE[GALILEO_E5A_NUMBER_OF_CODES] = {
     "3CEA9DA7B07B13A6CC0AE53DAD1EE2A0FCC70009338C08AC0EE457F76A1690815C3C940AB722487CC8F3D1F4C428828E7FD2A21230E42A3BBDF1E792165F644D0E0335F95EBDC93D6005CC0C680DB7B0E1B8C4946B7974319F9816141DB9E01011E4F20DA8F1B8E15A6F618CF599C3F5C1A1B276D51318ED4119BCE0ACD0332F3DD8F88EC5215AB311C51FF4987DA93B09A43BA84CF08032F6CB28F43043C54586811D870AD6FA27AA63785345C8BCDD3DA26A0134738BC7E08461D5409FF0B791D8574CE797FC5EF7821055028CB4AF92AE1088F8806CD55F0E5FDFCD8D74ED801B2B44AD5D79D1924D41DDC6AB2070B5360CB64CCF487FE517420348CC39BF50BDF78BE7DA91542FEAB689457B3EE69E43C75FADC303F31032FD96B7DC70A88C3B7BAC7322B285D9CFB3A93AC8B890165F23848FAD8477DBDD3D0AA4CB3CD73A48000B6D134DA2DA70B56E590A101AEE78864DA0C64A7BCC6B37CD6F31E9AFF10CA4D47630752D253944632DF6EC60AECDCD223F29399CDA3B74D1DFA5471277EE6C814464A8C55D3C0B83B36B6AC9FA90CE876ACDF65E3EA3FD61D309EB71ED29A3D510B2F4C0B6D6C5B57EC9060CFBE48389DCB17CBB2284E7F578565B91503B06F49CF3E8534870AEB6AD9707265A9A1E6E2E5E6DF6DAA367239A96EF5B02C19A4543D537EB4D9D73966C09E9B52B4706F57B3E0987885EB84DEA26F7823D895F62015188ED38C04CC6714F797FDB0BC713E3D0208462F9A68E3872A167BF1BF9791AEE8BB73CF527C50975B55C4E5C2F2E95B677F833ECC878D1764839608CC1108A75EE9E58FFCFE4CB52884E7AF15EE0632E0729DA1CF5B7A227028CFE1E08F8B881E1A743D52DD27BED33DE0EE75DC031B4864CF192DFEAF64F726D73321363A233F81C57232432D2B0A5A4C44F4320847A9C143F378F204185D2B571482FE45D6BCA152E6EA7223BFC6DCE06CEF90CE9114623EAB9B1EC789B2051B4AB711DABF5B16FCD970F437B8860313B4F1F14D384EE3976B7E55D2FDCB7E1BD9BE18B722E37C853ADC7E1CC2870A02881F95B78487780E1D1C296415109CF07AB63D0782A9F451CBEB3E8B919917AEDBCA8A8E563AD3784639793E0F25CC9CC62240FA04B2F141E71BF5C84EAC56431159556B8BCE077A51469A87737D3D6F06D97DD479FCC35129F4499C19EF98BDCEA9D4941B3756CDE1997C3AFCAE62B6D9E23341E11CD05A7FFF52F5814011A84D737E1264109006BEF5F19E3C6A9C7521B44741A8282755A8F0DC2FA0E1F6CA4FB34D8CD5FAA27E18808868725B9634376137C1BBC46934F83958112D03082DDD6148F353BD1DD24B9F8FD7AD89C40DA0A92A8DBE3608038CD56FFC4ACA35241D76FAC4CAE1211AAD9D73D51C81C59BCE05F71C345730D3A2C670F8F533A950EF24B00EFE6A3F1354694ABCC6FD9EC4E74DDE1F287AD4F847A297ECCCC39AF029EFCDDDB19932D906B9CEDFCBE0D422CEE305DD05E407340F28EEEA866664D60AF293A45D5D6D5C0000B05F79463DB513ED488DE7BD4EC9EACFEF973B23CE4E9539EFCB797456CF5FD1EC54FDCEE80B39063C48B91A5C2D2BEBC81B9B46D0AD6503BE5AACED2BA5EBE81F630B4E07510356E8229F7FC5EA532B8729CDB819E066A15379AC6942CD4BC5E97C6791E098105C323A3A3DA3880D5EE5562ABBA2BDC9906F4486B51ACF8AA4405E9D7A63DB9E3058782DD9AF3995FFB3D34AEF98234A0B3DC62C339325B60706C068F0198BD8FA658396D06931B069155217690C7F88FD230CDB38E3E48530BD47722FC",
     "9D8CF144C4B667345D44F765622A956CAC4E097AB1CAB05CFBCC6BB68C709503AD9DB09C09C983D46A04A05B6F7EB26DB4D46F868C10E112828B1AEDB3C0074BE0DE3C9B7821BABB4F8B8E24F69869CCD981B09A783BF6A95F39ECFAF25DED6B16F89EA09D3A8413CCEBB545651B363DD385D12BB72420440C40E804FA27DE029A1E08629BAAB598C035DC58FDD309844F3BEBDE40FCC231F38605DED06572ADD85DC51D3D8B89B4480143D0B75283522354330E5CCF4DE1A6E68047D5B8D45D835A891F2D40C9DB8A76CEB1D18FE2BC38D080A8D97064CC87D692DF21184ABFDDA7642D0BD6F3209D06B4AE7600F7DDDB71DA751120599117ECCE645FD109CCA2EC7DB98F4177F14DB854FEB314B5D7CDC3385AD203464EADEAFF4AD08DFEF3D21240BFB8EFCAAC1356C72A0F5C61BE03CD2A21A7D756FA9003D562FC4A49A6BE788EC8D80054ACA881DFFF72C2966EECD09F185EDD11218C6696DB14E05FFF3644D11E508F4F1E9C5AB3074FB1C3FB21092A1C8D5AE05688FA4A9226C3C30D0BC3981933DC8648240F8CB67085F53AC5295428DC8447A1E5A46C2BA86796982C4C6CC647FD8079BC4024BB69E2B226E6F3D0F8A90B4D36DA2AED4C6BB60D318AA7479FDC2031143C67CB4381C27072E12935001524C7BECEDAA9954BCC2AA218E9EC2C95498FD8DF655C015896D9ED42CE7F91CBBA2CC4A7920038EBB5F5CE638F969F8B179E72AE252BE7E826E5CB53C2E85AAF1E1F1AD8D534F78A681928818AC3154651FFC583DEB0A6A1F40B98771ACC528AAF80D210ADAF83597869968D499ADE9A19BAF341E8CBA20F0E1473BDD898C24C7A5466F9924EC7EE992A2086AF295BEE1F6D0F8843D91180BF2C981C11FD978B23B6BAF7786BD526B458B76A87C31D7C52DFA43F3D362C8EEFFFB3FE5FB3F6E5F34B1FEC7EF1031146F3F609B32677F148F7DEBCF3526BB45582436A3092408193D6312626E46ECFA96FEAD12A234CACE10FAF9DE75EE2D238088146328E10E9ECDBB0B018ECDF2725415CF5A06AAB857403BBF6CBFC350903A982864827988BC805A3484A31FECF7A40D4FE251BC7E487613B9D3A48D3C7DAEFDC49C4B7E625F868DB53A798515A61050978552699EF2A5BF2F13BDD444EADC9B60B479FDD4633EB4C1062AA78BEF06692DED203819D3160310FD7F2343732156A9CBCB0B50BA9A8F93E339B702670E54BFA6DB2E2E773202C690FB71EB03671AB0B1B02B2F189BD99061ADD23F75F4914067AE638C9A29DD3661C28AE272CE692CBDE6AE880FBCF272E548342372CBAF6370C7E3AE9648341CE7310BE1C534B5702B0611AF65868F840B6B7613FDAEA21DEFB4F2024487023B02B8B58C9E9F27AA787EE775249EFC40913CBBD69C38538F239B203815F00F7B9CB30DC79E6A0C3E069D109E4A1BAEEE36D354C3D0121F1342F1F4AC504A68D69DEC158D54B04BE8164B48F31BC0827A0379C5237070B6F963741AD9ED4F3865698FB8233D7F49ED4E0EEF3AD927CBAF4FAE183252BC56AE4CDE3E329B1D9C87C6C11429B15B8EE589213CFAC208A12AA01B4F1F7CC35CD0AEAE217471B3DAC1C279F353DC61994FC45FEDBBE0005D8EC729385645864EF98A3A417E62F1EACA7E60D4E773BB2E4024D62830F103A7988733DD7BBCF3AB0CD0049006FE2F7EB3821724BEC37EAE44681A9699A025D212724CD98CA3415FE2BD09FADC02F1501FA38A6083427B662DDCBD0460E12A09072698EC8966C47B8A640AC79C1B7722E78A6C28680F4BB77BBA477BE0A6FAB959B9753217C5708",
     "45D1C8FF162EE106CC87C3EBF6A837930F8CC797EC7A446E8A213ABD239582350636B19B5BE428A9C13F980B7AF5CD7F32630AFE8693CDF0EC0BC2C84F2472F5B86576E8C43136C14717A24705953D392BAC96C1055B782C7941D82FEA357E5FDEFF772FB9F3DF248455CADEAC4CBA2EBA9C91184006D1680E000D59E4BC8FBE2C2F7CC2E78BFA5B60EB292F244E6CF497D5A287432F2520B31B9D9FEC1210923299EDFF043CE077195509E92372F5959AAB4666AE486DEFA400D81463C388CD05C677BFD4953D2627105B0A776960FEE916C75D53981D30DC689581B7E8E0723D65949662ECFAA6FCC9F0CE8892E367721718F906207663F9AD450AE98D75DF004080FC15DC2CD7A1DCE013A0E547ADDC29A397ECB9E7FA02035327AC40240E2091098708D424563AB7C5867F3F2D78EE3EF5B658FDDBD49435060CA2EA3D559CDE957B7E48B98DB41CF875F7B3D9EBDF6547B4EDD98DF4B747B0793152FA8CC07C6D9EE5A2002464566D86466C2EDE54A2BF4BBE823049E57364C127A14BFE1B88ECF70EFB81EB831BBF50F6AE124E5F6A775F3F2620E91D489CCF24811C0890EF905E9E2ACD399E13DC81333A54BDD295B872EB74E412E2FB654A9874854FBC3A68C73434C5FC5CED27534B2B13C316205FF4E432FAFC13A7B5B7A7FFA9FEEDB5AE69036F8F2955DA124CE5856E8C53F24E609F7D3386DC5212B2E78B5AA23B59D45FE98AA08E9CFAA9D52ED260A36AF07522C047ED43808A39D7019E444EDF84D885A9AC84092A0F6BFED562F3E0D79FB5CF62F98E67EF219FA3F5AEB7D4E344642D3D4B1A7EEA18464F6CE8D4CB3181D9EBF6F4122751B54D0D7F3FC470A91B547148AAB1CA0DF59872120190640555A7561B0F2C11280768F74B1A56674FD5480B0F510491431810D99CECBC6DB85888BACBE2B020FB8B3D78039773229714156494EAEC3A2D0A59E718F72205747D69C05DDF1C678E2E154A1F84EF0CA2E24DC4A6A996F0850A396D2432596EAE84AEC0935B8C25D5C65B52A32722F01D281C4F753EE03EB10020E9FA02462CA303DA39560669637532D381EB78AE5EC0F6DBF6273EC979442E6243F65FC51F26C6C9554C6C0E3EFF33BC4EAB6A27CAB9383BE7DDDE4218C4998033B47919503E1C9A789711EBEAAD6C0298B3DC563F54D28675260F6D896F1B8D4FD0001C429210398E9544B3DAA12C31F7EE82EF4D2234E26F873610B76756DDACD24B6132BCFFE735FE75513ED527DD04D7DC6D24059F85706679DCD1474A9DB9571426BE17E6DEBA58B33B708567697F471CA8B78E8FA73B0E18CB6F88BF9E4F442F0FC21FAB89305484828F18B65F9D373A6A2B380D73F5924F80DA234C1DD87416D025E4E663C96F287B0C83DC92C2164D81830781B715209FD11A65E64962D805389BAAA91DFBB990D3511E506A8EC101131C5B7284252F861D047DB2C2027DBAAD487ABFE429CA21CBEA7671350618E441F4D62F2D579CAE29D97023A8873869B553293D9F54D4A929E252AF132325A6E3BCBF7B36D0DAFA1E56A39A5D801FD0D5A41111017BF62AAF8346C7D424FE007C32B437ADE60AAA9540AA5078FE6C3C3CCEA53EE863086646C976FE6C79434A0AA4F53B2E9E2C3B4CF9C9C4015391E27CDFF5C1FCCCC00BBF5B99715A1265F591E294D530DB14DFD485AD34BBCEA32E5B5D0EED15F88BF5D96D058E6D70BB1A232597E35A625E5E8C2EF5E7031A71F70309019A0591BA0A50E87C839498255A3602C0FAE53166BE5E49E29D24AEC47002B698F80FC49E718B66A8959259ACC540",
@@ -280,7 +280,7 @@ const std::string Galileo_E5a_I_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
 };
 
 // Galileo E5a-Q primary codes
-const std::string Galileo_E5a_Q_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
+const std::string GALILEO_E5A_Q_PRIMARY_CODE[GALILEO_E5A_NUMBER_OF_CODES] = {
     "515537AD5E5F4216C16046FB0AC50DCDBE5CEE7E3CBB51B6ABB4E87A407B90E0EFD49DE1DE5ED29184E7FF0DC31F75FBB94F46FF6586B36C7771E5A68D060A965ACCF8D640C6B6E4530FDF19DD2491BCAB69ACBCFD3EC7281CCC31253A471B652E21C4CB0B43613EC542266460F0A6199B436BEFD95572DEBEE920A915FD854D17FFD0DF8C74E23B21B28493A0927709709B07C65878C43B69DC501E9D0AA21061ECF173876CAE708C764435832D9D6FCFE62DDF2543016D6325A56D9BF1007886E62E8A832BC32063CB0717D723C5E8C5F0C0EB3960577D364C93060B64EE04A539B7601CC3113E0AEC53CF21AFAD0154DC5CCECF038474E0F4004A65B1EE2801F81968B88C3D35E87CBB126C02D770CC3D32A552883D351DEF47847391484F80646728221F993921BFC14126EE3D9527DE607152724C6D2DD305D3FEA0AAAEDF6509A2FE3248494A54FDA8E3CE7E6BBCE234E4686BA5A19724BA2CB78CFE71A6AF45532EFB286C5BB47BC3C1EEF4E4A8C757786AE974F30A86CD60EBCBFDF5502AA8F643819CBA4301E731ADBA1345B61C0B444FE7B817EA86F8DD749C451AE7D24A68D914F26C918238953E8AE61CC8553213DD6856C7863F9F6BAB1B4C84B225911E7B92BFFC12AC211B2B2CD905877FE976E07057963D47C437FE47D89648053F81AC39E8FD2F3A726866F6693E503CB6F0C3F0AA9B3EE2EA3BCDB16D726E1C6D8B073AA15F64EB68D53B1F8CDAC19C7AC33361226E81F1C793BF188755A3FE1BAC38B91ABBD4F077F7A28983EAFADC346CB941D49492625893453B364D07FE06FE42B160C16FE0462AB6366FFDEE54DC9CE4DCCA21E4E4AE5E92C872D1E4EC6FF6D3063C98A5AA5EE72481A0BDF15152E2A5425AB722101474D0E1EC8401273EA1BE1DAF7403190A94305BD1C7DFBE1F35F65D5CB97E82B7A297047507FFA0012FB73360FB8719C174E78A989A96E60A9184B3F3A8188DE100AB361921D38E8142859C8F0F7D441DB1B2E9687BBD1086643987C83DEE0BE8CED4C83BCC82B62B45311CE4F13ABC55BF5EB1ECDF15F5A07F8B2C42F07FACE0E299E87727E2D534FEBF7B9C3894CC3E2E4127A294B9FA2A671273B174DBB81D247CD2846116500A072DC3962C65FFECD0C0B46DC2AF52882058259C26FDE50BEB319AEECFA1FABA34C069680B9EBAA9D96EEBD7EA30E748213E1283396A2AFC63527624641D4E1F1022A973B1898BD4CEF4D712B49371A51D60E08F42ED1EA90AC49EEFBCC53E7F9E899DD1AA4056F11462DF1A4C81620A73C831CEB897430A22252B901EC3D6F3DF58EF26422F796EA31AA4E0E9CE5B4A9C312A22305E298FEB3B3628283D405EDF726937327D90C542434BA3B60684584A9DB244839D2ACBCD7EF147A541E35687B5B8F5F07764973112D20D1ED75DC31F6A938542B42EFAAEE0F11B0583AA4925C3132356200E8D6BDB3127B975F4115A7A8A1C471836E3C5450B501A24D4A1308BB319AA827222B550F253F64B6F7D2322C6A2D3012FEC265A66A60102A3340CBDAB900DFDB36693D41DAD8DDB8875F8C3BE76AD5355DD81D67AAEBFFFE9458E522BE0312E60F63DD92F25C0D7CF82F223AEC0BD7456752CBD5151FEB5368F8857EAFAA90E8C7499B75D46EC4CA20BA8A24C90C016B5BD2CD7864828C6140E98EDB9509AD1194F56D49675D077DE92CD481B469E3A37F7DF0D5392DA4CE4CB282530F1C73482CC0926B877B00B0CE49FAD21E4C26194C7E950E0078F3854EF88755E08E9380165C584A3DBF1ECEF6A31B224FC321326B93797BFE8",
     "D67539AFB80711A0BA3CD67D963BAD346BA813D35A2EEA104D36AAAB863C656A07AD61BA60598C07744D32ED01EFCE928346C09EAAC2D392E5655F0FEBC486815AE30A38014DD8520F73CCBB71D9D42636328A50998A2A3BED3E4B34D0DCD65B94807064E2EF0C420898DB96E3B99EA9A0AD91C63857DEAEDDA5E644E62212B23D72FEDBBAA78C6581C677B10689C4AF387626DAC55F4EBE1893D52D28D20EA365702448A64A0C553ED337C3BB911DDAE2A91727299D8064BEC880183064574B5E3631E70A0590210143F4079C572BD5E2F7634C2D53B1FB1DABE79C484799E7075EFF98F033F5B2EC66C373825335D883911CEC9CFBBE2E38129B7E03D9646A7E513D5069043BC62AF4C524F12D8F98D8C9DAC5D8642DFFF48CF6737AFBBCBE965925F55F03BBD5123C9DB47AAC780301DE91FBED3C01D03E6464C2C2915BFA187A4BD93E20C24574FB91F0358CBE0921DCC8D6B7E9976763A1D2158511861EFF5D1C0B71F608E7ADE91D9DCFF5640B55BC9BD1BB322C879C7EB5C06EB2601D06241D09CFB1BC1695DFA55FA044E0E2E4BC86EFBF6A55740C4640512DDD6CA069940BC0FE1738FD376C68BA8AF7CCBA7D89F7966B29355538836372EF418D149EBF3AC104919D91BCA2F13E79A7CF7684A4DC0AC556A2843E041A71F97C94B859FE009659F593EFFEBAA6F6C1C57A5BF22752613AFB26379C42AC25804AEDAE22D63B230FCB858F496B8EA6F37104D0890525DBDE06AD988BA0287B0938572F14A98EC9E60E973FD693DB1F2AFF671AB03FB12B729D0867938DF6B60EC69790C992C6C33A531FE56D0ECC1465F65E3E57FC9E45F0F65A1061CE6D3190B6C1B8708A8A5A47222369AE889D26499CDE8F0548B8D7071F2D4DF6C0F2418BE449552327981CB0B54F792F29A71E30DE257CE1B3A7553A22275E4C8B9FAC3B8D4E9912BB22B0A899E7337513C7ACBEDA15FAD3D6919FDDD941CA659D78B74FD39E2E2F622691B89CA82FFE602DB2578A20D4665184456F32DF4DD6CBC412EC7C6914CA427CEE02F6D9810AAE1406DD68ED3869BD8E3947A2B3A803E875FF82005D853E3F43A6BF936030744C34C8B71B7722BE0AD3F475E531C9249A42671D5F3A5C77C4C28DE29AE953EBFB572578B17B636F8365FC755C22871E7D53A1F1561C92909305C9FD36AAF79E8844B63370B800B25CC1355211D9919B830A988926829F808DD2C66400279E6AC14F8EECBBE8B6E9ABFA3BDBB38A49535F64F719EF48C5FE6B2738DC6F71AACD70274FD40A29BFCAA594AC3E7D0C3C522E406BA6392444C9F362339E8FF34BE330911DC7EB11A47FF3A62A46CDE961A40CD5B24020909E5B034F45FE96CB156FFE8E2FDBC12A7C12D60D24BFBE596544E4F03AF26F086A5A667496B7DF302E4DCFC568C7ABD665EA7EAD8A7F5A000DAD9F43E68C4D8A14742E050769B3CB270E3856D7E8F4E827046D3E55A52F0E02C883881914DE87AE3C24D93E61A94919B40398D3EABB1B5142431AB919208A9785962D05061EDC951C83C73FBF6AE8DD6FF839E631C9FCF6635FA053DBCF932E359F83FBB3EE310281569741E3A8975FAAD1E573E0EC3207F6DBCDB8CC90DCA1CE517C8DFC1D31AE4841F87A5157792738DAEE7C29240DAE26C6C3E9D8A899D2271B0C374BD2EE846C6625E31B2F8379A96F601323039D281608A01A1844E5D1D20CF1D92C52107CDA71BB3B7EC4DEA958CFD7A79F71868116CD1DD2B2E66BB94D1373B733F324BE489DA51BE72B01A8572880AE1E61650B839D03B0192D290D5B36A9CF93B304",
     "58B2E58A13D4D5F84F37A389E6B01DFA66DBC6A25338B2884EF08056BF0A9124DA29254AA79CDF1B0944DDED4BC7FE683EF7A3C7A1C359E61E959471E30F9D534F43EEF274AC6535C616ADC7455BFBFF43ABF268F7C995CE020CEC73BDBD04007562F2710498AD1A324F25A6233B2DF2D9A429F1C39943E45F934986D1979D293F90CFBEBE01665C98C0D72D09A382348136980B31F5D4696B85C3F42D5C445996804159CD4C4CE7547C4A3FB718AB62D9E9826D05C44C6BD21D708CABB01F46514F29FBE7352866EDBFABD0ADBB6093E1A519D0E11E27737239A07866752B6D864686AF1E308481C53C635046C0756E8008D3CD26DB970C5D6EF8CB9DE6BC4339EE9F88EA45D11B74A1525E2F1B9F91567A78E403F7ECD47A99E95C098870B928E1B0DAA984CCECA13C6857F350E808BBF66AB4EDFB0F369F6F009268D19DEEB377F7D0C4ED6414EF6D23A0A5F37A25AAD3CD62C2115CB70409049CF0CE6D4DBCC5C96767614C6FAF73E9A76C7550BB970AB3D3ACE0C07FAA9F36F1935DFCD5228427BBEB5FC7A2F951D9210A5BC32ACCA7E78AFD5FD460CE2A79348714E5542BF2D453680B070E85F3244E8A6B4EB6ED49F803E60B8A383C8BE6283B1C4DF79E0C4A23D5DAFCB26DFC5DF1D1520FB6CDA23A05A1513F751EBD0143C2B9F5494BAA74F9F95F189C5767C6F5623559D9F20CC9B9C9ADFE285FA4E1BBDA481A52ABAB36A5393370091A49A59B968CFAE89BEAF33BCA5C2A9BCC1758CEEFC2D0A175C8A5CAD5C7E3FA706C2FEA55F4971A7B8A0C5D1F22A26D7DA9A70603AC34566E4929AE78C8F1926239950EC0A6E1B37D919E24431E53FB08B2F7DCDCA2EF4177BD7D2F81BFC784FBEA0471831CDCBB9E11D60C53D0E062E8BB8D98B8EE5A40960EBE10FA642751B96E1407B38A024DC64D5C2005E71198EF394673A4A0097187D2475CF27B3EAA7955AD9F412A89B36AFB27FDF7FE699B2CC8C03F7FA40549178DF8A3C1A39441EAE869BBC89D583ECB18E310885F33B95B719045CA6955720CA75D5CF0B29E5F1B9E9EAC5EC92980B2D37EF6509CCA6E67544A8116494AC7EB9032E1E8CDB053B5AC0F60DE59BBFB78E3491D50C7ADED95042A8885FE284E90C04FFC0370B92B68379B2E7D52392A42FEB26B2419CC64412BFFC036C01109B9EAEC5FAF485F0D61C37A703EAD02127611F9D25E4EC515CABE21247156F0779CAB57C35581646BB71E87941AB5D06FB3C06C423E9E83E0C07E611C89CB000344AF49498EF5C30305DDC8958F45A45E1218837269DEEDBB0AE51D2AD8B41BE425EB7AB798856911B6F0DC721756A8154B9D1CCD61092D16A3E9E1CD5E1D7C2C45D236C9B21A0ED64AD4C0660FE42FC0B543A34FB545B0D88D42F696D53BF54A1A259486846E81B44C16EF146310AEFB3933BA9F9D4497E74AFE1449D69105B9F295DB24B4563C3FC0166CB70F104B3360BC0998EFEBABC6276F570F7679865036DB59B51AD2F91C0CCD3BCF5C07492765D480494AB5B87E83FD04B75A35F88656D3329AA5FD550DBF493B0CD2C19DEBE4358661C72A71FB17C812F75BEB61302AAAA1F757288C1D8626461F4162A2EC6296B3CCABE21B4F0695F2D2CB02B86035251FC9C5F2FB5BBF28237417DC56471629B3B4C25AFEDC4C9CD108ADAD9DB1330AB680E4998C5B3D99BCE8F08156B630A63EF36A51C813CE22A6B178683EDA389ACF58653582BC2AE8170ADEC4BE03C04CBA603C0E4572A74BD9599A8442E894EB504F7703F2353A8A3525EC5535E750303AC07E08D952755F97AF236014",
@@ -334,10 +334,10 @@ const std::string Galileo_E5a_Q_PRIMARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
 };
 
 // Galileo E5a-I secondary code
-const std::string Galileo_E5a_I_SECONDARY_CODE = "10000100001011101001";
+const std::string GALILEO_E5A_I_SECONDARY_CODE = "10000100001011101001";
 
 // Galileo E5a-Q secondary codes
-const std::string Galileo_E5a_Q_SECONDARY_CODE[Galileo_E5a_NUMBER_OF_CODES] = {
+const std::string GALILEO_E5A_Q_SECONDARY_CODE[GALILEO_E5A_NUMBER_OF_CODES] = {
     "1000001111110110111101101001110110001111011011100001010101000001000111111011100011001001101100011100",
     "0110011001010101100010111101001111001110000011000111011110010010111010000011001101010000010100100101",
     "0101100110100000001001011010100111000001101011110000011001010001101101110111100110101000001110000001",
diff --git a/src/core/system_parameters/beidou_dnav_ephemeris.cc b/src/core/system_parameters/beidou_dnav_ephemeris.cc
index 3ae8335f2..5081daa6a 100644
--- a/src/core/system_parameters/beidou_dnav_ephemeris.cc
+++ b/src/core/system_parameters/beidou_dnav_ephemeris.cc
@@ -275,7 +275,7 @@ double Beidou_Dnav_Ephemeris::satellitePosition(double transmitTime)
     double dtr_s = d_A_f0 + d_A_f1 * tk + d_A_f2 * tk * tk;
 
     /* relativity correction */
-    dtr_s -= 2.0 * sqrt(BEIDOU_GM * a) * d_eccentricity * sin(E) / (BEIDOU_C_m_s * BEIDOU_C_m_s);
+    dtr_s -= 2.0 * sqrt(BEIDOU_GM * a) * d_eccentricity * sin(E) / (BEIDOU_C_M_S * BEIDOU_C_M_S);
 
     return dtr_s;
 }
diff --git a/src/core/system_parameters/galileo_fnav_message.cc b/src/core/system_parameters/galileo_fnav_message.cc
index b7fa86e3c..918b7e9c7 100644
--- a/src/core/system_parameters/galileo_fnav_message.cc
+++ b/src/core/system_parameters/galileo_fnav_message.cc
@@ -232,150 +232,150 @@ bool Galileo_Fnav_Message::_CRC_test(std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> b
 void Galileo_Fnav_Message::decode_page(const std::string& data)
 {
     std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> data_bits(data);
-    page_type = read_navigation_unsigned(data_bits, FNAV_PAGE_TYPE_bit);
+    page_type = read_navigation_unsigned(data_bits, FNAV_PAGE_TYPE_BIT);
     switch (page_type)
         {
         case 1:  // SVID, Clock correction, SISA, Ionospheric correction, BGD, GST, Signal health and Data validity status
-            FNAV_SV_ID_PRN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SV_ID_PRN_1_bit));
-            FNAV_IODnav_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_1_bit));
-            FNAV_t0c_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0c_1_bit));
-            FNAV_t0c_1 *= FNAV_t0c_1_LSB;
-            FNAV_af0_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_1_bit));
-            FNAV_af0_1 *= FNAV_af0_1_LSB;
-            FNAV_af1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_1_bit));
-            FNAV_af1_1 *= FNAV_af1_1_LSB;
-            FNAV_af2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af2_1_bit));
-            FNAV_af2_1 *= FNAV_af2_1_LSB;
-            FNAV_SISA_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SISA_1_bit));
-            FNAV_ai0_1 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_ai0_1_bit));
-            FNAV_ai0_1 *= FNAV_ai0_1_LSB;
-            FNAV_ai1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_ai1_1_bit));
-            FNAV_ai1_1 *= FNAV_ai1_1_LSB;
-            FNAV_ai2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_ai2_1_bit));
-            FNAV_ai2_1 *= FNAV_ai2_1_LSB;
-            FNAV_region1_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region1_1_bit));
-            FNAV_region2_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region2_1_bit));
-            FNAV_region3_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region3_1_bit));
-            FNAV_region4_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region4_1_bit));
-            FNAV_region5_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_region5_1_bit));
-            FNAV_BGD_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_BGD_1_bit));
+            FNAV_SV_ID_PRN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SV_ID_PRN_1_BIT));
+            FNAV_IODnav_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_1_BIT));
+            FNAV_t0c_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0C_1_BIT));
+            FNAV_t0c_1 *= FNAV_T0C_1_LSB;
+            FNAV_af0_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_1_BIT));
+            FNAV_af0_1 *= FNAV_AF0_1_LSB;
+            FNAV_af1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_1_BIT));
+            FNAV_af1_1 *= FNAV_AF1_1_LSB;
+            FNAV_af2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF2_1_BIT));
+            FNAV_af2_1 *= FNAV_AF2_1_LSB;
+            FNAV_SISA_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SISA_1_BIT));
+            FNAV_ai0_1 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_AI0_1_BIT));
+            FNAV_ai0_1 *= FNAV_AI0_1_LSB;
+            FNAV_ai1_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AI1_1_BIT));
+            FNAV_ai1_1 *= FNAV_AI1_1_LSB;
+            FNAV_ai2_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AI2_1_BIT));
+            FNAV_ai2_1 *= FNAV_AI2_1_LSB;
+            FNAV_region1_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION1_1_BIT));
+            FNAV_region2_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION2_1_BIT));
+            FNAV_region3_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION3_1_BIT));
+            FNAV_region4_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION4_1_BIT));
+            FNAV_region5_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_REGION5_1_BIT));
+            FNAV_BGD_1 = static_cast<double>(read_navigation_signed(data_bits, FNAV_BGD_1_BIT));
             FNAV_BGD_1 *= FNAV_BGD_1_LSB;
-            FNAV_E5ahs_1 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_1_bit));
-            FNAV_WN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_1_bit));
-            FNAV_TOW_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_1_bit));
-            FNAV_E5advs_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_E5advs_1_bit));
+            FNAV_E5ahs_1 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_1_BIT));
+            FNAV_WN_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_1_BIT));
+            FNAV_TOW_1 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_1_BIT));
+            FNAV_E5advs_1 = static_cast<bool>(read_navigation_unsigned(data_bits, FNAV_E5ADVS_1_BIT));
             flag_TOW_1 = true;
             flag_TOW_set = true;
             flag_iono_and_GST = true;  // set to false externally
             break;
         case 2:  // Ephemeris (1/3) and GST
-            FNAV_IODnav_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_2_bit));
-            FNAV_M0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_bit));
+            FNAV_IODnav_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_2_BIT));
+            FNAV_M0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_BIT));
             FNAV_M0_2 *= FNAV_M0_2_LSB;
-            FNAV_omegadot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_omegadot_2_bit));
-            FNAV_omegadot_2 *= FNAV_omegadot_2_LSB;
-            FNAV_e_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_2_bit));
-            FNAV_e_2 *= FNAV_e_2_LSB;
-            FNAV_a12_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_a12_2_bit));
-            FNAV_a12_2 *= FNAV_a12_2_LSB;
-            FNAV_omega0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_omega0_2_bit));
-            FNAV_omega0_2 *= FNAV_omega0_2_LSB;
-            FNAV_idot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_idot_2_bit));
-            FNAV_idot_2 *= FNAV_idot_2_LSB;
-            FNAV_WN_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_2_bit));
-            FNAV_TOW_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_2_bit));
+            FNAV_omegadot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_2_BIT));
+            FNAV_omegadot_2 *= FNAV_OMEGADOT_2_LSB;
+            FNAV_e_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_2_BIT));
+            FNAV_e_2 *= FNAV_E_2_LSB;
+            FNAV_a12_2 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_A12_2_BIT));
+            FNAV_a12_2 *= FNAV_A12_2_LSB;
+            FNAV_omega0_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGA0_2_BIT));
+            FNAV_omega0_2 *= FNAV_OMEGA0_2_LSB;
+            FNAV_idot_2 = static_cast<double>(read_navigation_signed(data_bits, FNAV_IDOT_2_BIT));
+            FNAV_idot_2 *= FNAV_IDOT_2_LSB;
+            FNAV_WN_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_2_BIT));
+            FNAV_TOW_2 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_2_BIT));
             flag_TOW_2 = true;
             flag_TOW_set = true;
             flag_ephemeris_1 = true;
             break;
         case 3:  // Ephemeris (2/3) and GST
-            FNAV_IODnav_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_3_bit));
-            FNAV_i0_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_i0_3_bit));
-            FNAV_i0_3 *= FNAV_i0_3_LSB;
-            FNAV_w_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_3_bit));
-            FNAV_w_3 *= FNAV_w_3_LSB;
-            FNAV_deltan_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltan_3_bit));
-            FNAV_deltan_3 *= FNAV_deltan_3_LSB;
-            FNAV_Cuc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cuc_3_bit));
-            FNAV_Cuc_3 *= FNAV_Cuc_3_LSB;
-            FNAV_Cus_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cus_3_bit));
-            FNAV_Cus_3 *= FNAV_Cus_3_LSB;
-            FNAV_Crc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Crc_3_bit));
-            FNAV_Crc_3 *= FNAV_Crc_3_LSB;
-            FNAV_Crs_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Crs_3_bit));
-            FNAV_Crs_3 *= FNAV_Crs_3_LSB;
-            FNAV_t0e_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0e_3_bit));
-            FNAV_t0e_3 *= FNAV_t0e_3_LSB;
-            FNAV_WN_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_3_bit));
-            FNAV_TOW_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_3_bit));
+            FNAV_IODnav_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_3_BIT));
+            FNAV_i0_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_I0_3_BIT));
+            FNAV_i0_3 *= FNAV_I0_3_LSB;
+            FNAV_w_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_3_BIT));
+            FNAV_w_3 *= FNAV_W_3_LSB;
+            FNAV_deltan_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAN_3_BIT));
+            FNAV_deltan_3 *= FNAV_DELTAN_3_LSB;
+            FNAV_Cuc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CUC_3_BIT));
+            FNAV_Cuc_3 *= FNAV_CUC_3_LSB;
+            FNAV_Cus_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CUS_3_BIT));
+            FNAV_Cus_3 *= FNAV_CUS_3_LSB;
+            FNAV_Crc_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CRC_3_BIT));
+            FNAV_Crc_3 *= FNAV_CRC_3_LSB;
+            FNAV_Crs_3 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CRS_3_BIT));
+            FNAV_Crs_3 *= FNAV_CRS_3_LSB;
+            FNAV_t0e_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0E_3_BIT));
+            FNAV_t0e_3 *= FNAV_T0E_3_LSB;
+            FNAV_WN_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN_3_BIT));
+            FNAV_TOW_3 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_3_BIT));
             flag_TOW_3 = true;
             flag_TOW_set = true;
             flag_ephemeris_2 = true;
             break;
         case 4:  // Ephemeris (3/3),  GST-UTC conversion,  GST-GPS conversion and TOW
-            FNAV_IODnav_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODnav_4_bit));
-            FNAV_Cic_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cic_4_bit));
-            FNAV_Cic_4 *= FNAV_Cic_4_LSB;
-            FNAV_Cis_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Cis_4_bit));
-            FNAV_Cis_4 *= FNAV_Cis_4_LSB;
-            FNAV_A0_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0_4_bit));
+            FNAV_IODnav_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DNAV_4_BIT));
+            FNAV_Cic_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CIC_4_BIT));
+            FNAV_Cic_4 *= FNAV_CIC_4_LSB;
+            FNAV_Cis_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_CIS_4_BIT));
+            FNAV_Cis_4 *= FNAV_CIS_4_LSB;
+            FNAV_A0_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0_4_BIT));
             FNAV_A0_4 *= FNAV_A0_4_LSB;
-            FNAV_A1_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1_4_bit));
+            FNAV_A1_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1_4_BIT));
             FNAV_A1_4 *= FNAV_A1_4_LSB;
-            FNAV_deltatls_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_deltatls_4_bit));
-            FNAV_t0t_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0t_4_bit));
-            FNAV_t0t_4 *= FNAV_t0t_4_LSB;
-            FNAV_WNot_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WNot_4_bit));
-            FNAV_WNlsf_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WNlsf_4_bit));
-            FNAV_DN_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_DN_4_bit));
-            FNAV_deltatlsf_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_deltatlsf_4_bit));
-            FNAV_t0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0g_4_bit));
-            FNAV_t0g_4 *= FNAV_t0g_4_LSB;
-            FNAV_A0g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0g_4_bit));
-            FNAV_A0g_4 *= FNAV_A0g_4_LSB;
-            FNAV_A1g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1g_4_bit));
-            FNAV_A1g_4 *= FNAV_A1g_4_LSB;
-            FNAV_WN0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WN0g_4_bit));
-            FNAV_TOW_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_4_bit));
+            FNAV_deltatls_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_DELTATLS_4_BIT));
+            FNAV_t0t_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0T_4_BIT));
+            FNAV_t0t_4 *= FNAV_T0T_4_LSB;
+            FNAV_WNot_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_NOT_4_BIT));
+            FNAV_WNlsf_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_NLSF_4_BIT));
+            FNAV_DN_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_DN_4_BIT));
+            FNAV_deltatlsf_4 = static_cast<int32_t>(read_navigation_signed(data_bits, FNAV_DELTATLSF_4_BIT));
+            FNAV_t0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0G_4_BIT));
+            FNAV_t0g_4 *= FNAV_T0G_4_LSB;
+            FNAV_A0g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A0G_4_BIT));
+            FNAV_A0g_4 *= FNAV_A0G_4_LSB;
+            FNAV_A1g_4 = static_cast<double>(read_navigation_signed(data_bits, FNAV_A1G_4_BIT));
+            FNAV_A1g_4 *= FNAV_A1G_4_LSB;
+            FNAV_WN0g_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_N0G_4_BIT));
+            FNAV_TOW_4 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_TOW_4_BIT));
             flag_TOW_4 = true;
             flag_TOW_set = true;
             flag_ephemeris_3 = true;
             flag_utc_model = true;  // set to false externally
             break;
         case 5:  // Almanac (SVID1 and SVID2(1/2)), Week Number and almanac reference time
-            FNAV_IODa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODa_5_bit));
-            FNAV_WNa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_WNa_5_bit));
-            FNAV_t0a_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_t0a_5_bit));
-            FNAV_t0a_5 *= FNAV_t0a_5_LSB;
-            FNAV_SVID1_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVID1_5_bit));
-            FNAV_Deltaa12_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Deltaa12_1_5_bit));
-            FNAV_Deltaa12_1_5 *= FNAV_Deltaa12_5_LSB;
-            FNAV_e_1_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_1_5_bit));
-            FNAV_e_1_5 *= FNAV_e_5_LSB;
-            FNAV_w_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_1_5_bit));
-            FNAV_w_1_5 *= FNAV_w_5_LSB;
-            FNAV_deltai_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltai_1_5_bit));
-            FNAV_deltai_1_5 *= FNAV_deltai_5_LSB;
-            FNAV_Omega0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omega0_1_5_bit));
-            FNAV_Omega0_1_5 *= FNAV_Omega0_5_LSB;
-            FNAV_Omegadot_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omegadot_1_5_bit));
-            FNAV_Omegadot_1_5 *= FNAV_Omegadot_5_LSB;
-            FNAV_M0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_1_5_bit));
+            FNAV_IODa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DA_5_BIT));
+            FNAV_WNa_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_W_NA_5_BIT));
+            FNAV_t0a_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_T0A_5_BIT));
+            FNAV_t0a_5 *= FNAV_T0A_5_LSB;
+            FNAV_SVID1_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVI_D1_5_BIT));
+            FNAV_Deltaa12_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAA12_1_5_BIT));
+            FNAV_Deltaa12_1_5 *= FNAV_DELTAA12_5_LSB;
+            FNAV_e_1_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_1_5_BIT));
+            FNAV_e_1_5 *= FNAV_E_5_LSB;
+            FNAV_w_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_1_5_BIT));
+            FNAV_w_1_5 *= FNAV_W_5_LSB;
+            FNAV_deltai_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAI_1_5_BIT));
+            FNAV_deltai_1_5 *= FNAV_DELTAI_5_LSB;
+            FNAV_Omega0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGA0_1_5_BIT));
+            FNAV_Omega0_1_5 *= FNAV_OMEGA0_5_LSB;
+            FNAV_Omegadot_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_1_5_BIT));
+            FNAV_Omegadot_1_5 *= FNAV_OMEGADOT_5_LSB;
+            FNAV_M0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_1_5_BIT));
             FNAV_M0_1_5 *= FNAV_M0_5_LSB;
-            FNAV_af0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_1_5_bit));
-            FNAV_af0_1_5 *= FNAV_af0_5_LSB;
-            FNAV_af1_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_1_5_bit));
-            FNAV_af1_1_5 *= FNAV_af1_5_LSB;
-            FNAV_E5ahs_1_5 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_1_5_bit));
-            FNAV_SVID2_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVID2_5_bit));
-            FNAV_Deltaa12_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Deltaa12_2_5_bit));
-            FNAV_Deltaa12_2_5 *= FNAV_Deltaa12_5_LSB;
-            FNAV_e_2_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_2_5_bit));
-            FNAV_e_2_5 *= FNAV_e_5_LSB;
-            FNAV_w_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_2_5_bit));
-            FNAV_w_2_5 *= FNAV_w_5_LSB;
-            FNAV_deltai_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltai_2_5_bit));
-            FNAV_deltai_2_5 *= FNAV_deltai_5_LSB;
+            FNAV_af0_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_1_5_BIT));
+            FNAV_af0_1_5 *= FNAV_AF0_5_LSB;
+            FNAV_af1_1_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_1_5_BIT));
+            FNAV_af1_1_5 *= FNAV_AF1_5_LSB;
+            FNAV_E5ahs_1_5 = static_cast<uint32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_1_5_BIT));
+            FNAV_SVID2_5 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVI_D2_5_BIT));
+            FNAV_Deltaa12_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAA12_2_5_BIT));
+            FNAV_Deltaa12_2_5 *= FNAV_DELTAA12_5_LSB;
+            FNAV_e_2_5 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_2_5_BIT));
+            FNAV_e_2_5 *= FNAV_E_5_LSB;
+            FNAV_w_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_2_5_BIT));
+            FNAV_w_2_5 *= FNAV_W_5_LSB;
+            FNAV_deltai_2_5 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAI_2_5_BIT));
+            FNAV_deltai_2_5 *= FNAV_DELTAI_5_LSB;
             //TODO check this
             // Omega0_2 must be decoded when the two pieces are joined
             omega0_1 = data.substr(210, 4);
@@ -385,7 +385,7 @@ void Galileo_Fnav_Message::decode_page(const std::string& data)
             flag_almanac_1 = true;
             break;
         case 6:  // Almanac (SVID2(2/2) and SVID3)
-            FNAV_IODa_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IODa_6_bit));
+            FNAV_IODa_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_IO_DA_6_BIT));
             // Don't worry about omega pieces. If page 5 has not been received, all_ephemeris
             // flag will be set to false and the data won't be recorded.*/
             std::string omega0_2 = data.substr(10, 12);
@@ -393,36 +393,36 @@ void Galileo_Fnav_Message::decode_page(const std::string& data)
             std::bitset<GALILEO_FNAV_DATA_FRAME_BITS> omega_bits(Omega0);
             const std::vector<std::pair<int32_t, int32_t>> om_bit({{0, 12}});
             FNAV_Omega0_2_6 = static_cast<double>(read_navigation_signed(omega_bits, om_bit));
-            FNAV_Omega0_2_6 *= FNAV_Omega0_5_LSB;
-            FNAV_Omegadot_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omegadot_2_6_bit));
-            FNAV_Omegadot_2_6 *= FNAV_Omegadot_5_LSB;
-            FNAV_M0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_6_bit));
+            FNAV_Omega0_2_6 *= FNAV_OMEGA0_5_LSB;
+            FNAV_Omegadot_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_2_6_BIT));
+            FNAV_Omegadot_2_6 *= FNAV_OMEGADOT_5_LSB;
+            FNAV_M0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_2_6_BIT));
             FNAV_M0_2_6 *= FNAV_M0_5_LSB;
-            FNAV_af0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_2_6_bit));
-            FNAV_af0_2_6 *= FNAV_af0_5_LSB;
-            FNAV_af1_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_2_6_bit));
-            FNAV_af1_2_6 *= FNAV_af1_5_LSB;
-            FNAV_E5ahs_2_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_2_6_bit));
-            FNAV_SVID3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVID3_6_bit));
-            FNAV_Deltaa12_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Deltaa12_3_6_bit));
-            FNAV_Deltaa12_3_6 *= FNAV_Deltaa12_5_LSB;
-            FNAV_e_3_6 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_e_3_6_bit));
-            FNAV_e_3_6 *= FNAV_e_5_LSB;
-            FNAV_w_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_w_3_6_bit));
-            FNAV_w_3_6 *= FNAV_w_5_LSB;
-            FNAV_deltai_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_deltai_3_6_bit));
-            FNAV_deltai_3_6 *= FNAV_deltai_5_LSB;
-            FNAV_Omega0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omega0_3_6_bit));
-            FNAV_Omega0_3_6 *= FNAV_Omega0_5_LSB;
-            FNAV_Omegadot_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_Omegadot_3_6_bit));
-            FNAV_Omegadot_3_6 *= FNAV_Omegadot_5_LSB;
-            FNAV_M0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_3_6_bit));
+            FNAV_af0_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_2_6_BIT));
+            FNAV_af0_2_6 *= FNAV_AF0_5_LSB;
+            FNAV_af1_2_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_2_6_BIT));
+            FNAV_af1_2_6 *= FNAV_AF1_5_LSB;
+            FNAV_E5ahs_2_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_2_6_BIT));
+            FNAV_SVID3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_SVI_D3_6_BIT));
+            FNAV_Deltaa12_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAA12_3_6_BIT));
+            FNAV_Deltaa12_3_6 *= FNAV_DELTAA12_5_LSB;
+            FNAV_e_3_6 = static_cast<double>(read_navigation_unsigned(data_bits, FNAV_E_3_6_BIT));
+            FNAV_e_3_6 *= FNAV_E_5_LSB;
+            FNAV_w_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_W_3_6_BIT));
+            FNAV_w_3_6 *= FNAV_W_5_LSB;
+            FNAV_deltai_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_DELTAI_3_6_BIT));
+            FNAV_deltai_3_6 *= FNAV_DELTAI_5_LSB;
+            FNAV_Omega0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGA0_3_6_BIT));
+            FNAV_Omega0_3_6 *= FNAV_OMEGA0_5_LSB;
+            FNAV_Omegadot_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_OMEGADOT_3_6_BIT));
+            FNAV_Omegadot_3_6 *= FNAV_OMEGADOT_5_LSB;
+            FNAV_M0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_M0_3_6_BIT));
             FNAV_M0_3_6 *= FNAV_M0_5_LSB;
-            FNAV_af0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af0_3_6_bit));
-            FNAV_af0_3_6 *= FNAV_af0_5_LSB;
-            FNAV_af1_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_af1_3_6_bit));
-            FNAV_af1_3_6 *= FNAV_af1_5_LSB;
-            FNAV_E5ahs_3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5ahs_3_6_bit));
+            FNAV_af0_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF0_3_6_BIT));
+            FNAV_af0_3_6 *= FNAV_AF0_5_LSB;
+            FNAV_af1_3_6 = static_cast<double>(read_navigation_signed(data_bits, FNAV_AF1_3_6_BIT));
+            FNAV_af1_3_6 *= FNAV_AF1_5_LSB;
+            FNAV_E5ahs_3_6 = static_cast<int32_t>(read_navigation_unsigned(data_bits, FNAV_E5AHS_3_6_BIT));
 
             flag_almanac_2 = true;
             break;
diff --git a/src/core/system_parameters/galileo_navigation_message.cc b/src/core/system_parameters/galileo_navigation_message.cc
index 7ac22320c..ea3e7889b 100644
--- a/src/core/system_parameters/galileo_navigation_message.cc
+++ b/src/core/system_parameters/galileo_navigation_message.cc
@@ -398,7 +398,7 @@ void Galileo_Navigation_Message::split_page(std::string page_string, int32_t fla
                             // CRC correct: Decode word
                             std::string page_number_bits = Data_k.substr(0, 6);
                             std::bitset<GALILEO_PAGE_TYPE_BITS> page_type_bits(page_number_bits);  // from string to bitset
-                            Page_type = static_cast<int32_t>(read_page_type_unsigned(page_type_bits, type));
+                            Page_type = static_cast<int32_t>(read_page_type_unsigned(page_type_bits, TYPE));
                             Page_type_time_stamp = Page_type;
                             std::string Data_jk_ephemeris = Data_k + Data_j;
                             page_jk_decoder(Data_jk_ephemeris.c_str());
@@ -645,101 +645,101 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
     std::string data_jk_string = data_jk;
     std::bitset<GALILEO_DATA_JK_BITS> data_jk_bits(data_jk_string);
 
-    page_number = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, PAGE_TYPE_bit));
+    page_number = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, PAGE_TYPE_BIT));
     LOG(INFO) << "Page number = " << page_number;
 
     switch (page_number)
         {
         case 1:  // Word type 1: Ephemeris (1/4)
-            IOD_nav_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_1_bit));
+            IOD_nav_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_1_BIT));
             DLOG(INFO) << "IOD_nav_1= " << IOD_nav_1;
-            t0e_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0E_1_bit));
-            t0e_1 = t0e_1 * t0e_1_LSB;
+            t0e_1 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0_E_1_BIT));
+            t0e_1 = t0e_1 * T0E_1_LSB;
             DLOG(INFO) << "t0e_1= " << t0e_1;
-            M0_1 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_1_bit));
+            M0_1 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_1_BIT));
             M0_1 = M0_1 * M0_1_LSB;
             DLOG(INFO) << "M0_1= " << M0_1;
-            e_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_1_bit));
-            e_1 = e_1 * e_1_LSB;
+            e_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_1_BIT));
+            e_1 = e_1 * E_1_LSB;
             DLOG(INFO) << "e_1= " << e_1;
-            A_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, A_1_bit));
-            A_1 = A_1 * A_1_LSB_gal;
+            A_1 = static_cast<double>(read_navigation_unsigned(data_jk_bits, A_1_BIT));
+            A_1 = A_1 * A_1_LSB_GAL;
             DLOG(INFO) << "A_1= " << A_1;
             flag_ephemeris_1 = true;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
             break;
 
         case 2:  // Word type 2: Ephemeris (2/4)
-            IOD_nav_2 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_2_bit));
+            IOD_nav_2 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_2_BIT));
             DLOG(INFO) << "IOD_nav_2= " << IOD_nav_2;
-            OMEGA_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_0_2_bit));
+            OMEGA_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_0_2_BIT));
             OMEGA_0_2 = OMEGA_0_2 * OMEGA_0_2_LSB;
             DLOG(INFO) << "OMEGA_0_2= " << OMEGA_0_2;
-            i_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, i_0_2_bit));
-            i_0_2 = i_0_2 * i_0_2_LSB;
+            i_0_2 = static_cast<double>(read_navigation_signed(data_jk_bits, I_0_2_BIT));
+            i_0_2 = i_0_2 * I_0_2_LSB;
             DLOG(INFO) << "i_0_2= " << i_0_2;
-            omega_2 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_2_bit));
-            omega_2 = omega_2 * omega_2_LSB;
+            omega_2 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_2_BIT));
+            omega_2 = omega_2 * OMEGA_2_LSB;
             DLOG(INFO) << "omega_2= " << omega_2;
-            iDot_2 = static_cast<double>(read_navigation_signed(data_jk_bits, iDot_2_bit));
-            iDot_2 = iDot_2 * iDot_2_LSB;
+            iDot_2 = static_cast<double>(read_navigation_signed(data_jk_bits, I_DOT_2_BIT));
+            iDot_2 = iDot_2 * I_DOT_2_LSB;
             DLOG(INFO) << "iDot_2= " << iDot_2;
             flag_ephemeris_2 = true;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
             break;
 
         case 3:  // Word type 3: Ephemeris (3/4) and SISA
-            IOD_nav_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_3_bit));
+            IOD_nav_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_3_BIT));
             DLOG(INFO) << "IOD_nav_3= " << IOD_nav_3;
-            OMEGA_dot_3 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_dot_3_bit));
-            OMEGA_dot_3 = OMEGA_dot_3 * OMEGA_dot_3_LSB;
+            OMEGA_dot_3 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_3_BIT));
+            OMEGA_dot_3 = OMEGA_dot_3 * OMEGA_DOT_3_LSB;
             DLOG(INFO) << "OMEGA_dot_3= " << OMEGA_dot_3;
-            delta_n_3 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_n_3_bit));
-            delta_n_3 = delta_n_3 * delta_n_3_LSB;
+            delta_n_3 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_N_3_BIT));
+            delta_n_3 = delta_n_3 * DELTA_N_3_LSB;
             DLOG(INFO) << "delta_n_3= " << delta_n_3;
-            C_uc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_uc_3_bit));
-            C_uc_3 = C_uc_3 * C_uc_3_LSB;
+            C_uc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_UC_3_BIT));
+            C_uc_3 = C_uc_3 * C_UC_3_LSB;
             DLOG(INFO) << "C_uc_3= " << C_uc_3;
-            C_us_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_us_3_bit));
-            C_us_3 = C_us_3 * C_us_3_LSB;
+            C_us_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_US_3_BIT));
+            C_us_3 = C_us_3 * C_US_3_LSB;
             DLOG(INFO) << "C_us_3= " << C_us_3;
-            C_rc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_rc_3_bit));
-            C_rc_3 = C_rc_3 * C_rc_3_LSB;
+            C_rc_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_RC_3_BIT));
+            C_rc_3 = C_rc_3 * C_RC_3_LSB;
             DLOG(INFO) << "C_rc_3= " << C_rc_3;
-            C_rs_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_rs_3_bit));
-            C_rs_3 = C_rs_3 * C_rs_3_LSB;
+            C_rs_3 = static_cast<double>(read_navigation_signed(data_jk_bits, C_RS_3_BIT));
+            C_rs_3 = C_rs_3 * C_RS_3_LSB;
             DLOG(INFO) << "C_rs_3= " << C_rs_3;
-            SISA_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SISA_3_bit));
+            SISA_3 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SISA_3_BIT));
             DLOG(INFO) << "SISA_3= " << SISA_3;
             flag_ephemeris_3 = true;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
             break;
 
         case 4:  // Word type 4: Ephemeris (4/4) and Clock correction parameters
-            IOD_nav_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_nav_4_bit));
+            IOD_nav_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_NAV_4_BIT));
             DLOG(INFO) << "IOD_nav_4= " << IOD_nav_4;
-            SV_ID_PRN_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SV_ID_PRN_4_bit));
+            SV_ID_PRN_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SV_ID_PRN_4_BIT));
             DLOG(INFO) << "SV_ID_PRN_4= " << SV_ID_PRN_4;
-            C_ic_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_ic_4_bit));
-            C_ic_4 = C_ic_4 * C_ic_4_LSB;
+            C_ic_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_IC_4_BIT));
+            C_ic_4 = C_ic_4 * C_IC_4_LSB;
             DLOG(INFO) << "C_ic_4= " << C_ic_4;
-            C_is_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_is_4_bit));
-            C_is_4 = C_is_4 * C_is_4_LSB;
+            C_is_4 = static_cast<double>(read_navigation_signed(data_jk_bits, C_IS_4_BIT));
+            C_is_4 = C_is_4 * C_IS_4_LSB;
             DLOG(INFO) << "C_is_4= " << C_is_4;
             // Clock correction parameters
-            t0c_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0c_4_bit));
-            t0c_4 = t0c_4 * t0c_4_LSB;
+            t0c_4 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0C_4_BIT));
+            t0c_4 = t0c_4 * T0C_4_LSB;
             DLOG(INFO) << "t0c_4= " << t0c_4;
-            af0_4 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_4_bit));
-            af0_4 = af0_4 * af0_4_LSB;
+            af0_4 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_4_BIT));
+            af0_4 = af0_4 * AF0_4_LSB;
             DLOG(INFO) << "af0_4 = " << af0_4;
-            af1_4 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_4_bit));
-            af1_4 = af1_4 * af1_4_LSB;
+            af1_4 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_4_BIT));
+            af1_4 = af1_4 * AF1_4_LSB;
             DLOG(INFO) << "af1_4 = " << af1_4;
-            af2_4 = static_cast<double>(read_navigation_signed(data_jk_bits, af2_4_bit));
-            af2_4 = af2_4 * af2_4_LSB;
+            af2_4 = static_cast<double>(read_navigation_signed(data_jk_bits, AF2_4_BIT));
+            af2_4 = af2_4 * AF2_4_LSB;
             DLOG(INFO) << "af2_4 = " << af2_4;
-            spare_4 = static_cast<double>(read_navigation_unsigned(data_jk_bits, spare_4_bit));
+            spare_4 = static_cast<double>(read_navigation_unsigned(data_jk_bits, SPARE_4_BIT));
             DLOG(INFO) << "spare_4 = " << spare_4;
             flag_ephemeris_4 = true;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
@@ -747,47 +747,47 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
 
         case 5:  // Word type 5: Ionospheric correction, BGD, signal health and data validity status and GST
             // Ionospheric correction
-            ai0_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, ai0_5_bit));
-            ai0_5 = ai0_5 * ai0_5_LSB;
+            ai0_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, AI0_5_BIT));
+            ai0_5 = ai0_5 * AI0_5_LSB;
             DLOG(INFO) << "ai0_5= " << ai0_5;
-            ai1_5 = static_cast<double>(read_navigation_signed(data_jk_bits, ai1_5_bit));
-            ai1_5 = ai1_5 * ai1_5_LSB;
+            ai1_5 = static_cast<double>(read_navigation_signed(data_jk_bits, AI1_5_BIT));
+            ai1_5 = ai1_5 * AI1_5_LSB;
             DLOG(INFO) << "ai1_5= " << ai1_5;
-            ai2_5 = static_cast<double>(read_navigation_signed(data_jk_bits, ai2_5_bit));
-            ai2_5 = ai2_5 * ai2_5_LSB;
+            ai2_5 = static_cast<double>(read_navigation_signed(data_jk_bits, AI2_5_BIT));
+            ai2_5 = ai2_5 * AI2_5_LSB;
             DLOG(INFO) << "ai2_5= " << ai2_5;
             // Ionospheric disturbance flag
-            Region1_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region1_5_bit));
+            Region1_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION1_5_BIT));
             DLOG(INFO) << "Region1_flag_5= " << Region1_flag_5;
-            Region2_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region2_5_bit));
+            Region2_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION2_5_BIT));
             DLOG(INFO) << "Region2_flag_5= " << Region2_flag_5;
-            Region3_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region3_5_bit));
+            Region3_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION3_5_BIT));
             DLOG(INFO) << "Region3_flag_5= " << Region3_flag_5;
-            Region4_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region4_5_bit));
+            Region4_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION4_5_BIT));
             DLOG(INFO) << "Region4_flag_5= " << Region4_flag_5;
-            Region5_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, Region5_5_bit));
+            Region5_flag_5 = static_cast<bool>(read_navigation_bool(data_jk_bits, REGION5_5_BIT));
             DLOG(INFO) << "Region5_flag_5= " << Region5_flag_5;
-            BGD_E1E5a_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1E5a_5_bit));
-            BGD_E1E5a_5 = BGD_E1E5a_5 * BGD_E1E5a_5_LSB;
+            BGD_E1E5a_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1_E5A_5_BIT));
+            BGD_E1E5a_5 = BGD_E1E5a_5 * BGD_E1_E5A_5_LSB;
             DLOG(INFO) << "BGD_E1E5a_5= " << BGD_E1E5a_5;
-            BGD_E1E5b_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1E5b_5_bit));
-            BGD_E1E5b_5 = BGD_E1E5b_5 * BGD_E1E5b_5_LSB;
+            BGD_E1E5b_5 = static_cast<double>(read_navigation_signed(data_jk_bits, BGD_E1_E5B_5_BIT));
+            BGD_E1E5b_5 = BGD_E1E5b_5 * BGD_E1_E5B_5_LSB;
             DLOG(INFO) << "BGD_E1E5b_5= " << BGD_E1E5b_5;
-            E5b_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_5_bit));
+            E5b_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_5_BIT));
             DLOG(INFO) << "E5b_HS_5= " << E5b_HS_5;
-            E1B_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_5_bit));
+            E1B_HS_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_5_BIT));
             DLOG(INFO) << "E1B_HS_5= " << E1B_HS_5;
-            E5b_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E5b_DVS_5_bit));
+            E5b_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E5B_DVS_5_BIT));
             DLOG(INFO) << "E5b_DVS_5= " << E5b_DVS_5;
-            E1B_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E1B_DVS_5_bit));
+            E1B_DVS_5 = static_cast<bool>(read_navigation_unsigned(data_jk_bits, E1_B_DVS_5_BIT));
             DLOG(INFO) << "E1B_DVS_5= " << E1B_DVS_5;
             // GST
-            WN_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_5_bit));
+            WN_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_5_BIT));
             DLOG(INFO) << "WN_5= " << WN_5;
-            TOW_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_5_bit));
+            TOW_5 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_5_BIT));
             DLOG(INFO) << "TOW_5= " << TOW_5;
             flag_TOW_5 = true;  // set to false externally
-            spare_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, spare_5_bit));
+            spare_5 = static_cast<double>(read_navigation_unsigned(data_jk_bits, SPARE_5_BIT));
             DLOG(INFO) << "spare_5= " << spare_5;
             flag_iono_and_GST = true;  // set to false externally
             flag_TOW_set = true;       // set to false externally
@@ -795,26 +795,26 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
             break;
 
         case 6:  // Word type 6: GST-UTC conversion parameters
-            A0_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A0_6_bit));
+            A0_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A0_6_BIT));
             A0_6 = A0_6 * A0_6_LSB;
             DLOG(INFO) << "A0_6= " << A0_6;
-            A1_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A1_6_bit));
+            A1_6 = static_cast<double>(read_navigation_signed(data_jk_bits, A1_6_BIT));
             A1_6 = A1_6 * A1_6_LSB;
             DLOG(INFO) << "A1_6= " << A1_6;
-            Delta_tLS_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, Delta_tLS_6_bit));
+            Delta_tLS_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, DELTA_T_LS_6_BIT));
             DLOG(INFO) << "Delta_tLS_6= " << Delta_tLS_6;
-            t0t_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0t_6_bit));
-            t0t_6 = t0t_6 * t0t_6_LSB;
+            t0t_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0T_6_BIT));
+            t0t_6 = t0t_6 * T0T_6_LSB;
             DLOG(INFO) << "t0t_6= " << t0t_6;
-            WNot_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WNot_6_bit));
+            WNot_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, W_NOT_6_BIT));
             DLOG(INFO) << "WNot_6= " << WNot_6;
-            WN_LSF_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_LSF_6_bit));
+            WN_LSF_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_LSF_6_BIT));
             DLOG(INFO) << "WN_LSF_6= " << WN_LSF_6;
-            DN_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, DN_6_bit));
+            DN_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, DN_6_BIT));
             DLOG(INFO) << "DN_6= " << DN_6;
-            Delta_tLSF_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, Delta_tLSF_6_bit));
+            Delta_tLSF_6 = static_cast<int32_t>(read_navigation_signed(data_jk_bits, DELTA_T_LSF_6_BIT));
             DLOG(INFO) << "Delta_tLSF_6= " << Delta_tLSF_6;
-            TOW_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_6_bit));
+            TOW_6 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_6_BIT));
             DLOG(INFO) << "TOW_6= " << TOW_6;
             flag_TOW_6 = true;      // set to false externally
             flag_utc_model = true;  // set to false externally
@@ -823,34 +823,34 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
             break;
 
         case 7:  // Word type 7: Almanac for SVID1 (1/2), almanac reference time and almanac reference week number
-            IOD_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_7_bit));
+            IOD_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_7_BIT));
             DLOG(INFO) << "IOD_a_7= " << IOD_a_7;
-            WN_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_a_7_bit));
+            WN_a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_A_7_BIT));
             DLOG(INFO) << "WN_a_7= " << WN_a_7;
-            t0a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0a_7_bit));
-            t0a_7 = t0a_7 * t0a_7_LSB;
+            t0a_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0A_7_BIT));
+            t0a_7 = t0a_7 * T0A_7_LSB;
             DLOG(INFO) << "t0a_7= " << t0a_7;
-            SVID1_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVID1_7_bit));
+            SVID1_7 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVI_D1_7_BIT));
             DLOG(INFO) << "SVID1_7= " << SVID1_7;
-            DELTA_A_7 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_7_bit));
+            DELTA_A_7 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_7_BIT));
             DELTA_A_7 = DELTA_A_7 * DELTA_A_7_LSB;
             DLOG(INFO) << "DELTA_A_7= " << DELTA_A_7;
-            e_7 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_7_bit));
-            e_7 = e_7 * e_7_LSB;
+            e_7 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_7_BIT));
+            e_7 = e_7 * E_7_LSB;
             DLOG(INFO) << "e_7= " << e_7;
-            omega_7 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_7_bit));
-            omega_7 = omega_7 * omega_7_LSB;
+            omega_7 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_7_BIT));
+            omega_7 = omega_7 * OMEGA_7_LSB;
             DLOG(INFO) << "omega_7= " << omega_7;
-            delta_i_7 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_i_7_bit));
-            delta_i_7 = delta_i_7 * delta_i_7_LSB;
+            delta_i_7 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_I_7_BIT));
+            delta_i_7 = delta_i_7 * DELTA_I_7_LSB;
             DLOG(INFO) << "delta_i_7= " << delta_i_7;
-            Omega0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega0_7_bit));
-            Omega0_7 = Omega0_7 * Omega0_7_LSB;
+            Omega0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA0_7_BIT));
+            Omega0_7 = Omega0_7 * OMEGA0_7_LSB;
             DLOG(INFO) << "Omega0_7= " << Omega0_7;
-            Omega_dot_7 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega_dot_7_bit));
-            Omega_dot_7 = Omega_dot_7 * Omega_dot_7_LSB;
+            Omega_dot_7 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_7_BIT));
+            Omega_dot_7 = Omega_dot_7 * OMEGA_DOT_7_LSB;
             DLOG(INFO) << "Omega_dot_7= " << Omega_dot_7;
-            M0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_7_bit));
+            M0_7 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_7_BIT));
             M0_7 = M0_7 * M0_7_LSB;
             DLOG(INFO) << "M0_7= " << M0_7;
             flag_almanac_1 = true;
@@ -858,116 +858,116 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
             break;
 
         case 8:  // Word type 8: Almanac for SVID1 (2/2) and SVID2 (1/2)*/
-            IOD_a_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_8_bit));
+            IOD_a_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_8_BIT));
             DLOG(INFO) << "IOD_a_8= " << IOD_a_8;
-            af0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_8_bit));
-            af0_8 = af0_8 * af0_8_LSB;
+            af0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_8_BIT));
+            af0_8 = af0_8 * AF0_8_LSB;
             DLOG(INFO) << "af0_8= " << af0_8;
-            af1_8 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_8_bit));
-            af1_8 = af1_8 * af1_8_LSB;
+            af1_8 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_8_BIT));
+            af1_8 = af1_8 * AF1_8_LSB;
             DLOG(INFO) << "af1_8= " << af1_8;
-            E5b_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_8_bit));
+            E5b_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_8_BIT));
             DLOG(INFO) << "E5b_HS_8= " << E5b_HS_8;
-            E1B_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_8_bit));
+            E1B_HS_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_8_BIT));
             DLOG(INFO) << "E1B_HS_8= " << E1B_HS_8;
-            SVID2_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVID2_8_bit));
+            SVID2_8 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVI_D2_8_BIT));
             DLOG(INFO) << "SVID2_8= " << SVID2_8;
-            DELTA_A_8 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_8_bit));
+            DELTA_A_8 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_8_BIT));
             DELTA_A_8 = DELTA_A_8 * DELTA_A_8_LSB;
             DLOG(INFO) << "DELTA_A_8= " << DELTA_A_8;
-            e_8 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_8_bit));
-            e_8 = e_8 * e_8_LSB;
+            e_8 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_8_BIT));
+            e_8 = e_8 * E_8_LSB;
             DLOG(INFO) << "e_8= " << e_8;
-            omega_8 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_8_bit));
-            omega_8 = omega_8 * omega_8_LSB;
+            omega_8 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_8_BIT));
+            omega_8 = omega_8 * OMEGA_8_LSB;
             DLOG(INFO) << "omega_8= " << omega_8;
-            delta_i_8 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_i_8_bit));
-            delta_i_8 = delta_i_8 * delta_i_8_LSB;
+            delta_i_8 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_I_8_BIT));
+            delta_i_8 = delta_i_8 * DELTA_I_8_LSB;
             DLOG(INFO) << "delta_i_8= " << delta_i_8;
-            Omega0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega0_8_bit));
-            Omega0_8 = Omega0_8 * Omega0_8_LSB;
+            Omega0_8 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA0_8_BIT));
+            Omega0_8 = Omega0_8 * OMEGA0_8_LSB;
             DLOG(INFO) << "Omega0_8= " << Omega0_8;
-            Omega_dot_8 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega_dot_8_bit));
-            Omega_dot_8 = Omega_dot_8 * Omega_dot_8_LSB;
+            Omega_dot_8 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_8_BIT));
+            Omega_dot_8 = Omega_dot_8 * OMEGA_DOT_8_LSB;
             DLOG(INFO) << "Omega_dot_8= " << Omega_dot_8;
             flag_almanac_2 = true;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
             break;
 
         case 9:  // Word type 9: Almanac for SVID2 (2/2) and SVID3 (1/2)
-            IOD_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_9_bit));
+            IOD_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_9_BIT));
             DLOG(INFO) << "IOD_a_9= " << IOD_a_9;
-            WN_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_a_9_bit));
+            WN_a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_A_9_BIT));
             DLOG(INFO) << "WN_a_9= " << WN_a_9;
-            t0a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t0a_9_bit));
-            t0a_9 = t0a_9 * t0a_9_LSB;
+            t0a_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T0A_9_BIT));
+            t0a_9 = t0a_9 * T0A_9_LSB;
             DLOG(INFO) << "t0a_9= " << t0a_9;
-            M0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_9_bit));
+            M0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_9_BIT));
             M0_9 = M0_9 * M0_9_LSB;
             DLOG(INFO) << "M0_9= " << M0_9;
-            af0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_9_bit));
-            af0_9 = af0_9 * af0_9_LSB;
+            af0_9 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_9_BIT));
+            af0_9 = af0_9 * AF0_9_LSB;
             DLOG(INFO) << "af0_9= " << af0_9;
-            af1_9 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_9_bit));
-            af1_9 = af1_9 * af1_9_LSB;
+            af1_9 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_9_BIT));
+            af1_9 = af1_9 * AF1_9_LSB;
             DLOG(INFO) << "af1_9= " << af1_9;
-            E5b_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_9_bit));
+            E5b_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_9_BIT));
             DLOG(INFO) << "E5b_HS_9= " << E5b_HS_9;
-            E1B_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_9_bit));
+            E1B_HS_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_9_BIT));
             DLOG(INFO) << "E1B_HS_9= " << E1B_HS_9;
-            SVID3_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVID3_9_bit));
+            SVID3_9 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, SVI_D3_9_BIT));
             DLOG(INFO) << "SVID3_9= " << SVID3_9;
-            DELTA_A_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_9_bit));
+            DELTA_A_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_A_9_BIT));
             DELTA_A_9 = DELTA_A_9 * DELTA_A_9_LSB;
             DLOG(INFO) << "DELTA_A_9= " << DELTA_A_9;
-            e_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, e_9_bit));
-            e_9 = e_9 * e_9_LSB;
+            e_9 = static_cast<double>(read_navigation_unsigned(data_jk_bits, E_9_BIT));
+            e_9 = e_9 * E_9_LSB;
             DLOG(INFO) << "e_9= " << e_9;
-            omega_9 = static_cast<double>(read_navigation_signed(data_jk_bits, omega_9_bit));
-            omega_9 = omega_9 * omega_9_LSB;
+            omega_9 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_9_BIT));
+            omega_9 = omega_9 * OMEGA_9_LSB;
             DLOG(INFO) << "omega_9= " << omega_9;
-            delta_i_9 = static_cast<double>(read_navigation_signed(data_jk_bits, delta_i_9_bit));
-            delta_i_9 = delta_i_9 * delta_i_9_LSB;
+            delta_i_9 = static_cast<double>(read_navigation_signed(data_jk_bits, DELTA_I_9_BIT));
+            delta_i_9 = delta_i_9 * DELTA_I_9_LSB;
             DLOG(INFO) << "delta_i_9= " << delta_i_9;
             flag_almanac_3 = true;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
             break;
 
         case 10:  // Word type 10: Almanac for SVID3 (2/2) and GST-GPS conversion parameters
-            IOD_a_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_a_10_bit));
+            IOD_a_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, IOD_A_10_BIT));
             DLOG(INFO) << "IOD_a_10= " << IOD_a_10;
-            Omega0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega0_10_bit));
-            Omega0_10 = Omega0_10 * Omega0_10_LSB;
+            Omega0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA0_10_BIT));
+            Omega0_10 = Omega0_10 * OMEGA0_10_LSB;
             DLOG(INFO) << "Omega0_10= " << Omega0_10;
-            Omega_dot_10 = static_cast<double>(read_navigation_signed(data_jk_bits, Omega_dot_10_bit));
-            Omega_dot_10 = Omega_dot_10 * Omega_dot_10_LSB;
+            Omega_dot_10 = static_cast<double>(read_navigation_signed(data_jk_bits, OMEGA_DOT_10_BIT));
+            Omega_dot_10 = Omega_dot_10 * OMEGA_DOT_10_LSB;
             DLOG(INFO) << "Omega_dot_10= " << Omega_dot_10;
-            M0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_10_bit));
+            M0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, M0_10_BIT));
             M0_10 = M0_10 * M0_10_LSB;
             DLOG(INFO) << "M0_10= " << M0_10;
-            af0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, af0_10_bit));
-            af0_10 = af0_10 * af0_10_LSB;
+            af0_10 = static_cast<double>(read_navigation_signed(data_jk_bits, AF0_10_BIT));
+            af0_10 = af0_10 * AF0_10_LSB;
             DLOG(INFO) << "af0_10= " << af0_10;
-            af1_10 = static_cast<double>(read_navigation_signed(data_jk_bits, af1_10_bit));
-            af1_10 = af1_10 * af1_10_LSB;
+            af1_10 = static_cast<double>(read_navigation_signed(data_jk_bits, AF1_10_BIT));
+            af1_10 = af1_10 * AF1_10_LSB;
             DLOG(INFO) << "af1_10= " << af1_10;
-            E5b_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5b_HS_10_bit));
+            E5b_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E5B_HS_10_BIT));
             DLOG(INFO) << "E5b_HS_10= " << E5b_HS_10;
-            E1B_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1B_HS_10_bit));
+            E1B_HS_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, E1_B_HS_10_BIT));
             DLOG(INFO) << "E1B_HS_10= " << E1B_HS_10;
-            A_0G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_0G_10_bit));
+            A_0G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_0_G_10_BIT));
             A_0G_10 = A_0G_10 * A_0G_10_LSB;
             flag_GGTO_1 = true;
             DLOG(INFO) << "A_0G_10= " << A_0G_10;
-            A_1G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_1G_10_bit));
+            A_1G_10 = static_cast<double>(read_navigation_signed(data_jk_bits, A_1_G_10_BIT));
             A_1G_10 = A_1G_10 * A_1G_10_LSB;
             flag_GGTO_2 = true;
             DLOG(INFO) << "A_1G_10= " << A_1G_10;
-            t_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, t_0G_10_bit));
-            t_0G_10 = t_0G_10 * t_0G_10_LSB;
+            t_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, T_0_G_10_BIT));
+            t_0G_10 = t_0G_10 * T_0_G_10_LSB;
             flag_GGTO_3 = true;
             DLOG(INFO) << "t_0G_10= " << t_0G_10;
-            WN_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0G_10_bit));
+            WN_0G_10 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0_G_10_BIT));
             flag_GGTO_4 = true;
             DLOG(INFO) << "WN_0G_10= " << WN_0G_10;
             flag_almanac_4 = true;
@@ -975,11 +975,11 @@ int32_t Galileo_Navigation_Message::page_jk_decoder(const char* data_jk)
             break;
 
         case 0:  // Word type 0: I/NAV Spare Word
-            Time_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, Time_0_bit));
+            Time_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TIME_0_BIT));
             DLOG(INFO) << "Time_0= " << Time_0;
-            WN_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0_bit));
+            WN_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, WN_0_BIT));
             DLOG(INFO) << "WN_0= " << WN_0;
-            TOW_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_0_bit));
+            TOW_0 = static_cast<int32_t>(read_navigation_unsigned(data_jk_bits, TOW_0_BIT));
             DLOG(INFO) << "TOW_0= " << TOW_0;
             DLOG(INFO) << "flag_tow_set" << flag_TOW_set;
             break;
diff --git a/src/core/system_parameters/glonass_gnav_navigation_message.cc b/src/core/system_parameters/glonass_gnav_navigation_message.cc
index 5685b34a4..4433efc8a 100644
--- a/src/core/system_parameters/glonass_gnav_navigation_message.cc
+++ b/src/core/system_parameters/glonass_gnav_navigation_message.cc
@@ -405,7 +405,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
             // --- It is string 5 ----------------------------------------------
             if (flag_ephemeris_str_4 == true)
                 {
-                    gnav_utc_model.d_N_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
+                    gnav_utc_model.d_N_A = static_cast<double>(read_navigation_unsigned(string_bits, DAY_NUMBER_A));
                     gnav_utc_model.d_tau_c = static_cast<double>(read_navigation_signed(string_bits, TAU_C)) * TWO_N31;
                     gnav_utc_model.d_N_4 = static_cast<double>(read_navigation_unsigned(string_bits, N_4));
                     gnav_utc_model.d_tau_gps = static_cast<double>(read_navigation_signed(string_bits, TAU_GPS)) * TWO_N30;
@@ -451,7 +451,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
         case 6:
             // --- It is string 6 ----------------------------------------------
-            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
@@ -461,7 +461,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
-            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -501,7 +501,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
         case 8:
             // --- It is string 8 ----------------------------------------------
-            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
@@ -511,7 +511,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
-            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -546,7 +546,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
         case 10:
             // --- It is string 10 ---------------------------------------------
-            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
@@ -556,7 +556,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
-            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -591,7 +591,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
 
         case 12:
             // --- It is string 12 ---------------------------------------------
-            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+            i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
             d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
             // Make sure a valid frame_ID or satellite slot number is returned
             if (d_frame_ID == 0)
@@ -600,7 +600,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
                 }
             gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
-            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+            gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
             gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
             gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
@@ -642,7 +642,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
                 }
             else
                 {
-                    i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, n_A));
+                    i_alm_satellite_slot_number = static_cast<uint32_t>(read_navigation_unsigned(string_bits, N_A));
                     d_frame_ID = get_frame_number(i_alm_satellite_slot_number);
                     // Make sure a valid frame_ID or satellite slot number is returned
                     if (d_frame_ID == 0)
@@ -651,7 +651,7 @@ int32_t Glonass_Gnav_Navigation_Message::string_decoder(const std::string& frame
                         }
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_C_n = static_cast<bool>(read_navigation_bool(string_bits, C_N));
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_M_n_A = static_cast<double>(read_navigation_unsigned(string_bits, M_N_A));
-                    gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, n_A));
+                    gnav_almanac[i_alm_satellite_slot_number - 1].d_n_A = static_cast<double>(read_navigation_unsigned(string_bits, N_A));
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_tau_n_A = static_cast<double>(read_navigation_unsigned(string_bits, TAU_N_A)) * TWO_N18;
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_lambda_n_A = static_cast<double>(read_navigation_signed(string_bits, LAMBDA_N_A)) * TWO_N20 * GLONASS_PI;
                     gnav_almanac[i_alm_satellite_slot_number - 1].d_Delta_i_n_A = static_cast<double>(read_navigation_signed(string_bits, DELTA_I_N_A)) * TWO_N20 * GLONASS_PI;
diff --git a/src/core/system_parameters/gps_ephemeris.cc b/src/core/system_parameters/gps_ephemeris.cc
index c6e181815..e6b5b10ae 100644
--- a/src/core/system_parameters/gps_ephemeris.cc
+++ b/src/core/system_parameters/gps_ephemeris.cc
@@ -283,7 +283,7 @@ double Gps_Ephemeris::satellitePosition(double transmitTime)
     double dtr_s = d_A_f0 + d_A_f1 * tk + d_A_f2 * tk * tk;
 
     /* relativity correction */
-    dtr_s -= 2.0 * sqrt(GM * a) * d_e_eccentricity * sin(E) / (GPS_C_m_s * GPS_C_m_s);
+    dtr_s -= 2.0 * sqrt(GM * a) * d_e_eccentricity * sin(E) / (GPS_C_M_S * GPS_C_M_S);
 
     return dtr_s;
 }
diff --git a/src/main/main.cc b/src/main/main.cc
index 62641fd25..67e0881f5 100644
--- a/src/main/main.cc
+++ b/src/main/main.cc
@@ -72,8 +72,8 @@ using google::LogMessage;
 */
 
 // For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 int main(int argc, char** argv)
 {
diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc
index 66a8ab7de..55254a0ff 100644
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@@ -50,9 +50,9 @@
 #include <queue>
 
 
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
 
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 using google::LogMessage;
 
diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
index 5de0d332a..08939e1e3 100644
--- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
+++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <utility>
 
-bool rtklib_solver_dump_reader::read_binary_obs()
+bool Rtklib_Solver_Dump_Reader::read_binary_obs()
 {
     try
         {
@@ -74,7 +74,7 @@ bool rtklib_solver_dump_reader::read_binary_obs()
 }
 
 
-bool rtklib_solver_dump_reader::restart()
+bool Rtklib_Solver_Dump_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -86,7 +86,7 @@ bool rtklib_solver_dump_reader::restart()
 }
 
 
-int64_t rtklib_solver_dump_reader::num_epochs()
+int64_t Rtklib_Solver_Dump_Reader::num_epochs()
 {
     std::ifstream::pos_type size;
     int epoch_size_bytes = 2 * sizeof(uint32_t) + 21 * sizeof(double) + 3 * sizeof(uint8_t) + 2 * sizeof(float);
@@ -101,7 +101,7 @@ int64_t rtklib_solver_dump_reader::num_epochs()
 }
 
 
-bool rtklib_solver_dump_reader::open_obs_file(std::string out_file)
+bool Rtklib_Solver_Dump_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -125,7 +125,7 @@ bool rtklib_solver_dump_reader::open_obs_file(std::string out_file)
 }
 
 
-rtklib_solver_dump_reader::~rtklib_solver_dump_reader()
+Rtklib_Solver_Dump_Reader::~Rtklib_Solver_Dump_Reader()
 {
     try
         {
diff --git a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h b/src/tests/system-tests/libs/rtklib_solver_dump_reader.h
index 5006482dd..d3990e30f 100644
--- a/src/tests/system-tests/libs/rtklib_solver_dump_reader.h
+++ b/src/tests/system-tests/libs/rtklib_solver_dump_reader.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class rtklib_solver_dump_reader
+class Rtklib_Solver_Dump_Reader
 {
 public:
-    ~rtklib_solver_dump_reader();
+    ~Rtklib_Solver_Dump_Reader();
     bool read_binary_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
index 631e8e782..8a97cfeb3 100644
--- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
+++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.cc
@@ -35,7 +35,7 @@
 #include <utility>
 
 
-spirent_motion_csv_dump_reader::spirent_motion_csv_dump_reader()
+Spirent_Motion_Csv_Dump_Reader::Spirent_Motion_Csv_Dump_Reader()
 {
     header_lines = 2;
     TOW_ms = 0.0;
@@ -79,7 +79,7 @@ spirent_motion_csv_dump_reader::spirent_motion_csv_dump_reader()
 }
 
 
-spirent_motion_csv_dump_reader::~spirent_motion_csv_dump_reader()
+Spirent_Motion_Csv_Dump_Reader::~Spirent_Motion_Csv_Dump_Reader()
 {
     try
         {
@@ -99,7 +99,7 @@ spirent_motion_csv_dump_reader::~spirent_motion_csv_dump_reader()
 }
 
 
-bool spirent_motion_csv_dump_reader::read_csv_obs()
+bool Spirent_Motion_Csv_Dump_Reader::read_csv_obs()
 {
     try
         {
@@ -133,7 +133,7 @@ bool spirent_motion_csv_dump_reader::read_csv_obs()
 }
 
 
-bool spirent_motion_csv_dump_reader::parse_vector(std::vector<double> &vec)
+bool Spirent_Motion_Csv_Dump_Reader::parse_vector(std::vector<double> &vec)
 {
     try
         {
@@ -185,7 +185,7 @@ bool spirent_motion_csv_dump_reader::parse_vector(std::vector<double> &vec)
 }
 
 
-bool spirent_motion_csv_dump_reader::restart()
+bool Spirent_Motion_Csv_Dump_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -202,7 +202,7 @@ bool spirent_motion_csv_dump_reader::restart()
 }
 
 
-int64_t spirent_motion_csv_dump_reader::num_epochs()
+int64_t Spirent_Motion_Csv_Dump_Reader::num_epochs()
 {
     int64_t nepoch = 0LL;
     std::string line;
@@ -219,7 +219,7 @@ int64_t spirent_motion_csv_dump_reader::num_epochs()
 }
 
 
-bool spirent_motion_csv_dump_reader::open_obs_file(std::string out_file)
+bool Spirent_Motion_Csv_Dump_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -248,7 +248,7 @@ bool spirent_motion_csv_dump_reader::open_obs_file(std::string out_file)
 }
 
 
-void spirent_motion_csv_dump_reader::close_obs_file()
+void Spirent_Motion_Csv_Dump_Reader::close_obs_file()
 {
     try
         {
diff --git a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h
index b08beb6e0..5d8066627 100644
--- a/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h
+++ b/src/tests/system-tests/libs/spirent_motion_csv_dump_reader.h
@@ -36,11 +36,11 @@
 #include <string>
 #include <vector>
 
-class spirent_motion_csv_dump_reader
+class Spirent_Motion_Csv_Dump_Reader
 {
 public:
-    spirent_motion_csv_dump_reader();
-    ~spirent_motion_csv_dump_reader();
+    Spirent_Motion_Csv_Dump_Reader();
+    ~Spirent_Motion_Csv_Dump_Reader();
     bool read_csv_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc
index cb8f8975b..1365b4302 100644
--- a/src/tests/system-tests/position_test.cc
+++ b/src/tests/system-tests/position_test.cc
@@ -60,8 +60,8 @@
 #include <thread>
 
 // For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 class PositionSystemTest : public ::testing::Test
 {
@@ -470,7 +470,7 @@ void PositionSystemTest::check_results()
     arma::vec ref_r_enu = {0, 0, 0};
     cart2utm(true_r_eb_e, utm_zone, ref_r_enu);
 
-    rtklib_solver_dump_reader pvt_reader;
+    Rtklib_Solver_Dump_Reader pvt_reader;
     pvt_reader.open_obs_file(FLAGS_pvt_solver_dump_filename);
     int64_t n_epochs = pvt_reader.num_epochs();
     R_eb_e = arma::zeros(3, n_epochs);
@@ -596,7 +596,7 @@ void PositionSystemTest::check_results()
     else
         {
             //dynamic position
-            spirent_motion_csv_dump_reader ref_reader;
+            Spirent_Motion_Csv_Dump_Reader ref_reader;
             ref_reader.open_obs_file(FLAGS_ref_motion_filename);
             int64_t n_epochs = ref_reader.num_epochs();
             ref_R_eb_e = arma::zeros(3, n_epochs);
diff --git a/src/tests/system-tests/ttff.cc b/src/tests/system-tests/ttff.cc
index c9186a05f..ab9391244 100644
--- a/src/tests/system-tests/ttff.cc
+++ b/src/tests/system-tests/ttff.cc
@@ -62,8 +62,8 @@ DEFINE_string(subdevice, "A:0", "USRP subdevice");
 DEFINE_string(config_file_ttff, std::string(""), "File containing the configuration parameters for the TTFF test.");
 
 // For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 std::vector<double> TTFF_v;
 
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index 5c62f9f9c..7ad4910f5 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -171,8 +171,8 @@ DECLARE_string(log_dir);
 #endif  // UNIT_TESTING_MINIMAL
 
 // For GPS NAVIGATION (L1)
-concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 int main(int argc, char **argv)
 {
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index a62f21079..b02c4f59b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -58,16 +58,16 @@ class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx;
 
 using GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx>;
 
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block
 {
 private:
-    friend GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -75,7 +75,7 @@ public:
 };
 
 
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr(new GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(queue));
 }
@@ -97,7 +97,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events
 }
 
 
-GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -132,7 +132,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GalileoE1Pcps8msAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 54910c30f..50b4ad78f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -59,16 +59,16 @@ class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx;
 
 using GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx>;
 
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block
 {
 private:
-    friend GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -76,7 +76,7 @@ public:
 };
 
 
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr(new GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(queue));
 }
@@ -98,7 +98,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pm
 }
 
 
-GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -133,7 +133,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GalileoE1PcpsAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index 6e83b6df6..e0aeda58e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -67,16 +67,16 @@ class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx;
 
 using GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx>;
 
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx : public gr::block
 {
 private:
-    friend GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -84,7 +84,7 @@ public:
 };
 
 
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx_sptr(new GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(queue));
 }
@@ -106,7 +106,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events(pmt::p
 }
 
 
-GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest_msg_rx::msg_handler_events, this, _1));
@@ -139,7 +139,7 @@ protected:
     void wait_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GNSSBlockFactory> factory;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index 5e369c576..14aac00d8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -175,8 +175,8 @@ void GalileoE1PcpsAmbiguousAcquisitionTest::plot_grid()
     std::string basename = "./tmp-acq-gal1/acquisition_E_1B";
     auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
 
-    auto samples_per_code = static_cast<unsigned int>(round(4000000 / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));  // !!
-    acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code);
+    auto samples_per_code = static_cast<unsigned int>(round(4000000 / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));  // !!
+    Acquisition_Dump_Reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code);
 
     if (!acq_dump.read_binary_acq())
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index 40dbccb66..75207a375 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -59,16 +59,16 @@ class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx;
 
 using GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx>;
 
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx : public gr::block
 {
 private:
-    friend GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -76,7 +76,7 @@ public:
 };
 
 
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx_sptr(new GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(queue));
 }
@@ -98,7 +98,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events(pmt:
 }
 
 
-GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx::msg_handler_events, this, _1));
@@ -133,7 +133,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GalileoE1PcpsCccwsrAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index 1b3a50e84..4cf0f3672 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -67,16 +67,16 @@ class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx;
 
 using GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx>;
 
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx : public gr::block
 {
 private:
-    friend GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -84,7 +84,7 @@ public:
 };
 
 
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx_sptr(new GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(queue));
 }
@@ -106,7 +106,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_
 }
 
 
-GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1));
@@ -142,7 +142,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GalileoE1PcpsQuickSyncAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 100bae463..6d2bf7ead 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -61,16 +61,16 @@ class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx;
 
 using GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx>;
 
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx : public gr::block
 {
 private:
-    friend GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -78,7 +78,7 @@ public:
 };
 
 
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx_sptr(new GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(queue));
 }
@@ -100,7 +100,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_event
 }
 
 
-GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -134,7 +134,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GalileoE1PcpsTongAmbiguousAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 2c2eed08e..67ab17b53 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -58,16 +58,16 @@ class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx;
 
 using GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr = boost::shared_ptr<GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx>;
 
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue);
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx : public gr::block
 {
 private:
-    friend GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue);
+    friend GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -75,7 +75,7 @@ public:
 };
 
 
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(concurrent_queue<int>& queue)
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx_sptr(new GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(queue));
 }
@@ -97,7 +97,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events(p
 }
 
 
-GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(concurrent_queue<int>& queue) : gr::block("GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest_msg_rx::msg_handler_events, this, _1));
@@ -131,7 +131,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GalileoE5aNoncoherentIQAcquisitionCaf> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index 88ef46af5..6f92c592a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -63,16 +63,16 @@ class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx;
 
 using GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr = boost::shared_ptr<GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx>;
 
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue);
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx : public gr::block
 {
 private:
-    friend GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -80,7 +80,7 @@ public:
 };
 
 
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(concurrent_queue<int>& queue)
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx_sptr(new GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(queue));
 }
@@ -102,7 +102,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events(pmt::pmt_
 }
 
 
-GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx::msg_handler_events, this, _1));
@@ -138,7 +138,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
 
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 9a6ee1c8e..4f4ae7184 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -63,16 +63,16 @@ class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx;
 
 using GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx>;
 
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx : public gr::block
 {
 private:
-    friend GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -80,7 +80,7 @@ public:
 };
 
 
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx_sptr(new GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(queue));
 }
@@ -102,7 +102,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_t ms
 }
 
 
-GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -137,7 +137,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
 
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index 5cc30eeb1..b7f6863c8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -177,7 +177,7 @@ void GpsL1CaPcpsAcquisitionTest::plot_grid()
     auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
 
     auto samples_per_code = static_cast<unsigned int>(round(4000000 / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS)));  // !!
-    acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
+    Acquisition_Dump_Reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
 
     if (!acq_dump.read_binary_acq())
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index 82b06b177..a155ddc41 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -65,16 +65,16 @@ class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx;
 
 using GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx>;
 
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx : public gr::block
 {
 private:
-    friend GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -82,7 +82,7 @@ public:
 };
 
 
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(concurrent_queue<int>& queue)
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx_sptr(new GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(queue));
 }
@@ -104,7 +104,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events(pmt:
 }
 
 
-GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test_msg_rx::msg_handler_events, this, _1));
@@ -140,7 +140,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GNSSBlockFactory> factory;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index e9acd6ac9..599bd52b5 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -61,16 +61,16 @@ class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx;
 
 using GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr = boost::shared_ptr<GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx>;
 
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
 
 
 class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx : public gr::block
 {
 private:
-    friend GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue);
+    friend GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -78,7 +78,7 @@ public:
 };
 
 
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(concurrent_queue<int>& queue)
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx_sptr(new GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(queue));
 }
@@ -100,7 +100,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events(pmt::pmt_
 }
 
 
-GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(concurrent_queue<int>& queue) : gr::block("GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx(Concurrent_Queue<int>& queue) : gr::block("GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx::msg_handler_events, this, _1));
@@ -133,7 +133,7 @@ protected:
     void process_message();
     void stop_queue();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
     std::shared_ptr<GpsL1CaPcpsTongAcquisition> acquisition;
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
index f671a9b34..987ddb350 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.cc
@@ -35,7 +35,7 @@
 #include <cmath>
 #include <iostream>
 
-bool acquisition_dump_reader::read_binary_acq()
+bool Acquisition_Dump_Reader::read_binary_acq()
 {
     mat_t* matfile = Mat_Open(d_dump_filename.c_str(), MAT_ACC_RDONLY);
     if (matfile == nullptr)
@@ -143,7 +143,7 @@ bool acquisition_dump_reader::read_binary_acq()
 }
 
 
-acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
+Acquisition_Dump_Reader::Acquisition_Dump_Reader(const std::string& basename,
     int channel,
     int execution)
 {
@@ -192,7 +192,7 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
     d_num_doppler_bins = 0;
     num_dwells = 0;
 
-    acquisition_dump_reader(basename,
+    Acquisition_Dump_Reader(basename,
         sat_,
         doppler_max_,
         doppler_step_,
@@ -202,7 +202,7 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
 }
 
 
-acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
+Acquisition_Dump_Reader::Acquisition_Dump_Reader(const std::string& basename,
     unsigned int sat,
     unsigned int doppler_max,
     unsigned int doppler_step,
@@ -243,4 +243,4 @@ acquisition_dump_reader::acquisition_dump_reader(const std::string& basename,
 }
 
 
-acquisition_dump_reader::~acquisition_dump_reader() = default;
+Acquisition_Dump_Reader::~Acquisition_Dump_Reader() = default;
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h
index be5779f38..c68a32347 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/acquisition_dump_reader.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class acquisition_dump_reader
+class Acquisition_Dump_Reader
 {
 public:
-    acquisition_dump_reader(const std::string& basename,
+    Acquisition_Dump_Reader(const std::string& basename,
         unsigned int sat,
         unsigned int doppler_max,
         unsigned int doppler_step,
@@ -47,11 +47,11 @@ public:
         int channel = 0,
         int execution = 1);
 
-    acquisition_dump_reader(const std::string& basename,
+    Acquisition_Dump_Reader(const std::string& basename,
         int channel = 0,
         int execution = 1);
 
-    ~acquisition_dump_reader();
+    ~Acquisition_Dump_Reader();
 
     bool read_binary_acq();
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
index 370b38d9b..c85062d55 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <utility>
 
-bool observables_dump_reader::read_binary_obs()
+bool Observables_Dump_Reader::read_binary_obs()
 {
     try
         {
@@ -56,7 +56,7 @@ bool observables_dump_reader::read_binary_obs()
 }
 
 
-bool observables_dump_reader::restart()
+bool Observables_Dump_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -68,7 +68,7 @@ bool observables_dump_reader::restart()
 }
 
 
-int64_t observables_dump_reader::num_epochs()
+int64_t Observables_Dump_Reader::num_epochs()
 {
     std::ifstream::pos_type size;
     int number_of_vars_in_epoch = n_channels * 7;
@@ -84,7 +84,7 @@ int64_t observables_dump_reader::num_epochs()
 }
 
 
-bool observables_dump_reader::open_obs_file(std::string out_file)
+bool Observables_Dump_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -108,7 +108,7 @@ bool observables_dump_reader::open_obs_file(std::string out_file)
 }
 
 
-void observables_dump_reader::close_obs_file()
+void Observables_Dump_Reader::close_obs_file()
 {
     if (d_dump_file.is_open() == false)
         {
@@ -117,7 +117,7 @@ void observables_dump_reader::close_obs_file()
 }
 
 
-observables_dump_reader::observables_dump_reader(int n_channels_)
+Observables_Dump_Reader::Observables_Dump_Reader(int n_channels_)
 {
     n_channels = n_channels_;
     RX_time = new double[n_channels];
@@ -130,7 +130,7 @@ observables_dump_reader::observables_dump_reader(int n_channels_)
 }
 
 
-observables_dump_reader::~observables_dump_reader()
+Observables_Dump_Reader::~Observables_Dump_Reader()
 {
     try
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h
index 9548829ac..be5c76ed1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/observables_dump_reader.h
@@ -36,11 +36,11 @@
 #include <string>
 #include <vector>
 
-class observables_dump_reader
+class Observables_Dump_Reader
 {
 public:
-    observables_dump_reader(int n_channels);
-    ~observables_dump_reader();
+    Observables_Dump_Reader(int n_channels);
+    ~Observables_Dump_Reader();
     bool read_binary_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
index e35304014..286994f7e 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <utility>
 
-bool tlm_dump_reader::read_binary_obs()
+bool Tlm_Dump_Reader::read_binary_obs()
 {
     try
         {
@@ -49,7 +49,7 @@ bool tlm_dump_reader::read_binary_obs()
 }
 
 
-bool tlm_dump_reader::restart()
+bool Tlm_Dump_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -61,7 +61,7 @@ bool tlm_dump_reader::restart()
 }
 
 
-int64_t tlm_dump_reader::num_epochs()
+int64_t Tlm_Dump_Reader::num_epochs()
 {
     std::ifstream::pos_type size;
     int number_of_vars_in_epoch = 2;
@@ -77,7 +77,7 @@ int64_t tlm_dump_reader::num_epochs()
 }
 
 
-bool tlm_dump_reader::open_obs_file(std::string out_file)
+bool Tlm_Dump_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -102,7 +102,7 @@ bool tlm_dump_reader::open_obs_file(std::string out_file)
 }
 
 
-tlm_dump_reader::~tlm_dump_reader()
+Tlm_Dump_Reader::~Tlm_Dump_Reader()
 {
     try
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h
index 43178bdc6..3eacefee4 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tlm_dump_reader.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class tlm_dump_reader
+class Tlm_Dump_Reader
 {
 public:
-    ~tlm_dump_reader();
+    ~Tlm_Dump_Reader();
     bool read_binary_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
index 2e3fe04dc..49b37e148 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <utility>
 
-bool tracking_dump_reader::read_binary_obs()
+bool Tracking_Dump_Reader::read_binary_obs()
 {
     try
         {
@@ -68,7 +68,7 @@ bool tracking_dump_reader::read_binary_obs()
 }
 
 
-bool tracking_dump_reader::restart()
+bool Tracking_Dump_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -80,7 +80,7 @@ bool tracking_dump_reader::restart()
 }
 
 
-int64_t tracking_dump_reader::num_epochs()
+int64_t Tracking_Dump_Reader::num_epochs()
 {
     std::ifstream::pos_type size;
     int number_of_double_vars = 1;
@@ -100,7 +100,7 @@ int64_t tracking_dump_reader::num_epochs()
 }
 
 
-bool tracking_dump_reader::open_obs_file(std::string out_file)
+bool Tracking_Dump_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -124,7 +124,7 @@ bool tracking_dump_reader::open_obs_file(std::string out_file)
 }
 
 
-tracking_dump_reader::~tracking_dump_reader()
+Tracking_Dump_Reader::~Tracking_Dump_Reader()
 {
     try
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h
index 790838a8a..7a2ca7e33 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_dump_reader.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class tracking_dump_reader
+class Tracking_Dump_Reader
 {
 public:
-    ~tracking_dump_reader();
+    ~Tracking_Dump_Reader();
     bool read_binary_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
index 41735824f..25c81acc1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <utility>
 
-bool tracking_true_obs_reader::read_binary_obs()
+bool Tracking_True_Obs_Reader::read_binary_obs()
 {
     try
         {
@@ -51,7 +51,7 @@ bool tracking_true_obs_reader::read_binary_obs()
 }
 
 
-bool tracking_true_obs_reader::restart()
+bool Tracking_True_Obs_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -63,7 +63,7 @@ bool tracking_true_obs_reader::restart()
 }
 
 
-int64_t tracking_true_obs_reader::num_epochs()
+int64_t Tracking_True_Obs_Reader::num_epochs()
 {
     std::ifstream::pos_type size;
     int number_of_vars_in_epoch = 5;
@@ -79,7 +79,7 @@ int64_t tracking_true_obs_reader::num_epochs()
 }
 
 
-bool tracking_true_obs_reader::open_obs_file(std::string out_file)
+bool Tracking_True_Obs_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -103,7 +103,7 @@ bool tracking_true_obs_reader::open_obs_file(std::string out_file)
         }
 }
 
-void tracking_true_obs_reader::close_obs_file()
+void Tracking_True_Obs_Reader::close_obs_file()
 {
     if (d_dump_file.is_open() == true)
         {
@@ -111,7 +111,7 @@ void tracking_true_obs_reader::close_obs_file()
         }
 }
 
-tracking_true_obs_reader::~tracking_true_obs_reader()
+Tracking_True_Obs_Reader::~Tracking_True_Obs_Reader()
 {
     try
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h
index 5b8990325..50b496ceb 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/tracking_true_obs_reader.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class tracking_true_obs_reader
+class Tracking_True_Obs_Reader
 {
 public:
-    ~tracking_true_obs_reader();
+    ~Tracking_True_Obs_Reader();
     bool read_binary_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
index e183bb9ef..dd72ae6dc 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.cc
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <utility>
 
-bool true_observables_reader::read_binary_obs()
+bool True_Observables_Reader::read_binary_obs()
 {
     try
         {
@@ -56,7 +56,7 @@ bool true_observables_reader::read_binary_obs()
 }
 
 
-bool true_observables_reader::restart()
+bool True_Observables_Reader::restart()
 {
     if (d_dump_file.is_open())
         {
@@ -68,7 +68,7 @@ bool true_observables_reader::restart()
 }
 
 
-int64_t true_observables_reader::num_epochs()
+int64_t True_Observables_Reader::num_epochs()
 {
     std::ifstream::pos_type size;
     int number_of_vars_in_epoch = 6 * 12;
@@ -84,7 +84,7 @@ int64_t true_observables_reader::num_epochs()
 }
 
 
-bool true_observables_reader::open_obs_file(std::string out_file)
+bool True_Observables_Reader::open_obs_file(std::string out_file)
 {
     if (d_dump_file.is_open() == false)
         {
@@ -109,7 +109,7 @@ bool true_observables_reader::open_obs_file(std::string out_file)
 }
 
 
-true_observables_reader::~true_observables_reader()
+True_Observables_Reader::~True_Observables_Reader()
 {
     try
         {
diff --git a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h
index 86e1c868d..f17561f84 100644
--- a/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h
+++ b/src/tests/unit-tests/signal-processing-blocks/libs/true_observables_reader.h
@@ -36,10 +36,10 @@
 #include <string>
 #include <vector>
 
-class true_observables_reader
+class True_Observables_Reader
 {
 public:
-    ~true_observables_reader();
+    ~True_Observables_Reader();
     bool read_binary_obs();
     bool restart();
     int64_t num_epochs();
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
index 60e496ede..89cbfad09 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/nmea_printer_test.cc
@@ -155,7 +155,7 @@ void NmeaPrinterTest::conf()
 TEST_F(NmeaPrinterTest, PrintLine)
 {
     std::string filename("nmea_test.nmea");
-    std::shared_ptr<rtklib_solver> pvt_solution = std::make_shared<rtklib_solver>(12, "filename", false, false, rtk);
+    std::shared_ptr<Rtklib_Solver> pvt_solution = std::make_shared<Rtklib_Solver>(12, "filename", false, false, rtk);
 
     boost::posix_time::ptime pt(boost::gregorian::date(1994, boost::date_time::Nov, 19),
         boost::posix_time::hours(22) + boost::posix_time::minutes(54) + boost::posix_time::seconds(46));
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
index ae0a89039..53028074b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtcm_test.cc
@@ -336,14 +336,14 @@ TEST(RtcmTest, MT1045)
     Galileo_Ephemeris gal_eph_read = Galileo_Ephemeris();
 
     gal_eph.i_satellite_PRN = 5;
-    gal_eph.OMEGA_dot_3 = 53.0 * OMEGA_dot_3_LSB;
+    gal_eph.OMEGA_dot_3 = 53.0 * OMEGA_DOT_3_LSB;
     gal_eph.E5a_DVS = true;
 
     std::string tx_msg = rtcm->print_MT1045(gal_eph);
 
     EXPECT_EQ(0, rtcm->read_MT1045(tx_msg, gal_eph_read));
     EXPECT_EQ(expected_true, gal_eph_read.E5a_DVS);
-    EXPECT_DOUBLE_EQ(53.0 * OMEGA_dot_3_LSB, gal_eph_read.OMEGA_dot_3);
+    EXPECT_DOUBLE_EQ(53.0 * OMEGA_DOT_3_LSB, gal_eph_read.OMEGA_dot_3);
     EXPECT_EQ(static_cast<unsigned int>(5), gal_eph_read.i_satellite_PRN);
     EXPECT_EQ(1, rtcm->read_MT1045(rtcm->bin_to_binary_data(rtcm->hex_to_bin("FFFFFFFFFFF")), gal_eph_read));
 }
@@ -570,7 +570,7 @@ TEST(RtcmTest, MSM1)
     EXPECT_EQ(ref_id, rtcm->bin_to_uint(MSM1_bin.substr(size_header + size_msg_length + 12, 12)));
     EXPECT_EQ(0, MSM1_bin.substr(size_header + size_msg_length + 169, Nsat * Nsig).compare("101101"));  // check cell mask
 
-    double meters_to_miliseconds = GPS_C_m_s * 0.001;
+    double meters_to_miliseconds = GPS_C_M_S * 0.001;
     unsigned int rough_range_1 = static_cast<unsigned int>(std::floor(std::round(gnss_synchro.Pseudorange_m / meters_to_miliseconds / TWO_N10)) + 0.5) & 0x3FFu;
     unsigned int rough_range_2 = static_cast<unsigned int>(std::floor(std::round(gnss_synchro2.Pseudorange_m / meters_to_miliseconds / TWO_N10)) + 0.5) & 0x3FFu;
     unsigned int rough_range_4 = static_cast<unsigned int>(std::floor(std::round(gnss_synchro3.Pseudorange_m / meters_to_miliseconds / TWO_N10)) + 0.5) & 0x3FFu;
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
index 68eae1518..b4c5f432c 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_real_codes_test.cc
@@ -45,7 +45,7 @@
 DEFINE_int32(cpu_multicorrelator_real_codes_iterations_test, 100, "Number of averaged iterations in CPU multicorrelator test timing test");
 DEFINE_int32(cpu_multicorrelator_real_codes_max_threads_test, 12, "Number of maximum concurrent correlators in CPU multicorrelator test timing test");
 
-void run_correlator_cpu_real_codes(cpu_multicorrelator_real_codes* correlator,
+void run_correlator_cpu_real_codes(Cpu_Multicorrelator_Real_Codes* correlator,
     float d_rem_carrier_phase_rad,
     float d_carrier_phase_step_rad,
     float d_code_phase_step_chips,
@@ -71,7 +71,7 @@ TEST(CpuMulticorrelatorRealCodesTest, MeasureExecutionTime)
     std::chrono::duration<double> elapsed_seconds(0);
     int max_threads = FLAGS_cpu_multicorrelator_real_codes_max_threads_test;
     std::vector<std::thread> thread_pool;
-    cpu_multicorrelator_real_codes* correlator_pool[max_threads];
+    Cpu_Multicorrelator_Real_Codes* correlator_pool[max_threads];
     unsigned int correlation_sizes[3] = {2048, 4096, 8192};
     double execution_times[3];
 
@@ -118,7 +118,7 @@ TEST(CpuMulticorrelatorRealCodesTest, MeasureExecutionTime)
 
     for (int n = 0; n < max_threads; n++)
         {
-            correlator_pool[n] = new cpu_multicorrelator_real_codes();
+            correlator_pool[n] = new Cpu_Multicorrelator_Real_Codes();
             correlator_pool[n]->init(d_vector_length, d_n_correlator_taps);
             correlator_pool[n]->set_input_output_vectors(d_correlator_outs, in_cpu);
             correlator_pool[n]->set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
index 706c6fe45..0f133db98 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/cpu_multicorrelator_test.cc
@@ -45,7 +45,7 @@
 DEFINE_int32(cpu_multicorrelator_iterations_test, 100, "Number of averaged iterations in CPU multicorrelator test timing test");
 DEFINE_int32(cpu_multicorrelator_max_threads_test, 12, "Number of maximum concurrent correlators in CPU multicorrelator test timing test");
 
-void run_correlator_cpu(cpu_multicorrelator* correlator,
+void run_correlator_cpu(Cpu_Multicorrelator* correlator,
     float d_rem_carrier_phase_rad,
     float d_carrier_phase_step_rad,
     float d_code_phase_step_chips,
@@ -69,7 +69,7 @@ TEST(CpuMulticorrelatorTest, MeasureExecutionTime)
     std::chrono::duration<double> elapsed_seconds(0);
     int max_threads = FLAGS_cpu_multicorrelator_max_threads_test;
     std::vector<std::thread> thread_pool;
-    cpu_multicorrelator* correlator_pool[max_threads];
+    Cpu_Multicorrelator* correlator_pool[max_threads];
     unsigned int correlation_sizes[3] = {2048, 4096, 8192};
     double execution_times[3];
 
@@ -116,7 +116,7 @@ TEST(CpuMulticorrelatorTest, MeasureExecutionTime)
 
     for (int n = 0; n < max_threads; n++)
         {
-            correlator_pool[n] = new cpu_multicorrelator();
+            correlator_pool[n] = new Cpu_Multicorrelator();
             correlator_pool[n]->init(d_vector_length, d_n_correlator_taps);
             correlator_pool[n]->set_input_output_vectors(d_correlator_outs, in_cpu);
             correlator_pool[n]->set_local_code_and_taps(static_cast<int>(GPS_L1_CA_CODE_LENGTH_CHIPS), d_ca_code, d_local_code_shift_chips);
diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc
index 9fd80f772..32f8da6aa 100644
--- a/src/utils/front-end-cal/front_end_cal.cc
+++ b/src/utils/front-end-cal/front_end_cal.cc
@@ -48,11 +48,11 @@
 #include <memory>
 #include <utility>
 
-extern concurrent_map<Gps_Ephemeris> global_gps_ephemeris_map;
-extern concurrent_map<Gps_Iono> global_gps_iono_map;
-extern concurrent_map<Gps_Utc_Model> global_gps_utc_model_map;
-extern concurrent_map<Gps_Almanac> global_gps_almanac_map;
-extern concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+extern Concurrent_Map<Gps_Ephemeris> global_gps_ephemeris_map;
+extern Concurrent_Map<Gps_Iono> global_gps_iono_map;
+extern Concurrent_Map<Gps_Utc_Model> global_gps_utc_model_map;
+extern Concurrent_Map<Gps_Almanac> global_gps_almanac_map;
+extern Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 FrontEndCal::FrontEndCal() = default;
 
@@ -60,7 +60,7 @@ FrontEndCal::~FrontEndCal() = default;
 
 bool FrontEndCal::read_assistance_from_XML()
 {
-    gnss_sdr_supl_client supl_client_ephemeris_;
+    Gnss_Sdr_Supl_Client supl_client_ephemeris_;
     std::string eph_xml_filename = "gps_ephemeris.xml";
     std::cout << "SUPL: Trying to read GPS ephemeris from XML file " << eph_xml_filename << std::endl;
     LOG(INFO) << "SUPL: Trying to read GPS ephemeris from XML file " << eph_xml_filename;
@@ -87,8 +87,8 @@ bool FrontEndCal::read_assistance_from_XML()
 int FrontEndCal::Get_SUPL_Assist()
 {
     //######### GNSS Assistance #################################
-    gnss_sdr_supl_client supl_client_acquisition_;
-    gnss_sdr_supl_client supl_client_ephemeris_;
+    Gnss_Sdr_Supl_Client supl_client_acquisition_;
+    Gnss_Sdr_Supl_Client supl_client_ephemeris_;
     int supl_mcc;  // Current network MCC (Mobile country code), 3 digits.
     int supl_mns;  //Current network MNC (Mobile Network code), 2 or 3 digits.
     int supl_lac;  // Current network LAC (Location area code),16 bits, 1-65520 are valid values.
@@ -358,7 +358,7 @@ double FrontEndCal::estimate_doppler_from_eph(unsigned int PRN, double TOW, doub
 
             //Doppler estimation
             arma::vec Doppler_Hz;
-            Doppler_Hz = (obs_to_sat_velocity / GPS_C_m_s) * GPS_L1_FREQ_HZ;
+            Doppler_Hz = (obs_to_sat_velocity / GPS_C_M_S) * GPS_L1_FREQ_HZ;
             double mean_Doppler_Hz;
             mean_Doppler_Hz = arma::mean(Doppler_Hz);
             return mean_Doppler_Hz;
diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc
index b1680d51f..cc36ce147 100644
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -81,14 +81,14 @@ using google::LogMessage;
 
 DECLARE_string(log_dir);
 
-concurrent_map<Gps_Ephemeris> global_gps_ephemeris_map;
-concurrent_map<Gps_Iono> global_gps_iono_map;
-concurrent_map<Gps_Utc_Model> global_gps_utc_model_map;
-concurrent_map<Gps_Almanac> global_gps_almanac_map;
-concurrent_map<Gps_Acq_Assist> global_gps_acq_assist_map;
+Concurrent_Map<Gps_Ephemeris> global_gps_ephemeris_map;
+Concurrent_Map<Gps_Iono> global_gps_iono_map;
+Concurrent_Map<Gps_Utc_Model> global_gps_utc_model_map;
+Concurrent_Map<Gps_Almanac> global_gps_almanac_map;
+Concurrent_Map<Gps_Acq_Assist> global_gps_acq_assist_map;
 
 bool stop;
-concurrent_queue<int> channel_internal_queue;
+Concurrent_Queue<int> channel_internal_queue;
 GpsL1CaPcpsAcquisitionFineDoppler* acquisition;
 Gnss_Synchro* gnss_synchro;
 std::vector<Gnss_Synchro> gnss_sync_vector;

From 11829e5883b44266ed6fa728af244562bef1dda9 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 12:22:24 +0100
Subject: [PATCH 098/123] Unify use of stdint names

---
 .../libs/libswiftcnav/bits.c                  | 68 +++++++++----------
 .../libs/libswiftcnav/bits.h                  | 24 +++----
 .../libs/libswiftcnav/cnav_msg.c              | 26 +++----
 .../libs/libswiftcnav/cnav_msg.h              | 10 +--
 .../telemetry_decoder/libs/libswiftcnav/edc.c | 16 ++---
 .../telemetry_decoder/libs/libswiftcnav/edc.h |  4 +-
 .../libs/libswiftcnav/swift_common.h          | 31 ---------
 7 files changed, 74 insertions(+), 105 deletions(-)

diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
index acfe434ff..1cbe9eb12 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.c
@@ -34,7 +34,7 @@
 #include <string.h>
 
 
-static const u8 BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+static const uint8_t BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
 
 /** \defgroup bits Bit Utils
  * Bit field packing, unpacking and utility functions.
@@ -49,7 +49,7 @@ static const u8 BITN[16] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
  * \return 1 if there are an odd number of bits set.
  *         0 if there are an even number of bits set.
  */
-u8 parity(u32 x)
+uint8_t parity(uint32_t x)
 {
     x ^= x >> 16;
     x ^= x >> 8;
@@ -68,10 +68,10 @@ u8 parity(u32 x)
  * \param len Length of bit field in bits.
  * \return Bit field as an unsigned value.
  */
-u32 getbitu(const u8 *buff, u32 pos, u8 len)
+uint32_t getbitu(const uint8_t *buff, uint32_t pos, uint8_t len)
 {
-    u32 bits = 0;
-    u32 i = 0;
+    uint32_t bits = 0;
+    uint32_t i = 0;
     for (i = pos; i < pos + len; i++)
         {
             bits = (bits << 1) +
@@ -92,14 +92,14 @@ u32 getbitu(const u8 *buff, u32 pos, u8 len)
  * \param len Length of bit field in bits.
  * \return Bit field as a signed value.
  */
-s32 getbits(const u8 *buff, u32 pos, u8 len)
+int32_t getbits(const uint8_t *buff, uint32_t pos, uint8_t len)
 {
-    s32 bits = (s32)getbitu(buff, pos, len);
+    int32_t bits = (int32_t)getbitu(buff, pos, len);
 
     /* Sign extend, taken from:
      * http://graphics.stanford.edu/~seander/bithacks.html#VariableSignExtend
      */
-    s32 m = 1u << (len - 1);
+    int32_t m = 1u << (len - 1);
     return (bits ^ m) - m;
 }
 
@@ -112,15 +112,15 @@ s32 getbits(const u8 *buff, u32 pos, u8 len)
  * \param len Length of bit field in bits.
  * \param data Unsigned integer to be packed into bit field.
  */
-void setbitu(u8 *buff, u32 pos, u32 len, u32 data)
+void setbitu(uint8_t *buff, uint32_t pos, uint32_t len, uint32_t data)
 {
-    u32 mask = 1u << (len - 1);
+    uint32_t mask = 1u << (len - 1);
 
     if (len <= 0 || 32 < len)
         {
             return;
         }
-    u32 i = 0;
+    uint32_t i = 0;
     for (i = pos; i < pos + len; i++, mask >>= 1)
         {
             if (data & mask)
@@ -143,9 +143,9 @@ void setbitu(u8 *buff, u32 pos, u32 len, u32 data)
  * \param len Length of bit field in bits.
  * \param data Signed integer to be packed into bit field.
  */
-void setbits(u8 *buff, u32 pos, u32 len, s32 data)
+void setbits(uint8_t *buff, uint32_t pos, uint32_t len, int32_t data)
 {
-    setbitu(buff, pos, len, (u32)data);
+    setbitu(buff, pos, len, (uint32_t)data);
 }
 
 /**
@@ -158,7 +158,7 @@ void setbits(u8 *buff, u32 pos, u32 len, s32 data)
  *
  * \return None
  */
-void bitshl(void *buf, u32 size, u32 shift)
+void bitshl(void *buf, uint32_t size, uint32_t shift)
 {
     if (shift > size * CHAR_BIT)
         {
@@ -170,9 +170,9 @@ void bitshl(void *buf, u32 size, u32 shift)
     unsigned char *dst = buf;                          /* Destination byte. */
     const unsigned char *src = dst + shift / CHAR_BIT; /* First source byte, possibly incomplete. */
 
-    u32 copy_bits = size * CHAR_BIT - shift; /* Number of bits to move */
-    u32 byte_shift = copy_bits % CHAR_BIT;   /* Shift of data */
-    u32 full_bytes = copy_bits / CHAR_BIT;   /* Number of bytes to move */
+    uint32_t copy_bits = size * CHAR_BIT - shift; /* Number of bits to move */
+    uint32_t byte_shift = copy_bits % CHAR_BIT;   /* Shift of data */
+    uint32_t full_bytes = copy_bits / CHAR_BIT;   /* Number of bytes to move */
 
     if (0 == byte_shift)
         {
@@ -184,8 +184,8 @@ void bitshl(void *buf, u32 size, u32 shift)
     else
         {
             /* Create an accumulator: it will hold a value of two consecutive bytes */
-            u32 acc = *src++;
-            u32 i = 0;
+            uint32_t acc = *src++;
+            uint32_t i = 0;
             for (i = 0; i < full_bytes; ++i)
                 {
                     acc = (acc << CHAR_BIT) | *src++;
@@ -215,22 +215,22 @@ void bitshl(void *buf, u32 size, u32 shift)
  * \todo This function can be optimized for copying aligned data and using
  *       proper native type like long.
  */
-void bitcopy(void *dst, u32 dst_index, const void *src, u32 src_index,
-    u32 count)
+void bitcopy(void *dst, uint32_t dst_index, const void *src, uint32_t src_index,
+    uint32_t count)
 {
-    u32 limit1 = count / 32;
-    u32 limit2 = count % 32;
-    u32 idx = 0;
+    uint32_t limit1 = count / 32;
+    uint32_t limit2 = count % 32;
+    uint32_t idx = 0;
     for (idx = 0; idx < limit1; ++idx)
         {
-            u32 tmp = getbitu(src, src_index, 32);
+            uint32_t tmp = getbitu(src, src_index, 32);
             setbitu(dst, dst_index, 32, tmp);
             src_index += 32;
             dst_index += 32;
         }
     if (0 != limit2)
         {
-            u32 tmp = getbitu(src, src_index, limit2);
+            uint32_t tmp = getbitu(src, src_index, limit2);
             setbitu(dst, dst_index, limit2, tmp);
         }
 }
@@ -243,9 +243,9 @@ void bitcopy(void *dst, u32 dst_index, const void *src, u32 src_index,
  *
  * \return        Number of bits set to one or zero.
  */
-u8 count_bits_u64(u64 v, u8 bv)
+uint8_t count_bits_u64(uint64_t v, uint8_t bv)
 {
-    u8 r = 0;
+    uint8_t r = 0;
     int i = 0;
     for (i = 0; i < 16; i++)
         {
@@ -262,9 +262,9 @@ u8 count_bits_u64(u64 v, u8 bv)
  *
  * \return        Number of bits set to one or zero.
  */
-u8 count_bits_u32(u32 v, u8 bv)
+uint8_t count_bits_u32(uint32_t v, uint8_t bv)
 {
-    u8 r = 0;
+    uint8_t r = 0;
     int i = 0;
     for (i = 0; i < 8; i++)
         {
@@ -281,9 +281,9 @@ u8 count_bits_u32(u32 v, u8 bv)
  *
  * \return        Number of bits set to one or zero.
  */
-u8 count_bits_u16(u16 v, u8 bv)
+uint8_t count_bits_u16(uint16_t v, uint8_t bv)
 {
-    u8 r = 0;
+    uint8_t r = 0;
     int i = 0;
     for (i = 0; i < 4; i++)
         {
@@ -300,9 +300,9 @@ u8 count_bits_u16(u16 v, u8 bv)
  *
  * \return        Number of bits set to one or zero.
  */
-u8 count_bits_u8(u8 v, u8 bv)
+uint8_t count_bits_u8(uint8_t v, uint8_t bv)
 {
-    u8 r = 0;
+    uint8_t r = 0;
     int i = 0;
     for (i = 0; i < 2; i++)
         {
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
index 8e73ccf4a..11f5e512e 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/bits.h
@@ -34,17 +34,17 @@
 
 #include "swift_common.h"
 
-u8 parity(u32 x);
-u32 getbitu(const u8 *buff, u32 pos, u8 len);
-s32 getbits(const u8 *buff, u32 pos, u8 len);
-void setbitu(u8 *buff, u32 pos, u32 len, u32 data);
-void setbits(u8 *buff, u32 pos, u32 len, s32 data);
-void bitcopy(void *dst, u32 dst_index,
-    const void *src, u32 src_index, u32 count);
-void bitshl(void *buf, u32 size, u32 shift);
-u8 count_bits_u64(u64 v, u8 bv);
-u8 count_bits_u32(u32 v, u8 bv);
-u8 count_bits_u16(u16 v, u8 bv);
-u8 count_bits_u8(u8 v, u8 bv);
+uint8_t parity(uint32_t x);
+uint32_t getbitu(const uint8_t *buff, uint32_t pos, uint8_t len);
+int32_t getbits(const uint8_t *buff, uint32_t pos, uint8_t len);
+void setbitu(uint8_t *buff, uint32_t pos, uint32_t len, uint32_t data);
+void setbits(uint8_t *buff, uint32_t pos, uint32_t len, int32_t data);
+void bitcopy(void *dst, uint32_t dst_index,
+    const void *src, uint32_t src_index, uint32_t count);
+void bitshl(void *buf, uint32_t size, uint32_t shift);
+uint8_t count_bits_u64(uint64_t v, uint8_t bv);
+uint8_t count_bits_u32(uint32_t v, uint8_t bv);
+uint8_t count_bits_u16(uint16_t v, uint8_t bv);
+uint8_t count_bits_u8(uint8_t v, uint8_t bv);
 
 #endif /* LIBSWIFTNAV_BITS_H */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c
index bbb52ac4d..1676fc0cd 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.c
@@ -56,9 +56,9 @@
  */
 
 /** GPS L2C preamble */
-const u32 GPS_CNAV_PREAMBLE1 = 0x8Bu; /* (0b10001011u) */
+const uint32_t GPS_CNAV_PREAMBLE1 = 0x8Bu; /* (0b10001011u) */
 /** Inverted GPS L2C preamble */
-const u32 GPS_CNAV_PREAMBLE2 = 0x74u; /* (0b01110100u) */
+const uint32_t GPS_CNAV_PREAMBLE2 = 0x74u; /* (0b01110100u) */
 /** GPS L2C preamble length in bits */
 #define GPS_CNAV_PREAMBLE_LENGTH (8)
 /** GPS L2C CNAV message length in bits */
@@ -81,9 +81,9 @@ const u32 GPS_CNAV_PREAMBLE2 = 0x74u; /* (0b01110100u) */
  *
  * \private
  */
-static u32 _cnav_compute_crc(cnav_v27_part_t *part)
+static uint32_t _cnav_compute_crc(cnav_v27_part_t *part)
 {
-    u32 crc = crc24q_bits(0, part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
+    uint32_t crc = crc24q_bits(0, part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
         part->invert);
 
     return crc;
@@ -100,9 +100,9 @@ static u32 _cnav_compute_crc(cnav_v27_part_t *part)
  *
  * \private
  */
-static u32 _cnav_extract_crc(const cnav_v27_part_t *part)
+static uint32_t _cnav_extract_crc(const cnav_v27_part_t *part)
 {
-    u32 crc = getbitu(part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
+    uint32_t crc = getbitu(part->decoded, GPS_CNAV_MSG_DATA_LENGTH,
         GPS_CNAV_MSG_CRC_LENGTH);
     if (part->invert)
         {
@@ -136,7 +136,7 @@ static void _cnav_rescan_preamble(cnav_v27_part_t *part)
             size_t j = 0;
             for (i = 1, j = part->n_decoded - GPS_CNAV_PREAMBLE_LENGTH; i < j; ++i)
                 {
-                    u32 c = getbitu(part->decoded, i, GPS_CNAV_PREAMBLE_LENGTH);
+                    uint32_t c = getbitu(part->decoded, i, GPS_CNAV_PREAMBLE_LENGTH);
                     if (GPS_CNAV_PREAMBLE1 == c || GPS_CNAV_PREAMBLE2 == c)
                         {
                             part->preamble_seen = true;
@@ -171,7 +171,7 @@ static void _cnav_rescan_preamble(cnav_v27_part_t *part)
  *
  * \private
  */
-static void _cnav_add_symbol(cnav_v27_part_t *part, u8 ch)
+static void _cnav_add_symbol(cnav_v27_part_t *part, uint8_t ch)
 {
     part->symbols[part->n_symbols++] = ch;
 
@@ -240,8 +240,8 @@ static void _cnav_add_symbol(cnav_v27_part_t *part, u8 ch)
                 {
                     /* We have collected 300 bits starting from message preamble. Now try
                      * to compute CRC-24Q */
-                    u32 crc = _cnav_compute_crc(part);
-                    u32 crc2 = _cnav_extract_crc(part);
+                    uint32_t crc = _cnav_compute_crc(part);
+                    uint32_t crc2 = _cnav_extract_crc(part);
 
                     if (part->message_lock)
                         {
@@ -332,7 +332,7 @@ static void _cnav_msg_invert(cnav_v27_part_t *part)
  *
  * \private
  */
-static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, u32 *delay)
+static bool _cnav_msg_decode(cnav_v27_part_t *part, cnav_msg_t *msg, uint32_t *delay)
 {
     bool res = false;
     if (GPS_CNAV_MSG_LENGTH <= part->n_decoded)
@@ -425,9 +425,9 @@ void cnav_msg_decoder_init(cnav_msg_decoder_t *dec)
  * \retval false More data is required.
  */
 bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec,
-    u8 symbol,
+    uint8_t symbol,
     cnav_msg_t *msg,
-    u32 *pdelay)
+    uint32_t *pdelay)
 {
     _cnav_add_symbol(&dec->part1, symbol);
     _cnav_add_symbol(&dec->part2, symbol);
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
index f402675c5..823175d08 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
@@ -60,11 +60,11 @@
  */
 typedef struct
 {
-    u8 prn;                                                       /**< SV PRN. 0..31 */
-    u8 msg_id;                                                    /**< Message id. 0..31 */
-    u32 tow;                                                      /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
+    uint8_t prn;                                                       /**< SV PRN. 0..31 */
+    uint8_t msg_id;                                                    /**< Message id. 0..31 */
+    uint32_t tow;                                                      /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
     bool alert;                                                   /**< CNAV message alert flag */
-    u8 raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
+    uint8_t raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
 } cnav_msg_t;
 
 /**
@@ -112,7 +112,7 @@ void cnav_msg_decoder_init(cnav_msg_decoder_t *dec);
 bool cnav_msg_decoder_add_symbol(cnav_msg_decoder_t *dec,
     unsigned char symbol,
     cnav_msg_t *msg,
-    u32 *delay);
+    uint32_t *delay);
 
 /** \} */
 /** \} */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
index 27b669932..6e3e06c6f 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.c
@@ -39,7 +39,7 @@
  * Cyclic redundancy checks.
  * \{ */
 
-static const u32 CRC24QTAB[256] = {
+static const uint32_t CRC24QTAB[256] = {
     0x000000, 0x864CFB, 0x8AD50D, 0x0C99F6, 0x93E6E1, 0x15AA1A, 0x1933EC, 0x9F7F17,
     0xA18139, 0x27CDC2, 0x2B5434, 0xAD18CF, 0x3267D8, 0xB42B23, 0xB8B2D5, 0x3EFE2E,
     0xC54E89, 0x430272, 0x4F9B84, 0xC9D77F, 0x56A868, 0xD0E493, 0xDC7D65, 0x5A319E,
@@ -88,9 +88,9 @@ static const u32 CRC24QTAB[256] = {
  *
  * \return CRC-24Q value
  */
-u32 crc24q(const u8 *buf, u32 len, u32 crc)
+uint32_t crc24q(const uint8_t *buf, uint32_t len, uint32_t crc)
 {
-    u32 i = 0;
+    uint32_t i = 0;
     for (i = 0; i < len; i++)
         {
             crc = ((crc << 8) & 0xFFFFFF) ^ CRC24QTAB[((crc >> 16) ^ buf[i]) & 0xff];
@@ -113,13 +113,13 @@ u32 crc24q(const u8 *buf, u32 len, u32 crc)
  *
  * \return CRC-24Q value
  */
-u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert)
+uint32_t crc24q_bits(uint32_t crc, const uint8_t *buf, uint32_t n_bits, bool invert)
 {
-    u16 acc = 0;
-    u8 b = 0;
-    u32 shift = 8 - n_bits % 8;
+    uint16_t acc = 0;
+    uint8_t b = 0;
+    uint32_t shift = 8 - n_bits % 8;
 
-    u32 i = 0;
+    uint32_t i = 0;
     for (i = 0; i < n_bits / 8; ++i)
         {
             acc = (acc << 8) | *buf++;
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
index 58a968a65..03a4022a7 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/edc.h
@@ -35,7 +35,7 @@
 
 #include "swift_common.h"
 
-u32 crc24q(const u8 *buf, u32 len, u32 crc);
-u32 crc24q_bits(u32 crc, const u8 *buf, u32 n_bits, bool invert);
+uint32_t crc24q(const uint8_t *buf, uint32_t len, uint32_t crc);
+uint32_t crc24q_bits(uint32_t crc, const uint8_t *buf, uint32_t n_bits, bool invert);
 
 #endif /* LIBSWIFTNAV_EDC_H */
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
index b4a3a6fae..3b83f3034 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/swift_common.h
@@ -48,37 +48,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#ifndef COMMON_INT_TYPES
-#define COMMON_INT_TYPES
-
-/** \defgroup common_inttypes Integer types
- * Specified-width integer type definitions for shorter and nicer code.
- *
- * These should be used in preference to unspecified width types such as
- * `int` which can lead to portability issues between different platforms.
- * \{ */
-
-/** Signed 8-bit integer. */
-typedef int8_t s8;
-/** Signed 16-bit integer. */
-typedef int16_t s16;
-/** Signed 32-bit integer. */
-typedef int32_t s32;
-/** Signed 64-bit integer. */
-typedef int64_t s64;
-/** Unsigned 8-bit integer. */
-typedef uint8_t u8;
-/** Unsigned 16-bit integer. */
-typedef uint16_t u16;
-/** Unsigned 32-bit integer. */
-typedef uint32_t u32;
-/** Unsigned 64-bit integer. */
-typedef uint64_t u64;
-
-#endif
-
-/** \} */
-
 /** \} */
 
 #endif /* LIBSWIFTNAV_COMMON_H */

From d82dda30e734d732c4955fb89aaafe616f392db6 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 12:23:41 +0100
Subject: [PATCH 099/123] Remove repeated parameters

---
 src/core/system_parameters/Galileo_E1.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index d54472ca2..651176ea7 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -93,8 +93,6 @@ const int32_t GALILEO_PAGE_TYPE_BITS = 6;
 const int32_t GALILEO_DATA_JK_BITS = 128;
 const int32_t GALILEO_DATA_FRAME_BITS = 196;
 const int32_t GALILEO_DATA_FRAME_BYTES = 25;
-//const double GALILEO_E1_CODE_PERIOD = 0.004;
-//const int32_t GALILEO_E1_CODE_PERIOD_MS = 4;
 
 const std::vector<std::pair<int32_t, int32_t>> TYPE({{1, 6}});
 const std::vector<std::pair<int32_t, int32_t>> PAGE_TYPE_BIT({{1, 6}});

From 68bb71e5939907090df04654c60c102dcb7a9232 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 12:47:21 +0100
Subject: [PATCH 100/123] Add readability-identifier-naming keys

---
 .clang-tidy | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/.clang-tidy b/.clang-tidy
index cca10bf8d..bfb1b252c 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -97,16 +97,34 @@ CheckOptions:
     value:           llvm
   - key:             performance-unnecessary-value-param.IncludeStyle
     value:           llvm
+  - key:             readability-identifier-naming.AbstractClassCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.AbstractClassPrefix
+    value:           ''
+  - key:             readability-identifier-naming.AbstractClassSuffix
+    value:           ''
+  - key:             readability-identifier-naming.ClassCase
+    value:           Camel_Snake_Case
+  - key:             readability-identifier-naming.ClassPrefix
+    value:           ''
+  - key:             readability-identifier-naming.ClassSuffix
+    value:           ''
+  - key:             readability-identifier-naming.GlobalConstantCase
+    value:           UPPER_CASE
+  - key:             readability-identifier-naming.GlobalConstantPrefix
+    value:           ''
+  - key:             readability-identifier-naming.GlobalConstantSuffix
+    value:           ''
+  - key:             readability-identifier-naming.IgnoreFailedSplit
+    value:           '0'
+  - key:             readability-identifier-naming.StructCase
+    value:           aNy_CasE
+  - key:             readability-identifier-naming.StructPrefix
+    value:           ''
+  - key:             readability-identifier-naming.StructSuffix
+    value:           ''
   - key:             readability-inconsistent-declaration-parameter-name.IgnoreMacros
     value:           '1'
   - key:             readability-inconsistent-declaration-parameter-name.Strict
     value:           '0'
-  - key:             readability-identifier-naming.ClassCase
-    value:           Camel_Snake_Case
-  - key:             readability-identifier-naming.StructCase
-    value:           aNy_CasE
-  - key:             readability-identifier-naming.GlobalConstantCase
-    value:           UPPER_CASE
-  - key:             readability-identifier-naming.AbstractClassCase
-    value:           CamelCase
 ...

From f01f90695ea850bc9908c992037071d35abd02fc Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 13:30:18 +0100
Subject: [PATCH 101/123] Apply clang-format

---
 src/algorithms/libs/rtcm.h                         |  4 ++--
 .../telemetry_decoder/libs/libswiftcnav/cnav_msg.h |  2 +-
 src/core/receiver/control_thread.h                 |  2 +-
 src/core/receiver/gnss_block_factory.h             |  6 +++---
 src/core/system_parameters/GLONASS_L1_L2_CA.h      |  2 +-
 src/core/system_parameters/Galileo_E1.h            | 14 +++++++-------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/algorithms/libs/rtcm.h b/src/algorithms/libs/rtcm.h
index 50e541020..9196a0968 100644
--- a/src/algorithms/libs/rtcm.h
+++ b/src/algorithms/libs/rtcm.h
@@ -368,8 +368,8 @@ public:
     void run_server();   //<! Starts running the server
     void stop_server();  //<! Stops the server
 
-    void send_message(const std::string& msg);      //<! Sends a message through the server to all connected clients
-    bool is_server_running() const;                 //<! Returns true if the server is running, false otherwise
+    void send_message(const std::string& msg);  //<! Sends a message through the server to all connected clients
+    bool is_server_running() const;             //<! Returns true if the server is running, false otherwise
 
 private:
     //
diff --git a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
index 823175d08..9e4bdd65f 100644
--- a/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
+++ b/src/algorithms/telemetry_decoder/libs/libswiftcnav/cnav_msg.h
@@ -63,7 +63,7 @@ typedef struct
     uint8_t prn;                                                       /**< SV PRN. 0..31 */
     uint8_t msg_id;                                                    /**< Message id. 0..31 */
     uint32_t tow;                                                      /**< GPS ToW in 6-second units. Multiply to 6 to get seconds. */
-    bool alert;                                                   /**< CNAV message alert flag */
+    bool alert;                                                        /**< CNAV message alert flag */
     uint8_t raw_msg[GPS_L2C_V27_DECODE_BITS + GPS_L2C_V27_DELAY_BITS]; /**< RAW MSG for GNSS-SDR */
 } cnav_msg_t;
 
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index 0fe3674fc..d8fb5584c 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -93,7 +93,7 @@ public:
      *
      * \param[in] boost::shared_ptr<gr::msg_queue> control_queue
      */
-    void set_control_queue(const gr::msg_queue::sptr control_queue); // NOLINT(performance-unnecessary-value-param)
+    void set_control_queue(const gr::msg_queue::sptr control_queue);  // NOLINT(performance-unnecessary-value-param)
 
 
     unsigned int processed_control_messages()
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index d9c153794..2b2acc8b6 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -58,7 +58,7 @@ public:
     GNSSBlockFactory();
     virtual ~GNSSBlockFactory();
     std::unique_ptr<GNSSBlockInterface> GetSignalSource(const std::shared_ptr<ConfigurationInterface>& configuration,
-        const gr::msg_queue::sptr queue, int ID = -1); // NOLINT(performance-unnecessary-value-param)
+        const gr::msg_queue::sptr queue, int ID = -1);  // NOLINT(performance-unnecessary-value-param)
 
     std::unique_ptr<GNSSBlockInterface> GetSignalConditioner(const std::shared_ptr<ConfigurationInterface>& configuration, int ID = -1);
 
@@ -67,7 +67,7 @@ public:
     std::unique_ptr<GNSSBlockInterface> GetObservables(const std::shared_ptr<ConfigurationInterface>& configuration);
 
     std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GetChannels(const std::shared_ptr<ConfigurationInterface>& configuration,
-        const gr::msg_queue::sptr queue); // NOLINT(performance-unnecessary-value-param)
+        const gr::msg_queue::sptr queue);  // NOLINT(performance-unnecessary-value-param)
 
     /*
      * \brief Returns the block with the required configuration and implementation
@@ -75,7 +75,7 @@ public:
     std::unique_ptr<GNSSBlockInterface> GetBlock(const std::shared_ptr<ConfigurationInterface>& configuration,
         const std::string& role, const std::string& implementation,
         unsigned int in_streams, unsigned int out_streams,
-        const gr::msg_queue::sptr queue = nullptr); // NOLINT(performance-unnecessary-value-param)
+        const gr::msg_queue::sptr queue = nullptr);  // NOLINT(performance-unnecessary-value-param)
 
 private:
     std::unique_ptr<GNSSBlockInterface> GetChannel_1C(const std::shared_ptr<ConfigurationInterface>& configuration,
diff --git a/src/core/system_parameters/GLONASS_L1_L2_CA.h b/src/core/system_parameters/GLONASS_L1_L2_CA.h
index bcb414e48..b8c796b4f 100644
--- a/src/core/system_parameters/GLONASS_L1_L2_CA.h
+++ b/src/core/system_parameters/GLONASS_L1_L2_CA.h
@@ -48,7 +48,7 @@ const double GLONASS_PI = 3.1415926535898;                     //!< Pi as define
 const double GLONASS_TWO_PI = 6.283185307179586;               //!< 2Pi as defined in IS-GPS-200E
 const double GLONASS_OMEGA_EARTH_DOT = 7.292115e-5;            //!< Earth rotation rate, [rad/s]
 const double GLONASS_GM = 398600.4418e9;                       //!< Universal gravitational constant times the mass of the Earth, [m^3/s^2]
-const double GLONASS_F_M_A = 0.35e9;                            //!< Gravitational constant of atmosphere [m^3/s^2]
+const double GLONASS_F_M_A = 0.35e9;                           //!< Gravitational constant of atmosphere [m^3/s^2]
 const double GLONASS_SEMI_MAJOR_AXIS = 6378136;                //!< Semi-major axis of Earth [m]
 const double GLONASS_FLATTENING = 1 / 29825784;                //!< Flattening parameter
 const double GLONASS_GRAVITY = 97803284;                       //!< Equatorial acceleration of gravity [mGal]
diff --git a/src/core/system_parameters/Galileo_E1.h b/src/core/system_parameters/Galileo_E1.h
index 651176ea7..ee5fc3896 100644
--- a/src/core/system_parameters/Galileo_E1.h
+++ b/src/core/system_parameters/Galileo_E1.h
@@ -169,18 +169,18 @@ const double AI1_5_LSB = TWO_N8;
 const std::vector<std::pair<int32_t, int32_t>> AI2_5_BIT({{29, 14}});  //
 const double AI2_5_LSB = TWO_N15;
 /*Ionospheric disturbance flag*/
-const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}});     //
-const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}});     //
+const std::vector<std::pair<int32_t, int32_t>> REGION1_5_BIT({{43, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION2_5_BIT({{44, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION3_5_BIT({{45, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION4_5_BIT({{46, 1}});      //
+const std::vector<std::pair<int32_t, int32_t>> REGION5_5_BIT({{47, 1}});      //
 const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5A_5_BIT({{48, 10}});  //
 const double BGD_E1_E5A_5_LSB = TWO_N32;
 const std::vector<std::pair<int32_t, int32_t>> BGD_E1_E5B_5_BIT({{58, 10}});  //
 const double BGD_E1_E5B_5_LSB = TWO_N32;
-const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}});   //
+const std::vector<std::pair<int32_t, int32_t>> E5B_HS_5_BIT({{68, 2}});    //
 const std::vector<std::pair<int32_t, int32_t>> E1_B_HS_5_BIT({{70, 2}});   //
-const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}});  //
+const std::vector<std::pair<int32_t, int32_t>> E5B_DVS_5_BIT({{72, 1}});   //
 const std::vector<std::pair<int32_t, int32_t>> E1_B_DVS_5_BIT({{73, 1}});  //
 /*GST*/
 const std::vector<std::pair<int32_t, int32_t>> WN_5_BIT({{74, 12}});

From d7d4cd09aee47bf71c94572af0692c5c1671e7eb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 15:57:15 +0100
Subject: [PATCH 102/123] Fix naming in fgpa and extra unit test
 implementations

---
 ...ileo_e1_pcps_ambiguous_acquisition_fpga.cc | 12 +++---
 .../galileo_e5a_pcps_acquisition_fpga.cc      |  6 +--
 .../adapters/gps_l5i_pcps_acquisition_fpga.cc |  2 +-
 .../galileo_e1_dll_pll_veml_tracking_fpga.cc  | 28 +++++++-------
 .../galileo_e5a_dll_pll_tracking_fpga.cc      | 14 +++----
 .../adapters/gps_l5_dll_pll_tracking_fpga.cc  |  8 ++--
 .../dll_pll_veml_tracking_fpga.cc             | 38 +++++++++----------
 .../acquisition/acq_performance_test.cc       | 18 ++++-----
 .../gps_l2_m_pcps_acquisition_test.cc         |  2 +-
 .../observables/hybrid_observables_test.cc    | 14 +++----
 .../pvt/rtklib_solver_test.cc                 |  4 +-
 .../gps_l1_ca_telemetry_decoder_test.cc       |  4 +-
 .../gps_l1_ca_dll_pll_tracking_test.cc        |  6 +--
 .../gps_l1_ca_dll_pll_tracking_test_fpga.cc   |  4 +-
 .../tracking/gps_l1_ca_kf_tracking_test.cc    |  4 +-
 .../tracking/tracking_pull-in_test.cc         | 12 +++---
 .../tracking/tracking_pull-in_test_fpga.cc    |  4 +-
 17 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
index 6097ce61d..bf5f05c15 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition_fpga.cc
@@ -89,7 +89,7 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
     //   dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
     //   acq_parameters.dump_filename = dump_filename_;
     //--- Find number of samples per spreading code (4 ms)  -----------------
-    auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS)));
+    auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS)));
     //acq_parameters.samples_per_code = code_length_;
     //int samples_per_ms = static_cast<int>(std::round(static_cast<double>(fs_in_) * 0.001));
     //acq_parameters.samples_per_ms = samples_per_ms;
@@ -101,8 +101,8 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
     //        }
 
     //printf("fs_in = %d\n", fs_in);
-    //printf("Galileo_E1_B_CODE_LENGTH_CHIPS = %f\n", Galileo_E1_B_CODE_LENGTH_CHIPS);
-    //printf("Galileo_E1_CODE_CHIP_RATE_HZ = %f\n", Galileo_E1_CODE_CHIP_RATE_HZ);
+    //printf("GALILEO_E1_B_CODE_LENGTH_CHIPS = %f\n", GALILEO_E1_B_CODE_LENGTH_CHIPS);
+    //printf("GALILEO_E1_CODE_CHIP_RATE_HZ = %f\n", GALILEO_E1_CODE_CHIP_RATE_HZ);
     //printf("acq adapter code_length = %d\n", code_length);
     acq_parameters.code_length = code_length;
     // The FPGA can only use FFT lengths that are a power of two.
@@ -123,12 +123,12 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
     auto* fft_if = new gr::fft::fft_complex(nsamples_total, true);  // Direct FFT
     auto* code = new std::complex<float>[nsamples_total];           // buffer for the local code
     auto* fft_codes_padded = static_cast<gr_complex*>(volk_gnsssdr_malloc(nsamples_total * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_all_fft_codes_ = new lv_16sc_t[nsamples_total * Galileo_E1_NUMBER_OF_CODES];  // memory containing all the possible fft codes for PRN 0 to 32
+    d_all_fft_codes_ = new lv_16sc_t[nsamples_total * GALILEO_E1_NUMBER_OF_CODES];  // memory containing all the possible fft codes for PRN 0 to 32
     float max;                                                                      // temporary maxima search
 
     //int tmp_re, tmp_im;
 
-    for (unsigned int PRN = 1; PRN <= Galileo_E1_NUMBER_OF_CODES; PRN++)
+    for (unsigned int PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++)
         {
             //code_ = new gr_complex[vector_length_];
 
@@ -258,7 +258,7 @@ GalileoE1PcpsAmbiguousAcquisitionFpga::GalileoE1PcpsAmbiguousAcquisitionFpga(
         }
 
 
-    //    for (unsigned int PRN = 1; PRN <= Galileo_E1_NUMBER_OF_CODES; PRN++)
+    //    for (unsigned int PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++)
     //        {
     //                    // debug
     //                    char filename2[25];
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
index 0559ddc7e..7c3e62961 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_pcps_acquisition_fpga.cc
@@ -89,7 +89,7 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
             acq_pilot_ = false;
         }
 
-    auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / Galileo_E5a_CODE_CHIP_RATE_HZ * static_cast<double>(Galileo_E5a_CODE_LENGTH_CHIPS)));
+    auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / GALILEO_E5A_CODE_CHIP_RATE_HZ * static_cast<double>(GALILEO_E5A_CODE_LENGTH_CHIPS)));
     acq_parameters.code_length = code_length;
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f((float)code_length));
@@ -111,13 +111,13 @@ GalileoE5aPcpsAcquisitionFpga::GalileoE5aPcpsAcquisitionFpga(ConfigurationInterf
     auto* fft_if = new gr::fft::fft_complex(nsamples_total, true);  // Direct FFT
     auto* code = new std::complex<float>[nsamples_total];           // buffer for the local code
     auto* fft_codes_padded = static_cast<gr_complex*>(volk_gnsssdr_malloc(nsamples_total * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_all_fft_codes_ = new lv_16sc_t[nsamples_total * Galileo_E5a_NUMBER_OF_CODES];  // memory containing all the possible fft codes for PRN 0 to 32
+    d_all_fft_codes_ = new lv_16sc_t[nsamples_total * GALILEO_E5A_NUMBER_OF_CODES];  // memory containing all the possible fft codes for PRN 0 to 32
     float max;                                                                       // temporary maxima search
 
     //printf("creating the E5A acquisition CONT");
     //printf("nsamples_total = %d\n", nsamples_total);
 
-    for (unsigned int PRN = 1; PRN <= Galileo_E5a_NUMBER_OF_CODES; PRN++)
+    for (unsigned int PRN = 1; PRN <= GALILEO_E5A_NUMBER_OF_CODES; PRN++)
         {
             //    gr_complex* code = new gr_complex[code_length_];
             char signal_[3];
diff --git a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
index f90c77040..42358afc1 100644
--- a/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
+++ b/src/algorithms/acquisition/adapters/gps_l5i_pcps_acquisition_fpga.cc
@@ -89,7 +89,7 @@ GpsL5iPcpsAcquisitionFpga::GpsL5iPcpsAcquisitionFpga(
     //dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
     //acq_parameters.dump_filename = dump_filename_;
     //--- Find number of samples per spreading code -------------------------
-    auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (GPS_L5i_CODE_RATE_HZ / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS))));
+    auto code_length = static_cast<unsigned int>(std::round(static_cast<double>(fs_in) / (GPS_L5I_CODE_RATE_HZ / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS))));
     acq_parameters.code_length = code_length;
     // The FPGA can only use FFT lengths that are a power of two.
     float nbits = ceilf(log2f((float)code_length));
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
index 31d2cbfff..7d8462ea3 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking_fpga.cc
@@ -107,7 +107,7 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
     trk_param_fpga.track_pilot = track_pilot;
     d_track_pilot = track_pilot;
     trk_param_fpga.extend_correlation_symbols = extend_correlation_symbols;
-    int vector_length = std::round(fs_in / (Galileo_E1_CODE_CHIP_RATE_HZ / Galileo_E1_B_CODE_LENGTH_CHIPS));
+    int vector_length = std::round(fs_in / (GALILEO_E1_CODE_CHIP_RATE_HZ / GALILEO_E1_B_CODE_LENGTH_CHIPS));
     trk_param_fpga.vector_length = vector_length;
     trk_param_fpga.system = 'E';
     char sig_[3] = "1B";
@@ -136,26 +136,26 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
 
     //################# PRE-COMPUTE ALL THE CODES #################
     unsigned int code_samples_per_chip = 2;
-    d_ca_codes = static_cast<int*>(volk_gnsssdr_malloc(static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * Galileo_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+    d_ca_codes = static_cast<int*>(volk_gnsssdr_malloc(static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * GALILEO_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
     float* ca_codes_f;
     float* data_codes_f;
 
     if (trk_param_fpga.track_pilot)
         {
-            d_data_codes = static_cast<int*>(volk_gnsssdr_malloc((static_cast<unsigned int>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * Galileo_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+            d_data_codes = static_cast<int*>(volk_gnsssdr_malloc((static_cast<unsigned int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * GALILEO_E1_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
         }
-    ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
+    ca_codes_f = static_cast<float*>(volk_gnsssdr_malloc(static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
 
     if (trk_param_fpga.track_pilot)
         {
-            data_codes_f = static_cast<float*>(volk_gnsssdr_malloc((static_cast<unsigned int>(Galileo_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
+            data_codes_f = static_cast<float*>(volk_gnsssdr_malloc((static_cast<unsigned int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)) * code_samples_per_chip * sizeof(float), volk_gnsssdr_get_alignment()));
         }
 
     //printf("pppppppp trk_param_fpga.track_pilot = %d\n", trk_param_fpga.track_pilot);
 
     //int kk;
 
-    for (unsigned int PRN = 1; PRN <= Galileo_E1_NUMBER_OF_CODES; PRN++)
+    for (unsigned int PRN = 1; PRN <= GALILEO_E1_NUMBER_OF_CODES; PRN++)
         {
             char data_signal[3] = "1B";
             if (trk_param_fpga.track_pilot)
@@ -165,11 +165,11 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
                     galileo_e1_code_gen_sinboc11_float(ca_codes_f, pilot_signal, PRN);
                     galileo_e1_code_gen_sinboc11_float(data_codes_f, data_signal, PRN);
 
-                    for (unsigned int s = 0; s < 2 * Galileo_E1_B_CODE_LENGTH_CHIPS; s++)
+                    for (unsigned int s = 0; s < 2 * GALILEO_E1_B_CODE_LENGTH_CHIPS; s++)
                         {
-                            d_ca_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
-                            d_data_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(data_codes_f[s]);
-                            //printf("%f %d | ", data_codes_f[s], d_data_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
+                            d_ca_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
+                            d_data_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(data_codes_f[s]);
+                            //printf("%f %d | ", data_codes_f[s], d_data_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
                         }
                     //printf("\n next \n");
                     //scanf ("%d",&kk);
@@ -179,10 +179,10 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
                     //printf("no tracking pilot\n");
                     galileo_e1_code_gen_sinboc11_float(ca_codes_f, data_signal, PRN);
 
-                    for (unsigned int s = 0; s < 2 * Galileo_E1_B_CODE_LENGTH_CHIPS; s++)
+                    for (unsigned int s = 0; s < 2 * GALILEO_E1_B_CODE_LENGTH_CHIPS; s++)
                         {
-                            d_ca_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
-                            //printf("%f %d | ", ca_codes_f[s], d_ca_codes[static_cast<int>(Galileo_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
+                            d_ca_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS) * 2 * (PRN - 1) + s] = static_cast<int>(ca_codes_f[s]);
+                            //printf("%f %d | ", ca_codes_f[s], d_ca_codes[static_cast<int>(GALILEO_E1_B_CODE_LENGTH_CHIPS)* 2 * (PRN - 1) + s]);
                         }
                     //printf("\n next \n");
                     //scanf ("%d",&kk);
@@ -196,7 +196,7 @@ GalileoE1DllPllVemlTrackingFpga::GalileoE1DllPllVemlTrackingFpga(
         }
     trk_param_fpga.ca_codes = d_ca_codes;
     trk_param_fpga.data_codes = d_data_codes;
-    trk_param_fpga.code_length_chips = Galileo_E1_B_CODE_LENGTH_CHIPS;
+    trk_param_fpga.code_length_chips = GALILEO_E1_B_CODE_LENGTH_CHIPS;
     trk_param_fpga.code_samples_per_chip = code_samples_per_chip;  // 2 sample per chip
     //################# MAKE TRACKING GNURadio object ###################
     tracking_fpga_sc = dll_pll_veml_make_tracking_fpga(trk_param_fpga);
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
index 1a5e1cf09..b0e69c064 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking_fpga.cc
@@ -84,7 +84,7 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
     trk_param_fpga.dll_bw_narrow_hz = dll_bw_narrow_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param_fpga.early_late_space_chips = early_late_space_chips;
-    int vector_length = std::round(fs_in / (Galileo_E5a_CODE_CHIP_RATE_HZ / Galileo_E5a_CODE_LENGTH_CHIPS));
+    int vector_length = std::round(fs_in / (GALILEO_E5A_CODE_CHIP_RATE_HZ / GALILEO_E5A_CODE_LENGTH_CHIPS));
     trk_param_fpga.vector_length = vector_length;
     int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
     float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -96,9 +96,9 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
             extend_correlation_symbols = 1;
             std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
         }
-    else if (!track_pilot and extend_correlation_symbols > Galileo_E5a_I_SECONDARY_CODE_LENGTH)
+    else if (!track_pilot and extend_correlation_symbols > GALILEO_E5A_I_SECONDARY_CODE_LENGTH)
         {
-            extend_correlation_symbols = Galileo_E5a_I_SECONDARY_CODE_LENGTH;
+            extend_correlation_symbols = GALILEO_E5A_I_SECONDARY_CODE_LENGTH;
             std::cout << TEXT_RED << "WARNING: Galileo E5a. extend_correlation_symbols must be lower than 21 when tracking the data component. Coherent integration has been set to 20 symbols (20 ms)" << TEXT_RESET << std::endl;
         }
     if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
@@ -136,7 +136,7 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
 
     //################# PRE-COMPUTE ALL THE CODES #################
     unsigned int code_samples_per_chip = 1;
-    auto code_length_chips = static_cast<unsigned int>(Galileo_E5a_CODE_LENGTH_CHIPS);
+    auto code_length_chips = static_cast<unsigned int>(GALILEO_E5A_CODE_LENGTH_CHIPS);
 
     auto *aux_code = static_cast<gr_complex *>(volk_gnsssdr_malloc(sizeof(gr_complex) * code_length_chips * code_samples_per_chip, volk_gnsssdr_get_alignment()));
 
@@ -149,15 +149,15 @@ GalileoE5aDllPllTrackingFpga::GalileoE5aDllPllTrackingFpga(
         }
     tracking_code = static_cast<float *>(volk_gnsssdr_malloc(code_samples_per_chip * code_length_chips * sizeof(float), volk_gnsssdr_get_alignment()));
 
-    d_ca_codes = static_cast<int *>(volk_gnsssdr_malloc(static_cast<int>(code_length_chips) * code_samples_per_chip * Galileo_E5a_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+    d_ca_codes = static_cast<int *>(volk_gnsssdr_malloc(static_cast<int>(code_length_chips) * code_samples_per_chip * GALILEO_E5A_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
 
     if (trk_param_fpga.track_pilot)
         {
-            d_data_codes = static_cast<int *>(volk_gnsssdr_malloc((static_cast<unsigned int>(code_length_chips)) * code_samples_per_chip * Galileo_E5a_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
+            d_data_codes = static_cast<int *>(volk_gnsssdr_malloc((static_cast<unsigned int>(code_length_chips)) * code_samples_per_chip * GALILEO_E5A_NUMBER_OF_CODES * sizeof(int), volk_gnsssdr_get_alignment()));
         }
 
 
-    for (unsigned int PRN = 1; PRN <= Galileo_E5a_NUMBER_OF_CODES; PRN++)
+    for (unsigned int PRN = 1; PRN <= GALILEO_E5A_NUMBER_OF_CODES; PRN++)
         {
             //galileo_e5_a_code_gen_complex_primary(aux_code, PRN, const_cast<char *>(trk_param_fpga.signal.c_str()));
             galileo_e5_a_code_gen_complex_primary(aux_code, PRN, const_cast<char *>(sig_));
diff --git a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
index effa0c5b7..c12009b43 100644
--- a/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
+++ b/src/algorithms/tracking/adapters/gps_l5_dll_pll_tracking_fpga.cc
@@ -84,7 +84,7 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
     trk_param_fpga.dll_bw_narrow_hz = dll_bw_narrow_hz;
     float early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
     trk_param_fpga.early_late_space_chips = early_late_space_chips;
-    int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5i_CODE_RATE_HZ) / static_cast<double>(GPS_L5i_CODE_LENGTH_CHIPS)));
+    int vector_length = std::round(static_cast<double>(fs_in) / (static_cast<double>(GPS_L5I_CODE_RATE_HZ) / static_cast<double>(GPS_L5I_CODE_LENGTH_CHIPS)));
     trk_param_fpga.vector_length = vector_length;
     int extend_correlation_symbols = configuration->property(role + ".extend_correlation_symbols", 1);
     float early_late_space_narrow_chips = configuration->property(role + ".early_late_space_narrow_chips", 0.15);
@@ -95,9 +95,9 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
             extend_correlation_symbols = 1;
             std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be bigger than 0. Coherent integration has been set to 1 symbol (1 ms)" << TEXT_RESET << std::endl;
         }
-    else if (!track_pilot and extend_correlation_symbols > GPS_L5i_NH_CODE_LENGTH)
+    else if (!track_pilot and extend_correlation_symbols > GPS_L5I_NH_CODE_LENGTH)
         {
-            extend_correlation_symbols = GPS_L5i_NH_CODE_LENGTH;
+            extend_correlation_symbols = GPS_L5I_NH_CODE_LENGTH;
             std::cout << TEXT_RED << "WARNING: GPS L5. extend_correlation_symbols must be lower than 11 when tracking the data component. Coherent integration has been set to 10 symbols (10 ms)" << TEXT_RESET << std::endl;
         }
     if ((extend_correlation_symbols > 1) and (pll_bw_narrow_hz > pll_bw_hz or dll_bw_narrow_hz > dll_bw_hz))
@@ -136,7 +136,7 @@ GpsL5DllPllTrackingFpga::GpsL5DllPllTrackingFpga(
 
     //################# PRE-COMPUTE ALL THE CODES #################
     unsigned int code_samples_per_chip = 1;
-    auto code_length_chips = static_cast<unsigned int>(GPS_L5i_CODE_LENGTH_CHIPS);
+    auto code_length_chips = static_cast<unsigned int>(GPS_L5I_CODE_LENGTH_CHIPS);
     //printf("TRK code_length_chips = %d\n", code_length_chips);
 
     float *tracking_code;
diff --git a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
index 94ff75e3e..62479aaae 100644
--- a/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
@@ -124,7 +124,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
                     // preamble bits to sampled symbols
                     d_gps_l1ca_preambles_symbols = static_cast<int32_t *>(volk_gnsssdr_malloc(GPS_CA_PREAMBLE_LENGTH_SYMBOLS * sizeof(int32_t), volk_gnsssdr_get_alignment()));
                     int32_t n = 0;
-                    for (unsigned short preambles_bit : preambles_bits)
+                    for (uint16_t preambles_bit : preambles_bits)
                         {
                             for (uint32_t j = 0; j < GPS_CA_TELEMETRY_SYMBOLS_PER_BIT; j++)
                                 {
@@ -159,8 +159,8 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
             else if (signal_type == "L5")
                 {
                     d_signal_carrier_freq = GPS_L5_FREQ_HZ;
-                    d_code_period = GPS_L5i_PERIOD;
-                    d_code_chip_rate = GPS_L5i_CODE_RATE_HZ;
+                    d_code_period = GPS_L5I_PERIOD;
+                    d_code_chip_rate = GPS_L5I_CODE_RATE_HZ;
                     d_symbols_per_bit = GPS_L5_SAMPLES_PER_SYMBOL;
                     d_correlation_length_ms = 1;
                     //d_code_samples_per_chip = 1;
@@ -169,15 +169,15 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
                     //                   interchange_iq = false;
                     if (trk_parameters.track_pilot)
                         {
-                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5q_NH_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5q_NH_CODE_STR);
+                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5Q_NH_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5Q_NH_CODE_STR);
                             signal_pretty_name = signal_pretty_name + "Q";
                             interchange_iq = true;
                         }
                     else
                         {
-                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5i_NH_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5i_NH_CODE_STR);
+                            d_secondary_code_length = static_cast<uint32_t>(GPS_L5I_NH_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GPS_L5I_NH_CODE_STR);
                             signal_pretty_name = signal_pretty_name + "I";
                             interchange_iq = false;
                         }
@@ -201,9 +201,9 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
             systemName = "Galileo";
             if (signal_type == "1B")
                 {
-                    d_signal_carrier_freq = Galileo_E1_FREQ_HZ;
-                    d_code_period = Galileo_E1_CODE_PERIOD;
-                    d_code_chip_rate = Galileo_E1_CODE_CHIP_RATE_HZ;
+                    d_signal_carrier_freq = GALILEO_E1_FREQ_HZ;
+                    d_code_period = GALILEO_E1_CODE_PERIOD;
+                    d_code_chip_rate = GALILEO_E1_CODE_CHIP_RATE_HZ;
                     //d_code_length_chips = static_cast<uint32_t >(Galileo_E1_B_CODE_LENGTH_CHIPS);
                     d_symbols_per_bit = 1;
                     d_correlation_length_ms = 4;
@@ -212,8 +212,8 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
                     if (trk_parameters.track_pilot)
                         {
                             d_secondary = true;
-                            d_secondary_code_length = static_cast<uint32_t>(Galileo_E1_C_SECONDARY_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&Galileo_E1_C_SECONDARY_CODE);
+                            d_secondary_code_length = static_cast<uint32_t>(GALILEO_E1_C_SECONDARY_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GALILEO_E1_C_SECONDARY_CODE);
                             signal_pretty_name = signal_pretty_name + "C";
                         }
                     else
@@ -225,9 +225,9 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
                 }
             else if (signal_type == "5X")
                 {
-                    d_signal_carrier_freq = Galileo_E5a_FREQ_HZ;
-                    d_code_period = GALILEO_E5a_CODE_PERIOD;
-                    d_code_chip_rate = Galileo_E5a_CODE_CHIP_RATE_HZ;
+                    d_signal_carrier_freq = GALILEO_E5A_FREQ_HZ;
+                    d_code_period = GALILEO_E5A_CODE_PERIOD;
+                    d_code_chip_rate = GALILEO_E5A_CODE_CHIP_RATE_HZ;
                     d_symbols_per_bit = 20;
                     d_correlation_length_ms = 1;
                     //d_code_samples_per_chip = 1;
@@ -236,14 +236,14 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
                     //interchange_iq = false;
                     if (trk_parameters.track_pilot)
                         {
-                            d_secondary_code_length = static_cast<uint32_t>(Galileo_E5a_Q_SECONDARY_CODE_LENGTH);
+                            d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_Q_SECONDARY_CODE_LENGTH);
                             signal_pretty_name = signal_pretty_name + "Q";
                             interchange_iq = true;
                         }
                     else
                         {
-                            d_secondary_code_length = static_cast<uint32_t>(Galileo_E5a_I_SECONDARY_CODE_LENGTH);
-                            d_secondary_code_string = const_cast<std::string *>(&Galileo_E5a_I_SECONDARY_CODE);
+                            d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH);
+                            d_secondary_code_string = const_cast<std::string *>(&GALILEO_E5A_I_SECONDARY_CODE);
                             signal_pretty_name = signal_pretty_name + "I";
                             interchange_iq = false;
                         }
@@ -537,7 +537,7 @@ void dll_pll_veml_tracking_fpga::start_tracking()
         {
             if (trk_parameters.track_pilot)
                 {
-                    d_secondary_code_string = const_cast<std::string *>(&Galileo_E5a_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
+                    d_secondary_code_string = const_cast<std::string *>(&GALILEO_E5A_Q_SECONDARY_CODE[d_acquisition_gnss_synchro->PRN - 1]);
                     for (uint32_t i = 0; i < d_code_length_chips; i++)
                         {
                             // nothing to compute : the local codes are pre-computed in the adapter class
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
index 74508dc3c..e93092172 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -95,15 +95,15 @@ class AcqPerfTest_msg_rx;
 
 typedef boost::shared_ptr<AcqPerfTest_msg_rx> AcqPerfTest_msg_rx_sptr;
 
-AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(concurrent_queue<int>& queue);
+AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue<int>& queue);
 
 class AcqPerfTest_msg_rx : public gr::block
 {
 private:
-    friend AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(concurrent_queue<int>& queue);
+    friend AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue<int>& queue);
     void msg_handler_events(pmt::pmt_t msg);
-    AcqPerfTest_msg_rx(concurrent_queue<int>& queue);
-    concurrent_queue<int>& channel_internal_queue;
+    AcqPerfTest_msg_rx(Concurrent_Queue<int>& queue);
+    Concurrent_Queue<int>& channel_internal_queue;
 
 public:
     int rx_message;
@@ -111,7 +111,7 @@ public:
 };
 
 
-AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(concurrent_queue<int>& queue)
+AcqPerfTest_msg_rx_sptr AcqPerfTest_msg_rx_make(Concurrent_Queue<int>& queue)
 {
     return AcqPerfTest_msg_rx_sptr(new AcqPerfTest_msg_rx(queue));
 }
@@ -133,7 +133,7 @@ void AcqPerfTest_msg_rx::msg_handler_events(pmt::pmt_t msg)
 }
 
 
-AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(concurrent_queue<int>& queue) : gr::block("AcqPerfTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
+AcqPerfTest_msg_rx::AcqPerfTest_msg_rx(Concurrent_Queue<int>& queue) : gr::block("AcqPerfTest_msg_rx", gr::io_signature::make(0, 0, 0), gr::io_signature::make(0, 0, 0)), channel_internal_queue(queue)
 {
     this->message_port_register_in(pmt::mp("events"));
     this->set_msg_handler(pmt::mp("events"), boost::bind(&AcqPerfTest_msg_rx::msg_handler_events, this, _1));
@@ -323,7 +323,7 @@ protected:
     void check_results();
     void plot_results();
 
-    concurrent_queue<int> channel_internal_queue;
+    Concurrent_Queue<int> channel_internal_queue;
 
     gr::msg_queue::sptr queue;
     gr::top_block_sptr top_block;
@@ -779,7 +779,7 @@ void AcquisitionPerformanceTest::plot_results()
 
 TEST_F(AcquisitionPerformanceTest, ROC)
 {
-    tracking_true_obs_reader true_trk_data;
+    Tracking_True_Obs_Reader true_trk_data;
 
     if (boost::filesystem::exists(path_str))
         {
@@ -872,7 +872,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
 
                                     for (int execution = 1; execution <= num_executions; execution++)
                                         {
-                                            acquisition_dump_reader acq_dump(basename,
+                                            Acquisition_Dump_Reader acq_dump(basename,
                                                 observed_satellite,
                                                 config->property("Acquisition.doppler_max", 0),
                                                 config->property("Acquisition.doppler_step", 0),
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
index 8176537e2..5fb9d8c12 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
@@ -181,7 +181,7 @@ void GpsL2MPcpsAcquisitionTest::plot_grid()
     auto sat = static_cast<unsigned int>(gnss_synchro.PRN);
 
     auto samples_per_code = static_cast<unsigned int>(floor(static_cast<double>(sampling_frequency_hz) / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS))));
-    acquisition_dump_reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
+    Acquisition_Dump_Reader acq_dump(basename, sat, doppler_max, doppler_step, samples_per_code, 1);
     if (!acq_dump.read_binary_acq())
         {
             std::cout << "Error reading files" << std::endl;
diff --git a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
index 946e43b80..cee43548b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/observables/hybrid_observables_test.cc
@@ -493,10 +493,10 @@ bool HybridObservablesTest::acquire_signal()
                     opt_fs = GPS_L1_CA_OPT_ACQ_FS_HZ;
                     break;
                 case evGAL_1B:
-                    opt_fs = Galileo_E1_OPT_ACQ_FS_HZ;
+                    opt_fs = GALILEO_E1_OPT_ACQ_FS_HZ;
                     break;
                 case evGAL_5X:
-                    opt_fs = Galileo_E5a_OPT_ACQ_FS_HZ;
+                    opt_fs = GALILEO_E5A_OPT_ACQ_FS_HZ;
                     break;
                 case evGLO_1G:
                     opt_fs = baseband_sampling_freq;
@@ -1687,9 +1687,9 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
                 {
                     //based on true observables metadata (for custom sdr generator)
                     //open true observables log file written by the simulator or based on provided RINEX obs
-                    std::vector<std::shared_ptr<tracking_true_obs_reader>> true_reader_vec;
+                    std::vector<std::shared_ptr<Tracking_True_Obs_Reader>> true_reader_vec;
                     //read true data from the generator logs
-                    true_reader_vec.push_back(std::make_shared<tracking_true_obs_reader>());
+                    true_reader_vec.push_back(std::make_shared<Tracking_True_Obs_Reader>());
                     std::cout << "Loading true observable data for PRN " << n.PRN << std::endl;
                     std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
                     true_obs_file.append(std::to_string(n.PRN));
@@ -1837,7 +1837,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
     if (!FLAGS_enable_external_signal_file)
         {
             //load the true values
-            true_observables_reader true_observables;
+            True_Observables_Reader true_observables;
             ASSERT_NO_THROW({
                 if (true_observables.open_obs_file(std::string("./obs_out.bin")) == false)
                     {
@@ -1885,7 +1885,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
                 }
         }
     //read measured values
-    observables_dump_reader estimated_observables(tracking_ch_vec.size());
+    Observables_Dump_Reader estimated_observables(tracking_ch_vec.size());
     ASSERT_NO_THROW({
         if (estimated_observables.open_obs_file(std::string("./observables.dat")) == false)
             {
@@ -2040,7 +2040,7 @@ TEST_F(HybridObservablesTest, ValidationOfResults)
                 }
 
             arma::vec receiver_time_offset_ref_channel_s;
-            receiver_time_offset_ref_channel_s = (true_obs_vec.at(min_pr_ch_id).col(1)(0) - measured_obs_vec.at(min_pr_ch_id).col(4)(0)) / GPS_C_m_s;
+            receiver_time_offset_ref_channel_s = (true_obs_vec.at(min_pr_ch_id).col(1)(0) - measured_obs_vec.at(min_pr_ch_id).col(4)(0)) / GPS_C_M_S;
             std::cout << "Ref. channel initial Receiver time offset " << receiver_time_offset_ref_channel_s(0) * 1e3 << " [ms]" << std::endl;
 
             for (unsigned int n = 0; n < measured_obs_vec.size(); n++)
diff --git a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
index 28b69ce0d..ce191b01a 100644
--- a/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/pvt/rtklib_solver_test.cc
@@ -396,12 +396,12 @@ TEST(RTKLibSolverTest, test1)
     bool save_to_mat = false;
     rtk_t rtk = configure_rtklib_options();
 
-    std::unique_ptr<rtklib_solver> d_ls_pvt(new rtklib_solver(nchannels, dump_filename, flag_dump_to_file, save_to_mat, rtk));
+    std::unique_ptr<Rtklib_Solver> d_ls_pvt(new Rtklib_Solver(nchannels, dump_filename, flag_dump_to_file, save_to_mat, rtk));
     d_ls_pvt->set_averaging_depth(1);
 
     // load ephemeris
     std::string eph_xml_filename = path + "data/rtklib_test/eph_GPS_L1CA_test1.xml";
-    gnss_sdr_supl_client supl_client_ephemeris_;
+    Gnss_Sdr_Supl_Client supl_client_ephemeris_;
 
     std::cout << "SUPL: Try read GPS ephemeris from XML file " << eph_xml_filename << std::endl;
     if (supl_client_ephemeris_.load_ephemeris_xml(eph_xml_filename) == true)
diff --git a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
index 28da8661d..be7963164 100644
--- a/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/telemetry_decoder/gps_l1_ca_telemetry_decoder_test.cc
@@ -343,7 +343,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
     configure_receiver();
 
     //open true observables log file written by the simulator
-    tracking_true_obs_reader true_obs_data;
+    Tracking_True_Obs_Reader true_obs_data;
     int test_satellite_PRN = FLAGS_test_satellite_PRN;
     std::cout << "Testing satellite PRN=" << test_satellite_PRN << std::endl;
     std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
@@ -440,7 +440,7 @@ TEST_F(GpsL1CATelemetryDecoderTest, ValidationOfResults)
         }
 
     //load the measured values
-    tlm_dump_reader tlm_dump;
+    Tlm_Dump_Reader tlm_dump;
     ASSERT_NO_THROW({
         if (tlm_dump.open_obs_file(std::string("./telemetry0.dat")) == false)
             {
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
index 8fcd3a726..982eda0ee 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test.cc
@@ -447,7 +447,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
     int test_satellite_PRN = 0;
     double acq_delay_samples = 0.0;
     double acq_doppler_hz = 0.0;
-    tracking_true_obs_reader true_obs_data;
+    Tracking_True_Obs_Reader true_obs_data;
 
 
     // CONFIG PARAM SWEEP LOOP
@@ -645,7 +645,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
 
                     //check results
                     //load the measured values
-                    tracking_dump_reader trk_dump;
+                    Tracking_Dump_Reader trk_dump;
                     ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
                         << "Failure opening tracking dump file";
 
@@ -751,7 +751,7 @@ TEST_F(GpsL1CADllPllTrackingTest, ValidationOfResults)
                                             code_phase_error_chips = check_results_codephase(true_timestamp_s, true_prn_delay_chips, trk_timestamp_s, trk_prn_delay_chips, mean_error, std_dev_error, rmse);
                                             for (double code_phase_error_chip : code_phase_error_chips)
                                                 {
-                                                    code_phase_error_meters.push_back(GPS_L1_CA_CHIP_PERIOD * code_phase_error_chip * GPS_C_m_s);
+                                                    code_phase_error_meters.push_back(GPS_L1_CA_CHIP_PERIOD * code_phase_error_chip * GPS_C_M_S);
                                                 }
                                             mean_code_phase_error.push_back(mean_error);
                                             std_dev_code_phase_error.push_back(std_dev_error);
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
index 0f93e68d7..78303a1cf 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_dll_pll_tracking_test_fpga.cc
@@ -453,7 +453,7 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
     configure_receiver();
 
     //open true observables log file written by the simulator
-    tracking_true_obs_reader true_obs_data;
+    Tracking_True_Obs_Reader true_obs_data;
     int test_satellite_PRN = FLAGS_test_satellite_PRN;
     std::cout << "Testing satellite PRN=" << test_satellite_PRN << std::endl;
     std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
@@ -566,7 +566,7 @@ TEST_F(GpsL1CADllPllTrackingTestFpga, ValidationOfResultsFpga)
         }
 
     //load the measured values
-    tracking_dump_reader trk_dump;
+    Tracking_Dump_Reader trk_dump;
     ASSERT_NO_THROW(
         {
             if (trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")) == false)
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
index f987d1973..f1046a12b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/gps_l1_ca_kf_tracking_test.cc
@@ -375,7 +375,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults)
     configure_receiver();
 
     // open true observables log file written by the simulator
-    tracking_true_obs_reader true_obs_data;
+    Tracking_True_Obs_Reader true_obs_data;
     int test_satellite_PRN = FLAGS_test_satellite_PRN;
     std::cout << "Testing satellite PRN=" << test_satellite_PRN << std::endl;
     std::string true_obs_file = std::string("./gps_l1_ca_obs_prn");
@@ -459,7 +459,7 @@ TEST_F(GpsL1CAKfTrackingTest, ValidationOfResults)
         }
 
     //load the measured values
-    tracking_dump_reader trk_dump;
+    Tracking_Dump_Reader trk_dump;
 
     ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
         << "Failure opening tracking dump file";
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
index 15756f3bc..306ad74fd 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc
@@ -514,10 +514,10 @@ bool TrackingPullInTest::acquire_signal(int SV_ID)
                     opt_fs = GPS_L1_CA_OPT_ACQ_FS_HZ;
                     break;
                 case evGAL_1B:
-                    opt_fs = Galileo_E1_OPT_ACQ_FS_HZ;
+                    opt_fs = GALILEO_E1_OPT_ACQ_FS_HZ;
                     break;
                 case evGAL_5X:
-                    opt_fs = Galileo_E5a_OPT_ACQ_FS_HZ;
+                    opt_fs = GALILEO_E5A_OPT_ACQ_FS_HZ;
                     break;
                 case evGLO_1G:
                     opt_fs = baseband_sampling_freq;
@@ -750,7 +750,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
     double true_acq_delay_samples = 0.0;
     uint64_t acq_samplestamp_samples = 0;
 
-    tracking_true_obs_reader true_obs_data;
+    Tracking_True_Obs_Reader true_obs_data;
     if (!FLAGS_enable_external_signal_file)
         {
             test_satellite_PRN = FLAGS_test_satellite_PRN;
@@ -783,9 +783,9 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
     // create the msg queue for valve
 
     queue = gr::msg_queue::make(0);
-    boost::shared_ptr<gnss_sdr_valve> reseteable_valve;
+    boost::shared_ptr<Gnss_Sdr_Valve> reseteable_valve;
     long long int acq_to_trk_delay_samples = ceil(static_cast<double>(FLAGS_fs_gen_sps) * FLAGS_acq_to_trk_delay_s);
-    boost::shared_ptr<gnss_sdr_valve> resetable_valve_(new gnss_sdr_valve(sizeof(gr_complex), acq_to_trk_delay_samples, queue, false));
+    boost::shared_ptr<Gnss_Sdr_Valve> resetable_valve_(new Gnss_Sdr_Valve(sizeof(gr_complex), acq_to_trk_delay_samples, queue, false));
 
     std::shared_ptr<ControlMessageFactory> control_message_factory_;
     std::shared_ptr<std::vector<std::shared_ptr<ControlMessage>>> control_messages_;
@@ -910,7 +910,7 @@ TEST_F(TrackingPullInTest, ValidationOfResults)
                             if (FLAGS_plot_detail_level >= 2 and FLAGS_show_plots)
                                 {
                                     //load the measured values
-                                    tracking_dump_reader trk_dump;
+                                    Tracking_Dump_Reader trk_dump;
                                     ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
                                         << "Failure opening tracking dump file";
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
index 44cb83374..0904d2047 100644
--- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc
@@ -627,7 +627,7 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults)
     double true_acq_delay_samples = 0.0;
     uint64_t acq_samplestamp_samples = 0;
 
-    tracking_true_obs_reader true_obs_data;
+    Tracking_True_Obs_Reader true_obs_data;
     if (!FLAGS_enable_external_signal_file)
         {
             test_satellite_PRN = FLAGS_test_satellite_PRN;
@@ -739,7 +739,7 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults)
                             if (FLAGS_plot_detail_level >= 2 and FLAGS_show_plots)
                                 {
                                     //load the measured values
-                                    tracking_dump_reader trk_dump;
+                                    Tracking_Dump_Reader trk_dump;
                                     ASSERT_EQ(trk_dump.open_obs_file(std::string("./tracking_ch_0.dat")), true)
                                         << "Failure opening tracking dump file";
 

From 63c1409b8fbbd04362975a441658c4bb3b68eb79 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 16:56:10 +0100
Subject: [PATCH 103/123] Update changelog

---
 docs/changelog | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/changelog b/docs/changelog
index 692a939ef..312543bc6 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -1,14 +1,29 @@
 ## [Unreleased](https://github.com/gnss-sdr/gnss-sdr/tree/next)
 
+### Improvements in Efficiency
+
+- Applied clang-tidy checks and fixes related to performance.
+
 ### Improvements in Interoperability:
 
 - Added the BeiDou B1I receiver chain.
+- Fix bug in GLONASS dual frequency receiver.
+
+### Improvements in Maintainability:
+
+- Usage of clang-tidy integrated into CMake scripts. New option -DENABLE_CLANG_TIDY=ON executes clang-tidy along with compilation. Requires clang compiler.
+- Applied clang-tidy checks and fixes related to readability.
 
 ### Improvements in Portability:
 
 - CMake scripts now follow a modern approach (targets and properties) but still work in 2.8.12
 
 
+## Improvements in Reliability
+
+- Applied clang-tidy checks and fixes related to High Integrity C++.
+
+
 ## [0.0.10](https://github.com/gnss-sdr/gnss-sdr/releases/tag/v0.0.10)
 
 This release has several improvements in different dimensions, addition of new features and bug fixes:

From a05aa22d396ebb9eba64882c9241b7f87380308d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 20:54:41 +0100
Subject: [PATCH 104/123] Fix building of FMCOMMS2 option

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a57aebad3..1272bc341 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1731,6 +1731,7 @@ endif()
 ##############################################
 if(ENABLE_PLUTOSDR OR ENABLE_FMCOMMS2)
     find_package(GRIIO)
+    find_package(LIBIIO)
 endif()
 
 

From 9c2cebd9064d2148cd687c597fd97ef8d1f9a0b5 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:18:30 +0100
Subject: [PATCH 105/123] Fix flexiband driver building

---
 src/core/receiver/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 538f2d72a..4909f9ae9 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -168,6 +168,13 @@ if(OS_IS_MACOSX)
     endif()
 endif()
 
+if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
+    target_compile_definitions(core_receiver
+        PRIVATE
+            Gnuradio::teleorbit
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(core_receiver

From e6ae1a307cac745abc55272006626062f841f04a Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:22:36 +0100
Subject: [PATCH 106/123] Fix gn3s driver building

---
 src/core/receiver/CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 4909f9ae9..b30c2295e 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -175,6 +175,13 @@ if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
     )
 endif()
 
+if(ENABLE_GN3S AND GRGN3S_FOUND)
+    target_compile_definitions(core_receiver
+        PRIVATE
+            Gnuradio::gn3s
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(core_receiver

From 2f83d1e7339fc4023008ceb8547261279a353879 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:34:42 +0100
Subject: [PATCH 107/123] Apply clang-tidy to flexiband driver

---
 .../adapters/flexiband_signal_source.cc              | 12 +++++-------
 .../signal_source/adapters/flexiband_signal_source.h |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index 95b3c56cd..26d371535 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -1,4 +1,4 @@
-/*!
+(item_type_ == "gr_complex") /*!
  * \file raw_array_signal_source.cc
  * \brief CTTC Experimental GNSS 8 channels array signal source
  * \author Javier Arribas, jarribas(at)cttc.es
@@ -36,10 +36,10 @@
 #include <teleorbit/frontend.h>
 
 
-using google::LogMessage;
+    using google::LogMessage;
 
 FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configuration,
-    std::string role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue)
+    const std::string& role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue)
 {
     std::string default_item_type = "byte";
     item_type_ = configuration->property(role + ".item_type", default_item_type);
@@ -60,7 +60,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati
 
     RF_channels_ = configuration->property(role + ".RF_channels", 1);
 
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             flexiband_source_ = gr::teleorbit::frontend::make(firmware_filename_.c_str(), gain1_, gain2_, gain3_, AGC_, usb_packet_buffer_size_, signal_file.c_str(), flag_read_file);
@@ -96,9 +96,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati
 }
 
 
-FlexibandSignalSource::~FlexibandSignalSource()
-{
-}
+FlexibandSignalSource::~FlexibandSignalSource() = default;
 
 
 void FlexibandSignalSource::connect(gr::top_block_sptr top_block)
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index 54e7eeff4..ed70b5bfd 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -53,7 +53,7 @@ class FlexibandSignalSource : public GNSSBlockInterface
 {
 public:
     FlexibandSignalSource(ConfigurationInterface* configuration,
-        std::string role, unsigned int in_stream,
+        const std::string& role, unsigned int in_stream,
         unsigned int out_stream, gr::msg_queue::sptr queue);
 
     virtual ~FlexibandSignalSource();

From 30a72d5c061839b39e5c86c6b112a32210f5965c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:49:07 +0100
Subject: [PATCH 108/123] Fix headers

---
 .../adapters/flexiband_signal_source.cc        | 18 +++++++++++++-----
 .../adapters/flexiband_signal_source.h         | 13 +++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index 26d371535..213ab4b6b 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -1,6 +1,8 @@
-(item_type_ == "gr_complex") /*!
- * \file raw_array_signal_source.cc
- * \brief CTTC Experimental GNSS 8 channels array signal source
+/*!
+ * \file flexiband_signal_source.cc
+ * \brief ignal Source adapter for the Teleorbit Flexiband front-end device.
+ * This adapter requires a Flexiband GNU Radio driver
+ * installed (not included with GNSS-SDR)
  * \author Javier Arribas, jarribas(at)cttc.es
  *
  * -------------------------------------------------------------------------
@@ -36,10 +38,16 @@
 #include <teleorbit/frontend.h>
 
 
-    using google::LogMessage;
+using google::LogMessage;
 
 FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configuration,
-    const std::string& role, unsigned int in_stream, unsigned int out_stream, gr::msg_queue::sptr queue) : role_(role), in_stream_(in_stream), out_stream_(out_stream), queue_(queue)
+    const std::string& role,
+    unsigned int in_stream,
+    unsigned int out_stream,
+    gr::msg_queue::sptr queue) : role_(role),
+                                 in_stream_(in_stream),
+                                 out_stream_(out_stream),
+                                 queue_(queue)
 {
     std::string default_item_type = "byte";
     item_type_ = configuration->property(role + ".item_type", default_item_type);
diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.h b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
index ed70b5bfd..40030af6c 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.h
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.h
@@ -1,7 +1,8 @@
 /*!
- * \file raw_array_signal_source.h
- * \brief Signal Source adapter for the Teleorbit Flexiband front-end device.
- * This adapter requires a Flexiband GNURadio driver installed (not included with GNSS-SDR)
+ * \file flexiband_signal_source.h
+ * \brief ignal Source adapter for the Teleorbit Flexiband front-end device.
+ * This adapter requires a Flexiband GNU Radio driver
+ * installed (not included with GNSS-SDR)
  * \author Javier Arribas, jarribas(at)cttc.es
  *
  * -------------------------------------------------------------------------
@@ -30,8 +31,8 @@
  */
 
 
-#ifndef FLEXIBAND_SIGNAL_SOURCE_H_
-#define FLEXIBAND_SIGNAL_SOURCE_H_
+#ifndef GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H_
+#define GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H_
 
 #include "gnss_block_interface.h"
 #include <gnuradio/blocks/char_to_float.h>
@@ -108,4 +109,4 @@ private:
     boost::shared_ptr<gr::msg_queue> queue_;
 };
 
-#endif /*FLEXIBAND_SIGNAL_SOURCE_H_*/
+#endif  // GNSS_SDR_FLEXIBAND_SIGNAL_SOURCE_H_

From 13d8d19679f0badd065fa9b0094bb12f9873fbcb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 22:02:37 +0100
Subject: [PATCH 109/123] clang-tidy fixes

---
 .../signal_source/adapters/raw_array_signal_source.cc |  6 ++----
 .../signal_source/adapters/raw_array_signal_source.h  |  6 +++---
 src/core/receiver/CMakeLists.txt                      | 11 +++++++++--
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
index b7f29a012..589af32c5 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.cc
@@ -66,7 +66,7 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
     int sampling_freq_;
     sampling_freq_ = configuration->property(role + ".sampling_freq", 5000000);
 
-    if (item_type_.compare("gr_complex") == 0)
+    if (item_type_ == "gr_complex")
         {
             item_size_ = sizeof(gr_complex);
             raw_array_source_ = gr::dbfcttc::raw_array::make(eth_device_.c_str(), channels_, snapshots_per_frame_, inter_frame_delay_, sampling_freq_);
@@ -97,9 +97,7 @@ RawArraySignalSource::RawArraySignalSource(ConfigurationInterface* configuration
 }
 
 
-RawArraySignalSource::~RawArraySignalSource()
-{
-}
+RawArraySignalSource::~RawArraySignalSource() = default;
 
 
 void RawArraySignalSource::connect(gr::top_block_sptr top_block)
diff --git a/src/algorithms/signal_source/adapters/raw_array_signal_source.h b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
index 9af4df30f..321895cef 100644
--- a/src/algorithms/signal_source/adapters/raw_array_signal_source.h
+++ b/src/algorithms/signal_source/adapters/raw_array_signal_source.h
@@ -29,8 +29,8 @@
  */
 
 
-#ifndef RAW_ARRAY_SIGNAL_SOURCE_H_
-#define RAW_ARRAY_SIGNAL_SOURCE_H_
+#ifndef GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
+#define GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_
 
 #include "gnss_block_interface.h"
 #include <gnuradio/blocks/file_sink.h>
@@ -90,4 +90,4 @@ private:
     boost::shared_ptr<gr::msg_queue> queue_;
 };
 
-#endif /*RAW_ARRAY_SIGNAL_SOURCE_H_*/
+#endif /*GNSS_SDR_RAW_ARRAY_SIGNAL_SOURCE_H_*/
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index b30c2295e..469960d47 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -169,19 +169,26 @@ if(OS_IS_MACOSX)
 endif()
 
 if(ENABLE_FLEXIBAND AND TELEORBIT_FOUND)
-    target_compile_definitions(core_receiver
+    target_link_libraries(core_receiver
         PRIVATE
             Gnuradio::teleorbit
     )
 endif()
 
 if(ENABLE_GN3S AND GRGN3S_FOUND)
-    target_compile_definitions(core_receiver
+    target_link_libraries(core_receiver
         PRIVATE
             Gnuradio::gn3s
     )
 endif()
 
+if(ENABLE_ARRAY AND GRDBFCTTC_FOUND)
+    target_link_libraries(core_receiver
+        PRIVATE
+            Gnuradio::dbfcttc
+    )
+endif()
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(core_receiver

From 00687408956373c673155d9c68e2499cff8e9d03 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 22:12:44 +0100
Subject: [PATCH 110/123] clang-tidy fixes

---
 .../signal_source/adapters/flexiband_signal_source.cc         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
index 213ab4b6b..216fa084c 100644
--- a/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/flexiband_signal_source.cc
@@ -36,7 +36,7 @@
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/msg_queue.h>
 #include <teleorbit/frontend.h>
-
+#include <utility>
 
 using google::LogMessage;
 
@@ -47,7 +47,7 @@ FlexibandSignalSource::FlexibandSignalSource(ConfigurationInterface* configurati
     gr::msg_queue::sptr queue) : role_(role),
                                  in_stream_(in_stream),
                                  out_stream_(out_stream),
-                                 queue_(queue)
+                                 queue_(std::move(queue))
 {
     std::string default_item_type = "byte";
     item_type_ = configuration->property(role + ".item_type", default_item_type);

From 07259159afd4ac54d3a1056b2076e5581f53a882 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 21:34:15 +0000
Subject: [PATCH 111/123] Apply clang-tidy checks

---
 src/algorithms/libs/rtklib/rtklib_rtkpos.cc   |  5 +--
 .../adapters/ad9361_fpga_signal_source.cc     |  2 +-
 .../adapters/ad9361_fpga_signal_source.h      |  2 +-
 .../adapters/custom_udp_signal_source.cc      |  2 +-
 .../adapters/custom_udp_signal_source.h       |  2 +-
 .../gr_complex_ip_packet_source.cc            | 32 +++++++++----------
 .../gr_complex_ip_packet_source.h             |  8 ++---
 .../signal_source/libs/fpga_switch.cc         | 12 +++----
 .../signal_source/libs/fpga_switch.h          |  6 ++--
 9 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
index 40645f9a0..e59327680 100644
--- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
+++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc
@@ -57,6 +57,7 @@
 #include "rtklib_pntpos.h"
 #include "rtklib_ppp.h"
 #include "rtklib_tides.h"
+#include <cmath>
 #include <cstring>
 
 static int resamb_WLNL(rtk_t *rtk __attribute((unused)), const obsd_t *obs __attribute((unused)), const int *sat __attribute((unused)),
@@ -2672,7 +2673,7 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
                 }
             rtk->sol.age = static_cast<float>(timediff(rtk->sol.time, solb.time));
 
-            if (fabs(rtk->sol.age) > TTOL_MOVEB)
+            if (std::fabs(rtk->sol.age) > TTOL_MOVEB)
                 {
                     errmsg(rtk, "time sync error for moving-base (age=%.1f)\n", rtk->sol.age);
                     return 0;
@@ -2692,7 +2693,7 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
         {
             rtk->sol.age = static_cast<float>(timediff(obs[0].time, obs[nu].time));
 
-            if (fabs(rtk->sol.age) > opt->maxtdiff)
+            if (std::fabs(rtk->sol.age) > opt->maxtdiff)
                 {
                     errmsg(rtk, "age of differential error (age=%.1f)\n", rtk->sol.age);
                     outsolstat(rtk);
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
index a9cade7c5..5d989b956 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.cc
@@ -110,7 +110,7 @@ Ad9361FpgaSignalSource::Ad9361FpgaSignalSource(ConfigurationInterface* configura
     std::string default_device_name = "/dev/uio13";
     std::string device_name = configuration->property(role + ".devicename", default_device_name);
     int switch_position = configuration->property(role + ".switch_position", 0);
-    switch_fpga = std::make_shared<fpga_switch>(device_name);
+    switch_fpga = std::make_shared<Fpga_Switch>(device_name);
     switch_fpga->set_switch_position(switch_position);
     if (in_stream_ > 0)
         {
diff --git a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
index 79ebeff3e..9277c4c2b 100644
--- a/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
+++ b/src/algorithms/signal_source/adapters/ad9361_fpga_signal_source.h
@@ -114,7 +114,7 @@ private:
 
     boost::shared_ptr<gr::msg_queue> queue_;
 
-    std::shared_ptr<fpga_switch> switch_fpga;
+    std::shared_ptr<Fpga_Switch> switch_fpga;
 };
 
 #endif /*GNSS_SDR_AD9361_FPGA_SIGNAL_SOURCE_H_*/
diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
index 2f2e76ef3..2b4714bca 100644
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.cc
@@ -72,7 +72,7 @@ CustomUDPSignalSource::CustomUDPSignalSource(ConfigurationInterface* configurati
     // output item size is always gr_complex
     item_size_ = sizeof(gr_complex);
 
-    udp_gnss_rx_source_ = gr_complex_ip_packet_source::make(capture_device,
+    udp_gnss_rx_source_ = Gr_Complex_Ip_Packet_Source::make(capture_device,
         address,
         port,
         payload_bytes,
diff --git a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
index bec7c3d73..18cc21c9e 100644
--- a/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
+++ b/src/algorithms/signal_source/adapters/custom_udp_signal_source.h
@@ -97,7 +97,7 @@ private:
     bool dump_;
     std::string dump_filename_;
     std::vector<boost::shared_ptr<gr::block>> null_sinks_;
-    gr_complex_ip_packet_source::sptr udp_gnss_rx_source_;
+    Gr_Complex_Ip_Packet_Source::sptr udp_gnss_rx_source_;
     std::vector<boost::shared_ptr<gr::block>> file_sink_;
     boost::shared_ptr<gr::msg_queue> queue_;
 };
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
index ba6a8ec3e..8085e9e81 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.cc
@@ -75,8 +75,8 @@ typedef struct gr_udp_header
 } gr_udp_header;
 
 
-gr_complex_ip_packet_source::sptr
-gr_complex_ip_packet_source::make(std::string src_device,
+Gr_Complex_Ip_Packet_Source::sptr
+Gr_Complex_Ip_Packet_Source::make(std::string src_device,
     const std::string &origin_address,
     int udp_port,
     int udp_packet_size,
@@ -85,7 +85,7 @@ gr_complex_ip_packet_source::make(std::string src_device,
     size_t item_size,
     bool IQ_swap_)
 {
-    return gnuradio::get_initial_sptr(new gr_complex_ip_packet_source(std::move(src_device),
+    return gnuradio::get_initial_sptr(new Gr_Complex_Ip_Packet_Source(std::move(src_device),
         origin_address,
         udp_port,
         udp_packet_size,
@@ -99,7 +99,7 @@ gr_complex_ip_packet_source::make(std::string src_device,
 /*
  * The private constructor
  */
-gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
+Gr_Complex_Ip_Packet_Source::Gr_Complex_Ip_Packet_Source(std::string src_device,
     __attribute__((unused)) const std::string &origin_address,
     int udp_port,
     int udp_packet_size,
@@ -151,14 +151,14 @@ gr_complex_ip_packet_source::gr_complex_ip_packet_source(std::string src_device,
 
 
 // Called by gnuradio to enable drivers, etc for i/o devices.
-bool gr_complex_ip_packet_source::start()
+bool Gr_Complex_Ip_Packet_Source::start()
 {
     std::cout << "gr_complex_ip_packet_source START\n";
     // open the ethernet device
     if (open() == true)
         {
             // start pcap capture thread
-            d_pcap_thread = new boost::thread(boost::bind(&gr_complex_ip_packet_source::my_pcap_loop_thread, this, descr));
+            d_pcap_thread = new boost::thread(boost::bind(&Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread, this, descr));
             return true;
         }
     else
@@ -169,7 +169,7 @@ bool gr_complex_ip_packet_source::start()
 
 
 // Called by gnuradio to disable drivers, etc for i/o devices.
-bool gr_complex_ip_packet_source::stop()
+bool Gr_Complex_Ip_Packet_Source::stop()
 {
     std::cout << "gr_complex_ip_packet_source STOP\n";
     if (descr != nullptr)
@@ -182,7 +182,7 @@ bool gr_complex_ip_packet_source::stop()
 }
 
 
-bool gr_complex_ip_packet_source::open()
+bool Gr_Complex_Ip_Packet_Source::open()
 {
     char errbuf[PCAP_ERRBUF_SIZE];
     boost::mutex::scoped_lock lock(d_mutex);  // hold mutex for duration of this function
@@ -219,7 +219,7 @@ bool gr_complex_ip_packet_source::open()
 }
 
 
-gr_complex_ip_packet_source::~gr_complex_ip_packet_source()
+Gr_Complex_Ip_Packet_Source::~Gr_Complex_Ip_Packet_Source()
 {
     if (d_pcap_thread != nullptr)
         {
@@ -230,15 +230,15 @@ gr_complex_ip_packet_source::~gr_complex_ip_packet_source()
 }
 
 
-void gr_complex_ip_packet_source::static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr,
+void Gr_Complex_Ip_Packet_Source::static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr,
     const u_char *packet)
 {
-    auto *bridge = reinterpret_cast<gr_complex_ip_packet_source *>(args);
+    auto *bridge = reinterpret_cast<Gr_Complex_Ip_Packet_Source *>(args);
     bridge->pcap_callback(args, pkthdr, packet);
 }
 
 
-void gr_complex_ip_packet_source::pcap_callback(__attribute__((unused)) u_char *args, __attribute__((unused)) const struct pcap_pkthdr *pkthdr,
+void Gr_Complex_Ip_Packet_Source::pcap_callback(__attribute__((unused)) u_char *args, __attribute__((unused)) const struct pcap_pkthdr *pkthdr,
     const u_char *packet)
 {
     boost::mutex::scoped_lock lock(d_mutex);  // hold mutex for duration of this function
@@ -312,13 +312,13 @@ void gr_complex_ip_packet_source::pcap_callback(__attribute__((unused)) u_char *
 }
 
 
-void gr_complex_ip_packet_source::my_pcap_loop_thread(pcap_t *pcap_handle)
+void Gr_Complex_Ip_Packet_Source::my_pcap_loop_thread(pcap_t *pcap_handle)
 {
-    pcap_loop(pcap_handle, -1, gr_complex_ip_packet_source::static_pcap_callback, reinterpret_cast<u_char *>(this));
+    pcap_loop(pcap_handle, -1, Gr_Complex_Ip_Packet_Source::static_pcap_callback, reinterpret_cast<u_char *>(this));
 }
 
 
-void gr_complex_ip_packet_source::demux_samples(gr_vector_void_star output_items, int num_samples_readed)
+void Gr_Complex_Ip_Packet_Source::demux_samples(gr_vector_void_star output_items, int num_samples_readed)
 {
     int8_t real;
     int8_t imag;
@@ -383,7 +383,7 @@ void gr_complex_ip_packet_source::demux_samples(gr_vector_void_star output_items
 }
 
 
-int gr_complex_ip_packet_source::work(int noutput_items,
+int Gr_Complex_Ip_Packet_Source::work(int noutput_items,
     __attribute__((unused)) gr_vector_const_void_star &input_items,
     gr_vector_void_star &output_items)
 {
diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
index d008e1314..8807be5bb 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -43,7 +43,7 @@
 #include <string>
 #include <sys/ioctl.h>
 
-class gr_complex_ip_packet_source : virtual public gr::sync_block
+class Gr_Complex_Ip_Packet_Source : virtual public gr::sync_block
 {
 private:
     boost::mutex d_mutex;
@@ -82,7 +82,7 @@ private:
     static void static_pcap_callback(u_char *args, const struct pcap_pkthdr *pkthdr, const u_char *packet);
 
 public:
-    typedef boost::shared_ptr<gr_complex_ip_packet_source> sptr;
+    typedef boost::shared_ptr<Gr_Complex_Ip_Packet_Source> sptr;
     static sptr make(std::string src_device,
         const std::string &origin_address,
         int udp_port,
@@ -91,7 +91,7 @@ public:
         const std::string &wire_sample_type,
         size_t item_size,
         bool IQ_swap_);
-    gr_complex_ip_packet_source(std::string src_device,
+    Gr_Complex_Ip_Packet_Source(std::string src_device,
         const std::string &origin_address,
         int udp_port,
         int udp_packet_size,
@@ -99,7 +99,7 @@ public:
         const std::string &wire_sample_type,
         size_t item_size,
         bool IQ_swap_);
-    ~gr_complex_ip_packet_source();
+    ~Gr_Complex_Ip_Packet_Source();
 
     // Where all the action really happens
     int work(int noutput_items,
diff --git a/src/algorithms/signal_source/libs/fpga_switch.cc b/src/algorithms/signal_source/libs/fpga_switch.cc
index 71fd26eba..3f1caec12 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.cc
+++ b/src/algorithms/signal_source/libs/fpga_switch.cc
@@ -45,7 +45,7 @@
 const size_t PAGE_SIZE = 0x10000;
 const unsigned int TEST_REGISTER_TRACK_WRITEVAL = 0x55AA;
 
-fpga_switch::fpga_switch(const std::string &device_name)
+Fpga_Switch::Fpga_Switch(const std::string &device_name)
 {
     if ((d_device_descriptor = open(device_name.c_str(), O_RDWR | O_SYNC)) == -1)
         {
@@ -67,7 +67,7 @@ fpga_switch::fpga_switch(const std::string &device_name)
     // sanity check : check test register
     unsigned writeval = TEST_REGISTER_TRACK_WRITEVAL;
     unsigned readval;
-    readval = fpga_switch::fpga_switch_test_register(writeval);
+    readval = Fpga_Switch::fpga_switch_test_register(writeval);
     if (writeval != readval)
         {
             LOG(WARNING) << "Test register sanity check failed";
@@ -81,19 +81,19 @@ fpga_switch::fpga_switch(const std::string &device_name)
 }
 
 
-fpga_switch::~fpga_switch()
+Fpga_Switch::~Fpga_Switch()
 {
     close_device();
 }
 
 
-void fpga_switch::set_switch_position(int switch_position)
+void Fpga_Switch::set_switch_position(int switch_position)
 {
     d_map_base[0] = switch_position;
 }
 
 
-unsigned fpga_switch::fpga_switch_test_register(
+unsigned Fpga_Switch::fpga_switch_test_register(
     unsigned writeval)
 {
     unsigned readval;
@@ -106,7 +106,7 @@ unsigned fpga_switch::fpga_switch_test_register(
 }
 
 
-void fpga_switch::close_device()
+void Fpga_Switch::close_device()
 {
     auto *aux = const_cast<unsigned *>(d_map_base);
     if (munmap(static_cast<void *>(aux), PAGE_SIZE) == -1)
diff --git a/src/algorithms/signal_source/libs/fpga_switch.h b/src/algorithms/signal_source/libs/fpga_switch.h
index 2ab67dbef..f535bce7d 100644
--- a/src/algorithms/signal_source/libs/fpga_switch.h
+++ b/src/algorithms/signal_source/libs/fpga_switch.h
@@ -41,11 +41,11 @@
 
 #define MAX_LENGTH_DEVICEIO_NAME 50
 
-class fpga_switch
+class Fpga_Switch
 {
 public:
-    fpga_switch(const std::string& device_name);
-    ~fpga_switch();
+    Fpga_Switch(const std::string& device_name);
+    ~Fpga_Switch();
     void set_switch_position(int switch_position);
 
 private:

From 3b039619cc6a75f32c329670a93c6cb55dff1aaa Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 22 Feb 2019 23:02:16 +0100
Subject: [PATCH 112/123] Uniformize header guards

---
 .../gnuradio_blocks/gr_complex_ip_packet_source.h           | 6 +++---
 .../gnuradio_blocks/unpack_byte_4bit_samples.h              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
index 8807be5bb..ee915a662 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/gr_complex_ip_packet_source.h
@@ -30,8 +30,8 @@
  */
 
 
-#ifndef INCLUDED_GR_COMPLEX_IP_PACKET_SOURCE_H
-#define INCLUDED_GR_COMPLEX_IP_PACKET_SOURCE_H
+#ifndef GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H
+#define GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H
 
 #include <boost/thread.hpp>
 #include <gnuradio/sync_block.h>
@@ -112,4 +112,4 @@ public:
     bool stop();
 };
 
-#endif /* INCLUDED_GR_COMPLEX_IP_PACKET_SOURCE_H */
+#endif /* GNSS_SDR_GR_COMPLEX_IP_PACKET_SOURCE_H */
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
index 2ee08145e..8b9ad7454 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_byte_4bit_samples.h
@@ -30,8 +30,8 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_unpack_byte_4bit_samples_H
-#define GNSS_SDR_unpack_byte_4bit_samples_H
+#ifndef GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
+#define GNSS_SDR_UNPACK_BYTE_4BIT_SAMPLES_H
 
 #include <gnuradio/sync_interpolator.h>
 

From 08b0a7cd82f7e4f8f9bdd86800ad256ea733f61d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 13:22:52 +0100
Subject: [PATCH 113/123] Fix thread termination

Some boost::threads replaced by std::threads
---
 src/core/receiver/CMakeLists.txt    |  1 -
 src/core/receiver/control_thread.cc | 38 ++++++++++++++---------------
 src/core/receiver/control_thread.h  | 10 ++++----
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 469960d47..a9225792d 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -143,7 +143,6 @@ target_link_libraries(core_receiver
         core_libs
         core_monitor
     PRIVATE
-        Boost::chrono
         Gflags::gflags
         Glog::glog
         signal_source_adapters
diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index e7cd49740..accddea95 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -54,7 +54,6 @@
 #include "rtklib_conversions.h"
 #include "rtklib_ephemeris.h"
 #include "rtklib_rtkcmn.h"
-#include <boost/chrono.hpp>
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
 #include <gnuradio/message.h>
@@ -197,6 +196,16 @@ ControlThread::~ControlThread()  // NOLINT(modernize-use-equals-default)
         {
             msgctl(msqid, IPC_RMID, nullptr);
         }
+
+    if (sysv_queue_thread_.joinable())
+        {
+            sysv_queue_thread_.join();
+        }
+
+    if (cmd_interface_thread_.joinable())
+        {
+            cmd_interface_thread_.join();
+        }
 }
 
 
@@ -256,12 +265,12 @@ int ControlThread::run()
     // launch GNSS assistance process AFTER the flowgraph is running because the GNU Radio asynchronous queues must be already running to transport msgs
     assist_GNSS();
     // start the keyboard_listener thread
-    keyboard_thread_ = boost::thread(&ControlThread::keyboard_listener, this);
-    sysv_queue_thread_ = boost::thread(&ControlThread::sysv_queue_listener, this);
+    keyboard_thread_ = std::thread(&ControlThread::keyboard_listener, this);
+    sysv_queue_thread_ = std::thread(&ControlThread::sysv_queue_listener, this);
 
     // start the telecommand listener thread
     cmd_interface_.set_pvt(flowgraph_->get_pvt());
-    cmd_interface_thread_ = boost::thread(&ControlThread::telecommand_listener, this);
+    cmd_interface_thread_ = std::thread(&ControlThread::telecommand_listener, this);
 
     bool enable_FPGA = configuration_->property("Channel.enable_FPGA", false);
     if (enable_FPGA == true)
@@ -284,21 +293,10 @@ int ControlThread::run()
     stop_ = true;
     flowgraph_->disconnect();
 
-    // Join keyboard thread
-    try
-        {
-            keyboard_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
-            sysv_queue_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
-            cmd_interface_thread_.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(1000));
-        }
-    catch (const boost::thread_interrupted &interrupt)
-        {
-            DLOG(WARNING) << "Thread interrupted";
-        }
-    catch (const boost::system::system_error &e)
-        {
-            LOG(WARNING) << "System error";
-        }
+    // Terminate keyboard thread
+    pthread_t id = keyboard_thread_.native_handle();
+    keyboard_thread_.detach();
+    pthread_cancel(id);
 
     if (restart_)
         {
@@ -1105,6 +1103,6 @@ void ControlThread::keyboard_listener()
                         }
                     read_keys = false;
                 }
-            usleep(500000);
+            std::this_thread::sleep_for(std::chrono::milliseconds(100));
         }
 }
diff --git a/src/core/receiver/control_thread.h b/src/core/receiver/control_thread.h
index d8fb5584c..6507ca645 100644
--- a/src/core/receiver/control_thread.h
+++ b/src/core/receiver/control_thread.h
@@ -44,9 +44,9 @@
 #include "gnss_sdr_supl_client.h"
 #include "tcp_cmd_interface.h"
 #include <armadillo>
-#include <boost/thread.hpp>
 #include <gnuradio/msg_queue.h>
 #include <memory>
+#include <thread>
 #include <vector>
 
 
@@ -120,7 +120,7 @@ private:
     //Telecommand TCP interface
     TcpCmdInterface cmd_interface_;
     void telecommand_listener();
-    boost::thread cmd_interface_thread_;
+    std::thread cmd_interface_thread_;
     //SUPL assistance classes
     Gnss_Sdr_Supl_Client supl_client_acquisition_;
     Gnss_Sdr_Supl_Client supl_client_ephemeris_;
@@ -168,9 +168,9 @@ private:
     bool delete_configuration_;
     unsigned int processed_control_messages_;
     unsigned int applied_actions_;
-    boost::thread keyboard_thread_;
-    boost::thread sysv_queue_thread_;
-    boost::thread gps_acq_assist_data_collector_thread_;
+    std::thread keyboard_thread_;
+    std::thread sysv_queue_thread_;
+    std::thread gps_acq_assist_data_collector_thread_;
 
     void keyboard_listener();
     void sysv_queue_listener();

From 88195f40b8f28f9a677a548bd34d9884e64c0a4c Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 14:11:21 +0100
Subject: [PATCH 114/123] Leave CMAKE_CXX_FLAGS alone

---
 CMakeLists.txt | 67 ++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1272bc341..9d6be231f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,23 +420,23 @@ if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
 else()
     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+            add_compile_options(-std=c++11)
         else()
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+            add_compile_options(-std=c++14)
         endif()
     endif()
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         if(OS_IS_MACOSX)
             if(CLANG_VERSION VERSION_LESS "600")
-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+                add_compile_options(-std=c++11)
             else()
-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+                add_compile_options(-std=c++14)
             endif()
         else()
             if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++11")
+                add_compile_options(-std=c++11)
             else()
-                set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -std=c++14")
+                add_compile_options(-std=c++14)
             endif()
         endif()
     endif()
@@ -1834,10 +1834,10 @@ if(ENABLE_GPERFTOOLS)
     # See https://github.com/gperftools/gperftools/blob/master/README
     if(GPERFTOOLS_FOUND)
         if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free")
+            add_compile_options(-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free)
         endif()
         if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-            set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -fno-builtin")
+            add_compile_options(-fno-builtin)
         endif()
     endif()
 endif()
@@ -1848,7 +1848,7 @@ endif()
 # GNU gprof (OPTIONAL) - https://sourceware.org/binutils/docs/gprof/
 ########################################################################
 if(ENABLE_GPROF)
-    set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -pg")
+    add_compile_options(-pg)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pg")
 endif()
@@ -1858,35 +1858,38 @@ endif()
 # Set compiler flags
 ########################################################################
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-    set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -Wall -Wextra")  #Add warning flags: For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
+    # Add warning flags
+    # For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
+    add_compile_options(-Wall -Wextra)
+    if(CMAKE_CROSSCOMPILING)
+        add_compile_options(-Wno-psabi)
+    endif()
 endif()
 
 # Processor-architecture related flags
 # See https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html
-if(NOT ARCH_COMPILER_FLAGS)
-    if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
-      if(OS_IS_MACOSX)
-          set(ARCH_COMPILER_FLAGS "-march=corei7 -mfpmath=sse")
-      else()
-          if(NOT ${ENABLE_GENERIC_ARCH})
-              if(IS_ARM) # ARM-specific options (https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html)
-                  if(NOT CMAKE_CROSSCOMPILING)
-                      if(ARM_VERSION STREQUAL "arm")
-                          # Unknown arm version - try our best to detect
-                          set(ARCH_COMPILER_FLAGS "-mcpu=native")
-                      else()
-                          set(ARCH_COMPILER_FLAGS "-march=${ARM_VERSION}")
-                      endif()
-                  endif()
-              else()
-                  set(ARCH_COMPILER_FLAGS "-march=native -mfpmath=sse")
-              endif()
-          endif()
-      endif()
+if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
+    if(OS_IS_MACOSX)
+        add_compile_options(-march=corei7 -mfpmath=sse)
+    else()
+        if(NOT ENABLE_GENERIC_ARCH)
+            if(IS_ARM)
+                # ARM-specific options
+                # See https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html
+                if(NOT CMAKE_CROSSCOMPILING)
+                    if(ARM_VERSION STREQUAL "arm")
+                        # Unknown arm version - try our best to detect
+                        add_compile_options(-mcpu=native)
+                    else()
+                        add_compile_options(-march=${ARM_VERSION})
+                    endif()
+                endif()
+            else()
+                add_compile_options(-march=native -mfpmath=sse)
+            endif()
+        endif()
     endif()
 endif()
-set(MY_CXX_FLAGS "${MY_CXX_FLAGS} ${ARCH_COMPILER_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_FLAGS}")
 
 
 

From 46f985d7632f3599d5ae29f046f39dc3fb5b4dae Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 14:35:18 +0100
Subject: [PATCH 115/123] Fix for CMake < 3.1

---
 CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d6be231f..c988a8003 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,23 +420,23 @@ if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
 else()
     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
-            add_compile_options(-std=c++11)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
         else()
-            add_compile_options(-std=c++14)
+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
         endif()
     endif()
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         if(OS_IS_MACOSX)
             if(CLANG_VERSION VERSION_LESS "600")
-                add_compile_options(-std=c++11)
+                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
             else()
-                add_compile_options(-std=c++14)
+                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
             endif()
         else()
             if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-                add_compile_options(-std=c++11)
+                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
             else()
-                add_compile_options(-std=c++14)
+                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
             endif()
         endif()
     endif()

From 869aadc731e2f67304292d173313ca993cfe6bc0 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 19:17:32 +0100
Subject: [PATCH 116/123] Pass warning flags only to C++ targets

---
 CMakeLists.txt | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c988a8003..ccedec774 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -418,25 +418,26 @@ if(NOT (CMAKE_VERSION VERSION_LESS "3.1"))
     set(CMAKE_CXX_STANDARD 14)
     set(CMAKE_CXX_EXTENSIONS OFF)
 else()
+    add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,C>:-std=gnu11>")
     if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
         if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+            add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>")
         else()
-            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+            add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>")
         endif()
     endif()
     if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         if(OS_IS_MACOSX)
             if(CLANG_VERSION VERSION_LESS "600")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+                add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>")
             else()
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+                add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>")
             endif()
         else()
             if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.5.0")
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+                add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++11>")
             else()
-                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+                add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:-std=c++14>")
             endif()
         endif()
     endif()
@@ -1860,7 +1861,8 @@ endif()
 if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
     # Add warning flags
     # For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
-    add_compile_options(-Wall -Wextra)
+    set(cxx_warning_flags -Wall -Wextra)
+    add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:${cxx_warning_flags}>")
     if(CMAKE_CROSSCOMPILING)
         add_compile_options(-Wno-psabi)
     endif()

From d2a3de3c5871c727a72bfaeff094ff8205eddad8 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 20:22:15 +0100
Subject: [PATCH 117/123] Improve compilation options

---
 CMakeLists.txt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccedec774..492169801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1862,7 +1862,14 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
     # Add warning flags
     # For "-Wall" see https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
     set(cxx_warning_flags -Wall -Wextra)
-    add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:${cxx_warning_flags}>")
+    if(NOT (CMAKE_VERSION VERSION_LESS "3.3"))
+        add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:${cxx_warning_flags}>")
+    else()
+        add_compile_options("$<$<STREQUAL:$<TARGET_PROPERTY:LINKER_LANGUAGE>,CXX>:${cxx_warning_flags}>")
+    endif()
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")
+        add_compile_options(-Wno-missing-field-initializers)
+    endif()
     if(CMAKE_CROSSCOMPILING)
         add_compile_options(-Wno-psabi)
     endif()

From a51ccdca8b6311286bf168c1074ff639a24c45bb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 20:57:51 +0100
Subject: [PATCH 118/123] Fix termination if GNSS-SDR.telecommand_enabled is
 set to true

---
 src/core/receiver/control_thread.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/receiver/control_thread.cc b/src/core/receiver/control_thread.cc
index accddea95..16c180990 100644
--- a/src/core/receiver/control_thread.cc
+++ b/src/core/receiver/control_thread.cc
@@ -58,6 +58,7 @@
 #include <glog/logging.h>
 #include <gnuradio/message.h>
 #include <algorithm>
+#include <chrono>
 #include <cmath>
 #include <iostream>
 #include <limits>
@@ -204,7 +205,7 @@ ControlThread::~ControlThread()  // NOLINT(modernize-use-equals-default)
 
     if (cmd_interface_thread_.joinable())
         {
-            cmd_interface_thread_.join();
+            cmd_interface_thread_.detach();
         }
 }
 

From 14899a3a777e2c8ac9ee6fb3f1c0f822afb3abe8 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Sun, 24 Feb 2019 23:11:19 +0100
Subject: [PATCH 119/123] Replace boost::thread by std::thread, get rid of
 boost::chrono

---
 src/tests/CMakeLists.txt                      |  1 -
 src/tests/single_test_main.cc                 |  1 -
 src/tests/test_main.cc                        |  3 +-
 .../acquisition/acq_performance_test.cc       |  7 ++--
 ...8ms_ambiguous_acquisition_gsoc2013_test.cc | 27 +++++++--------
 ...cps_ambiguous_acquisition_gsoc2013_test.cc |  4 +--
 ...e1_pcps_ambiguous_acquisition_gsoc_test.cc |  4 +--
 ...ileo_e1_pcps_ambiguous_acquisition_test.cc | 24 +++++++-------
 ...wsr_ambiguous_acquisition_gsoc2013_test.cc | 29 ++++++++--------
 ...ync_ambiguous_acquisition_gsoc2014_test.cc | 33 ++++++++++---------
 ...ong_ambiguous_acquisition_gsoc2013_test.cc | 28 ++++++++--------
 ...cps_acquisition_gsoc2014_gensource_test.cc |  4 +--
 ...ss_l1_ca_pcps_acquisition_gsoc2017_test.cc | 32 +++++++++---------
 .../glonass_l1_ca_pcps_acquisition_test.cc    | 21 ++++++------
 .../glonass_l2_ca_pcps_acquisition_test.cc    | 28 ++++++++--------
 ...ps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 31 ++++++++---------
 .../gps_l1_ca_pcps_acquisition_test.cc        | 26 +++++++--------
 .../gps_l1_ca_pcps_acquisition_test_fpga.cc   | 26 +++++++--------
 ...a_pcps_opencl_acquisition_gsoc2013_test.cc | 25 +++++++-------
 ...cps_quicksync_acquisition_gsoc2014_test.cc | 29 ++++++++--------
 ..._ca_pcps_tong_acquisition_gsoc2013_test.cc | 27 +++++++--------
 .../gps_l2_m_pcps_acquisition_test.cc         | 24 +++++++-------
 22 files changed, 219 insertions(+), 215 deletions(-)

diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 4ea6bd739..c6e4ab268 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -345,7 +345,6 @@ if(ENABLE_UNIT_TESTING)
 
     target_link_libraries(run_tests
         PUBLIC
-            Boost::chrono
             Boost::filesystem
             Boost::system
             Boost::thread
diff --git a/src/tests/single_test_main.cc b/src/tests/single_test_main.cc
index 55254a0ff..02814af09 100644
--- a/src/tests/single_test_main.cc
+++ b/src/tests/single_test_main.cc
@@ -40,7 +40,6 @@
 #include "gps_ephemeris.h"
 #include "gps_navigation_message.h"
 #include <boost/filesystem.hpp>
-#include <boost/thread.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gnuradio/msg_queue.h>
diff --git a/src/tests/test_main.cc b/src/tests/test_main.cc
index 7ad4910f5..2e200e73b 100644
--- a/src/tests/test_main.cc
+++ b/src/tests/test_main.cc
@@ -48,8 +48,7 @@
 #include "gps_utc_model.h"
 #include "sbas_ephemeris.h"
 #include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/thread.hpp>
+#include <boost/shared_ptr.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gnuradio/msg_queue.h>
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
index e93092172..3021e15a1 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -52,6 +52,7 @@
 #include <gnuradio/blocks/interleaved_char_to_complex.h>
 #include <gnuradio/blocks/skiphead.h>
 #include <gnuradio/top_block.h>
+#include <thread>
 #include <utility>
 
 
@@ -337,7 +338,7 @@ protected:
     bool stop;
 
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     std::string implementation = FLAGS_acq_test_implementation;
 
@@ -395,7 +396,7 @@ void AcquisitionPerformanceTest::init()
 void AcquisitionPerformanceTest::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&AcquisitionPerformanceTest::wait_message, this);
+    ch_thread = std::thread(&AcquisitionPerformanceTest::wait_message, this);
 }
 
 
@@ -647,7 +648,7 @@ int AcquisitionPerformanceTest::run_receiver()
 
     top_block->run();  // Start threads and wait
 
-    ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+    ch_thread.join();
 
     return 0;
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
index b02c4f59b..a1517dd8f 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc
@@ -30,17 +30,6 @@
  */
 
 
-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "fir_filter.h"
 #include "galileo_e1_pcps_8ms_ambiguous_acquisition.h"
 #include "gen_signal_source.h"
@@ -50,8 +39,20 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test_msg_rx;
@@ -142,7 +143,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -339,7 +340,7 @@ void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::config_2()
 void GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1Pcps8msAmbiguousAcquisitionGSoC2013Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
index 50b4ad78f..346e59e79 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc2013_test.cc
@@ -143,7 +143,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -348,7 +348,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::config_2()
 void GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoC2013Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
index e0aeda58e..06ec5811c 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc
@@ -148,7 +148,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 };
 
 
@@ -175,7 +175,7 @@ void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::init()
 
 void GalileoE1PcpsAmbiguousAcquisitionGSoCTest::start_queue()
 {
-    ch_thread = boost::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsAmbiguousAcquisitionGSoCTest::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
index 14aac00d8..c31937d37 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_ambiguous_acquisition_test.cc
@@ -31,18 +31,6 @@
  */
 
 
-#include <boost/make_shared.hpp>
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "Galileo_E1.h"
 #include "acquisition_dump_reader.h"
 #include "galileo_e1_pcps_ambiguous_acquisition.h"
@@ -54,9 +42,21 @@
 #include "gnuplot_i.h"
 #include "in_memory_configuration.h"
 #include "test_flags.h"
+#include <boost/make_shared.hpp>
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsAmbiguousAcquisitionTest_msg_rx;
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
index 75207a375..60d23b6ba 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_cccwsr_ambiguous_acquisition_gsoc2013_test.cc
@@ -31,17 +31,6 @@
  */
 
 
-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "fir_filter.h"
 #include "galileo_e1_pcps_cccwsr_ambiguous_acquisition.h"
 #include "gen_signal_source.h"
@@ -51,8 +40,20 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsCccwsrAmbiguousAcquisitionTest_msg_rx;
@@ -143,7 +144,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -346,7 +347,7 @@ void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::config_2()
 void GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsCccwsrAmbiguousAcquisitionTest::wait_message, this);
 }
 
 
@@ -550,7 +551,7 @@ TEST_F(GalileoE1PcpsCccwsrAmbiguousAcquisitionTest, ValidationOfResults)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop";
         }
 }
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
index 4cf0f3672..f2229bc57 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_quicksync_ambiguous_acquisition_gsoc2014_test.cc
@@ -31,20 +31,6 @@
  */
 
 
-#include <boost/shared_ptr.hpp>
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <fstream>
-#include <stdexcept>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "fir_filter.h"
 #include "galileo_e1_pcps_quicksync_ambiguous_acquisition.h"
 #include "gen_signal_source.h"
@@ -54,7 +40,22 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <fstream>
+#include <stdexcept>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 DEFINE_double(e1_value_threshold, 0.3, "Value of the threshold for the acquisition");
 DEFINE_int32(e1_value_CN0_dB_0, 50, "Value for the CN0_dB_0 in channel 0");
@@ -152,7 +153,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -462,7 +463,7 @@ void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::config_3()
 void GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsQuickSyncAmbiguousAcquisitionGSoC2014Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
index 6d2bf7ead..a021e5196 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e1_pcps_tong_ambiguous_acquisition_gsoc2013_test.cc
@@ -30,18 +30,6 @@
  * -------------------------------------------------------------------------
  */
 
-#include <boost/shared_ptr.hpp>
-#include <boost/thread.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "galileo_e1_pcps_tong_ambiguous_acquisition.h"
@@ -52,9 +40,21 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test_msg_rx;
@@ -144,7 +144,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -349,7 +349,7 @@ void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::config_2()
 void GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GalileoE1PcpsTongAmbiguousAcquisitionGSoC2013Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
index 67ab17b53..f90407d0d 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/galileo_e5a_pcps_acquisition_gsoc2014_gensource_test.cc
@@ -141,7 +141,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -426,7 +426,7 @@ void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::config_3()
 void GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::wait_message, this);
+    ch_thread = std::thread(&GalileoE5aPcpsAcquisitionGSoC2014GensourceTest::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
index 6f92c592a..dbee4f413 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_gsoc2017_test.cc
@@ -31,16 +31,6 @@
  */
 
 
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "freq_xlating_fir_filter.h"
 #include "gen_signal_source.h"
@@ -52,11 +42,21 @@
 #include "pass_through.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
-#include "boost/shared_ptr.hpp"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
-
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL1CaPcpsAcquisitionGSoC2017Test_msg_rx;
@@ -148,7 +148,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -353,7 +353,7 @@ void GlonassL1CaPcpsAcquisitionGSoC2017Test::config_2()
 void GlonassL1CaPcpsAcquisitionGSoC2017Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GlonassL1CaPcpsAcquisitionGSoC2017Test::wait_message, this);
+    ch_thread = std::thread(&GlonassL1CaPcpsAcquisitionGSoC2017Test::wait_message, this);
 }
 
 
@@ -552,7 +552,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResults)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop";
         }
 
@@ -642,7 +642,7 @@ TEST_F(GlonassL1CaPcpsAcquisitionGSoC2017Test, ValidationOfResultsProbabilities)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop"
                << std::endl;
         }
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
index 3ed69a462..9cd20eefe 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l1_ca_pcps_acquisition_test.cc
@@ -30,11 +30,20 @@
  * -------------------------------------------------------------------------
  */
 
-#include <boost/chrono.hpp>
+#include "freq_xlating_fir_filter.h"
+#include "glonass_l1_ca_pcps_acquisition.h"
+#include "gnss_block_factory.h"
+#include "gnss_block_interface.h"
+#include "gnss_sdr_valve.h"
+#include "gnss_synchro.h"
+#include "in_memory_configuration.h"
 #include <boost/make_shared.hpp>
 #include <gnuradio/analog/sig_source_waveform.h>
 #include <gnuradio/blocks/file_source.h>
+#include <gnuradio/blocks/null_sink.h>
+#include <gnuradio/msg_queue.h>
 #include <gnuradio/top_block.h>
+#include <gtest/gtest.h>
 #include <chrono>
 #include <cstdlib>
 #include <utility>
@@ -43,16 +52,6 @@
 #else
 #include <gnuradio/analog/sig_source_c.h>
 #endif
-#include "freq_xlating_fir_filter.h"
-#include "glonass_l1_ca_pcps_acquisition.h"
-#include "gnss_block_factory.h"
-#include "gnss_block_interface.h"
-#include "gnss_sdr_valve.h"
-#include "gnss_synchro.h"
-#include "in_memory_configuration.h"
-#include <gnuradio/blocks/null_sink.h>
-#include <gnuradio/msg_queue.h>
-#include <gtest/gtest.h>
 
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
index 6409a8d19..ba0611f90 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/glonass_l2_ca_pcps_acquisition_test.cc
@@ -30,15 +30,6 @@
  */
 
 
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@@ -51,10 +42,19 @@
 #include "signal_generator.h"
 #include "signal_generator_c.h"
 #include "boost/shared_ptr.hpp"
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
-
+#include <chrono>
+#include <thread>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GlonassL2CaPcpsAcquisitionTest_msg_rx;
@@ -150,7 +150,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -351,7 +351,7 @@ void GlonassL2CaPcpsAcquisitionTest::config_2()
 void GlonassL2CaPcpsAcquisitionTest::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GlonassL2CaPcpsAcquisitionTest::wait_message, this);
+    ch_thread = std::thread(&GlonassL2CaPcpsAcquisitionTest::wait_message, this);
 }
 
 
@@ -551,7 +551,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResults)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop";
         }
 
@@ -641,7 +641,7 @@ TEST_F(GlonassL2CaPcpsAcquisitionTest, ValidationOfResultsProbabilities)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop";
         }
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
index 4f4ae7184..e4ef9974b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_gsoc2013_test.cc
@@ -31,16 +31,6 @@
  */
 
 
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@@ -52,10 +42,21 @@
 #include "pass_through.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
-#include "boost/shared_ptr.hpp"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
@@ -147,7 +148,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -348,7 +349,7 @@ void GpsL1CaPcpsAcquisitionGSoC2013Test::config_2()
 void GpsL1CaPcpsAcquisitionGSoC2013Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsAcquisitionGSoC2013Test::wait_message, this);
 }
 
 
@@ -545,7 +546,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResults)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop";
         }
 
@@ -635,7 +636,7 @@ TEST_F(GpsL1CaPcpsAcquisitionGSoC2013Test, ValidationOfResultsProbabilities)
                 }
 
             ASSERT_NO_THROW({
-                ch_thread.try_join_until(boost::chrono::steady_clock::now() + boost::chrono::milliseconds(50));
+                ch_thread.join();
             }) << "Failure while waiting the queue to stop";
         }
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
index b7f6863c8..8e6876aa9 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test.cc
@@ -31,19 +31,6 @@
  */
 
 
-#include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "GPS_L1_CA.h"
 #include "acquisition_dump_reader.h"
 #include "gnss_block_factory.h"
@@ -54,9 +41,22 @@
 #include "gps_l1_ca_pcps_acquisition.h"
 #include "in_memory_configuration.h"
 #include "test_flags.h"
+#include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
index a64b752e8..fd0da8297 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_acquisition_test_fpga.cc
@@ -29,30 +29,30 @@
  * -------------------------------------------------------------------------
  */
 
-#include <boost/make_shared.hpp>
-#include <boost/thread.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <cstdlib>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "gnss_block_factory.h"
 #include "gnss_block_interface.h"
 #include "gnss_sdr_valve.h"
 #include "gnss_synchro.h"
 #include "gps_l1_ca_pcps_acquisition_fpga.h"
 #include "in_memory_configuration.h"
+#include <boost/make_shared.hpp>
+#include <boost/thread.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/blocks/throttle.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <cstdlib>
 #include <unistd.h>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 #define DMA_ACQ_TRANSFER_SIZE 2046               // DMA transfer size for the acquisition
 #define RX_SIGNAL_MAX_VALUE 127                  // 2^7 - 1 for 8-bit signed values
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
index 2fa64118b..2eecb0e53 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc
@@ -31,16 +31,6 @@
  */
 
 
-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@@ -51,8 +41,19 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
+#include <chrono>
+#include <thread>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsOpenClAcquisitionGSoC2013Test_msg_rx;
@@ -147,7 +148,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -348,7 +349,7 @@ void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::config_2()
 void GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsOpenClAcquisitionGSoC2013Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
index a155ddc41..db5e51af8 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_quicksync_acquisition_gsoc2014_test.cc
@@ -31,18 +31,6 @@
  */
 
 
-#include <glog/logging.h>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <stdexcept>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "gnss_block_factory.h"
 #include "gnss_block_interface.h"
 #include "gnss_sdr_valve.h"
@@ -51,9 +39,22 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <glog/logging.h>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <stdexcept>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 DEFINE_double(value_threshold, 1, "Value of the threshold for the acquisition");
 DEFINE_int32(value_CN0_dB_0, 44, "Value for the CN0_dB_0 in channel 0");
@@ -150,7 +151,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -454,7 +455,7 @@ void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::config_3()
 void GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsQuickSyncAcquisitionGSoC2014Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
index 599bd52b5..b5977ff39 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc
@@ -31,17 +31,6 @@
  */
 
 
-#include <boost/shared_ptr.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "configuration_interface.h"
 #include "fir_filter.h"
 #include "gen_signal_source.h"
@@ -52,9 +41,21 @@
 #include "in_memory_configuration.h"
 #include "signal_generator.h"
 #include "signal_generator_c.h"
+#include <boost/shared_ptr.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <thread>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########
 class GpsL1CaPcpsTongAcquisitionGSoC2013Test_msg_rx;
@@ -142,7 +143,7 @@ protected:
     size_t item_size;
     bool stop;
     int message;
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     unsigned int integration_time_ms = 0;
     unsigned int fs_in = 0;
@@ -343,7 +344,7 @@ void GpsL1CaPcpsTongAcquisitionGSoC2013Test::config_2()
 void GpsL1CaPcpsTongAcquisitionGSoC2013Test::start_queue()
 {
     stop = false;
-    ch_thread = boost::thread(&GpsL1CaPcpsTongAcquisitionGSoC2013Test::wait_message, this);
+    ch_thread = std::thread(&GpsL1CaPcpsTongAcquisitionGSoC2013Test::wait_message, this);
 }
 
 
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
index 5fb9d8c12..add12d00b 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l2_m_pcps_acquisition_test.cc
@@ -31,18 +31,6 @@
  */
 
 
-#include <boost/filesystem.hpp>
-#include <boost/make_shared.hpp>
-#include <gnuradio/analog/sig_source_waveform.h>
-#include <gnuradio/blocks/file_source.h>
-#include <gnuradio/top_block.h>
-#include <chrono>
-#include <utility>
-#ifdef GR_GREATER_38
-#include <gnuradio/analog/sig_source.h>
-#else
-#include <gnuradio/analog/sig_source_c.h>
-#endif
 #include "GPS_L2C.h"
 #include "acquisition_dump_reader.h"
 #include "gnss_block_factory.h"
@@ -53,11 +41,23 @@
 #include "gps_l2_m_pcps_acquisition.h"
 #include "in_memory_configuration.h"
 #include "test_flags.h"
+#include <boost/filesystem.hpp>
+#include <boost/make_shared.hpp>
+#include <gnuradio/analog/sig_source_waveform.h>
 #include <gnuradio/blocks/char_to_short.h>
+#include <gnuradio/blocks/file_source.h>
 #include <gnuradio/blocks/interleaved_short_to_complex.h>
 #include <gnuradio/blocks/null_sink.h>
 #include <gnuradio/msg_queue.h>
+#include <gnuradio/top_block.h>
 #include <gtest/gtest.h>
+#include <chrono>
+#include <utility>
+#ifdef GR_GREATER_38
+#include <gnuradio/analog/sig_source.h>
+#else
+#include <gnuradio/analog/sig_source_c.h>
+#endif
 
 
 // ######## GNURADIO BLOCK MESSAGE RECEVER #########

From 4fe976ba016fa9c1c64ece88b26a9a93d93a84f4 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 25 Feb 2019 00:02:53 +0100
Subject: [PATCH 120/123] Replace boost::thread by std::thread

---
 src/utils/front-end-cal/CMakeLists.txt   |  6 +++---
 src/utils/front-end-cal/front_end_cal.cc |  3 ---
 src/utils/front-end-cal/main.cc          | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index 821009d47..a8d0e244e 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -38,12 +38,11 @@ target_link_libraries(front_end_cal_lib
         core_receiver
         core_libs
     PRIVATE
+        Boost::boost
         Gflags::gflags
         Glog::glog
         Gnuradio::blocks
         Gnuradio::runtime
-        Boost::serialization
-        Boost::thread
 )
 
 if(ENABLE_CLANG_TIDY)
@@ -65,8 +64,9 @@ target_link_libraries(front-end-cal
         front_end_cal_lib
         gnss_sdr_flags
     PRIVATE
+        Boost::filesystem
+        Gflags::gflags
         Glog::glog
-        Armadillo::armadillo
 )
 
 target_compile_definitions(front-end-cal
diff --git a/src/utils/front-end-cal/front_end_cal.cc b/src/utils/front-end-cal/front_end_cal.cc
index 32f8da6aa..58e38e067 100644
--- a/src/utils/front-end-cal/front_end_cal.cc
+++ b/src/utils/front-end-cal/front_end_cal.cc
@@ -38,10 +38,7 @@
 #include "gps_iono.h"
 #include "gps_navigation_message.h"
 #include "gps_utc_model.h"
-#include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
 #include <glog/logging.h>
 #include <cmath>
 #include <exception>
diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc
index cc36ce147..6d9380cb4 100644
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -57,7 +57,6 @@
 #include <boost/exception/detail/exception_ptr.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/thread.hpp>
 #include <glog/logging.h>
 #include <gnuradio/blocks/file_sink.h>
 #include <gnuradio/blocks/file_source.h>
@@ -73,6 +72,7 @@
 #include <exception>
 #include <memory>
 #include <queue>
+#include <thread>
 #include <utility>
 #include <vector>
 
@@ -398,7 +398,7 @@ int main(int argc, char** argv)
     std::map<int, double> doppler_measurements_map;
     std::map<int, double> cn0_measurements_map;
 
-    boost::thread ch_thread;
+    std::thread ch_thread;
 
     // record startup time
     std::chrono::time_point<std::chrono::system_clock> start, end;
@@ -417,9 +417,9 @@ int main(int argc, char** argv)
             stop = false;
             try
                 {
-                    ch_thread = boost::thread(wait_message);
+                    ch_thread = std::thread(wait_message);
                 }
-            catch (const boost::thread_resource_error& e)
+            catch (const std::exception& e)
                 {
                     LOG(INFO) << "Exception caught (thread resource error)";
                 }
@@ -457,7 +457,7 @@ int main(int argc, char** argv)
                 {
                     ch_thread.join();
                 }
-            catch (const boost::thread_resource_error& e)
+            catch (const std::exception& e)
                 {
                     LOG(INFO) << "Exception caught while joining threads.";
                 }

From c3709567a23680408f26310fb0be0337d1be879d Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Mon, 25 Feb 2019 15:14:13 +0100
Subject: [PATCH 121/123] Accelerate GPS L1 preamble correlation

---
 .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index 658397b46..a833bfefe 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -336,14 +336,14 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
 
     // ******* preamble correlation ********
     int32_t corr_value = 0;
-    if ((d_symbol_history.size() == GPS_CA_PREAMBLE_LENGTH_SYMBOLS))  // and (d_make_correlation or !d_flag_frame_sync))
+    if ((d_symbol_history.size() == GPS_CA_PREAMBLE_LENGTH_SYMBOLS))
         {
-            // std::cout << "-------\n";
-            for (uint32_t i = 0; i < GPS_CA_PREAMBLE_LENGTH_SYMBOLS; i++)
+            int i = 0;
+            for (const auto &iter : d_symbol_history)
                 {
-                    if (d_symbol_history[i].Flag_valid_symbol_output == true)
+                    if (iter.Flag_valid_symbol_output == true)
                         {
-                            if (d_symbol_history[i].Prompt_I < 0)  // symbols clipping
+                            if (iter.Prompt_I < 0)  // symbols clipping
                                 {
                                     corr_value -= d_preambles_symbols[i];
                                 }
@@ -352,6 +352,7 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
                                     corr_value += d_preambles_symbols[i];
                                 }
                         }
+                    i += 1;
                 }
         }
 

From 8e66577ee9471b71de1b108ba87ef449d1bc2a23 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 26 Feb 2019 01:38:48 +0100
Subject: [PATCH 122/123] Reorder PVT

Add includes
Reorder CMake scripts
Put work at the end of the file
---
 src/algorithms/PVT/adapters/CMakeLists.txt    |   6 +-
 src/algorithms/PVT/adapters/rtklib_pvt.cc     |  28 +-
 src/algorithms/PVT/adapters/rtklib_pvt.h      |  12 +-
 .../PVT/gnuradio_blocks/CMakeLists.txt        |  15 +-
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.cc      | 529 +++++++++---------
 .../PVT/gnuradio_blocks/rtklib_pvt_cc.h       |  13 +-
 src/algorithms/libs/rtklib/rtklib.h           |   1 -
 src/core/receiver/gnss_block_factory.cc       |   2 +-
 8 files changed, 304 insertions(+), 302 deletions(-)

diff --git a/src/algorithms/PVT/adapters/CMakeLists.txt b/src/algorithms/PVT/adapters/CMakeLists.txt
index 954d057bc..538a7ddcf 100644
--- a/src/algorithms/PVT/adapters/CMakeLists.txt
+++ b/src/algorithms/PVT/adapters/CMakeLists.txt
@@ -31,13 +31,11 @@ add_library(pvt_adapters ${PVT_ADAPTER_SOURCES} ${PVT_ADAPTER_HEADERS})
 
 target_link_libraries(pvt_adapters
     PUBLIC
-        Armadillo::armadillo
-        Gnuradio::runtime
         pvt_gr_blocks
-        pvt_libs
         core_system_parameters
     PRIVATE
-        Boost::serialization
+        gnss_sdr_flags
+        pvt_libs
 )
 
 target_include_directories(pvt_adapters
diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.cc b/src/algorithms/PVT/adapters/rtklib_pvt.cc
index 61b243633..7491968a1 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.cc
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.cc
@@ -33,16 +33,12 @@
 #include "configuration_interface.h"
 #include "gnss_sdr_flags.h"
 #include "pvt_conf.h"
-#include <boost/archive/xml_iarchive.hpp>
-#include <boost/archive/xml_oarchive.hpp>
-#include <boost/serialization/map.hpp>
 #include <glog/logging.h>
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
 namespace bc = boost::math;
 #else
 #include <boost/integer/common_factor_rt.hpp>
-#include <utility>
 namespace bc = boost::integer;
 #endif
 
@@ -50,7 +46,7 @@ namespace bc = boost::integer;
 using google::LogMessage;
 
 
-RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
+Rtklib_Pvt::Rtklib_Pvt(ConfigurationInterface* configuration,
     const std::string& role,
     unsigned int in_streams,
     unsigned int out_streams) : role_(role),
@@ -724,13 +720,13 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
 }
 
 
-RtklibPvt::~RtklibPvt()
+Rtklib_Pvt::~Rtklib_Pvt()
 {
     rtkfree(&rtk);
 }
 
 
-bool RtklibPvt::get_latest_PVT(double* longitude_deg,
+bool Rtklib_Pvt::get_latest_PVT(double* longitude_deg,
     double* latitude_deg,
     double* height_m,
     double* ground_speed_kmh,
@@ -746,37 +742,37 @@ bool RtklibPvt::get_latest_PVT(double* longitude_deg,
 }
 
 
-void RtklibPvt::clear_ephemeris()
+void Rtklib_Pvt::clear_ephemeris()
 {
     pvt_->clear_ephemeris();
 }
 
 
-std::map<int, Gps_Ephemeris> RtklibPvt::get_gps_ephemeris() const
+std::map<int, Gps_Ephemeris> Rtklib_Pvt::get_gps_ephemeris() const
 {
     return pvt_->get_gps_ephemeris_map();
 }
 
 
-std::map<int, Galileo_Ephemeris> RtklibPvt::get_galileo_ephemeris() const
+std::map<int, Galileo_Ephemeris> Rtklib_Pvt::get_galileo_ephemeris() const
 {
     return pvt_->get_galileo_ephemeris_map();
 }
 
 
-std::map<int, Gps_Almanac> RtklibPvt::get_gps_almanac() const
+std::map<int, Gps_Almanac> Rtklib_Pvt::get_gps_almanac() const
 {
     return pvt_->get_gps_almanac_map();
 }
 
 
-std::map<int, Galileo_Almanac> RtklibPvt::get_galileo_almanac() const
+std::map<int, Galileo_Almanac> Rtklib_Pvt::get_galileo_almanac() const
 {
     return pvt_->get_galileo_almanac_map();
 }
 
 
-void RtklibPvt::connect(gr::top_block_sptr top_block)
+void Rtklib_Pvt::connect(gr::top_block_sptr top_block)
 {
     if (top_block)
         { /* top_block is not null */
@@ -786,7 +782,7 @@ void RtklibPvt::connect(gr::top_block_sptr top_block)
 }
 
 
-void RtklibPvt::disconnect(gr::top_block_sptr top_block)
+void Rtklib_Pvt::disconnect(gr::top_block_sptr top_block)
 {
     if (top_block)
         { /* top_block is not null */
@@ -795,13 +791,13 @@ void RtklibPvt::disconnect(gr::top_block_sptr top_block)
 }
 
 
-gr::basic_block_sptr RtklibPvt::get_left_block()
+gr::basic_block_sptr Rtklib_Pvt::get_left_block()
 {
     return pvt_;
 }
 
 
-gr::basic_block_sptr RtklibPvt::get_right_block()
+gr::basic_block_sptr Rtklib_Pvt::get_right_block()
 {
     return nullptr;  // this is a sink, nothing downstream
 }
diff --git a/src/algorithms/PVT/adapters/rtklib_pvt.h b/src/algorithms/PVT/adapters/rtklib_pvt.h
index 41235471b..ace356712 100644
--- a/src/algorithms/PVT/adapters/rtklib_pvt.h
+++ b/src/algorithms/PVT/adapters/rtklib_pvt.h
@@ -32,8 +32,14 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_H_
 #define GNSS_SDR_RTKLIB_PVT_H_
 
+#include "galileo_almanac.h"
+#include "galileo_ephemeris.h"
+#include "gps_almanac.h"
+#include "gps_ephemeris.h"
 #include "pvt_interface.h"
+#include "rtklib.h"
 #include "rtklib_pvt_cc.h"
+#include <map>
 #include <string>
 
 
@@ -42,15 +48,15 @@ class ConfigurationInterface;
 /*!
  * \brief This class implements a PvtInterface for the RTKLIB PVT block
  */
-class RtklibPvt : public PvtInterface
+class Rtklib_Pvt : public PvtInterface
 {
 public:
-    RtklibPvt(ConfigurationInterface* configuration,
+    Rtklib_Pvt(ConfigurationInterface* configuration,
         const std::string& role,
         unsigned int in_streams,
         unsigned int out_streams);
 
-    virtual ~RtklibPvt();
+    virtual ~Rtklib_Pvt();
 
     inline std::string role() override
     {
diff --git a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
index 6c36caa24..d59bac863 100644
--- a/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt
@@ -30,15 +30,18 @@ add_library(pvt_gr_blocks ${PVT_GR_BLOCKS_SOURCES} ${PVT_GR_BLOCKS_HEADERS})
 
 target_link_libraries(pvt_gr_blocks
     PUBLIC
-        Boost::date_time
-        Gnuradio::runtime
         pvt_libs
+        core_system_parameters
+        Boost::date_time
+        Gnuradio::pmt
+        Gnuradio::runtime
     PRIVATE
+        algorithms_libs
         Gflags::gflags
         Glog::glog
         Boost::filesystem
         Boost::system
-        core_system_parameters
+        Boost::serialization
 )
 
 if(ENABLE_CLANG_TIDY)
@@ -50,11 +53,6 @@ if(ENABLE_CLANG_TIDY)
     endif()
 endif()
 
-target_include_directories(pvt_gr_blocks
-    PUBLIC
-        ${CMAKE_SOURCE_DIR}/src/algorithms/PVT/libs
-)
-
 if(Boost_VERSION LESS 105800)
     target_compile_definitions(pvt_gr_blocks PRIVATE -DOLD_BOOST=1)
 endif()
@@ -62,5 +60,4 @@ endif()
 set_property(TARGET pvt_gr_blocks
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/core/system_parameters>
 )
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
index fcf93d12f..c41a1989d 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
@@ -30,7 +30,6 @@
 
 #include "rtklib_pvt_cc.h"
 #include "display.h"
-#include "galileo_almanac.h"
 #include "galileo_almanac_helper.h"
 #include "gnss_sdr_create_directory.h"
 #include "pvt_conf.h"
@@ -44,8 +43,8 @@
 #include <gnuradio/io_signature.h>
 #include <algorithm>
 #include <exception>
+#include <fstream>
 #include <iostream>
-#include <map>
 #include <stdexcept>
 #if OLD_BOOST
 #include <boost/math/common_factor_rt.hpp>
@@ -68,267 +67,6 @@ rtklib_pvt_cc_sptr rtklib_make_pvt_cc(uint32_t nchannels,
 }
 
 
-void rtklib_pvt_cc::msg_handler_telemetry(const pmt::pmt_t& msg)
-{
-    try
-        {
-            // ************* GPS telemetry *****************
-            if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Ephemeris>))
-                {
-                    // ### GPS EPHEMERIS ###
-                    std::shared_ptr<Gps_Ephemeris> gps_eph;
-                    gps_eph = boost::any_cast<std::shared_ptr<Gps_Ephemeris>>(pmt::any_ref(msg));
-                    DLOG(INFO) << "Ephemeris record has arrived from SAT ID "
-                               << gps_eph->i_satellite_PRN << " (Block "
-                               << gps_eph->satelliteBlock[gps_eph->i_satellite_PRN] << ")"
-                               << "inserted with Toe=" << gps_eph->d_Toe << " and GPS Week="
-                               << gps_eph->i_GPS_week;
-                    // update/insert new ephemeris record to the global ephemeris map
-                    d_pvt_solver->gps_ephemeris_map[gps_eph->i_satellite_PRN] = *gps_eph;
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Iono>))
-                {
-                    // ### GPS IONO ###
-                    std::shared_ptr<Gps_Iono> gps_iono;
-                    gps_iono = boost::any_cast<std::shared_ptr<Gps_Iono>>(pmt::any_ref(msg));
-                    d_pvt_solver->gps_iono = *gps_iono;
-                    DLOG(INFO) << "New IONO record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Utc_Model>))
-                {
-                    // ### GPS UTC MODEL ###
-                    std::shared_ptr<Gps_Utc_Model> gps_utc_model;
-                    gps_utc_model = boost::any_cast<std::shared_ptr<Gps_Utc_Model>>(pmt::any_ref(msg));
-                    d_pvt_solver->gps_utc_model = *gps_utc_model;
-                    DLOG(INFO) << "New UTC record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Ephemeris>))
-                {
-                    // ### GPS CNAV message ###
-                    std::shared_ptr<Gps_CNAV_Ephemeris> gps_cnav_ephemeris;
-                    gps_cnav_ephemeris = boost::any_cast<std::shared_ptr<Gps_CNAV_Ephemeris>>(pmt::any_ref(msg));
-                    // update/insert new ephemeris record to the global ephemeris map
-                    d_pvt_solver->gps_cnav_ephemeris_map[gps_cnav_ephemeris->i_satellite_PRN] = *gps_cnav_ephemeris;
-                    DLOG(INFO) << "New GPS CNAV ephemeris record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Iono>))
-                {
-                    // ### GPS CNAV IONO ###
-                    std::shared_ptr<Gps_CNAV_Iono> gps_cnav_iono;
-                    gps_cnav_iono = boost::any_cast<std::shared_ptr<Gps_CNAV_Iono>>(pmt::any_ref(msg));
-                    d_pvt_solver->gps_cnav_iono = *gps_cnav_iono;
-                    DLOG(INFO) << "New CNAV IONO record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Utc_Model>))
-                {
-                    // ### GPS CNAV UTC MODEL ###
-                    std::shared_ptr<Gps_CNAV_Utc_Model> gps_cnav_utc_model;
-                    gps_cnav_utc_model = boost::any_cast<std::shared_ptr<Gps_CNAV_Utc_Model>>(pmt::any_ref(msg));
-                    d_pvt_solver->gps_cnav_utc_model = *gps_cnav_utc_model;
-                    DLOG(INFO) << "New CNAV UTC record has arrived ";
-                }
-
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Almanac>))
-                {
-                    // ### GPS ALMANAC ###
-                    std::shared_ptr<Gps_Almanac> gps_almanac;
-                    gps_almanac = boost::any_cast<std::shared_ptr<Gps_Almanac>>(pmt::any_ref(msg));
-                    d_pvt_solver->gps_almanac_map[gps_almanac->i_satellite_PRN] = *gps_almanac;
-                    DLOG(INFO) << "New GPS almanac record has arrived ";
-                }
-
-            // **************** Galileo telemetry ********************
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Ephemeris>))
-                {
-                    // ### Galileo EPHEMERIS ###
-                    std::shared_ptr<Galileo_Ephemeris> galileo_eph;
-                    galileo_eph = boost::any_cast<std::shared_ptr<Galileo_Ephemeris>>(pmt::any_ref(msg));
-                    // insert new ephemeris record
-                    DLOG(INFO) << "Galileo New Ephemeris record inserted in global map with TOW =" << galileo_eph->TOW_5
-                               << ", GALILEO Week Number =" << galileo_eph->WN_5
-                               << " and Ephemeris IOD = " << galileo_eph->IOD_ephemeris;
-                    // update/insert new ephemeris record to the global ephemeris map
-                    d_pvt_solver->galileo_ephemeris_map[galileo_eph->i_satellite_PRN] = *galileo_eph;
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Iono>))
-                {
-                    // ### Galileo IONO ###
-                    std::shared_ptr<Galileo_Iono> galileo_iono;
-                    galileo_iono = boost::any_cast<std::shared_ptr<Galileo_Iono>>(pmt::any_ref(msg));
-                    d_pvt_solver->galileo_iono = *galileo_iono;
-                    DLOG(INFO) << "New IONO record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Utc_Model>))
-                {
-                    // ### Galileo UTC MODEL ###
-                    std::shared_ptr<Galileo_Utc_Model> galileo_utc_model;
-                    galileo_utc_model = boost::any_cast<std::shared_ptr<Galileo_Utc_Model>>(pmt::any_ref(msg));
-                    d_pvt_solver->galileo_utc_model = *galileo_utc_model;
-                    DLOG(INFO) << "New UTC record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac_Helper>))
-                {
-                    // ### Galileo Almanac ###
-                    std::shared_ptr<Galileo_Almanac_Helper> galileo_almanac_helper;
-                    galileo_almanac_helper = boost::any_cast<std::shared_ptr<Galileo_Almanac_Helper>>(pmt::any_ref(msg));
-
-                    Galileo_Almanac sv1 = galileo_almanac_helper->get_almanac(1);
-                    Galileo_Almanac sv2 = galileo_almanac_helper->get_almanac(2);
-                    Galileo_Almanac sv3 = galileo_almanac_helper->get_almanac(3);
-
-                    if (sv1.i_satellite_PRN != 0)
-                        {
-                            d_pvt_solver->galileo_almanac_map[sv1.i_satellite_PRN] = sv1;
-                        }
-                    if (sv2.i_satellite_PRN != 0)
-                        {
-                            d_pvt_solver->galileo_almanac_map[sv2.i_satellite_PRN] = sv2;
-                        }
-                    if (sv3.i_satellite_PRN != 0)
-                        {
-                            d_pvt_solver->galileo_almanac_map[sv3.i_satellite_PRN] = sv3;
-                        }
-                    DLOG(INFO) << "New Galileo Almanac data have arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac>))
-                {
-                    // ### Galileo Almanac ###
-                    std::shared_ptr<Galileo_Almanac> galileo_alm;
-                    galileo_alm = boost::any_cast<std::shared_ptr<Galileo_Almanac>>(pmt::any_ref(msg));
-                    // update/insert new almanac record to the global almanac map
-                    d_pvt_solver->galileo_almanac_map[galileo_alm->i_satellite_PRN] = *galileo_alm;
-                }
-
-            // **************** GLONASS GNAV Telemetry **************************
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Glonass_Gnav_Ephemeris>))
-                {
-                    // ### GLONASS GNAV EPHEMERIS ###
-                    std::shared_ptr<Glonass_Gnav_Ephemeris> glonass_gnav_eph;
-                    glonass_gnav_eph = boost::any_cast<std::shared_ptr<Glonass_Gnav_Ephemeris>>(pmt::any_ref(msg));
-                    // TODO Add GLONASS with gps week number and tow,
-                    // insert new ephemeris record
-                    DLOG(INFO) << "GLONASS GNAV New Ephemeris record inserted in global map with TOW =" << glonass_gnav_eph->d_TOW
-                               << ", Week Number =" << glonass_gnav_eph->d_WN
-                               << " and Ephemeris IOD in UTC = " << glonass_gnav_eph->compute_GLONASS_time(glonass_gnav_eph->d_t_b)
-                               << " from SV = " << glonass_gnav_eph->i_satellite_slot_number;
-                    // update/insert new ephemeris record to the global ephemeris map
-                    d_pvt_solver->glonass_gnav_ephemeris_map[glonass_gnav_eph->i_satellite_PRN] = *glonass_gnav_eph;
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Glonass_Gnav_Utc_Model>))
-                {
-                    // ### GLONASS GNAV UTC MODEL ###
-                    std::shared_ptr<Glonass_Gnav_Utc_Model> glonass_gnav_utc_model;
-                    glonass_gnav_utc_model = boost::any_cast<std::shared_ptr<Glonass_Gnav_Utc_Model>>(pmt::any_ref(msg));
-                    d_pvt_solver->glonass_gnav_utc_model = *glonass_gnav_utc_model;
-                    DLOG(INFO) << "New GLONASS GNAV UTC record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Glonass_Gnav_Almanac>))
-                {
-                    // ### GLONASS GNAV Almanac ###
-                    std::shared_ptr<Glonass_Gnav_Almanac> glonass_gnav_almanac;
-                    glonass_gnav_almanac = boost::any_cast<std::shared_ptr<Glonass_Gnav_Almanac>>(pmt::any_ref(msg));
-                    d_pvt_solver->glonass_gnav_almanac = *glonass_gnav_almanac;
-                    DLOG(INFO) << "New GLONASS GNAV Almanac has arrived "
-                               << ", GLONASS GNAV Slot Number =" << glonass_gnav_almanac->d_n_A;
-                }
-
-            // ************* BeiDou telemetry *****************
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Ephemeris>))
-                {
-                    // ### Beidou EPHEMERIS ###
-                    std::shared_ptr<Beidou_Dnav_Ephemeris> bds_dnav_eph;
-                    bds_dnav_eph = boost::any_cast<std::shared_ptr<Beidou_Dnav_Ephemeris>>(pmt::any_ref(msg));
-                    DLOG(INFO) << "Ephemeris record has arrived from SAT ID "
-                               << bds_dnav_eph->i_satellite_PRN << " (Block "
-                               << bds_dnav_eph->satelliteBlock[bds_dnav_eph->i_satellite_PRN] << ")"
-                               << "inserted with Toe=" << bds_dnav_eph->d_Toe << " and BDS Week="
-                               << bds_dnav_eph->i_BEIDOU_week;
-                    // update/insert new ephemeris record to the global ephemeris map
-                    d_pvt_solver->beidou_dnav_ephemeris_map[bds_dnav_eph->i_satellite_PRN] = *bds_dnav_eph;
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Iono>))
-                {
-                    // ### BeiDou IONO ###
-                    std::shared_ptr<Beidou_Dnav_Iono> bds_dnav_iono;
-                    bds_dnav_iono = boost::any_cast<std::shared_ptr<Beidou_Dnav_Iono>>(pmt::any_ref(msg));
-                    d_pvt_solver->beidou_dnav_iono = *bds_dnav_iono;
-                    DLOG(INFO) << "New BeiDou DNAV IONO record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Utc_Model>))
-                {
-                    // ### GPS UTC MODEL ###
-                    std::shared_ptr<Beidou_Dnav_Utc_Model> bds_dnav_utc_model;
-                    bds_dnav_utc_model = boost::any_cast<std::shared_ptr<Beidou_Dnav_Utc_Model>>(pmt::any_ref(msg));
-                    d_pvt_solver->beidou_dnav_utc_model = *bds_dnav_utc_model;
-                    DLOG(INFO) << "New BeiDou DNAV UTC record has arrived ";
-                }
-            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Almanac>))
-                {
-                    // ### GPS ALMANAC ###
-                    std::shared_ptr<Beidou_Dnav_Almanac> bds_dnav_almanac;
-                    bds_dnav_almanac = boost::any_cast<std::shared_ptr<Beidou_Dnav_Almanac>>(pmt::any_ref(msg));
-                    d_pvt_solver->beidou_dnav_almanac_map[bds_dnav_almanac->i_satellite_PRN] = *bds_dnav_almanac;
-                    DLOG(INFO) << "New BeiDou DNAV almanac record has arrived ";
-                }
-            else
-                {
-                    LOG(WARNING) << "msg_handler_telemetry unknown object type!";
-                }
-        }
-    catch (boost::bad_any_cast& e)
-        {
-            LOG(WARNING) << "msg_handler_telemetry Bad any cast!";
-        }
-}
-
-
-std::map<int, Gps_Ephemeris> rtklib_pvt_cc::get_gps_ephemeris_map() const
-{
-    return d_pvt_solver->gps_ephemeris_map;
-}
-
-
-std::map<int, Gps_Almanac> rtklib_pvt_cc::get_gps_almanac_map() const
-{
-    return d_pvt_solver->gps_almanac_map;
-}
-
-
-std::map<int, Galileo_Ephemeris> rtklib_pvt_cc::get_galileo_ephemeris_map() const
-{
-    return d_pvt_solver->galileo_ephemeris_map;
-}
-
-
-std::map<int, Galileo_Almanac> rtklib_pvt_cc::get_galileo_almanac_map() const
-{
-    return d_pvt_solver->galileo_almanac_map;
-}
-
-
-std::map<int, Beidou_Dnav_Ephemeris> rtklib_pvt_cc::get_beidou_dnav_ephemeris_map() const
-{
-    return d_pvt_solver->beidou_dnav_ephemeris_map;
-}
-
-
-std::map<int, Beidou_Dnav_Almanac> rtklib_pvt_cc::get_beidou_dnav_almanac_map() const
-{
-    return d_pvt_solver->beidou_dnav_almanac_map;
-}
-
-
-void rtklib_pvt_cc::clear_ephemeris()
-{
-    d_pvt_solver->gps_ephemeris_map.clear();
-    d_pvt_solver->gps_almanac_map.clear();
-    d_pvt_solver->galileo_ephemeris_map.clear();
-    d_pvt_solver->galileo_almanac_map.clear();
-    d_pvt_solver->beidou_dnav_ephemeris_map.clear();
-    d_pvt_solver->beidou_dnav_almanac_map.clear();
-}
-
-
 rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
     const Pvt_Conf& conf_,
     const rtk_t& rtk) : gr::sync_block("rtklib_pvt_cc",
@@ -563,9 +301,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(uint32_t nchannels,
             xml_base_path = xml_base_path + boost::filesystem::path::preferred_separator;
         }
 
-
     d_rx_time = 0.0;
-
     d_last_status_print_seg = 0;
 
     // PVT MONITOR
@@ -1147,6 +883,267 @@ rtklib_pvt_cc::~rtklib_pvt_cc()
 }
 
 
+void rtklib_pvt_cc::msg_handler_telemetry(const pmt::pmt_t& msg)
+{
+    try
+        {
+            // ************* GPS telemetry *****************
+            if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Ephemeris>))
+                {
+                    // ### GPS EPHEMERIS ###
+                    std::shared_ptr<Gps_Ephemeris> gps_eph;
+                    gps_eph = boost::any_cast<std::shared_ptr<Gps_Ephemeris>>(pmt::any_ref(msg));
+                    DLOG(INFO) << "Ephemeris record has arrived from SAT ID "
+                               << gps_eph->i_satellite_PRN << " (Block "
+                               << gps_eph->satelliteBlock[gps_eph->i_satellite_PRN] << ")"
+                               << "inserted with Toe=" << gps_eph->d_Toe << " and GPS Week="
+                               << gps_eph->i_GPS_week;
+                    // update/insert new ephemeris record to the global ephemeris map
+                    d_pvt_solver->gps_ephemeris_map[gps_eph->i_satellite_PRN] = *gps_eph;
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Iono>))
+                {
+                    // ### GPS IONO ###
+                    std::shared_ptr<Gps_Iono> gps_iono;
+                    gps_iono = boost::any_cast<std::shared_ptr<Gps_Iono>>(pmt::any_ref(msg));
+                    d_pvt_solver->gps_iono = *gps_iono;
+                    DLOG(INFO) << "New IONO record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Utc_Model>))
+                {
+                    // ### GPS UTC MODEL ###
+                    std::shared_ptr<Gps_Utc_Model> gps_utc_model;
+                    gps_utc_model = boost::any_cast<std::shared_ptr<Gps_Utc_Model>>(pmt::any_ref(msg));
+                    d_pvt_solver->gps_utc_model = *gps_utc_model;
+                    DLOG(INFO) << "New UTC record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Ephemeris>))
+                {
+                    // ### GPS CNAV message ###
+                    std::shared_ptr<Gps_CNAV_Ephemeris> gps_cnav_ephemeris;
+                    gps_cnav_ephemeris = boost::any_cast<std::shared_ptr<Gps_CNAV_Ephemeris>>(pmt::any_ref(msg));
+                    // update/insert new ephemeris record to the global ephemeris map
+                    d_pvt_solver->gps_cnav_ephemeris_map[gps_cnav_ephemeris->i_satellite_PRN] = *gps_cnav_ephemeris;
+                    DLOG(INFO) << "New GPS CNAV ephemeris record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Iono>))
+                {
+                    // ### GPS CNAV IONO ###
+                    std::shared_ptr<Gps_CNAV_Iono> gps_cnav_iono;
+                    gps_cnav_iono = boost::any_cast<std::shared_ptr<Gps_CNAV_Iono>>(pmt::any_ref(msg));
+                    d_pvt_solver->gps_cnav_iono = *gps_cnav_iono;
+                    DLOG(INFO) << "New CNAV IONO record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_CNAV_Utc_Model>))
+                {
+                    // ### GPS CNAV UTC MODEL ###
+                    std::shared_ptr<Gps_CNAV_Utc_Model> gps_cnav_utc_model;
+                    gps_cnav_utc_model = boost::any_cast<std::shared_ptr<Gps_CNAV_Utc_Model>>(pmt::any_ref(msg));
+                    d_pvt_solver->gps_cnav_utc_model = *gps_cnav_utc_model;
+                    DLOG(INFO) << "New CNAV UTC record has arrived ";
+                }
+
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Gps_Almanac>))
+                {
+                    // ### GPS ALMANAC ###
+                    std::shared_ptr<Gps_Almanac> gps_almanac;
+                    gps_almanac = boost::any_cast<std::shared_ptr<Gps_Almanac>>(pmt::any_ref(msg));
+                    d_pvt_solver->gps_almanac_map[gps_almanac->i_satellite_PRN] = *gps_almanac;
+                    DLOG(INFO) << "New GPS almanac record has arrived ";
+                }
+
+            // **************** Galileo telemetry ********************
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Ephemeris>))
+                {
+                    // ### Galileo EPHEMERIS ###
+                    std::shared_ptr<Galileo_Ephemeris> galileo_eph;
+                    galileo_eph = boost::any_cast<std::shared_ptr<Galileo_Ephemeris>>(pmt::any_ref(msg));
+                    // insert new ephemeris record
+                    DLOG(INFO) << "Galileo New Ephemeris record inserted in global map with TOW =" << galileo_eph->TOW_5
+                               << ", GALILEO Week Number =" << galileo_eph->WN_5
+                               << " and Ephemeris IOD = " << galileo_eph->IOD_ephemeris;
+                    // update/insert new ephemeris record to the global ephemeris map
+                    d_pvt_solver->galileo_ephemeris_map[galileo_eph->i_satellite_PRN] = *galileo_eph;
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Iono>))
+                {
+                    // ### Galileo IONO ###
+                    std::shared_ptr<Galileo_Iono> galileo_iono;
+                    galileo_iono = boost::any_cast<std::shared_ptr<Galileo_Iono>>(pmt::any_ref(msg));
+                    d_pvt_solver->galileo_iono = *galileo_iono;
+                    DLOG(INFO) << "New IONO record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Utc_Model>))
+                {
+                    // ### Galileo UTC MODEL ###
+                    std::shared_ptr<Galileo_Utc_Model> galileo_utc_model;
+                    galileo_utc_model = boost::any_cast<std::shared_ptr<Galileo_Utc_Model>>(pmt::any_ref(msg));
+                    d_pvt_solver->galileo_utc_model = *galileo_utc_model;
+                    DLOG(INFO) << "New UTC record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac_Helper>))
+                {
+                    // ### Galileo Almanac ###
+                    std::shared_ptr<Galileo_Almanac_Helper> galileo_almanac_helper;
+                    galileo_almanac_helper = boost::any_cast<std::shared_ptr<Galileo_Almanac_Helper>>(pmt::any_ref(msg));
+
+                    Galileo_Almanac sv1 = galileo_almanac_helper->get_almanac(1);
+                    Galileo_Almanac sv2 = galileo_almanac_helper->get_almanac(2);
+                    Galileo_Almanac sv3 = galileo_almanac_helper->get_almanac(3);
+
+                    if (sv1.i_satellite_PRN != 0)
+                        {
+                            d_pvt_solver->galileo_almanac_map[sv1.i_satellite_PRN] = sv1;
+                        }
+                    if (sv2.i_satellite_PRN != 0)
+                        {
+                            d_pvt_solver->galileo_almanac_map[sv2.i_satellite_PRN] = sv2;
+                        }
+                    if (sv3.i_satellite_PRN != 0)
+                        {
+                            d_pvt_solver->galileo_almanac_map[sv3.i_satellite_PRN] = sv3;
+                        }
+                    DLOG(INFO) << "New Galileo Almanac data have arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Galileo_Almanac>))
+                {
+                    // ### Galileo Almanac ###
+                    std::shared_ptr<Galileo_Almanac> galileo_alm;
+                    galileo_alm = boost::any_cast<std::shared_ptr<Galileo_Almanac>>(pmt::any_ref(msg));
+                    // update/insert new almanac record to the global almanac map
+                    d_pvt_solver->galileo_almanac_map[galileo_alm->i_satellite_PRN] = *galileo_alm;
+                }
+
+            // **************** GLONASS GNAV Telemetry **************************
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Glonass_Gnav_Ephemeris>))
+                {
+                    // ### GLONASS GNAV EPHEMERIS ###
+                    std::shared_ptr<Glonass_Gnav_Ephemeris> glonass_gnav_eph;
+                    glonass_gnav_eph = boost::any_cast<std::shared_ptr<Glonass_Gnav_Ephemeris>>(pmt::any_ref(msg));
+                    // TODO Add GLONASS with gps week number and tow,
+                    // insert new ephemeris record
+                    DLOG(INFO) << "GLONASS GNAV New Ephemeris record inserted in global map with TOW =" << glonass_gnav_eph->d_TOW
+                               << ", Week Number =" << glonass_gnav_eph->d_WN
+                               << " and Ephemeris IOD in UTC = " << glonass_gnav_eph->compute_GLONASS_time(glonass_gnav_eph->d_t_b)
+                               << " from SV = " << glonass_gnav_eph->i_satellite_slot_number;
+                    // update/insert new ephemeris record to the global ephemeris map
+                    d_pvt_solver->glonass_gnav_ephemeris_map[glonass_gnav_eph->i_satellite_PRN] = *glonass_gnav_eph;
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Glonass_Gnav_Utc_Model>))
+                {
+                    // ### GLONASS GNAV UTC MODEL ###
+                    std::shared_ptr<Glonass_Gnav_Utc_Model> glonass_gnav_utc_model;
+                    glonass_gnav_utc_model = boost::any_cast<std::shared_ptr<Glonass_Gnav_Utc_Model>>(pmt::any_ref(msg));
+                    d_pvt_solver->glonass_gnav_utc_model = *glonass_gnav_utc_model;
+                    DLOG(INFO) << "New GLONASS GNAV UTC record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Glonass_Gnav_Almanac>))
+                {
+                    // ### GLONASS GNAV Almanac ###
+                    std::shared_ptr<Glonass_Gnav_Almanac> glonass_gnav_almanac;
+                    glonass_gnav_almanac = boost::any_cast<std::shared_ptr<Glonass_Gnav_Almanac>>(pmt::any_ref(msg));
+                    d_pvt_solver->glonass_gnav_almanac = *glonass_gnav_almanac;
+                    DLOG(INFO) << "New GLONASS GNAV Almanac has arrived "
+                               << ", GLONASS GNAV Slot Number =" << glonass_gnav_almanac->d_n_A;
+                }
+
+            // ************* BeiDou telemetry *****************
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Ephemeris>))
+                {
+                    // ### Beidou EPHEMERIS ###
+                    std::shared_ptr<Beidou_Dnav_Ephemeris> bds_dnav_eph;
+                    bds_dnav_eph = boost::any_cast<std::shared_ptr<Beidou_Dnav_Ephemeris>>(pmt::any_ref(msg));
+                    DLOG(INFO) << "Ephemeris record has arrived from SAT ID "
+                               << bds_dnav_eph->i_satellite_PRN << " (Block "
+                               << bds_dnav_eph->satelliteBlock[bds_dnav_eph->i_satellite_PRN] << ")"
+                               << "inserted with Toe=" << bds_dnav_eph->d_Toe << " and BDS Week="
+                               << bds_dnav_eph->i_BEIDOU_week;
+                    // update/insert new ephemeris record to the global ephemeris map
+                    d_pvt_solver->beidou_dnav_ephemeris_map[bds_dnav_eph->i_satellite_PRN] = *bds_dnav_eph;
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Iono>))
+                {
+                    // ### BeiDou IONO ###
+                    std::shared_ptr<Beidou_Dnav_Iono> bds_dnav_iono;
+                    bds_dnav_iono = boost::any_cast<std::shared_ptr<Beidou_Dnav_Iono>>(pmt::any_ref(msg));
+                    d_pvt_solver->beidou_dnav_iono = *bds_dnav_iono;
+                    DLOG(INFO) << "New BeiDou DNAV IONO record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Utc_Model>))
+                {
+                    // ### BeiDou UTC MODEL ###
+                    std::shared_ptr<Beidou_Dnav_Utc_Model> bds_dnav_utc_model;
+                    bds_dnav_utc_model = boost::any_cast<std::shared_ptr<Beidou_Dnav_Utc_Model>>(pmt::any_ref(msg));
+                    d_pvt_solver->beidou_dnav_utc_model = *bds_dnav_utc_model;
+                    DLOG(INFO) << "New BeiDou DNAV UTC record has arrived ";
+                }
+            else if (pmt::any_ref(msg).type() == typeid(std::shared_ptr<Beidou_Dnav_Almanac>))
+                {
+                    // ### BeiDou ALMANAC ###
+                    std::shared_ptr<Beidou_Dnav_Almanac> bds_dnav_almanac;
+                    bds_dnav_almanac = boost::any_cast<std::shared_ptr<Beidou_Dnav_Almanac>>(pmt::any_ref(msg));
+                    d_pvt_solver->beidou_dnav_almanac_map[bds_dnav_almanac->i_satellite_PRN] = *bds_dnav_almanac;
+                    DLOG(INFO) << "New BeiDou DNAV almanac record has arrived ";
+                }
+            else
+                {
+                    LOG(WARNING) << "msg_handler_telemetry unknown object type!";
+                }
+        }
+    catch (boost::bad_any_cast& e)
+        {
+            LOG(WARNING) << "msg_handler_telemetry Bad any cast!";
+        }
+}
+
+
+std::map<int, Gps_Ephemeris> rtklib_pvt_cc::get_gps_ephemeris_map() const
+{
+    return d_pvt_solver->gps_ephemeris_map;
+}
+
+
+std::map<int, Gps_Almanac> rtklib_pvt_cc::get_gps_almanac_map() const
+{
+    return d_pvt_solver->gps_almanac_map;
+}
+
+
+std::map<int, Galileo_Ephemeris> rtklib_pvt_cc::get_galileo_ephemeris_map() const
+{
+    return d_pvt_solver->galileo_ephemeris_map;
+}
+
+
+std::map<int, Galileo_Almanac> rtklib_pvt_cc::get_galileo_almanac_map() const
+{
+    return d_pvt_solver->galileo_almanac_map;
+}
+
+
+std::map<int, Beidou_Dnav_Ephemeris> rtklib_pvt_cc::get_beidou_dnav_ephemeris_map() const
+{
+    return d_pvt_solver->beidou_dnav_ephemeris_map;
+}
+
+
+std::map<int, Beidou_Dnav_Almanac> rtklib_pvt_cc::get_beidou_dnav_almanac_map() const
+{
+    return d_pvt_solver->beidou_dnav_almanac_map;
+}
+
+
+void rtklib_pvt_cc::clear_ephemeris()
+{
+    d_pvt_solver->gps_ephemeris_map.clear();
+    d_pvt_solver->gps_almanac_map.clear();
+    d_pvt_solver->galileo_ephemeris_map.clear();
+    d_pvt_solver->galileo_almanac_map.clear();
+    d_pvt_solver->beidou_dnav_ephemeris_map.clear();
+    d_pvt_solver->beidou_dnav_almanac_map.clear();
+}
+
+
 bool rtklib_pvt_cc::observables_pairCompare_min(const std::pair<int, Gnss_Synchro>& a, const std::pair<int, Gnss_Synchro>& b)
 {
     return (a.second.Pseudorange_m) < (b.second.Pseudorange_m);
@@ -1215,7 +1212,7 @@ bool rtklib_pvt_cc::load_gnss_synchro_map_xml(const std::string& file_name)
 }
 
 
-std::vector<std::string> rtklib_pvt_cc::split_string(const std::string& s, char delim)
+std::vector<std::string> rtklib_pvt_cc::split_string(const std::string& s, char delim) const
 {
     std::vector<std::string> v;
     std::stringstream ss(s);
diff --git a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
index 23ecb0206..dbe2fe3eb 100644
--- a/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
+++ b/src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
@@ -31,7 +31,13 @@
 #ifndef GNSS_SDR_RTKLIB_PVT_CC_H
 #define GNSS_SDR_RTKLIB_PVT_CC_H
 
+#include "beidou_dnav_almanac.h"
+#include "beidou_dnav_ephemeris.h"
+#include "galileo_almanac.h"
+#include "galileo_ephemeris.h"
 #include "geojson_printer.h"
+#include "gnss_synchro.h"
+#include "gps_almanac.h"
 #include "gps_ephemeris.h"
 #include "gpx_printer.h"
 #include "kml_printer.h"
@@ -44,14 +50,17 @@
 #include <boost/date_time/gregorian/gregorian.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <gnuradio/sync_block.h>
+#include <pmt/pmt.h>
 #include <chrono>
 #include <cstdint>
-#include <fstream>
+#include <map>
+#include <memory>
 #include <string>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/types.h>
 #include <utility>
+#include <vector>
 
 
 class rtklib_pvt_cc;
@@ -146,7 +155,7 @@ private:
 
     bool flag_monitor_pvt_enabled;
     std::unique_ptr<Monitor_Pvt_Udp_Sink> udp_sink_ptr;
-    std::vector<std::string> split_string(const std::string& s, char delim);
+    std::vector<std::string> split_string(const std::string& s, char delim) const;
 
 public:
     rtklib_pvt_cc(uint32_t nchannels,
diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h
index 55ba3ac03..f4305a75a 100644
--- a/src/algorithms/libs/rtklib/rtklib.h
+++ b/src/algorithms/libs/rtklib/rtklib.h
@@ -60,7 +60,6 @@
 #include <cmath>
 #include <cstdarg>
 #include <cstdint>
-#include <cstdio>
 #include <cstdlib>
 #include <netinet/in.h>
 #include <pthread.h>
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index dce01a732..a87e5bbba 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -1802,7 +1802,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
     // PVT -------------------------------------------------------------------------
     else if ((implementation == "RTKLIB_PVT") || (implementation == "GPS_L1_CA_PVT") || (implementation == "Galileo_E1_PVT") || (implementation == "Hybrid_PVT"))
         {
-            std::unique_ptr<GNSSBlockInterface> block_(new RtklibPvt(configuration.get(), role, in_streams,
+            std::unique_ptr<GNSSBlockInterface> block_(new Rtklib_Pvt(configuration.get(), role, in_streams,
                 out_streams));
             block = std::move(block_);
         }

From 4b325ed56adc1542bb84a0d7c3954ce2786b4ca7 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 26 Feb 2019 09:09:14 +0100
Subject: [PATCH 123/123] Apply minor cleaning

---
 .../gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc          | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
index a833bfefe..4d3b9f315 100644
--- a/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
+++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/gps_l1_ca_telemetry_decoder_cc.cc
@@ -352,7 +352,7 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
                                     corr_value += d_preambles_symbols[i];
                                 }
                         }
-                    i += 1;
+                    i++;
                 }
         }
 
@@ -480,6 +480,5 @@ int gps_l1_ca_telemetry_decoder_cc::general_work(int noutput_items __attribute__
             return 1;
         }
 
-
     return 0;
 }