Fix two bugs in mctx.gui.js ++

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

diff --git a/testing/MCTXWeb/public_html/static/mctx.pintest.js b/testing/MCTXWeb/public_html/static/mctx.pintest.js
index 1e2d2d9..9e64e4e 100644 (file)
--- a/testing/MCTXWeb/public_html/static/mctx.pintest.js
+++ b/testing/MCTXWeb/public_html/static/mctx.pintest.js
@@ -27,7 +27,7 @@ $.fn.exportGPIO = function(menu) {
   var number = menu.val();
   var container = this;
   
-  $.ajax({url : mctx.pintest.api, data : {type : "gpi", num : number, export : 1}})
+  return $.ajax({url : mctx.pintest.api, data : {type : "gpi", num : number, export : 1}})
   .done(function () {
     var form = $("<form/>", {"class" : "controls", action : "#", id : "gpio-" + number});
     var title = $("<div/>", {"class" : "centre bold", text : "GPIO " + number});
@@ -60,14 +60,13 @@ $.fn.exportGPIO = function(menu) {
     alert("Failed to export GPIO " + number + ". Is the server running?\n" +
           "Error code: " + jqXHR.status);
   });
-  return this;
 };
 
 $.fn.exportPWM = function(menu) {
   var number = menu.val();
   var container = this;
  
-  $.ajax({url : mctx.pintest.api, data : {type : "pwm", num : number, export : "1"}})
+  return $.ajax({url : mctx.pintest.api, data : {type : "pwm", num : number, export : "1"}})
   .done(function () {
     var form = $("<form/>", {"class" : "controls", action : "#", id : "pwm-" + number});
     var title = $("<div/>", {"class" : "centre bold", text : "PWM " + number});
@@ -106,7 +105,6 @@ $.fn.exportPWM = function(menu) {
     alert("Failed to export PWM " + number + ". Is the server running?\n" +
           "Error code: " + jqXHR.status);
   });
-  return this;
 };
 
 $.fn.setGPIOControl = function (number, menu) {
@@ -133,15 +131,14 @@ $.fn.setGPIOControl = function (number, menu) {
   dir.click(function () {
     dir.attr('disabled', true);
     var setOut = dir.val() === "In";
+    result.val("");
     if (setOut) {
       update = false;
       set.attr('disabled', false);
-      result.empty();
       dir.val("Out");
     } else {
       update = true;
       set.attr('disabled', true);
-      result.empty();
       dir.val("In");
     }
     dir.attr('disabled', false);
@@ -149,6 +146,7 @@ $.fn.setGPIOControl = function (number, menu) {
   
   set.click(function () {
     dir.attr("disabled", true);
+    set.attr("disabled", true);
     var val = (set.val() === "Off") ? 1 : 0;
     $.ajax({url : mctx.pintest.api, data : {type : "gpo", num : number, set : val}})
     .done(function (data) {
@@ -163,6 +161,7 @@ $.fn.setGPIOControl = function (number, menu) {
     })
     .always(function () {
       dir.attr("disabled", false);
+      set.attr("disabled", false);
     });
   });
   
@@ -230,7 +229,12 @@ $.fn.setADCControl = function() {
       if (update) {
          $.ajax({url : mctx.pintest.api, data : {type : "adc", num : number}})
          .done(function (data) {
-            result.val(data);
+            if (update) {
+              result.val(data);
+            }
+         })
+         .fail(function () {
+            result.val("fail - server not running?");
          })
          .always(function () {
             setTimeout(updater, mctx.pintest.refreshRate);