From 2c3db0fb91481176a8c69280e2b867c826148c98 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <dante@highfidelity.io>
Date: Wed, 21 Jun 2017 01:07:12 +0100
Subject: [PATCH] finished calibration-ui

---
 .../images/loader-calibrate-blue.png          | Bin 0 -> 7935 bytes
 .../images/loader-calibrate-white.png         | Bin 0 -> 7376 bytes
 .../qml/hifi/tablet/CalibratingScreen.qml     |  82 +++++++++++--
 .../qml/hifi/tablet/ControllerSettings.qml    |  23 ++--
 .../qml/hifi/tablet/OpenVrConfiguration.qml   | 110 +++++++++++++-----
 interface/src/Application.cpp                 |   2 +
 interface/src/Menu.cpp                        |   8 +-
 .../src/plugins/InputConfiguration.cpp        |  30 ++++-
 .../plugins/src/plugins/InputConfiguration.h  |   1 +
 libraries/plugins/src/plugins/InputPlugin.h   |   1 +
 plugins/openvr/src/ViveControllerManager.cpp  |  54 ++++-----
 plugins/openvr/src/ViveControllerManager.h    |   3 +-
 12 files changed, 234 insertions(+), 80 deletions(-)
 create mode 100644 interface/resources/images/loader-calibrate-blue.png
 create mode 100644 interface/resources/images/loader-calibrate-white.png

