X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Fstatic%2Fmctx.gui.js;h=606c0be942230a8b2bb9473032e681f1bd4fdc43;hb=989a1d2ff5f5afc20f78738f57cc829ae9d11e99;hp=c359e3bf833d8a42b97183c7bc1fec6029975fa6;hpb=6377ff1447acecdb0496116d983034768773d726;p=matches%2FMCTX3420.git diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js index c359e3b..606c0be 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; } @@ -187,6 +188,9 @@ $.fn.setErrorLog = function () { var updater = function () { $.ajax({url : url}).done(function (data) { outdiv.text(data); + outdiv.scrollTop( + outdiv[0].scrollHeight - outdiv.height() + ); setTimeout(updater, 1000); }).fail(function (jqXHR) { outdiv.text("Failed to retrieve the error log."); @@ -197,5 +201,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