diff --git a/testing/MCTXWeb/public_html/pintest.html b/testing/MCTXWeb/public_html/pintest.html index d8821be..0d64c19 100644 --- a/testing/MCTXWeb/public_html/pintest.html +++ b/testing/MCTXWeb/public_html/pintest.html @@ -37,7 +37,13 @@

- BBB pin test +

+ +

+ + BBB pin test +

diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js index c359e3b..82f823c 100644 --- a/testing/MCTXWeb/public_html/static/mctx.gui.js +++ b/testing/MCTXWeb/public_html/static/mctx.gui.js @@ -22,7 +22,8 @@ mctx.sensors = { 2 : {name : "Strain gauge 3"}, 3 : {name : "Strain gauge 4"}, 4 : {name : "Pressure sensor 1"}, - 5 : {name : "Pressure sensor 2"} + 5 : {name : "Pressure sensor 2"}, + 6 : {name : "Pressure sensor 3"} }; mctx.actuators = { @@ -81,8 +82,8 @@ $.fn.populateNavbar = function () { return {text : items[item].name, href : href}; }; - menu.populateSubmenu("Sensor data dump", mctx.sensors, sensorTranslator); - menu.populateSubmenu("Actuator data dump", mctx.actuators, actuatorTranslator); + menu.populateSubmenu("Sensor data", mctx.sensors, sensorTranslator); + menu.populateSubmenu("Actuator data", mctx.actuators, actuatorTranslator); menu.appendTo(this); return this; } @@ -197,5 +198,5 @@ $.fn.setErrorLog = function () { }; $(document).ajaxError(function (event, jqXHR) { - console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")"); + //console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")"); }); \ No newline at end of file diff --git a/testing/MCTXWeb/public_html/static/mctx.pintest.js b/testing/MCTXWeb/public_html/static/mctx.pintest.js index f04daad..1e2d2d9 100644 --- a/testing/MCTXWeb/public_html/static/mctx.pintest.js +++ b/testing/MCTXWeb/public_html/static/mctx.pintest.js @@ -68,7 +68,7 @@ $.fn.exportPWM = function(menu) { var container = this; $.ajax({url : mctx.pintest.api, data : {type : "pwm", num : number, export : "1"}}) - .fail(function () { + .done(function () { var form = $("

", {"class" : "controls", action : "#", id : "pwm-" + number}); var title = $("

", {"class" : "centre bold", text : "PWM " + number}); var table = $("", {"class" : "centre"}); @@ -102,7 +102,7 @@ $.fn.exportPWM = function(menu) { container.append(form); menu.find("option[value='" + number+"']").remove(); }) - .done(function (jqXHR) { + .fail(function (jqXHR) { alert("Failed to export PWM " + number + ". Is the server running?\n" + "Error code: " + jqXHR.status); }); diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css index 7ca9f52..88a4c9f 100644 --- a/testing/MCTXWeb/public_html/static/style.css +++ b/testing/MCTXWeb/public_html/static/style.css @@ -86,6 +86,7 @@ input[type="text"], input[type="password"] { #header { background-color: #2a2a2a; + border-top: 0.8em solid #1188DD; color: #f2f2f2; padding: 1.5em 2em; margin-top: -1em; @@ -95,15 +96,44 @@ input[type="text"], input[type="password"] { transition: all 0.2s ease 0s; } +#header input[type="button"], input[type="submit"] { + background-color: #808080; + border: 1px solid #808080; + box-shadow: none; + color: #f2f2f2; + cursor: pointer; +} + +#header input[type="button"]:hover, input[type="submit"]:hover { + background-color: #606060; + border: 1px solid #606060; +} + +#header #leftnav { + float: left; + display: table; +} + +#header #leftnav a { + color: #2a2a2a; +} + #header #title { - font-family: "Open Sans", Arial; font-size: 30px; - margin-left: 50px; + display: table-cell; + vertical-align: middle; + padding-left: 1em; } #header #rightnav { float: right; + font-size: 15px; padding-top: 0.5em; + text-align: right; +} + +#header #rightnav span { + margin-left: 1em; } #header #menu-container { @@ -113,7 +143,6 @@ input[type="text"], input[type="password"] { } #header #date { - padding-top: 1em; font-size: 12px; } diff --git a/testing/MCTXWeb/public_html/static/uwacrest-text.png b/testing/MCTXWeb/public_html/static/uwacrest-text.png new file mode 100644 index 0000000000000000000000000000000000000000..84d44d0cb649c7065eb123054d6eca75ead3a6e2 GIT binary patch literal 7467 zcmV+`9n|89P)x_SE^h3vjSy{1LdPuK6#wO?;gO#D^4dFu}SbKp9%)K3n`T%Rtb&w?Ul z_=UKubo=hV>HO6j)Nw*MZ9aU7Zi#oKzyA9znjgB8igj7%2D97!HDC_4Z=nSX7SPU} zJ89RhU9@=dV!D6-KJD4FhlULsMp02wv}n;Hx^?RowQt{^Dh7lnOW%IlZtB{#E3H_u zf;Mj4NMC>bHH{rRmNswROsiL~rYTdV(CE>l>A-;l6c7+Vp*xPb!R&U=7tE8wj?%L2 z=V-;+a0%veZ_h7Z)eN+`M^n3S4}Udd%5JSsN{; zOTXNqacjP(+O=!b`Sa)L#~**B-+udz_U+q8(b3U#=+GgGiHV^jM~+Z@d_4L4`_rNg zduY|J^OU#c@-%^2#CugxAwl^By`<6Wf?obB`%UDZjq8B&UlWvB344Y8Use6x?r#FK zcimw53owryIg&PP*g#)>^%aGMh0*@~`)SpxRdn>|QTaT5`g93KfLZ0t$OD`iU=9xt zmjDJQ$3)n@dp9{84vL6~pk>RJ(dpBtsc+xD63pr0%p%?#LAwPl6ckR0E<(^eLAwNf z`8R-hEteZ4$V&;UEGU8f-C+K^!Cb+ABh?(XNrHLAh!K*D0=UPH9h1*%)~u0S8QgaJ z_U&};+&Ky6CgY>&AMIC5Ah(;kn*xFlNHCu`aYDw!1OTW3W^ib5W&9#v1I*P2N0Mi) z1!)CyVdeQl2Gu8uUupi$A!wkW$%4wVUnW7HvR^yAv;T{Nh6F>!|k^MnZ#q?iFtx@F522|UQm03|?r z{rdGJF{9O_om6A!Ci1PnkjAY3o(3%XMuHhK@xg-!Wj-rcu9WGK7I`9U{rdG%W(Jrs z334}EmTsBZ49r@1A3?urey?zvk2L@Bf{rVlU)e>utvHWLCSey;e+Jz(K}EE97_TsJG~BIq-vep>}aD*03w6yl;kF(JRfm~fe(!GdlHdQW2laMg^qnQj09 z=AlD}O3*D`x|B9;+9ZJoFh)j3(#4AxrHEmG*=z#{Fk=z`%;3o5$B&ok0pf4J{gxIk zTu8HL&(4sTkw!3g7j#wgdx6tbHUZc1RF>O<^QdSNc24!@6#xLgDyV?s-^&1i;%+CPcAL>LF&mRbSVAR=It(0&8s{L>fMP zc)B-$=>YSuf*LB++6;&c<{0LNAG+E|rUJ|rl=n`&JVptM!{(6vyCNSGFi+C_K4q}w z=J)l2@|u8oGuOS2wkiEY0do;S@q+x6@GM+sOtzvX?YX7b^I2f#@Ihb>f?8tYy6DU7 zoKG#2unrvdk_P6U+}010ff@Q?$i0V;pQdTkrcvnnaM}>Lji%0=OPxA(l5(_vKz~{n zzM1S%TWHRgUrN=T!I?AFnooIJET_&h_sUIPaPUHMY>K8;p$_WOr7KOEG)aPd&Vr>B zF7jQyb{)-}Ig>UYIQ@5V=4%|!pt>%=9M8-07+ucQ;?^@0RX7ZQeN%bw#(Dbk#`OYg zJlYFtnhG#`3;LO5+Lr|_F)1^GIe1e+!CKfSyeWlDy zUp{pcp=|(9DDOF+F#wm;O^#BZm6~6FmFp;gPS7VIZvdw{(XGR@Fv3ZFHVIl`R(DJo z08-IzoYFR#RkX>!PRkpzZwHeyYjHoi>ZedpD#j73#=q4~t&)DA$p)~Np1~cTdJEGH zz$#t((GTl$Qf!2k4zJBa#aoX^cU~pCqt5hw8iAaNRabD+b&kYwrZ8yoX{s`~9$MTL zg8pO;NGC(p4{^Ywh!jvC&SahW1danv8?ADF-Yg?+kV(1SoN08FdVMSC$g_0r%p9h% z2-cog+_{2AXnOp&xlDgOgR424E=?EsYV_zy--l$SwskVoMY~l3`dC;ldb|Cgbma%T z5Xh5h1T%K#r34idRMG@Q7WOZu%D=n`GSXyKbetsw6&Lgt>sS3!Q3njd$Gjn|VxkE! z@-3lrFs@&A<^3ftzl5qcry`sp%sij7JJJAKZp9FB-+8@*B zZM~BKeQHAv$+6R#XVrn&zmUUyl;w8mJ(fLCL~P{J0=l+=tp#vx61e9#T4}jBo^H^f z0kx@<2E=&FVds5hB3pMudlEFGsNEbdMa zyV05UlP*E#`N=#An)s0vDFWMgQ@>W;k|P7m!#erOpiUTGr_#|yDQ|%2t})R72b^>(l#Zq2?*5UVncME&-p$7kB;L$btC!z z70mDLIq@&20LxtaOPW2cvIJzG=H68HO;4&**^5dR^rRTE;p^VIv^?5|K~eYa-Rb!8 z`k2hkXVsGBeOQF;+6t6?@hgvZ|`L ziI$}{=kbwt*wa#NH#321tmbUOe$WcWIOD0ULCON%cR;ffCb9@>nVnbbdE}qvg zn1?HV&7hFi4iMmK@NsN_5{5w;$0uR4S;tzLb+=VnFMEks2H0BkR}LaD8%Ob=PSqyU z1J+x&=I07pTaafPlL5Wq>U53cEf;hcnkg42bQLt+?^(@nJ|FhrqQM-c-)!(AVB+7Cb=ZDR(rj_k<};?|3&L}I<8j-PUs$a-lh({H zl?1|G&AcUm*97@e@K7K5{MEulP}i(klS-5*LD{osmlk)y!NJtCXHRK5I;2O*6mm8= zJvhEv-sekTeVF_RH5FinZuG9PX=Ko#16HxYj2HW_)D8ivXof55K}MvKpT$IH9H1V# ztK306U&lb}{>lm3C;Yt4#CGC54{9^b|J!HuK@JwR-sd(|F%hvyHy+|s#-hsmEn_mN zrlCssI@Kc2Xdmm>6O==sd-};7^vf_OFtbKvPM_eUZR^ZTM!Bv3GCc`}+zg9316Vm4 zPNRrLZzcm^k=H#F!93oF$`$jZ{P{A`sZc9r%H%Yar?c-t$9E7z*zCH-H^n@O5_!Y^yqtP;o&FJQNfJA^_0ubYAyv{rC_zxp$! zVZIP`esyKk<6U`?aUImpMIQK`j;>6l>}y+ z%|?R;4U)FX*aYH+_rejmoPrrNcX~y6Lj^KhIybNuUfOVtXQtxcg#n5Cfp0n4FeTZ? zn&dl~xny<|FrRl)mtPbyLpPSW&6ab}s9ZD&Kd3xUU<)$HyJ0TcUWsMdGE6nOT?3Rj z`PuIsE$tzbqjf8T{0Eb=LRBLs#lITM%w^b!UI%LvUWqW_!uV1^4h_r?U4VIo<~M-z znZ)^CO~C}Q>pdBNgSrfA?i6_Q2Kh+tjOadDJg8HH%v7yfHA(Qxl`EGt=Euzv7~Z#Q zQ7!3++ZomO?@iZl-+!dr&!!R3p$2zW{A|n(&pF{HDwtIxmXgZzWfObn0nRq6!vCf! zK4`}A0B2o(4riNYHT(xHukk!dqg}Lng>EUxhD+y_{X!-dADU}gj>F3PYsMxMcLN!m zURu5|d|GQ#2TY(x{QM$=Yk;-~$*E{eU@P562{$fDWLG%3r^3nC>P%N@TP|M3>X~)U z_jN|tXYym)bGaF3haVWFY4XjER8Kn`0_g8Ixu-zP2` z831!rvyBq(uE&}98`_LcY_Kv?3ERxFUqxQVELvJe*1nq9dwYbfFM`9^S4y@ME(EjVpelZ{pf9+aNE5j3pU%5m7IiiMsZ zZ%`Yt*wev@uG#EHNG=9Z2ld9b0`iUw>OzYDJ8aZHL|wrYtx#JIt6^f;{}PwgQIoSh z`4)BuO=tZ&_rq}Jyz0f-Qp`l^unxbeHWrPHeH^O*JF;cp3;f0EfW6d(-$!k4@=Kjp}flS`EUNpKrs z<%J3ls=RX>lIL+`U2duw7)%czJ-(@{u-wk=o;RRJMjyFCtp>C)*FcDkpqHnIskosN z^w4h=_M~0&5^XeK1N~w5KstRHVrTLL0=IL!=LO)Gv~&9Xz2@$h$IoVfo;kpWa%Riq z6vQv)%tU=#c+*Y>u|b^&wVfA{`_+m!-B zX+v-^Q$QbCWua`g(SI(ZVFe8^^vE6HQ)0xjkkV5acVrq zPJcdpd`tP}TR#58)EoSsq?U0zw@VM0ae~uNc|XHn-7yr?4R78{__O+eB^0%!P)c3# zL|+Q(nI-8^WpvjpDdH@h^ENdc6%HW(Zm5!2HFZ?`wWP{HALHlF7X_MyprvZN3#>W*;GAAdfCDPtK$Cg05EEMdRb z_{jIU+?a?B%bERZn1>~Wzr)h_qQe&WSM+7PJx7jsyYCyZQI`MJ8k&m{mgZ)CbUMr< z%SDGzA+!;{apAVNE^o@7Gp+f5AMD{B>#(gsJ~3NzWs7xKqkf9=us#nk=V4Io=WF5L z(NkAfiC6Q+o%;#z1+1k7GvAe$R!bG~l-dd$q`-o%Oc77&($G5z$fL&9pgJQr0m#2; zN6iD2G8Xd*7`}6M^LY%$rAXfbu@RQD=(LmrWos)2E7=!>VxxQt$A|lVkkNAE9Jaio z+&gg&-}nFLfM{!*;da=qox~YI%5T1n_VA3g+h)evtxIAfY^CBNEK>mLbTJ#dbz>5+ zBW!D*n-)U>7EWLuEALaZxYZLLJi60=!G7`|(MW9ceCXo}UQ%PRa*PjU_VSQ7P)>&B zpf-W+XkzG5Z1#TCPx#on?V<63k0(!_{KnKr)5X2R_F^)HI~l0uI>+9#$0IW+ z!;>i7ub3!zgUdm5*joP;oHS{5*yG`w;Z;p=O=tZP7hzimAj@$K^YBVn{vy4YEF%*0 zv(}5V+uA%YFdJ4?QEW`2x~3-a@j;ONJC0tZ>V3x2uI2fYI57adVL=h99x#KB#7KOu z*R8`ikH-8>H&~C!Puu?bD=a|Gt*27m7SXw)V?Gld)li5N{huz4wssdCmKGRjQO~8| zoMKRBosY_z8=`^WrV|Z-$Js6KinRVQ8!fNK*nJ9${078tw!IWBiNoWs)F zj3bFW2ZF1CgJH11-9&!P#Nf3`%-dE&l(jP^%KCO9cd}JSJOD=wYG<+BmcJNb9gihf z)N`bu+DNZ*+q21(Cj+5f5oaSQiO+Q5RV!hhH_3 zW>E4K#o9&WDgSBUio^P{0P_rUM&aQj(w;{jh&V$aCP;tuQ-r0dOl!A}hTr)p%PXSK z0^;qqGICrTwtpf`Vx27$k%l?+5-~=8yt0)Rb?h1w=~qHb&`M$)Cd=^<^)}puHT#1v;(hp$3V2YLIbDo%f zvEh~~0I-;xl@r@%or?*XIM9|phPZ?k0^kx8d9N&6$hV@bg%`v9N{Vul%qnGHL|Wf5 z04(b*$~5m^YaNmA0?uPt(#jC-mj^3he1xqgCbF!jm~c;5LounuBp2;ziGBrlPil|D zx){#@r)cve^esdWIT-}w0jN=L^f$&q#83K2CHe*62NO^^Wf9i(st$%Hc7TpIW?_7z zVG@5<)tfIVo>{)*9KG8kn6`Wei%EGMrvPg!hOw1d55Btev%KghZgYo(gvjqb9du=SPU+GE!x9oh#}0y8-p`Tj;Czi1Yo9u zdxN7gXB_}}+?jYICdiSea-j7Gl#js&mo%1dW5Xl{=?iu91i8`R*cdpG?nI*OZ=DZW z9C;!Q9vF1tzYP-xU{72%EK|gDPjGutR)<9S*V-c{!ml`13j+`U znzPLqxG2DHyaRwnJw(3t3mbj^0q!kVBNnFsUQv%}MxJpIzE#DT^g@42#v>+(?0dn8 z(6*=jVeN@JV-jNGuxvfu;OH2aiw^7X6ikJ0G^-9*_)Gu%^UqIk4GOoc@rOI?9`lWc zu?*^RY-*XnH+w%|1NOc7;s$4X#{5y@7KVU&~e~U;9_#=kFYufAYQ{DLcZlr+k_<;;iA*FVp1e6ff3dn z0J!lkCPFBD2G>`30P$?ktC-V6G;L~ zvqMZ=iuo8;!uhGBIgrICp6s$DD z{}9F{QFCFN0dO+s4aZnO^CZB$3XH}W7fh-0U$&Fl-3Ka#!_`@qctBo&Cq0EaM5uF*j3dT z;(^l{ewg9v#K4lTs`qs6Yqr6HA37KV1d+xlTLOmjka5J|B;^(6_oA8}+)XV0OVV6SQbHsu*|)iPxDsbZy)5J?<`s*!4Kem@x>Ps$PgHO49$9 z;Gd}=rU;Sc9^dI|s{H+y7vFGDH=l32N5$>Z3+7e|kXrKfn8qe|z;d%}4Ne?-_wL;o zzFSsOi&vhno1bT{JB}xWuNKdjZwMUa8w6x_@zU+wE-hfr#v(#E|KW+c3C!^qm06ts pht6;<_*-eA`bSsX&h1j`{sXbU=UuGq2jc($002ovPDHLkV1hNslv@A* literal 0 HcmV?d00001 diff --git a/testing/uwacrest-text.svg b/testing/uwacrest-text.svg new file mode 100644 index 0000000..6e64c7d --- /dev/null +++ b/testing/uwacrest-text.svg @@ -0,0 +1,151 @@ + + + -- 2.20.1