diff --git a/interface/resources/images/loader-calibrate-blue.png b/interface/resources/images/loader-calibrate-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..808f5fa3d217e7ed4558b72aad5c4e633f31be99
GIT binary patch
literal 7935
zcmaKRdpy(a|Npf~DhidB6l+SvHir<xoR!F(62m0TA+~9T8Hx}RIxu%AiBz{l%tq!=
zrh_GiikyZyh0r929Qr=SeSbc`KR);G{dny0xUSdrdOe@d*Xz3We!SlAcY?j0)#gpR
zHUR)OAGJ0=2>=8q{B2kd0BBSV*#!WQrC2yo97tZ25DzjQn4Bk_!^4jfJiPHI@gC<x
zFTTSc0YF6A_mmUG$@aLuCy9Xa5c;5~ga9DCju=w|JUspI6!<y3w=dBUF;!WEfcu^|
zM4ZvKRksZ=!~6JJ)5v%Sn%yZ+nxCiMd4#bM{0LQ_N(dm}DIRbt!JinYPc=lW;_4Fv
z^@V0M0>0`(@iRoMiE^^Fhntbec(^u72kEJyp#j&`LuqIq*3#5ggKMg5XrtBj&>HGU
zbq#$Db$v~B_}>@82!4co-b??ax#izn<nvyJ2p<Y1Kp%|`2?;@kXrV}CZ?uM<o*r6V
z6RoL<B%k*}28I$T9#kYTQ1KrGb9|sD**AdVOCrLBh#u!iK@>v-;-3@<0sny|2L4?p
zPZ9x5^$0*~pwxvat>sDxu(kdFyAlZh@eZV%#Q#_C{{#*^6&ip?pTq}}g2<lulXx#h
zAyt6B85!?EA(2m!NdEs+(cXtdAqD!70^nw5t5t(5+j@BV5`{*U)hJtA{iDP{iU-jX
zf7IL%K_vvBe0|UBAJQ>3(NZ@vKcsi~kcNhZuBp1IwuQQ-u9lgOrp_S^(|=;kNuEIj
zJdyHG?D_x3TKsFQ@IVNQqHm5T`v&9BTarlx_-f+%zW+mu*&$0yO+9tZLwdS;|69vi
z?D>D!V)n0E&_?hhXyNw$KimC}>7==(aQL6YYXtxA@y8R-8zRUEW21LQS*`%c5ssRh
zoT7GqySwpennlLdL<_C;>+Pl1N$(VmQI;5k$A39zz1`d;`l5JCxm=f9<;3J@gu8!N
zEHkM*`D(evgTly+y$_VH9BPP^*x&=Cw?|o8y_Of93@^HTH-JF;+%c9F_MxKbHoGP3
zS5wvZ<q@M#g@4uj<>ugUTLeUowcOhZ02~JZM;w577ytq&0DMvK_^AF#=wt29#--xW
zH<;`{3PZc`9e4eFGCn1mnhacHbx1-mdX(ZB=G#9Fk&7-grxz}>rIb=i8Ra>JxZ~ZN
zG138fxh&j7B}yJ$E5ENL8YvR~%X!PRUb79$DHv<%veGqOjW_#o4-NRSOw$8gsqB|V
z(P|<QMcO~TXWZ3pho_vWxw5Rl0#fKhn!iq8F30~l6p&q~wp_3@(k#U>cImum0|cgu
zvtB7ByM6UuX}(Hil{FW?dPLVn`Ykt$0DkNX?>v0!?;=gc)fN9+lZo`-#ZS%Ik<=Vq
z%h(kSx@Wj$<=C^)w$@@>lw47d|H9jn`jXEjjU_$P&xfYyzk@nrGM+7DxroKX#x~kU
z?itZ)BU{JTWbga+OhMkh&4u?PwATg(1g3Qt9}lhL9_9+@A_u=42G8#W__U@A++DqX
zqJY!&eWvU>iEgy9hN<*|j-@;Erk#n-XOe1mo+yCuW3iPf2b}F@WN#JgR(_ej%5{`c
z6Yzy$UM;lF1p3D6kjyI<^w^b}hHKab?wBBmRuxIjIlVMc@~AxZw%e=|QO_snWjNQ*
zNPKt7AQX<9--?77d>%>Ftf4E_4ll6Jg~m+_&0_(tM(H12X9LWhuqR5yq=&J%l5mVK
zL<$|AmW#X{u|92Hd#3MYmRE<<l!ZqYObUGpYS<TW^+fMhUXj&>Y!<t(^wupX9JfJy
zPK|r#86(24>|QW)NUyh&;Pmw;lpjlOG1}<8ID?w5(%<Tx-=vmqNEZk3FsRSvuE2=(
z+ZS+1NZ9L<4yMzQ)f{#nA{x|tJ8i7nc*6N!a7W!{!mdH_c-Zvw^r0i!7cHvig18dd
zpHsI2f$60gr>O;c;I;5<`2cFGw+KG3UFey6dpGL)sB>O`0_#Zs7uJpiC_nZ}oD7QL
zI#{9@w8>&|-;v?c1WklHhHbyIx7hVt+>T8ai(N+iQu@|4V~<)o7Im>h!yxwl#ja5!
zuJYb#QI2?QZdCv}u;aFO?DyCqkL-$6Ng?v9(Q_5ukDBWge>zQ>(XCY6@k6Ro>Tup`
zz7tml6(;pSigK$i+9*>+p-M=&dzWK*t0ueFBUVgpuJW7p9)MxnuM?>XC^}dijCPs)
zVJ40#f&syfgb%uvop>>uVb97Td2SWTz)S1~8t{=@H_q+q9cYZ3eRX%Z<UkWxfWmo*
zQBuVRav|4lE=iCuL{!+4VqOhQIvuXSJ&~7Z_>Bj8&LDeBx??EgX4N2`HGBAtO$Zs%
zZug`0u3g6}YLc89t9;4oNzrrHsgl!MY*gf?MKSF9k9E@q+(x=l=(EoYUKs(Ejrd2u
zpu!akP0n;!dQ!`9!MjuGwoF5-jvHu<O7UMWD>Ud+*y=kYFM_J$!Ya9TbFu4F(W>&1
z@}!}bn@4I?FfWSA{lCrW<k?KYfPkLN3|K1T>Y!2tkJBe5j8Jcd#t*T$7mCxakM`qr
z^^;Fp2_>sBhG);9sxMFONKab4^rqxy%0{7#hq*zl8pcerYiTRKK#tMip{pQ0C>}|*
zv8rm%c9~6b)#{z2DD>q*-om6vq1O4vrIcjXT*c68(t@~xIHo$1%1xg<fm}3y*0Lk{
z_hd;D7jgp)=dEj9e)Lvbk~)g&9{{VNKF8+{gyt=Jb0v4X=s~ANIW9Wbs_&jK1zh>(
zX)~^p(fY`6h=3l~HoEe*{y-~n_S}k`0%Vn7z_d59M>mC{y-uLQQV_yVH}k}I6(t$&
z&gmB|99q8aBDuzqu2J|h$#DJC1crO_N6|s?cvd(gdveY-yiN`&`!V;`_0d&kC4D_p
zzaUQ+gR%Y%gllzUqN_CK-g&-SnO~HKX%bFycT4SHtBHJtB#0|cbbcRZB_C)73sAo8
z6}y=E;5;`MgE7w8SzM%J8X9`lQhG`cWgvr?@orZd?zBmFdmYIWmf`x(sve`8elwBl
z7FVe=BUeye(H`dqcip`?D@IfWaNZ$T?>oDF+kI<Uhm*%4!hi7XfU==Z>qXUS7WZYU
zuqsM@=egRy-mmX$uke>#pL|wqP&{52A`(FgIXjrqrKVM$CiKehKgNx*UOdH}=(ZFl
z^fBPh&|lVzYTP|^C88qS9m5_9d^$A|EWs!eRP|_goBFI<K%C`tbyA+YddSLG4BK%7
zyN&M8iO1`1PIt*S?|kIE!YLFHa%~={qMEVC!YU0af>yWbgl@X+<Jjb>1r9kKufp0a
zEY%^`u@Vtgvu?tj56HDB{TCy*tQU8qabQ(&m@|qgv4uej>4@3&W)4h?axypU=?%P;
zw=AE&$7$ngre_}yJ+Q7!o~%gkS{E5EP0~jdU*E)t@Th1ixwdB6r9=~4Z59|xUQ7hl
zDED>OsWv9tF6?Tbko9r*sL1XT!A!vf`2$DN@9x;mH{qHRCBd`>+xP2uz1%q_3=QD!
zoXib`NG()z{zmPjapG{>s_Ci+s`|&5I+Ou&C%A#;+j1&!)yU^B6JcvJA2d&@6L_Oo
z>%annN68|{O8K}9e+iWkPV;t;)XVXu(e40K9j`0h>CFncPl)=PtC$t$mA9<H#S%q@
zLPihQwW>DjH2nkIf@AMxG)*cIMOIh;{8nNWV^-C3pj;HZ73QIi=1HBv&Tn58dE+B8
z8cHY%6F`N|3C*p~KO!cyTxa9eSC``*kcuJ%ZWR?GRCQ{uHBp!2K>wU7zpD9oN!C`M
zkFC!isTizM)ywf^xrl}>_L<WbwLevG$h`)7&25AA;$Y^IG|7~5KCA}Qb(~w8x_dR8
z!Z;q!Xv*sbZ(*(1=Js*tF`4umjSv2wbF4Fy{oPMgKyIM(wvl?{sUg^Vxt~^j&zMP=
zK?zMR!}b@zptz7$v_T>=d~YFDGATYpgfHrIWC79F2AkSQH;U5PtnoDOJpjJ-2B_B8
zUr@l%-CB+Jl0G0pASvQN<P86F%Y@jvP8`EOj{}l=f5eU@>T+Bg#G8W$6C(>0aeJn;
zbefqB(_4o`@6U<*)*HMgTi>^}VqM0B3bn~hY20LnrtSa>raw6a0};3!hLEgaTa1-h
z=dcSehXH12dkd*n7QDq>c+tqLaOr?f`64qm0H38vkK(C8SH43VHh~+CY%Axh>pOQ~
zgB=_}B!h3L*~*N+1qFGqDe0*85crzbpNddIB2raZ1z@m(EpxsJy2=Lth9=mO$f!E1
z2LY{#bKh&nvG0mw$WU<V1luM80C*1dXCKESiiuC%3gA`LIHzA?oxBIB0HjH;3E4K)
zS36D%IH&h;9e8|?dIsC}$1!1P_H36%1F&xgDTG^#={nf30o=f`#avz>a3FFlAq100
z(8jMuu&{0Rmcob$7<Ji=`zBRdNF=$5T}|H#6*jGrFJL4wZd4TWXR4HNDa?f?+R4j}
z0bsPgOSSbX6#@>zdH15)L!5b!R;`tn`+nNeB~|tc)0^GEPNqP>!F{~RsCHckBM{jT
zA5v30uJFg|kmb_%6PYRr?rZWl6T~XgrXk>zCEE>JM9K{pW=R^U9q&?602n-{OXa(M
zmkAV{vSu%?!~KpCx}ITYpIn2SsvS2_Rsfiw`bF6x5%Bmr)j%k|Q)+5t4L&Fy2JY){
zDihb@0I<gkg71d|@L6Vxx8~9lOND?7X6!}#Rm{0SjySNF<4>3`0B}%|*PQ$Eu24!)
zeOK(7&YTH_$~AsnMt`VogBY-v6<kf8?@0N3-3(c|ma;D8dYI(eI#HZmZM-ItwH`Nh
zbPXIC)gHE1lDXX4@v56>Vak<y-(TpM8sFFo#az!nI@5GadMfTFGg^7Ivczj|VFD;P
zg<*GYSYF1s7#~~RWPVlcxQO!J)dvip4T5Kq>`TR-Vb)+n?X|1)QK!BjKanE8+^i^i
zed<;qMGWGouHTCTnDWv3#b;b*oWHM=hdO>8ru+tu-Kp%IG^ETC2OC&NI$;+l#%jmS
zlodg1?2IAq`9TD4g&vf;4YZgBak}1-ck)Fs%o{kisv;rI#p@3{5F<WXUw|Y0j-*0B
zzv(%_WU-oLe8|p+>oDc^J0}v^D}}Y=brInHhnPf)U*#LQZAI&hUX`TYf;QL1GWc#g
zd<|YrOYIlMFm5=qZ6dI{91q_jL*cI0XkHI}KSVHgk)K1CNtFTprhm@vXOA@2j?-?O
z+qYlT$E_dH^LkuxO&3AfiXLEt8UMY{sbzD|u5P=^Y}RR*dl2G)1?R<)4h{Cv@_A0%
zM+M3GPeGbAs+Ca550VyK^Hf#^uVQETZeL&3ZH$M(b0|52uTK2MPXlgeWj~r`;tV*`
zTZTk2<u{(aQN@X~d0m?HRw&%<@jYt&#nc^O)RZRp5YpejE@2Kdh(}WP7E*PcaT^(<
zgZ%?4XwVwV;LH3#5C)Wm<A(UTXiV2ex>4#*Flvewj1BguLkV%%*AC}|HxrpaMM69*
zl7~8lVWY7+mK=i^O%b@8wJMK=41^LQkOxkB3H^ek1^OIu3<-Ad052_yd3(2K6#(z*
zD_>5V-nW$#9KZhw%mnW(q`H~2&pmjkFti?6tMW$Ns88qAx$jct0K8CmpH5_)c+f4p
z3#xj#v{`Y&HtmmNZW^exR}r9C?>8~ZO0$l=g8)Ikw^yDmf6vhl;TSem8l|&GoU#iq
z1~{2?C9c-Z*^kI*WkUexF|65%Py!aKbEj1V@NE;5MQQr2D8cN*B@jvdIGu_Qx<BE=
zl}%LuQY0*c;cuDe#>aao0yvLj&6a}_^r0)qi4Y+Wn;5FudWp`Z|0$ftShE!@X;t2V
zasUYOEv#ydrG3+>Vgai6TYPnYm|X*>w-r&l@iy<V=NLn-L{R|e%~bK;ASSj>sT0N4
zg!zdOZcT1qo2eBa+3K54eRI*~{!Nc8*k4H8NPVSRbG}u4(*PX^mFF24wxR_0>IkcS
z*++!n!)C?=Uaz<Hwu=ae*WE*lneVr*OukYR=^`>ig9!31_z{O%QG#Ut>}q?Hj8>C$
z))DKB!=m`JtBA>0E~~d*%Hh5ag9xAPY~wkV>dpBH%tT~#h3#q==NUV+V!f!VmL8C~
z+HP`1P;yh7FFxVUPOSE++j0_^i)sbXi5|6d=Pmug5MdvcoQ|Bc?0n;b8d;mu!(5pp
z(uRceJ@4-~zJ);)c^8U%G#jVw?pGxaZQ=$H<(e0TVS4mR#fdlAXAH_<8$|ecHF|^U
zY4E4-gNcL0J@B&__UOE@!}A^7^^<lWU=cvf+<0~Q`T1<!iZuJCSv#1#<DdA7wvww|
z8~R*7=Ha$O1WNsm+@PDYPjJ<?-N(Sb>(r0x&0KArrvX(%I>h~eTm<WEpU);G!ASmx
zO$_<(x{m=2d$ieUau4cAR&(zh&5CRwJYi;4ye`EFPo%EXuK=4>!$7$fVnYA!{A>M1
z0|?+3`nFa0r`0`pt3CGfQfAjC;f54Bt@w28tQa;x8R%>PK%iv$Xj|{Ojy*n89u@DV
zZHZ_A=TRQFFUDCfN^wKnf+<qMUEwsM40Mz^JGpaeisg;MLt0!v9maJ>v>#`L_g?gu
z!jQi_enhx-<|$+81Kvt3w%O#4aq-M>u<&@-g>y+r8$`QLTAd_vk<1lJ^<WO^qQd=e
z%+rUg=pVX+0fz0{Y;vcj#Q&OWuHl|b{vB~HlJ-W|e;{x<r?=EFmXPEm`Qmw5Lw8{<
z=1YfQ^b<ec&W$8%xC2^Mysj*Z_WaV0ieXx>fmfLbfb-11Lc}+#EE$rMl)4Y0-s=nF
z5}J4QW)I&iqGv333S#5{oHsa~wAmnQXo$<(0`}J)M)Nnnn>&Cq>d$|ZShnL&x5m{1
zc~)cV<XkT3ytc_$4u^dGiQt+0lts($Nj5y6gWO-X@WD3OGe+oXG9F&$YxhmSm#-cv
zz-fy4K%2*HT^{A<=QFX^wvT<eZ^H{@Dg0O+oIB@@C>$;39PIqUiCN*l*w$lvoA$>Y
zFN%NN<&cSq@5ZPuHA7~G$s^cYP=|WGgpnpN`M_}PyNr8*r7!mG4szrZ8=|R!K4(f(
z+=7qW`)k)Z{YHlxb0_FZM*1M^k_OXtyd?DIa%SkmqTj!NAg`Moihh^tZ|t5h7j>ll
z=Uf#oAq0*WnZFga;%#aySM@tbtNo?s`_{XfdwF!H(cfh&5s;d#ZWG2n+mz)P7nSC-
zV+$19{ewGh$isO%I{0DLofZC`_xw&UkC(ZQ?0go*w6gl$kv(>KhiUj^$!!njADWy@
z$-=YcEko}0>dn7tL67i<@zFZ30)F4A`8=dRcJaL9+hNinMcV7Lv19YI;?ol875;?p
z+Z)zz{;>VGbIsF8zw8oM-_R>1WlO3ejO+ATwzu<CiELN!O}~_&j(x9cu#>@pI4v-?
znUG1VIFWv&{X%`p>j+Zm(_BhCYx~U0maC&v*k|v46r>s5*rj09s@aGikAaNcEe)3p
z35T>_@af-@p0o_*BQu{=!wNdO!V6?)AchUoBzhRKKw06_-e_dH6RM1&+V^W@sp*~C
zvGi=_(%S%)$8QQQ78Gn+vKq&8Bj|C;dp=3i`ufkE`LgoK0C}0*5!02?H!qSR@o@kd
zt$pdMM=UI$`m@BZKKX$XjlM;sxXRv7>bYvL3V)YRRh!B$J%LRgI%bu^!dmB_DSvfF
z%eqbSmw$e^z1a+<Lteb08QQDWLrx$1Y>LW%W0RsQ^Q#tFx|GiK3j49=&nJ=$9SPZy
zIC=SpG4>)^193Z)c2KK^^(SW+Vy0UL2)2iE^6&JPZep*9bL)%(RTLP|F_1M<dM0Wr
zv|Cd3y~=E6%fQ1oE*ob|T>TdcxL#MpMk;U$l%$7uzh1^?PKGssG|TbENAokt?}per
zxib25PD}?=8oMlB=@V+UrdsA&-eP<c_SgoQvynrt*&Y_`6LsgXcYcuddb8xwhP-3B
zl3)E$aw3jJ!Kb3Cq%6Xq#>1rvCrzP@(*qqwxrx+l$3CC^$xNH&E1InXg$EAh1V^1{
zLhy8(@B_ZI4|nCj!~3XwyO?Hn-9-!b300!}jPuPgNwXA~fVqC#a&w)YMfC~jCE<&?
z7-)0(gsjmUnFXHJa`UTipDrtN5~(iYwvUIrZVIjKZcK-al8lq4;u0mtXZ2pZo%;|J
z=GbxSyc0x#;9<Ys9P~<ylUcy+k$*ffdoMVPCLybceB^A$+U+<Pru`(-<+MXf?_()6
zzffjhPq*5SNJMWz0?Rx6-osSFEeEwnzl84}{d(@5K6Kjobv#v?RG4#Txch0~b7Rbl
zP^}1t>L*%5NAuTIzddDI?;g2r{C#%Bu~F^uu)=O3y~Vb@8BuM=DJt0~H=FsKH1GP+
zn3J_R_TKeR!Fk(kcG^k(+S|5CwlMWh`>x9nP9k;Oq_)C&w0b|=y=%sh6#CM8|NcUo
ztL5L`Sq|+x)0q*L)HUo_|K6{$MuKm_{&~eKKd|&u^s%K~a^X|D=}D<&`J)42tcn?=
zVBBZOhA8uXyzD#7j2+M7H5bt{p0~aK`Bt;~Ll+(9#-x1R&lO8$DjlvRv$^!0_s;4u
zt`|K_LtzCE($HMLQFH=TnpE{5fz_=xtAf8&czWf`35z%y`LK6T%Z>-0ZaPo%Bv3!b
zeepKLG#gu^3&~VzQctfI%iGaKt9!X&iT2Cn?o`S0{_TyyQ~B?Y`c9R6R(&&n{bGI5
z*##@c6$@2oasf8uLIsG233NKuW4vBy4;UJ?w0|lp5MREWCX-sRk8$FSb@m_6*d7mt
zeV*b}&v><W20-~1Y{KS7s^74IuDH>@miC_hl8CFl#cW?^en}v+Z~W_0l{8&Z&FaOs
zyivP^YNliUpyLyt`i2iQ)h&Drc9Na@+~+$2qm4DQL^RHDVuqeVa~tn;N?Kg()!8y9
zJ6zvo)Iay-YxN7n!)LljP1*4*WR5JkF*PNy<NX3eW?tSPJmt9aQ0~xi{hJE|`bF+%
zxR`Y0h}<_V&LaoW>TJghpZa&M>4lik%0G<a<6#2k>3vDvYA?J#Nj~{L*L5MZ9lr=w
z&XAxrjYOO=Sd`#y5W{YnZaF^$vZIkbs!Pjd56o3<$OXq8wfS+90tD`@*C*}LdzpBJ
zyYuaX;ory|7dAzdGX%3%bR@2=%Qg5}I*qGeKkLw2u=0K+Fxzd#FR1w2L}^M2E%z?c
zExf2K6K{-ek*6=aF*PF4?ulDYFID=LTdG=-3#^ALbpkp!@GaQigEE@fs%9!jPck(3
zv5xIyoy)V0qSkEkeir4YBsvn7m~pfHJ=^Q6wu5ojR+(5Ocp21O)r5gK|9q-U1dj8O
z-pI$ZMox9i;@BA#O^tj%%NpZ{zqS^BZEi^JKA3{Xv5&++<6+0VSW{I<-`NaWeMQG|
zw||Y-N*VONUv!&^=LhVQ92vQa&vF%?ch7i11g58H^@$M~x$jg9*X``fm4Q}#hGO;X
z$3-GCnwzgBc8`e{a-7C<Wp=q#{EVdLw0#--*gAOAam&o?^yh2PLbb2`_(B=6o^X=0
zs<i$hE{K?BO8jgp2E#=aa}Th__Odpa{<ikPa}HFu|0T1nYbo17RfX~3Txt5G63e@6
v9j5+m<zEm0T3i3+a~6gTKwtN7adqHyLmC+r_Vl3elk`ywJM(9zXRrJpZJ(pY

literal 0
HcmV?d00001

diff --git a/interface/resources/images/loader-calibrate-white.png b/interface/resources/images/loader-calibrate-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b1b7b0e21dc94ead244bb22f4dcd778d94fc5eb
GIT binary patch
literal 7376
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

literal 0
HcmV?d00001

diff --git a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
index ffd2a80e58..b8935f5463 100644
--- a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
+++ b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
@@ -25,23 +25,40 @@ Rectangle {
     signal canceled()
     signal restart()
 
-    property int count: 3 
+    property int count: 3
+    property string calibratingText: "CALIBRATING..."
+    property string calibratingCountText: "CALIBRATION STARTING IN"
+    property string calibrationSuccess: "CALIBRATION COMPLETED"
+    property string calibrationFailed: "CALIBRATION FAILED"
     
     HifiConstants { id: hifi }
     visible: true
     color: hifi.colors.baseGray
 
-    BusyIndicator {
+    property string whiteIndicator: "../../../images/loader-calibrate-white.png"
+    property string blueIndicator: "../../../images/loader-calibrate-blue.png"
+    
+    Image {
         id: busyIndicator
         width: 350
         height: 350
 
+        property bool running: true
+
         anchors {
             horizontalCenter: parent.horizontalCenter
             top: parent.top
             topMargin: 60
         }
-        running: true
+        visible: busyIndicator.running
+        source: blueIndicator
+        NumberAnimation on rotation {
+            id: busyRotation
+            running: busyIndicator.running
+            loops: Animation.Infinite
+            duration: 1000
+            from: 0 ; to: 360
+        }
     }
 
 
@@ -60,7 +77,7 @@ Rectangle {
 
     RalewayBold {
         id: statusText
-        text: "CALIBRATION STARTING IN"
+        text: info.calibratingCountText
         size: 16
         color: hifi.colors.blueHighlight
 
@@ -102,10 +119,27 @@ Rectangle {
     NumberAnimation {
         id: numberAnimation
         target: info
-        property: count
+        property: "count"
         to: 0
     }
 
+    Timer {
+        id: timer
+
+        repeat: false
+        interval: 3000
+        onTriggered: {
+            info.calibrating();
+        }
+    }
+
+    Timer {
+        id: closeWindow
+        repeat: false
+        interval: 3000
+        onTriggered: stack.pop();
+    }
+
     Row {
 
         spacing: 20
@@ -124,6 +158,10 @@ Rectangle {
 
             onClicked: {
                 restart();
+                numberAnimation.stop();
+                info.count = (timer.interval / 1000);
+                numberAnimation.start();
+                timer.restart();
             }
         }
 
@@ -134,14 +172,42 @@ Rectangle {
             text: "CANCEL"
 
             onClicked: {
-                stack.pop();
                 canceled();
+                stack.pop()
             }
         }
     }
     
-    function start() {
+    function start(interval, countNumber) {
+        countDown.visible = true;
+        statusText.color = hifi.colors.blueHighlight;
+        numberAnimation.duration = interval
+        info.count = countNumber;
+        timer.interval = interval;
+        numberAnimation.start();
+        timer.start();
     }
-    function callingFunction() {
+
+    function calibrating() {
+        countDown.visible = false;
+        busyIndicator.source = whiteIndicator;
+        busyRotation.from = 360
+        busyRotation.to = 0
+        statusText.text = info.calibratingText;
+        statusText.color = hifi.colors.white
+    }
+
+    function success() {
+        busyIndicator.running = false;
+        statusText.text = info.calibrationSuccess
+        statusText.color = hifi.colors.greenHighlight
+        closeWindow.start();
+    }
+
+    function failure() {
+        busyIndicator.running = false;
+        statusText.text = info.calibrationFailed
+        statusText.color = hifi.colors.redHighlight
+        closeWindow.start();
     }
 }
diff --git a/interface/resources/qml/hifi/tablet/ControllerSettings.qml b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
index cc638858e9..e1ba93a840 100644
--- a/interface/resources/qml/hifi/tablet/ControllerSettings.qml
+++ b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
@@ -103,10 +103,9 @@ StackView {
             HifiControls.CheckBox {
                 id: checkBox
                 colorScheme: hifi.colorSchemes.dark
-                text: "show all input plugins"
+                text: "show all input devices"
 
                 onClicked: {
-                    console.log("clicked");
                     inputPlugins();
                     changeSource();
                 }
@@ -162,12 +161,16 @@ StackView {
             source: InputConfiguration.configurationLayout(box.currentText);
             onLoaded: {
                 if (loader.item.hasOwnProperty("pluginName")) {
-                    loader.item.pluginName = box.currentText
-
-                    if (loader.item.hasOwnProperty("displayInformation")) {
-                        loader.item.displayInformation();
+                    if (box.currentText === "Vive") {
+                        loader.item.pluginName = "OpenVR";
+                    } else {
+                        loader.item.pluginName = box.currentText;
                     }
                 }
+                
+                if (loader.item.hasOwnProperty("displayInformation")) {
+                    loader.item.displayConfiguration();
+                }
             }
         }
     }
@@ -187,7 +190,13 @@ StackView {
     
     function changeSource() {
         loader.source = "";
-        var source = InputConfiguration.configurationLayout(box.currentText);
+        var source = "";
+        if (box.currentText == "Vive") {
+            source = InputConfiguration.configurationLayout("OpenVR");
+        } else { 
+            source = InputConfiguration.configurationLayout(box.currentText);
+        }
+        
         loader.source = source;
         if (source === "") {
             box.label = "(not configurable)";
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 7fde6c53eb..9c23cf8677 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -27,7 +27,7 @@ Rectangle {
     property int leftMargin: 75
     property int countDown: 0
     property string pluginName: ""
-    property var displayInformation: openVrConfiguration.displayConfiguration()
+    property var displayInformation: null
 
     readonly property bool feetChecked: feetBox.checked
     readonly property bool hipsChecked: hipBox.checked
@@ -144,7 +144,7 @@ Rectangle {
             decimals: 4
             width: 112
             label: "Y: offset"
-            value:  -0.0254
+            minimumValue: -10
             stepSize: 0.0254
             colorScheme: hifi.colorSchemes.dark
 
@@ -157,7 +157,7 @@ Rectangle {
             id: headZOffset
             width: 112
             label: "Z: offset"
-            value: -0.152
+            minimumValue: -10
             stepSize: 0.0254
             decimals: 4
             colorScheme: hifi.colorSchemes.dark
@@ -249,7 +249,7 @@ Rectangle {
             decimals: 4
             width: 112
             label: "Y: offset"
-            value: -0.0508
+            minimumValue: -10
             stepSize: 0.0254
             colorScheme: hifi.colorSchemes.dark
 
@@ -262,7 +262,7 @@ Rectangle {
             id: handZOffset
             width: 112
             label: "Z: offset"
-            value: -0.0254
+            minimumValue: -10
             stepSize: 0.0254
             decimals: 4
             colorScheme: hifi.colorSchemes.dark
@@ -528,17 +528,19 @@ Rectangle {
             hoverEnabled: true
             onClicked: {
                 if (calibrationButton.enabled) {
-                    calibrationTimer.interval = timeToCalibrate.value * 1000
-                    openVrConfiguration.countDown = timeToCalibrate.value;
-                    numberAnimation.duration = calibrationTimer.interval
-                    numberAnimation.start();
-                    calibrationTimer.start();
-                    var calibratingScreen = screen.createObject();
-                    stack.push(calibratingScreen);
-
-                    calibratingScreen.callingFunction();
-                    calibratingScreen.canceled.connect(cancelCalibration);
-                    calibratingScreen.restart.connect(restartCalibration);
+                    if (openVrConfiguration.state === buttonState.apply) {
+                        InputConfiguration.uncalibratePlugin(pluginName);
+                        updateCalibrationButton();
+                    } else {
+                        calibrationTimer.interval = timeToCalibrate.value * 1000
+                        openVrConfiguration.countDown = timeToCalibrate.value;
+                        var calibratingScreen = screen.createObject();
+                        stack.push(calibratingScreen);
+                        calibratingScreen.canceled.connect(cancelCalibration);
+                        calibratingScreen.restart.connect(restartCalibration);
+                        calibratingScreen.start(calibrationTimer.interval, timeToCalibrate.value);
+                        calibrationTimer.start();
+                    }
                 }
             }
             
@@ -547,7 +549,7 @@ Rectangle {
             }
             
             onReleased: {
-            calibrationButton.pressed = false;
+                calibrationButton.pressed = false;
             }
             
             onEntered: {
@@ -592,7 +594,6 @@ Rectangle {
 
         minimumValue: 3
         value: 3
-        label: "Time til calibration ( in seconds )"
         colorScheme: hifi.colorSchemes.dark
 
         onEditingFinished: {
@@ -602,6 +603,31 @@ Rectangle {
         }
     }
 
+    RalewayBold {
+        id: delayTextInfo
+        size: 10
+        text: "Delay Before Calibration Starts"
+        color: hifi.colors.white
+
+        anchors {
+            left: timeToCalibrate.right
+            leftMargin: 20
+            verticalCenter: timeToCalibrate.verticalCenter
+        }
+    }
+
+    RalewayRegular {
+        size: 12
+        text: "sec"
+        color: hifi.colors.lightGray
+
+        anchors {
+            left: delayTextInfo.right
+            leftMargin: 10
+            verticalCenter: delayTextInfo.verticalCenter
+        }
+    }
+
     NumberAnimation {
         id: numberAnimation
         target: openVrConfiguration
@@ -610,16 +636,17 @@ Rectangle {
     }
 
     function calibrationStatusInfo(status) {
+        var calibrationScreen = stack.currentItem;
         if (status["calibrated"]) {
+            calibrationScreen.success();
         } else if (!status["calibrated"]) {
             var uncalibrated = status["success"];
-            if (uncalibrated) {
-                
-            } else {
-                
+            if (!uncalibrated) {
+                calibrationScreen.failure();
             }
         }
-        displayTimer.start();
+
+        updateCalibrationButton();
     }
 
 
@@ -650,11 +677,11 @@ Rectangle {
     }
 
     function cancelCalibration() {
-        console.log("canceling calibration");
+        calibrationTimer.stop();
     }
 
     function restartCalibration() {
-        console.log("restating calibration");
+        calibrationTimer.restart();
     }
 
     function displayConfiguration() {
@@ -681,6 +708,9 @@ Rectangle {
             handPuckBox.checked = true;
             handBox.checked = false;
         }
+
+        initializeButtonState();
+        updateCalibrationText();
     }
 
     function displayTrackerConfiguration(type) {
@@ -732,25 +762,45 @@ Rectangle {
         if (settingsChanged) {
             if ((!handOverride) && (!headOverride) && (bodySetting === "None")) {
                 state = buttonState.apply;
-                console.log("apply");
             } else {
                 state = buttonState.applyAndCalibrate;
-                console.log("apply and calibrate");
             }   
         } else {
             if (state == buttonState.apply) {
                 state = buttonState.disabled;
-                console.log("disable");
+            } else if (state == buttonState.applyAndCalibrate) {
+                state = buttonState.calibrate;
             }
         }
         
         lastConfiguration = settings;
     }
 
-    function updateCalibrationText() {
+    function initializeButtonState() {
+        var settings = composeConfigurationSettings();
+        var bodySetting = settings["bodyConfiguration"];
+        var headSetting = settings["headConfiguration"];
+        var headOverride = headSetting["override"];
+        var handSetting = settings["handConfiguration"];
+        var handOverride = handSetting["override"];
+
+
+        if ((!handOverride) && (!headOverride) && (bodySetting === "None")) {
+            state = buttonState.disabled;
+        } else {
+            state = buttonState.calibrate;
+        }   
+    }
+
+    function updateCalibrationButton() {
         updateButtonState();
+        updateCalibrationText();
+    }
+
+    function updateCalibrationText() {
         if (buttonState.disabled == state) {
             calibrationButton.enabled = false;
+            calibrationButton.text = "Apply";
         } else if (buttonState.apply == state) {
             calibrationButton.enabled = true;
             calibrationButton.text = "Apply";
@@ -818,6 +868,6 @@ Rectangle {
     function sendConfigurationSettings() {
         var settings = composeConfigurationSettings();
         InputConfiguration.setConfigurationSettings(settings, pluginName);
-        updateCalibrationText();
+        updateCalibrationButton();
     }
 }
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 8505e07181..95e3cec3b5 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -109,6 +109,7 @@
 #include <plugins/PluginManager.h>
 #include <plugins/PluginUtils.h>
 #include <plugins/SteamClientPlugin.h>
+#include <plugins/InputConfiguration.h>
 #include <RecordingScriptingInterface.h>
 #include <RenderableWebEntityItem.h>
 #include <RenderShadowTask.h>
@@ -1997,6 +1998,7 @@ void Application::initializeUi() {
     surfaceContext->setContextProperty("TextureCache", DependencyManager::get<TextureCache>().data());
     surfaceContext->setContextProperty("ModelCache", DependencyManager::get<ModelCache>().data());
     surfaceContext->setContextProperty("SoundCache", DependencyManager::get<SoundCache>().data());
+    surfaceContext->setContextProperty("InputConfiguration", DependencyManager::get<InputConfiguration>().data());
 
     surfaceContext->setContextProperty("Account", AccountScriptingInterface::getInstance());
     surfaceContext->setContextProperty("Tablet", DependencyManager::get<TabletScriptingInterface>().data());
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 5b5480dbfc..8c9baa7c43 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -38,6 +38,7 @@
 #include "MainWindow.h"
 #include "render/DrawStatus.h"
 #include "scripting/MenuScriptingInterface.h"
+#include "scripting/HMDScriptingInterface.h"
 #include "ui/DialogsManager.h"
 #include "ui/StandAloneJSConsole.h"
 #include "InterfaceLogging.h"
@@ -310,10 +311,15 @@ Menu::Menu() {
             QString("../../hifi/tablet/TabletLodPreferences.qml"), "LodPreferencesDialog");
     });
 
-    action = addActionToQMenuAndActionHash(settingsMenu, "InputConfiguration");
+    action = addActionToQMenuAndActionHash(settingsMenu, "Controller Settings");
     connect(action, &QAction::triggered, [] {
             auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
+            auto hmd = DependencyManager::get<HMDScriptingInterface>();
             tablet->loadQMLSource("ControllerSettings.qml");
+
+            if (!hmd->getShouldShowTablet()) {
+                hmd->toggleShouldShowTablet();
+            }
         });
 
     // Settings > Control with Speech [advanced]
diff --git a/libraries/plugins/src/plugins/InputConfiguration.cpp b/libraries/plugins/src/plugins/InputConfiguration.cpp
index d20678b972..33948ef70d 100644
--- a/libraries/plugins/src/plugins/InputConfiguration.cpp
+++ b/libraries/plugins/src/plugins/InputConfiguration.cpp
@@ -28,7 +28,12 @@ QStringList InputConfiguration::inputPlugins() {
 
     QStringList inputPlugins;
     for (auto plugin : PluginManager::getInstance()->getInputPlugins()) {
-        inputPlugins << QString(plugin->getName());
+        QString pluginName = plugin->getName();
+        if (pluginName == QString("OpenVR")) {
+            inputPlugins << QString("Vive");
+        } else {
+            inputPlugins << pluginName;
+        }
     }
     return inputPlugins;
 }
@@ -45,7 +50,12 @@ QStringList InputConfiguration::activeInputPlugins() {
     QStringList activePlugins;
     for (auto plugin : PluginManager::getInstance()->getInputPlugins()) {
         if (plugin->configurable()) {
-            activePlugins << QString(plugin->getName());
+            QString pluginName = plugin->getName();
+            if (pluginName == QString("OpenVR")) {
+                activePlugins << QString("Vive");
+            } else {
+                activePlugins << pluginName;
+            }
         }
     }
     return activePlugins;
@@ -113,3 +123,19 @@ void InputConfiguration::calibratePlugin(QString pluginName) {
         }
     }
 }
+
+
+bool InputConfiguration::uncalibratePlugin(QString pluginName) {
+    if (QThread::currentThread() != thread()) {
+        bool result;
+        QMetaObject::invokeMethod(this, "uncalibratePlugin", Qt::BlockingQueuedConnection,
+                                  Q_ARG(bool, result));
+        return result;
+    }
+
+    for (auto plugin : PluginManager::getInstance()->getInputPlugins()) {
+        if (plugin->getName() == pluginName) {
+            return plugin->uncalibrate();
+        }
+    }
+}
diff --git a/libraries/plugins/src/plugins/InputConfiguration.h b/libraries/plugins/src/plugins/InputConfiguration.h
index abf0c89ab4..27591edc34 100644
--- a/libraries/plugins/src/plugins/InputConfiguration.h
+++ b/libraries/plugins/src/plugins/InputConfiguration.h
@@ -28,6 +28,7 @@ public:
     Q_INVOKABLE void setConfigurationSettings(QJsonObject configurationSettings, QString pluginName);
     Q_INVOKABLE void calibratePlugin(QString pluginName);
     Q_INVOKABLE QJsonObject configurationSettings(QString pluginName);
+    Q_INVOKABLE bool uncalibratePlugin(QString pluginName);
 
 signals:
     void calibrationStatus(const QJsonObject& status);
diff --git a/libraries/plugins/src/plugins/InputPlugin.h b/libraries/plugins/src/plugins/InputPlugin.h
index 51bff07de9..5d02964c97 100644
--- a/libraries/plugins/src/plugins/InputPlugin.h
+++ b/libraries/plugins/src/plugins/InputPlugin.h
@@ -29,6 +29,7 @@ public:
     virtual QJsonObject configurationSettings() { return QJsonObject(); } 
     virtual QString configurationLayout() { return QString(); }
     virtual void calibrate() {}
+    virtual bool uncalibrate() { return false; } 
     virtual bool configurable() { return false; }
     virtual bool isHandController() const { return false; }
     virtual bool isHeadController() const { return false; }
diff --git a/plugins/openvr/src/ViveControllerManager.cpp b/plugins/openvr/src/ViveControllerManager.cpp
index f683ee75de..3b62a1a927 100644
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@@ -127,6 +127,14 @@ void ViveControllerManager::calibrate() {
     }
 }
 
+bool ViveControllerManager::uncalibrate() {
+    if (isSupported()) {
+        _inputDevice->uncalibrate();
+        return true;
+    }
+    return false;
+}
+
 bool ViveControllerManager::isSupported() const {
     return openVrSupported();
 }
@@ -241,10 +249,6 @@ ViveControllerManager::InputDevice::InputDevice(vr::IVRSystem*& system) : contro
     _configStringMap[Config::FeetAndHips] = QString("FeetAndHips");
     _configStringMap[Config::FeetHipsAndChest] = QString("FeetHipsAndChest");
     _configStringMap[Config::FeetHipsAndShoulders] = QString("FeetHipsAndShoulders");
-
-    if (openVrSupported()) {
-        loadSettings();
-    }
 }
 
 void ViveControllerManager::InputDevice::update(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) {
@@ -319,7 +323,8 @@ void ViveControllerManager::InputDevice::calibrateFromHandController(const contr
 
 void ViveControllerManager::InputDevice::calibrateFromUI(const controller::InputCalibrationData& inputCalibrationData) {
     if (_calibrate) {
-        calibrateOrUncalibrate(inputCalibrationData);
+        uncalibrate();
+        calibrate(inputCalibrationData);
         _calibrate = false;
     }
 }
@@ -337,6 +342,8 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
                 bool overrideHead = headObject["override"].toBool();
                 if (overrideHead) {
                     _headConfig = HeadConfig::Puck;
+                    HEAD_PUCK_Y_OFFSET = (float)headObject["Y"].toDouble();
+                    HEAD_PUCK_Z_OFFSET = (float)headObject["Z"].toDouble();
                 } else {
                     _headConfig = HeadConfig::HMD;
                 }
@@ -345,6 +352,8 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
                 bool overrideHands = handsObject["override"].toBool();
                 if (overrideHands) {
                     _handConfig = HandConfig::Pucks;
+                    HAND_PUCK_Y_OFFSET = (float)handsObject["Y"].toDouble();
+                    HAND_PUCK_Z_OFFSET = (float)handsObject["Z"].toDouble();
                 } else {
                     _handConfig = HandConfig::HandController;
                 }
@@ -352,10 +361,6 @@ void ViveControllerManager::InputDevice::configureCalibrationSettings(const QJso
             iter++;
         }
     }
-
-    qDebug() << configToString(_preferedConfig);
-
-    saveSettings();
 }
 
 void ViveControllerManager::InputDevice::calibrateNextFrame() {
@@ -444,15 +449,22 @@ void ViveControllerManager::InputDevice::calibrateOrUncalibrate(const controller
 void ViveControllerManager::InputDevice::calibrate(const controller::InputCalibrationData& inputCalibration) {
     qDebug() << "Puck Calibration: Starting...";
 
+    int puckCount = (int)_validTrackedObjects.size();
+    qDebug() << "Puck Calibration: " << puckCount << " pucks found for calibration";
+
+    if (puckCount == 0) {
+        uncalibrate();
+        emitCalibrationStatus(false);
+        return;
+    }
+
     glm::mat4 defaultToReferenceMat = glm::mat4();
     if (_headConfig == HeadConfig::HMD) {
         defaultToReferenceMat = calculateDefaultToReferenceForHmd(inputCalibration);
     } else if (_headConfig == HeadConfig::Puck) { 
         defaultToReferenceMat = calculateDefaultToReferenceForHeadPuck(inputCalibration);
     }
-
-    int puckCount = (int)_validTrackedObjects.size();
-    qDebug() << "Puck Calibration: " << puckCount << " pucks found for calibration";
+    
     _config = _preferedConfig;
     
     bool headConfigured = configureHead(defaultToReferenceMat, inputCalibration);
@@ -1006,24 +1018,6 @@ void ViveControllerManager::InputDevice::calibrateHead(glm::mat4& defaultToRefer
     _pucksOffset[head.first] = computeOffset(defaultToReferenceMat, inputCalibration.defaultHeadMat, newHead);
 }
 
-
-void ViveControllerManager::InputDevice::loadSettings() {
-    Settings settings;
-    settings.beginGroup("PUCK_CONFIG");
-    {
-    }
-    settings.endGroup();
-}
-
-void ViveControllerManager::InputDevice::saveSettings() const {
-    Settings settings;
-    settings.beginGroup("PUCK_CONFIG");
-    {
-
-    }
-    settings.endGroup();
-}
-
 QString ViveControllerManager::InputDevice::configToString(Config config) {
     return _configStringMap[config];
 }
diff --git a/plugins/openvr/src/ViveControllerManager.h b/plugins/openvr/src/ViveControllerManager.h
index 1a4df550d9..4ebe466a04 100644
--- a/plugins/openvr/src/ViveControllerManager.h
+++ b/plugins/openvr/src/ViveControllerManager.h
@@ -45,6 +45,7 @@ public:
     void setConfigurationSettings(const QJsonObject configurationSettings) override;
     QJsonObject configurationSettings() override;
     void calibrate() override;
+    bool uncalibrate() override;
     bool isHeadController() const override { return true; }
     bool isHeadControllerMounted() const;
 
@@ -91,8 +92,6 @@ private:
         void partitionTouchpad(int sButton, int xAxis, int yAxis, int centerPsuedoButton, int xPseudoButton, int yPseudoButton);
         void printDeviceTrackingResultChange(uint32_t deviceIndex);
         void setConfigFromString(const QString& value);
-        void loadSettings();
-        void saveSettings() const;
         bool configureHead(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
         bool configureHands(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);
         bool configureBody(glm::mat4& defaultToReferenceMat, const controller::InputCalibrationData& inputCalibration);