Merge pull request #48 from jtanx/master

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / static / mctx.gui.js

diff --git a/testing/MCTXWeb/public_html/static/mctx.gui.js b/testing/MCTXWeb/public_html/static/mctx.gui.js
index 7c87c37..247484d 100644 (file)
--- 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 = {
@@ -55,7 +56,7 @@ $.fn.populateSubmenu = function(header, items, translator) {
   var submenuHeader = $("<li/>").append($("<a/>", {text : header, href : "#"}));
   var submenu = $("<ul/>", {"class" : "submenu"});
   
-  for (item in items) {
+  for (var item in items) {
     var info = translator(item, items);
     submenu.append($("<li/>").append(
           $("<a/>", {text : info.text, 
@@ -92,7 +93,7 @@ $.fn.populateNavbar = function () {
  * @returns {$.fn}
  */
 $.fn.setCamera = function () {
-  var url = mctx.api + "image";
+  var url = mctx.api + "image";  //http://beaglebone/api/image
   var update = true;
 
   //Stop updating if we can't retrieve an image!
@@ -178,4 +179,30 @@ $.fn.login = function () {
     mctx.has_control = false;
     alert("no");
   });
-};
\ No newline at end of file
+};
+
+$.fn.setErrorLog = function () {
+  var url = mctx.api + "errorlog";
+  var outdiv = this;
+  
+  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) {
+      if (jqXHR.status === 502 || jqXHR.status === 0) {
+        outdiv.text("Failed to retrieve the error log.");
+      }
+      setTimeout(updater, 1500);
+    });
+  };
+  
+  updater();
+};
+
+$(document).ajaxError(function (event, jqXHR) {
+  //console.log("AJAX query failed with: " + jqXHR.status + " (" + jqXHR.statusText + ")");
+});
\ No newline at end of file