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 0000000..84d44d0 Binary files /dev/null and b/testing/MCTXWeb/public_html/static/uwacrest-text.png differ 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 @@ + + +